Index: head/x11/cde/Makefile =================================================================== --- head/x11/cde/Makefile (revision 565413) +++ head/x11/cde/Makefile (revision 565414) @@ -1,131 +1,120 @@ # $FreeBSD$ PORTNAME= cde -DISTVERSION= 2.3.1 -PORTREVISION= 2 +DISTVERSION= 2.3.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 -BROKEN_FreeBSD_13= fails to build: flex scanner jammed 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 \ +RUN_DEPENDS= ksh93:shells/ksh93 \ + ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ xrdb:x11/xrdb \ xset:x11/xset USES= iconv:wchar_t jpeg motif perl5 shebangfix tcl:86 xorg -SHEBANG_LANG= pl ksh tcl +SHEBANG_LANG= pl SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate \ programs/dtdocbook/doc2sdl/docbook.tcl \ programs/dtdocbook/doc2sdl/dtdocbook USE_LDCONFIG= ${PREFIX}/dt/lib -USE_RC_SUBR= dtcms dtspc dtlogin +USE_RC_SUBR= dtcms dtlogin USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} ALL_TARGET= World -MAKE_ARGS+= PERL=${PERL} +MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message +LDFLAGS+= -z muldefs #--allow-multiple-definition 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/dtinfo/tools/bin/ccdate @${REINPLACE_CMD} -e 's|/bin/ksh|${LOCALBASE}/bin/ksh93|g' \ ${WRKSRC}/programs/dtopen/dtopen.src @${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/distinfo =================================================================== --- head/x11/cde/distinfo (revision 565413) +++ head/x11/cde/distinfo (revision 565414) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576421538 -SHA256 (cde-2.3.1.tar.gz) = f414ff60b1a4d7a7c96589d10b64cfafc08602a7b3a87d78b69c3f315e66c7a1 -SIZE (cde-2.3.1.tar.gz) = 57549415 +TIMESTAMP = 1612966762 +SHA256 (cde-2.3.2.tar.gz) = 7dd1f4e22dd018be2c310354314f469d835f8441f4b69f511f88e412a1a43909 +SIZE (cde-2.3.2.tar.gz) = 57552496 Index: head/x11/cde/files/dtspc.in =================================================================== --- head/x11/cde/files/dtspc.in (revision 565413) +++ head/x11/cde/files/dtspc.in (nonexistent) @@ -1,29 +0,0 @@ -#!/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" - -load_rc_config $name - -: ${dtspc_enable:=NO} - -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 -command=/usr/sbin/daemon -command_args="-P $pidfile %%PREFIX%%/dt/bin/dtspcd" - -run_rc_command $1 Property changes on: head/x11/cde/files/dtspc.in ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/cde/files/dtlogin.in =================================================================== --- head/x11/cde/files/dtlogin.in (revision 565413) +++ head/x11/cde/files/dtlogin.in (revision 565414) @@ -1,26 +1,36 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: dtlogin # REQUIRE: LOGIN dbus dtspc # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable slim: +# Add the following line to /etc/rc.conf to enable dtlogin: # 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 + +start_precmd=dtlogin_prestart + +dtlogin_prestart() +{ + if ! [ -f "%%PREFIX%%/etc/X11/Xwrapper.config" ]; then + echo "If dtlogin fails to start:" + echo "# echo allowed_users=anybody >> %%PREFIX%%/etc/X11/Xwrapper.config" + fi +} run_rc_command $1 Index: head/x11/cde/files/patch-Makefile =================================================================== --- head/x11/cde/files/patch-Makefile (nonexistent) +++ head/x11/cde/files/patch-Makefile (revision 565414) @@ -0,0 +1,18 @@ +There really is no need to run make clean on newly extracted sources + +--- Makefile.orig 2021-02-11 09:31:32.955339000 +0000 ++++ Makefile 2021-02-11 09:31:55.051680000 +0000 +@@ -51,13 +51,10 @@ + ;; esac; + @date + @echo "" +- cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean + $(MAKE) $(MFLAGS) Makefile.boot + $(MAKE_CMD) $(MFLAGS) VerifyOS + $(MAKE_CMD) $(MFLAGS) Makefiles + $(MAKE_CMD) $(MFLAGS) Makefiles.doc +- $(MAKE_CMD) $(MFLAGS) clean +- $(MAKE_CMD) $(MFLAGS) clean.doc + $(MAKE_CMD) $(MFLAGS) includes + $(MAKE_CMD) $(MFLAGS) includes.doc + $(MAKE_CMD) $(MFLAGS) depend Property changes on: head/x11/cde/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ 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/patch-lib_DtSearch_raima_dbtype.h =================================================================== --- head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h (nonexistent) +++ head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h (revision 565414) @@ -0,0 +1,13 @@ +Remove unnecessary and conflicting global variable + +--- lib/DtSearch/raima/dbtype.h.orig 2021-02-11 09:26:30.733694000 +0000 ++++ lib/DtSearch/raima/dbtype.h 2021-02-11 09:25:05.275302000 +0000 +@@ -405,7 +405,7 @@ + struct sk { + INT sk_fld; + CHAR_P sk_val; +-} __SK__; ++}; + typedef struct { struct sk *ptr; LOCK_DESC } SK_P; + + /* node key search path stack entry: one per level per key field */ Property changes on: head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ 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/pkg-message.in =================================================================== --- head/x11/cde/files/pkg-message.in (revision 565413) +++ head/x11/cde/files/pkg-message.in (revision 565414) @@ -1,25 +1,36 @@ [ { type: install message: <