Date: Thu, 20 Jun 2019 19:19:25 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504733 - in head/x11/cde: . files Message-ID: <201906201919.x5KJJPgc081244@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Thu Jun 20 19:19:25 2019 New Revision: 504733 URL: https://svnweb.freebsd.org/changeset/ports/504733 Log: x11/cde: Add dtlogin rc script Remove double ksh dependency Pet portlint Mark BROKEN on head: cc -o dthelpview -O2 -fno-strict-aliasing -Wno-write-strings -Wno-unused-result -Wno-deprecated-register -pipe -L../../../exports/lib -L/usr/local/lib -L/usr/local/lib Main.o ManPage.o Util.o version.o -lDtHelp -lDtSvc -ltt -lXm -lXt -lSM -lICE -lXext -lX11 -L/usr/local/dt/lib -L/usr/local/lib -L/usr/local/lib -liconv -lm -lstdc++ ld: error: ../../../exports/lib/libDtHelp.so: undefined reference to jpeg_CreateDecompress [...] Added: head/x11/cde/files/dtlogin.in (contents, props changed) Modified: head/x11/cde/Makefile head/x11/cde/files/dtcms.in head/x11/cde/files/dtspc.in Modified: head/x11/cde/Makefile ============================================================================== --- head/x11/cde/Makefile Thu Jun 20 19:16:20 2019 (r504732) +++ head/x11/cde/Makefile Thu Jun 20 19:19:25 2019 (r504733) @@ -2,7 +2,7 @@ PORTNAME= cde DISTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ @@ -22,7 +22,6 @@ BUILD_DEPENDS= ksh93:shells/ksh93 \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ - ksh93:shells/ksh93 \ xrdb:x11/xrdb \ xset:x11/xset @@ -33,7 +32,7 @@ SHEBANG_FILES= programs/dtdocbook/sgmls/sgmls.pl \ programs/dtdocbook/doc2sdl/docbook.tcl \ programs/dtdocbook/doc2sdl/dtdocbook USE_LDCONFIG= ${PREFIX}/dt/lib -USE_RC_SUBR= dtcms dtspc +USE_RC_SUBR= dtcms dtspc dtlogin USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xp xscrnsaver xt WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -41,6 +40,12 @@ ALL_TARGET= World MAKE_ARGS+= PERL=${PERL} MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message + +.include <bsd.port.options.mk> + +.if ${OSVERSION} >= 1300018 +BROKEN= Fails to build: ld: error: ../../../exports/lib/libDtHelp.so: undefined reference to jpeg_CreateDecompress +.endif post-patch: @if [ -f /usr/include/iconv.h ]; then \ Modified: head/x11/cde/files/dtcms.in ============================================================================== --- head/x11/cde/files/dtcms.in Thu Jun 20 19:16:20 2019 (r504732) +++ head/x11/cde/files/dtcms.in Thu Jun 20 19:19:25 2019 (r504733) @@ -15,14 +15,14 @@ name=dtcms rcvar=dtcms_enable desc="CDE calendar manager service daemon" -start_precmd="force_depend rpcbind || exit 1" load_rc_config $name : ${dtcms_enable:=NO} command=/usr/sbin/daemon -pidfile=/var/run/dtcms.pid command_args="-P $pidfile %%PREFIX%%/dt/bin/rpc.cmsd" +start_precmd="force_depend rpcbind || exit 1" +pidfile=/var/run/dtcms.pid run_rc_command $1 Added: head/x11/cde/files/dtlogin.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/cde/files/dtlogin.in Thu Jun 20 19:19:25 2019 (r504733) @@ -0,0 +1,26 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: dtlogin +# REQUIRE: LOGIN dbus hald dtspc +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable slim: +# dtlogin_enable="YES" +# + +. /etc/rc.subr + +name=dtlogin +rcvar=dtlogin_enable +desc="Display manager for CDE" + +load_rc_config dtlogin + +: ${dtlogin_enable:=NO} + +command=%%PREFIX%%/dt/bin/dtlogin +command_args=-daemon + +run_rc_command $1 Modified: head/x11/cde/files/dtspc.in ============================================================================== --- head/x11/cde/files/dtspc.in Thu Jun 20 19:16:20 2019 (r504732) +++ head/x11/cde/files/dtspc.in Thu Jun 20 19:19:25 2019 (r504733) @@ -15,16 +15,15 @@ name=dtspc rcvar=dtspc_enable desc="CDE Subprocess Control Service" -start_precmd="force_depend rpcbind || exit 1" load_rc_config $name : ${dtspc_enable:=NO} command=/usr/sbin/daemon -pidfile=/var/run/dtspc.pid command_args="-P $pidfile %%PREFIX%%/dt/bin/dtspcd" -start_precmd="ln -sf %%PREFIX%%/dt /usr/dt && ln -sf %%PREFIX%%/etc/dt /etc/dt" +start_precmd="force_depend rpcbind || exit 1 && ln -sf %%PREFIX%%/dt /usr/dt && ln -sf %%PREFIX%%/etc/dt /etc/dt" stop_postcmd="[ -L /usr/dt -a -L /etc/dt ] && rm /usr/dt /etc/dt" +pidfile=/var/run/dtspc.pid run_rc_command $1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906201919.x5KJJPgc081244>