Index: head/x11/cde/Makefile =================================================================== --- head/x11/cde/Makefile (revision 504732) +++ head/x11/cde/Makefile (revision 504733) @@ -1,132 +1,137 @@ # $FreeBSD$ PORTNAME= cde DISTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ MAINTAINER= crees@FreeBSD.org COMMENT= Common Desktop Environment LICENSE= LGPL21 BROKEN_mips64= fails to build: ./config/imake/imake: No such file or directory BROKEN_powerpc64= fails to build: ./config/imake/imake: No such file or directory BUILD_DEPENDS= ksh93:shells/ksh93 \ bdftopcf:x11-fonts/bdftopcf \ mkfontscale>=0:x11-fonts/mkfontscale \ biconv:converters/iconv \ ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ ${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 USES= iconv:wchar_t motif perl5 shebangfix tcl:85 SHEBANG_LANG= pl ksh tcl SHEBANG_FILES= programs/dtdocbook/sgmls/sgmls.pl \ programs/dtinfo/tools/bin/ccdate \ 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} ALL_TARGET= World MAKE_ARGS+= PERL=${PERL} MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message + +.include + +.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 \ ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \ ${WRKSRC}/programs/dtmail/libDtMail/Common/Session.C \ ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCBodyPart.C; \ fi # From shells/ksh93 @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/include/sfio*.h \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.h # Speed up poudriere + qemu + native-xtools @${REINPLACE_CMD} \ -e 's|CcCmd cc|CcCmd ${CC}|g' \ -e 's|CplusplusCmd c++|CplusplusCmd ${CXX}|g' \ -e 's|CppCmd /usr/bin/cpp|CppCmd ${CPP}|g' \ ${WRKSRC}/config/cf/FreeBSD.cf # Needed for armv6 @${REINPLACE_CMD} -e 's|__va_copy|va_copy|g' \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/hash/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/string/*.c # Fix all hardcoded path @${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ ${WRKSRC}/config/cf/Imake.tmpl \ ${WRKSRC}/programs/dtdocbook/sgmls/sgmls.pl \ ${WRKSRC}/programs/dtinfo/tools/bin/ccdate @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/dt|${LOCALBASE}/dt|g ; \ s|/etc/dt|${LOCALBASE}/etc/dt|g' @${REINPLACE_CMD} -e 's|STAGEDIR|${STAGEDIR}|g' -e \ 's|LOCALBASE|${LOCALBASE}|g' \ ${WRKSRC}/admin/IntegTools/dbTools/installCDE.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configRun.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configShlibs.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configMin.src # we need to remove a few LOCALBASE @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtinfogen|/etc/dtinfogen|g' \ ${WRKSRC}/databases/CDE-RUN.udb \ ${WRKSRC}/config/cf/cde.tmpl @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtsr|/etc/dtsr|g' -e \ 's|${LOCALBASE}/etc/dtinfo_start|/etc/dtinfo_start|g' \ ${WRKSRC}/databases/CDE-RUN.udb \ ${WRKSRC}/programs/tttypes/dtinfo_start.ptype \ ${WRKSRC}/programs/tttypes/dtinfo.ptype @${REINPLACE_CMD} -e 's|${LOCALBASE}||g' \ ${WRKSRC}/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c # why redefine exit?? @${REINPLACE_CMD} -e '/void exit/d' \ ${WRKSRC}/lib/tt/bin/tt_type_comp/frozen.mp_types_lex.C # (time_t*) NULL is apparently too C-ish @${REINPLACE_CMD} -e 's,(time_t) *NULL,nullptr,' \ ${WRKSRC}/programs/dtmail/libDtMail/Common/FileShare.C \ ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCMailBox.C # The docs say not necessary, but unreliable without # @${MKDIR} ${WRKSRC}/imports/x11/include # @${LN} -s ${LOCALBASE}/include/X11 ${WRKSRC}/imports/x11/include # @${LN} -s ${LOCALBASE}/include/Xm ${WRKSRC}/imports/x11/include # @${LN} -s ${LOCALBASE}/include/fontconfig ${WRKSRC}/imports/x11/include # @${LN} -s ${LOCALBASE}/include/freetype2 ${WRKSRC}/imports/x11/include do-install: cd ${WRKSRC}/admin/IntegTools/dbTools && \ ./installCDE -s ${WRKSRC} -destdir ${STAGEDIR} (cd ${STAGEDIR}${PREFIX}/dt/share/man && \ for m in 1 1m 3 4 5 6; do \ ${GZIP_CMD} man$$m/*.$$m; \ done) ${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf \ ${STAGEDIR}${PREFIX}/etc/pam.d/cde.conf post-install: ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; # Documented switches don't actually produce desired effect! # ./installCDE -s ${WRKSRC} -pI ${STAGEDIR}${PREFIX}/dt \ # -pV ${STAGEDIR}/var -pC ${STAGEDIR}${PREFIX}/etc .include Index: head/x11/cde/files/dtcms.in =================================================================== --- head/x11/cde/files/dtcms.in (revision 504732) +++ head/x11/cde/files/dtcms.in (revision 504733) @@ -1,28 +1,28 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: dtcms # REQUIRE: rpcbind # KEYWORD: shutdown # Add the following line to /etc/rc.conf to enable dtcms: # # dtcms_enable=YES . /etc/rc.subr 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 Index: head/x11/cde/files/dtlogin.in =================================================================== --- head/x11/cde/files/dtlogin.in (nonexistent) +++ head/x11/cde/files/dtlogin.in (revision 504733) @@ -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 Property changes on: head/x11/cde/files/dtlogin.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/cde/files/dtspc.in =================================================================== --- head/x11/cde/files/dtspc.in (revision 504732) +++ head/x11/cde/files/dtspc.in (revision 504733) @@ -1,30 +1,29 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: dtspc # REQUIRE: rpcbind # KEYWORD: shutdown # Add the following line to /etc/rc.conf to enable dtspc: # # dtspc_enable=YES . /etc/rc.subr 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