From owner-svn-ports-all@freebsd.org Sun Dec 9 13:51:21 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F289913225FC; Sun, 9 Dec 2018 13:51:20 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9D5956C383; Sun, 9 Dec 2018 13:51:20 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E26612171; Sun, 9 Dec 2018 13:51:20 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB9DpKHX082954; Sun, 9 Dec 2018 13:51:20 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB9DpIZ4082945; Sun, 9 Dec 2018 13:51:18 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201812091351.wB9DpIZ4082945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Sun, 9 Dec 2018 13:51:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r487047 - in branches/2018Q4/x11-wm/cde: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in branches/2018Q4/x11-wm/cde: . files X-SVN-Commit-Revision: 487047 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9D5956C383 X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.99)[-0.993,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2018 13:51:21 -0000 Author: crees Date: Sun Dec 9 13:51:18 2018 New Revision: 487047 URL: https://svnweb.freebsd.org/changeset/ports/487047 Log: MFH 484207 (partial) Update to 2.3.0 Unbreak Incorporate changes and improvements made by Mikael Urankar PR: ports/221102 Submitted by: mikael.urankar@gmail.com Various other cleanups; correct pkg-message and add ksh dependency PR: ports/220572 Submitted by: pfg NOT MERGED: Move to more correct x11 category Approved by: portmgr (implicit; unbreaking) Added: branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_dbTools_installCDE (contents, props changed) branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configMin.src (contents, props changed) branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configRun.src (contents, props changed) branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src (contents, props changed) branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.cf (contents, props changed) branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.rules (contents, props changed) Deleted: branches/2018Q4/x11-wm/cde/files/patch-lib_tt_lib_util_tt__file__system.C Modified: branches/2018Q4/x11-wm/cde/Makefile branches/2018Q4/x11-wm/cde/distinfo branches/2018Q4/x11-wm/cde/files/pkg-message.in branches/2018Q4/x11-wm/cde/pkg-plist Modified: branches/2018Q4/x11-wm/cde/Makefile ============================================================================== --- branches/2018Q4/x11-wm/cde/Makefile Sun Dec 9 13:24:29 2018 (r487046) +++ branches/2018Q4/x11-wm/cde/Makefile Sun Dec 9 13:51:18 2018 (r487047) @@ -1,29 +1,36 @@ # $FreeBSD$ PORTNAME= cde -DISTVERSION= 2.2.3 -PORTREVISION= 1 +DISTVERSION= 2.3.0 CATEGORIES= x11-wm MASTER_SITES= SF/cdesktopenv/src/ -DISTNAME= ${PORTNAME}-src-${DISTVERSION} 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 \ - mkfontdir:x11-fonts/mkfontdir \ - biconv:converters/iconv + mkfontdir:x11-fonts/mkfontdir \ + 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= motif perl5 shebangfix +USES= iconv motif perl5 shebangfix tcl:85 SHEBANG_FILES= programs/dtdocbook/sgmls/sgmls.pl \ programs/dtinfo/tools/bin/ccdate USE_LDCONFIG= ${PREFIX}/dt/lib USE_RC_SUBR= dtcms dtspc -USE_XORG= xinerama xp xt +USE_XORG= xinerama xp xt xscrnsaver WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} ALL_TARGET= World @@ -37,46 +44,89 @@ SUB_FILES= pkg-message BROKEN= Does not build on head .endif -DTPATHSRE= 's,/usr/dt,${STAGEDIR}${PREFIX}/dt,;s,/etc/dt,${STAGEDIR}${PREFIX}/etc/dt,;\ - s,/var/dt,${STAGEDIR}${PREFIX}/dt/var,' post-patch: - if [ -f /usr/include/iconv.h ]; then \ + @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 - ${REINPLACE_CMD} -e 's,^PREFIX.*,PREFIX=${STAGEDIR}${PREFIX},' \ +# From shells/ksh93 +.if ${OSVERSION} >= 1100093 + @${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 +.endif + +# 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 - ${FIND} ${WRKSRC}/programs/dtksh/ksh93 -type f -exec \ - ${REINPLACE_CMD} -e 's,SF_FLAGS,SFIO_FLAGS,g' \{} \+ - cd ${WRKSRC} && \ - ${MKDIR} imports/x11 && \ - ${LN} -s ${LOCALBASE}/bin ${LOCALBASE}/include ${LOCALBASE}/lib \ - imports/x11 && \ - ${MKDIR} imports/motif/include && \ - ${LN} -s ${LOCALBASE}/include/Xm imports/motif/include -# PREFIX safe- ugh! Ignore doc subdirectoy as it causes build headaches -# ${FIND} ${WRKSRC}/??[^c]* -type f -exec ${REINPLACE_CMD} \ -# -e 's,\([>/]|^\)usr/dt,\2${PREFIX:S,^/,,}/dt,g' \ -# -e 's,\([^a-zA-Z]|^\)/etc/dt,\1${PREFIX}/etc/dt,g' \ -# \{} + - ${REINPLACE_CMD} ${DTPATHSRE} ${WRKSRC}/databases/* - ${FIND} ${WRKSRC}/programs/ -type f \ - -name Makefile \ - -exec ${REINPLACE_CMD} ${DTPATHSRE} \{} + -# \( -name '*.[Cch]' -or -name Makefile \) \ +# 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} -pseudo - ${ECHO_CMD} "MANPATH ${PREFIX}/dt/share/man" > \ - ${STAGEDIR}${PREFIX}/etc/man.d/cde.conf + ./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 + ${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 \ Modified: branches/2018Q4/x11-wm/cde/distinfo ============================================================================== --- branches/2018Q4/x11-wm/cde/distinfo Sun Dec 9 13:24:29 2018 (r487046) +++ branches/2018Q4/x11-wm/cde/distinfo Sun Dec 9 13:51:18 2018 (r487047) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496004049 -SHA256 (cde-src-2.2.3.tar.gz) = 108fc8ee6216a2d3da5ee0682c3012a042c33b2eaf4b4dc357e1e2b770be4f8f -SIZE (cde-src-2.2.3.tar.gz) = 60738851 +TIMESTAMP = 1541358342 +SHA256 (cde-2.3.0.tar.gz) = 2f82c32a9ec7d81130336959c01942eedaa2ffab810df2ee69f3aefd8d2ae641 +SIZE (cde-2.3.0.tar.gz) = 57941186 Added: branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_dbTools_installCDE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_dbTools_installCDE Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,11 @@ +--- admin/IntegTools/dbTools/installCDE.src.orig 2016-05-26 15:44:34 UTC ++++ admin/IntegTools/dbTools/installCDE.src +@@ -648,7 +648,7 @@ XCOMM + TAR_DIR="" + LeaveLinks="no" + REMOVE_LINKS="no" +- CLEAN_DAEMONS="yes" ++ CLEAN_DAEMONS="no" + theLang="" + CONFIGURE_ONLY="no" + Added: branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configMin.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configMin.src Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,41 @@ +--- admin/IntegTools/post_install/freebsd/configMin.src.orig 2016-06-21 UTC ++++ admin/IntegTools/post_install/freebsd/configMin.src +@@ -197,13 +197,13 @@ RemoveMinFiles() + + SetManPath() + { +- DTMANPATH=CDE_INSTALLATION_TOP/share/man +- echo "MANPATH $DTMANPATH" > ${PREFIX}/etc/man.d/cde.conf ++ DTMANPATH=/usr/local/dt/share/man ++ echo "MANPATH $DTMANPATH" > STAGEDIR/LOCALBASE/etc/man.d/cde.conf + } + + UnSetManPath() + { +- rm -f ${PREFIX}/etc/man.d/cde.conf ++ rm -f STAGEDIR/LOCALBASE/etc/man.d/cde.conf + } + + VerifyInstalledFiles() +@@ -235,21 +235,8 @@ XCOMM ################################## + if [ "$OPERATION" = "configure" ] + then + +- FixEtcServices +- +- : FixEtcInetdDotConf +- + SetManPath + +- HASH +- HASH create the /var/dt/tmp directory for the dtspcd +- HASH +- +- if [ ! -d CDE_LOGFILES_TOP/tmp ] +- then +- mkdir -p CDE_LOGFILES_TOP/tmp +- fi +- + elif [ "$OPERATION" = "deconfigure" ] + then + Added: branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configRun.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configRun.src Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,50 @@ +--- admin/IntegTools/post_install/freebsd/configRun.src.orig 2016-06-21 UTC ++++ admin/IntegTools/post_install/freebsd/configRun.src +@@ -221,9 +221,9 @@ XCOMM ################################## + PRODUCT=CDE + FILESET=CDE-RUN + +-DT_TOP=CDE_INSTALLATION_TOP +-DT_CONFIG_TOP=CDE_CONFIGURATION_TOP +-DT_TEMP_TOP=CDE_LOGFILES_TOP ++DT_TOP=STAGEDIR/usr/dt ++DT_CONFIG_TOP=STAGEDIR/etc/dt ++DT_TEMP_TOP=STAGEDIR/var/dt + ROOT=/ + + retval=0 +@@ -253,17 +253,6 @@ DEFAULT_PRINTER="DtPrint" + mkdir -p $DT_TEMP_TOP/$APPCONFIG/appmanager + fi + +- cd $DT_TEMP_TOP +- mv $APPCONFIG/appmanager .hidden-appmanager +- chmod -R 755 * +- chmod 755 .hidden-appmanager +- chown -R bin * +- chgrp -R bin * +- mv .hidden-appmanager $APPCONFIG/appmanager +- chmod 755 . +- chown bin . +- chgrp bin . +- + HASH + HASH create the CDE_CONFIGURATION_TOP and its config directory + HASH +@@ -296,8 +285,6 @@ DEFAULT_PRINTER="DtPrint" + cd $DT_CONFIG_TOP + chmod -R 755 * + +- FixInetdDotConf +- + elif [ "$OPERATION" = "deconfigure" ] + then + +@@ -322,7 +309,4 @@ DEFAULT_PRINTER="DtPrint" + /etc/rc.d/inetd onereload + fi + +- HASH dtmail requires setgid +- chmod 2555 $DT_TOP/bin/dtmail +- + return $retval Added: branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,30 @@ +--- admin/IntegTools/post_install/freebsd/configShlibs.src.orig 2016-05-27 14:25:51 UTC ++++ admin/IntegTools/post_install/freebsd/configShlibs.src +@@ -54,7 +54,7 @@ XCOMM + XCOMM creates links in the install tree libtt.so -> libtt.so.1 + XCOMM + +- cd CDE_INSTALLATION_TOP/lib ++ cd STAGEDIR/LOCALBASE/dt/lib + + for lib in `/bin/ls *.so.*` + do +@@ -78,7 +78,7 @@ FILESET=CDE-SHLIBS + retval=0 + CDE_TOP=CDE_INSTALLATION_TOP + CDE_CONF_TOP=CDE_CONFIGURATION_TOP +-LDCONFIGFILE=/usr/local/libdata/ldconfig/cde ++LDCONFIGFILE=STAGEDIR/LOCALBASE/libdata/ldconfig/cde + + HandleOption $* + +@@ -100,8 +100,7 @@ LDCONFIGFILE=/usr/local/libdata/ldconfig + MakeTheLink + + rm -f $LDCONFIGFILE +- echo $CDE_TOP/lib > $LDCONFIGFILE +- /sbin/ldconfig -m $CDE_TOP/lib ++ echo LOCALBASE/dt/lib > $LDCONFIGFILE + + elif [ "$OPERATION" = "verify" ] + then Added: branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.cf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.cf Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,13 @@ +--- ./config/cf/Imake.cf.orig 2016-05-19 UTC ++++ ./config/cf/Imake.cf +@@ -205,6 +205,10 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 + # define AMD64Architecture + # undef amd64 + # endif ++# if defined(__arm__) ++# undef __arm__ ++# define ARMArchitecture ++# endif + #endif /* __FreeBSD__ */ + + #ifdef AMOEBA Added: branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.rules ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11-wm/cde/files/patch-config_cf_Imake.rules Sun Dec 9 13:51:18 2018 (r487047) @@ -0,0 +1,30 @@ +Work around a difference between "clang -traditional" and "gcc -traditional" + +CppScriptTarget is used to generate rules to create a shell script by running +the input through cpp (cf config/cf/Imake.rules) + +For example, we have +CppScriptTarget(configRun,configRun.src,...) + +in admin/IntegTools/post_install/freebsd/configRun.src, we have: +#define STAR * +for j in $DT_TOP/$APPCONFIG/$i/STAR + +gcc outputs this "for j in $DT_TOP/$APPCONFIG/$i/*" +clang outputs this "for j in $DT_TOP/$APPCONFIG/$i/ *" + +This prevents some post install scripts to create the correct directories. + +Should we use devel/tradcpp instead? + +--- config/cf/Imake.rules.orig 2016-10-31 UTC ++++ config/cf/Imake.rules +@@ -2398,7 +2398,7 @@ MakeMakeSubdirs(dirs,Makefiles) + * Also delete line numbers from the cpp output (-P is not portable, I guess). + */ + #ifndef CppSedMagic +-#define CppSedMagic $(SED) -e '/^#[line]* *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' ++#define CppSedMagic $(SED) -E 's;(/|#) \*;/*;g' | $(SED) -e '/^#[line]* *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' + #endif /* CppSedMagic */ + + #ifndef CppFileTarget Modified: branches/2018Q4/x11-wm/cde/files/pkg-message.in ============================================================================== --- branches/2018Q4/x11-wm/cde/files/pkg-message.in Sun Dec 9 13:24:29 2018 (r487046) +++ branches/2018Q4/x11-wm/cde/files/pkg-message.in Sun Dec 9 13:51:18 2018 (r487047) @@ -15,5 +15,5 @@ the calendar to work). # service rpcbind start && service dtspc start && service dtcms start To start the Common Desktop Environment, -% ln -s /usr/dt/bin/Xsession ~/.Xsession +% ln -s %%PREFIX%%/dt/bin/Xsession ~/.Xsession % env LANG=C startx Modified: branches/2018Q4/x11-wm/cde/pkg-plist ============================================================================== --- branches/2018Q4/x11-wm/cde/pkg-plist Sun Dec 9 13:24:29 2018 (r487046) +++ branches/2018Q4/x11-wm/cde/pkg-plist Sun Dec 9 13:51:18 2018 (r487047) @@ -21,7 +21,6 @@ dt/app-defaults/C/Dtscreen dt/app-defaults/C/Dtsession dt/app-defaults/C/Dtstyle dt/app-defaults/C/Dtterm -dt/app-defaults/C/Dtudcfonted dt/app-defaults/C/Dtwm dt/app-defaults/C/Ttsnoop dt/app-defaults/C/UNIXbindings @@ -45,7 +44,6 @@ dt/app-defaults/de_DE.ISO8859-1/Dtscreen dt/app-defaults/de_DE.ISO8859-1/Dtsession dt/app-defaults/de_DE.ISO8859-1/Dtstyle dt/app-defaults/de_DE.ISO8859-1/Dtterm -dt/app-defaults/de_DE.ISO8859-1/Dtudcfonted dt/app-defaults/de_DE.ISO8859-1/Dtwm dt/app-defaults/es_ES.ISO8859-1/Dt dt/app-defaults/es_ES.ISO8859-1/Dtbuilder @@ -67,7 +65,6 @@ dt/app-defaults/es_ES.ISO8859-1/Dtscreen dt/app-defaults/es_ES.ISO8859-1/Dtsession dt/app-defaults/es_ES.ISO8859-1/Dtstyle dt/app-defaults/es_ES.ISO8859-1/Dtterm -dt/app-defaults/es_ES.ISO8859-1/Dtudcfonted dt/app-defaults/es_ES.ISO8859-1/Dtwm dt/app-defaults/fr_FR.ISO8859-1/Dt dt/app-defaults/fr_FR.ISO8859-1/Dtbuilder @@ -89,7 +86,6 @@ dt/app-defaults/fr_FR.ISO8859-1/Dtscreen dt/app-defaults/fr_FR.ISO8859-1/Dtsession dt/app-defaults/fr_FR.ISO8859-1/Dtstyle dt/app-defaults/fr_FR.ISO8859-1/Dtterm -dt/app-defaults/fr_FR.ISO8859-1/Dtudcfonted dt/app-defaults/fr_FR.ISO8859-1/Dtwm dt/app-defaults/it_IT.ISO8859-1/Dt dt/app-defaults/it_IT.ISO8859-1/Dtbuilder @@ -111,7 +107,6 @@ dt/app-defaults/it_IT.ISO8859-1/Dtscreen dt/app-defaults/it_IT.ISO8859-1/Dtsession dt/app-defaults/it_IT.ISO8859-1/Dtstyle dt/app-defaults/it_IT.ISO8859-1/Dtterm -dt/app-defaults/it_IT.ISO8859-1/Dtudcfonted dt/app-defaults/it_IT.ISO8859-1/Dtwm dt/appconfig/appmanager/C/Desktop_Apps/DtLoadInfoLib dt/appconfig/appmanager/C/Desktop_Apps/DtPrintManager @@ -4117,8 +4112,8 @@ dt/appconfig/types/it_IT.ISO8859-1/xclients.dt dt/backdrops dt/bin/Xsession dt/bin/dsdm -dt/bin/dtaction -dt/bin/dtappgather +@(,,6755) dt/bin/dtaction +@(,,4755) dt/bin/dtappgather dt/bin/dtappintegrate dt/bin/dtbuilder dt/bin/dtcalc @@ -4153,18 +4148,19 @@ dt/bin/dthelpview dt/bin/dticon dt/bin/dtimsstart dt/bin/dtinfo +dt/bin/dtinfogen dt/bin/dtksh dt/bin/dtlogin dt/bin/dtlp -@(root,mail,2555) dt/bin/dtmail -dt/bin/dtmailpr +@(,mail,2755) dt/bin/dtmail +@(,mail,2755) dt/bin/dtmailpr dt/bin/dtpad dt/bin/dtpdm dt/bin/dtpdmd -dt/bin/dtprintinfo +@(,,2755) dt/bin/dtprintinfo dt/bin/dtscreen dt/bin/dtsearchpath -dt/bin/dtsession +@(,,2755) dt/bin/dtsession dt/bin/dtsession_res dt/bin/dtspcd dt/bin/dtsrclean @@ -4176,10 +4172,8 @@ dt/bin/dtsrindex dt/bin/dtsrkdump dt/bin/dtsrload dt/bin/dtstyle -dt/bin/dtterm +@(,,2755) dt/bin/dtterm dt/bin/dttypes -dt/bin/dtudcexch -dt/bin/dtudcfonted dt/bin/dtwm dt/bin/huffcode dt/bin/rpc.cmsd @@ -4202,7 +4196,6 @@ dt/config/C/Xresources.d/0120.session dt/config/C/Xresources.d/0140.session dt/config/C/Xresources.d/0160.session dt/config/C/dtfile.config -dt/config/C/fonts.list dt/config/C/sys.dtwmrc dt/config/C/sys.font dt/config/C/sys.resources @@ -4215,7 +4208,6 @@ dt/config/Xservers dt/config/Xsession.d/0010.dtpaths dt/config/Xsession.d/0020.dtims dt/config/Xsession.d/0030.dttmpdir -dt/config/Xsession.d/0040.xmbind dt/config/Xsession.d/0060.dtsysenv dt/config/Xsetup dt/config/Xstartup @@ -4405,6 +4397,9 @@ dt/infolib/etc/StyleUpdate dt/infolib/etc/dbdrv dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.sfx dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.stp +dt/infolib/etc/dtinfo_start +dt/infolib/etc/dtinfogen_worker +dt/infolib/etc/dtsr/dtsearch.dbd dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.sfx dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.stp dt/infolib/etc/fr_FR.ISO8859-1/dtsr/fra.sfx @@ -4419,41 +4414,7 @@ dt/infolib/etc/nsgmls dt/infolib/etc/online.feature.spec dt/infolib/etc/valBase dt/infolib/etc/validator -dt/lib/bindings/acorn -dt/lib/bindings/apollo -dt/lib/bindings/dec -dt/lib/bindings/dg_AViiON -dt/lib/bindings/doubleclick -dt/lib/bindings/hal -dt/lib/bindings/hitachi -dt/lib/bindings/hp -dt/lib/bindings/ibm -dt/lib/bindings/intergraph -dt/lib/bindings/intergraph17 -dt/lib/bindings/megatek -dt/lib/bindings/motorola -dt/lib/bindings/ncr_at -dt/lib/bindings/ncr_vt -dt/lib/bindings/pc -dt/lib/bindings/sgi -dt/lib/bindings/siemens_9733 -dt/lib/bindings/siemens_wx200 -dt/lib/bindings/sni -dt/lib/bindings/sni_97801 -dt/lib/bindings/sony -dt/lib/bindings/sun -dt/lib/bindings/sun_at -dt/lib/bindings/tek -dt/lib/bindings/xmbind.alias dt/lib/dtksh/DtFuncs.dtsh -dt/lib/dtudcfonted/dtaddcpf -dt/lib/dtudcfonted/dtbdftocpf -dt/lib/dtudcfonted/dtcpftobdf -dt/lib/dtudcfonted/dtcpftogpf -dt/lib/dtudcfonted/dtcpgpf -dt/lib/dtudcfonted/dtgpftobdf -dt/lib/dtudcfonted/dtgpftocpf -dt/lib/dtudcfonted/dtlsgpf dt/lib/libDtHelp.so dt/lib/libDtHelp.so.2 dt/lib/libDtMmdb.so @@ -4514,8 +4475,6 @@ dt/lib/nls/msg/C/dtsession.cat dt/lib/nls/msg/C/dtstyle.cat dt/lib/nls/msg/C/dtterm.cat dt/lib/nls/msg/C/dttypes.cat -dt/lib/nls/msg/C/dtudcexch.cat -dt/lib/nls/msg/C/dtudcfonted.cat dt/lib/nls/msg/C/dtwm.cat dt/lib/nls/msg/C/fmt_tbl.cat dt/lib/nls/msg/C/libDtMail.cat @@ -4558,8 +4517,6 @@ dt/lib/nls/msg/de_DE.ISO8859-1/dtsession.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtstyle.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtterm.cat dt/lib/nls/msg/de_DE.ISO8859-1/dttypes.cat -dt/lib/nls/msg/de_DE.ISO8859-1/dtudcexch.cat -dt/lib/nls/msg/de_DE.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtwm.cat dt/lib/nls/msg/de_DE.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/de_DE.ISO8859-1/libDtMail.cat @@ -4602,8 +4559,6 @@ dt/lib/nls/msg/es_ES.ISO8859-1/dtsession.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtstyle.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtterm.cat dt/lib/nls/msg/es_ES.ISO8859-1/dttypes.cat -dt/lib/nls/msg/es_ES.ISO8859-1/dtudcexch.cat -dt/lib/nls/msg/es_ES.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtwm.cat dt/lib/nls/msg/es_ES.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/es_ES.ISO8859-1/libDtMail.cat @@ -4646,8 +4601,6 @@ dt/lib/nls/msg/fr_FR.ISO8859-1/dtsession.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtstyle.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtterm.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dttypes.cat -dt/lib/nls/msg/fr_FR.ISO8859-1/dtudcexch.cat -dt/lib/nls/msg/fr_FR.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtwm.cat dt/lib/nls/msg/fr_FR.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/fr_FR.ISO8859-1/libDtMail.cat @@ -4690,8 +4643,6 @@ dt/lib/nls/msg/it_IT.ISO8859-1/dtsession.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtstyle.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtterm.cat dt/lib/nls/msg/it_IT.ISO8859-1/dttypes.cat -dt/lib/nls/msg/it_IT.ISO8859-1/dtudcexch.cat -dt/lib/nls/msg/it_IT.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtwm.cat dt/lib/nls/msg/it_IT.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/it_IT.ISO8859-1/libDtMail.cat @@ -4733,26 +4684,20 @@ dt/share/backdrops/desc.it_IT.ISO8859-1 dt/share/examples/README dt/share/examples/dtaction/Makefile.HP dt/share/examples/dtaction/Makefile.IBM -dt/share/examples/dtaction/Makefile.NOVELL dt/share/examples/dtaction/Makefile.SUN -dt/share/examples/dtaction/Makefile.UXP dt/share/examples/dtaction/README dt/share/examples/dtaction/actions.c dt/share/examples/dtbuilder/README dt/share/examples/dtbuilder/about_box.bil dt/share/examples/dtcalendar/Makefile.HP dt/share/examples/dtcalendar/Makefile.IBM -dt/share/examples/dtcalendar/Makefile.NOVELL dt/share/examples/dtcalendar/Makefile.SUN -dt/share/examples/dtcalendar/Makefile.UXP dt/share/examples/dtcalendar/README dt/share/examples/dtcalendar/attributes.c dt/share/examples/dtdnd/Dtdnddemo dt/share/examples/dtdnd/Makefile.HP dt/share/examples/dtdnd/Makefile.IBM dt/share/examples/dtdnd/Makefile.SUN -dt/share/examples/dtdnd/Makefile.USL -dt/share/examples/dtdnd/Makefile.UXP dt/share/examples/dtdnd/README dt/share/examples/dtdnd/buff.c dt/share/examples/dtdnd/buff.h @@ -4766,9 +4711,7 @@ dt/share/examples/dtdnd/text.c dt/share/examples/dtdnd/text.h dt/share/examples/dtdts/Makefile.HP dt/share/examples/dtdts/Makefile.IBM -dt/share/examples/dtdts/Makefile.NOVELL dt/share/examples/dtdts/Makefile.SUN -dt/share/examples/dtdts/Makefile.UXP dt/share/examples/dtdts/README dt/share/examples/dtdts/datatyping.c dt/share/examples/dthelp/Dthelpdemo @@ -4779,11 +4722,9 @@ dt/share/examples/dthelp/HourGlass.c dt/share/examples/dthelp/HourGlassI.h dt/share/examples/dthelp/Main.c dt/share/examples/dthelp/Main.h -dt/share/examples/dthelp/Makefile.DEC dt/share/examples/dthelp/Makefile.HP dt/share/examples/dthelp/Makefile.IBM dt/share/examples/dthelp/Makefile.SUN -dt/share/examples/dthelp/Makefile.UXP dt/share/examples/dthelp/README dt/share/examples/dthelp/help/Makefile dt/share/examples/dthelp/help/graphics/AppWithHelp.xwd @@ -4843,89 +4784,32 @@ dt/share/examples/dtksh/crMovesText1 dt/share/examples/dtksh/ksh93.memo dt/share/examples/dtscreen/Makefile.HP dt/share/examples/dtscreen/Makefile.IBM -dt/share/examples/dtscreen/Makefile.NOVELL dt/share/examples/dtscreen/Makefile.SUN -dt/share/examples/dtscreen/Makefile.UXP dt/share/examples/dtscreen/README dt/share/examples/dtscreen/dt/appconfig/types/C/screensaver.dt dt/share/examples/dtscreen/screensaver.c dt/share/examples/dtsession/Makefile.HP dt/share/examples/dtsession/Makefile.IBM -dt/share/examples/dtsession/Makefile.NOVELL dt/share/examples/dtsession/Makefile.SUN -dt/share/examples/dtsession/Makefile.UXP dt/share/examples/dtsession/README dt/share/examples/dtsession/session.c dt/share/examples/dtterm/Makefile.HP dt/share/examples/dtterm/Makefile.IBM -dt/share/examples/dtterm/Makefile.NOVELL dt/share/examples/dtterm/Makefile.SUN -dt/share/examples/dtterm/Makefile.UXP dt/share/examples/dtterm/README dt/share/examples/dtterm/term.c dt/share/examples/dtwidget/Makefile.HP dt/share/examples/dtwidget/Makefile.IBM -dt/share/examples/dtwidget/Makefile.NOVELL dt/share/examples/dtwidget/Makefile.SUN -dt/share/examples/dtwidget/Makefile.UXP dt/share/examples/dtwidget/README dt/share/examples/dtwidget/controls.c dt/share/examples/dtwidget/editor.c dt/share/examples/dtwsm/Makefile.HP dt/share/examples/dtwsm/Makefile.IBM -dt/share/examples/dtwsm/Makefile.NOVELL dt/share/examples/dtwsm/Makefile.SUN -dt/share/examples/dtwsm/Makefile.UXP dt/share/examples/dtwsm/README dt/share/examples/dtwsm/occupy.c dt/share/examples/dtwsm/wsinfo.c -dt/share/examples/motif/clipboard/Makefile.HP -dt/share/examples/motif/clipboard/Makefile.IBM -dt/share/examples/motif/clipboard/Makefile.NOVELL -dt/share/examples/motif/clipboard/Makefile.SUN -dt/share/examples/motif/clipboard/Makefile.UXP -dt/share/examples/motif/clipboard/README -dt/share/examples/motif/clipboard/cutpaste.c -dt/share/examples/motif/clipboard/cutpaste.uil -dt/share/examples/motif/clipboard/cutpaste_local.uil -dt/share/examples/motif/dogs/Dog.c -dt/share/examples/motif/dogs/Dog.h -dt/share/examples/motif/dogs/Dog.uil -dt/share/examples/motif/dogs/DogP.h -dt/share/examples/motif/dogs/Makefile.HP -dt/share/examples/motif/dogs/Makefile.IBM -dt/share/examples/motif/dogs/Makefile.NOVELL -dt/share/examples/motif/dogs/Makefile.SUN -dt/share/examples/motif/dogs/Makefile.UXP -dt/share/examples/motif/dogs/README -dt/share/examples/motif/dogs/Square.c -dt/share/examples/motif/dogs/Square.h -dt/share/examples/motif/dogs/Square.uil -dt/share/examples/motif/dogs/SquareP.h -dt/share/examples/motif/dogs/bark.bm -dt/share/examples/motif/dogs/dogs.c -dt/share/examples/motif/dogs/dogs.uil -dt/share/examples/motif/dogs/down.bm -dt/share/examples/motif/dogs/up.bm -dt/share/examples/motif/draganddrop/DNDDemo.c -dt/share/examples/motif/draganddrop/DNDDemo.h -dt/share/examples/motif/draganddrop/DNDDraw.c -dt/share/examples/motif/draganddrop/Makefile.HP -dt/share/examples/motif/draganddrop/Makefile.IBM -dt/share/examples/motif/draganddrop/Makefile.NOVELL -dt/share/examples/motif/draganddrop/Makefile.SUN -dt/share/examples/motif/draganddrop/Makefile.UXP -dt/share/examples/motif/draganddrop/README -dt/share/examples/motif/periodic/Makefile.HP -dt/share/examples/motif/periodic/Makefile.IBM -dt/share/examples/motif/periodic/Makefile.NOVELL -dt/share/examples/motif/periodic/Makefile.SUN -dt/share/examples/motif/periodic/Makefile.UXP -dt/share/examples/motif/periodic/Periodic -dt/share/examples/motif/periodic/README -dt/share/examples/motif/periodic/periodic.c -dt/share/examples/motif/periodic/periodic.uil -dt/share/examples/motif/periodic/periodic_local.uil dt/share/examples/sys.font.iso dt/share/examples/template/C/README dt/share/examples/template/C/Template.ad @@ -4946,9 +4830,7 @@ dt/share/examples/template/C/template_icon.pm dt/share/examples/template/C/template_icon_m.bm dt/share/examples/template/Makefile.HP dt/share/examples/template/Makefile.IBM -dt/share/examples/template/Makefile.NOVELL dt/share/examples/template/Makefile.SUN -dt/share/examples/template/Makefile.UXP dt/share/examples/template/README dt/share/examples/template/TemplateNew dt/share/examples/template/TemplateOpen @@ -4958,9 +4840,7 @@ dt/share/examples/template/template.c dt/share/examples/template/template.ptype dt/share/examples/tt/Makefile.HP dt/share/examples/tt/Makefile.IBM -dt/share/examples/tt/Makefile.NOVELL dt/share/examples/tt/Makefile.SUN -dt/share/examples/tt/Makefile.UXP dt/share/examples/tt/README dt/share/examples/tt/broadcast.c dt/share/examples/types/C/IconBrowse.dt @@ -5059,8 +4939,6 @@ dt/share/man/man1/dtsrload.1.gz dt/share/man/man1/dtstyle.1.gz dt/share/man/man1/dtterm.1.gz dt/share/man/man1/dttypes.1.gz -dt/share/man/man1/dtudcexch.1.gz -dt/share/man/man1/dtudcfonted.1.gz dt/share/man/man1/dtwm.1.gz dt/share/man/man1/huffcode.1.gz dt/share/man/man1/ksh.1.gz @@ -5712,7 +5590,29 @@ dt/share/palettes/desc.de_DE.ISO8859-1 dt/share/palettes/desc.es_ES.ISO8859-1 dt/share/palettes/desc.fr_FR.ISO8859-1 dt/share/palettes/desc.it_IT.ISO8859-1 +etc/pam.d/cde.conf +etc/man.d/cde.conf @dir dt/appconfig/appmanager/de_DE.ISO8859-1/System_Admin @dir dt/appconfig/appmanager/es_ES.ISO8859-1/System_Admin @dir dt/appconfig/appmanager/fr_FR.ISO8859-1/System_Admin @dir dt/appconfig/appmanager/it_IT.ISO8859-1/System_Admin +@dir etc/dt/appconfig/appmanager/C +@dir etc/dt/appconfig/appmanager/de_DE.ISO8859-1 +@dir etc/dt/appconfig/appmanager/es_ES.ISO8859-1 +@dir etc/dt/appconfig/appmanager/fr_FR.ISO8859-1 +@dir etc/dt/appconfig/appmanager/it_IT.ISO8859-1 +@dir etc/dt/appconfig/help/C +@dir etc/dt/appconfig/help/de_DE.ISO8859-1 +@dir etc/dt/appconfig/help/es_ES.ISO8859-1 +@dir etc/dt/appconfig/help/fr_FR.ISO8859-1 +@dir etc/dt/appconfig/help/it_IT.ISO8859-1 +@dir etc/dt/appconfig/icons/C +@dir etc/dt/appconfig/types/C +@dir etc/dt/appconfig/types/de_DE.ISO8859-1 +@dir etc/dt/appconfig/types/es_ES.ISO8859-1 +@dir etc/dt/appconfig/types/fr_FR.ISO8859-1 +@dir etc/dt/appconfig/types/it_IT.ISO8859-1 +@dir etc/dt/config/Xsession.d +@dir /var/dt/appconfig/appmanager +@dir /var/dt/appconfig +@dir /var/dt