diff --git a/x11/cde-devel/Makefile b/x11/cde-devel/Makefile index 16c168c801cd..fb17f43b1fd2 100644 --- a/x11/cde-devel/Makefile +++ b/x11/cde-devel/Makefile @@ -1,134 +1,142 @@ PORTNAME= cde PORTVERSION= ${COMMIT_DATE} CATEGORIES= x11 .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel .endif MAINTAINER= cy@FreeBSD.org COMMENT= Common Desktop Environment WWW= https://sourceforge.net/p/cdesktopenv/wiki/Home/ USE_GITHUB= yes GH_ACCOUNT= cschuber GH_PROJECT= cdesktopenv-code -GH_TAGNAME= d8cd65f3a -COMMIT_DATE= 2026.07.06 +GH_TAGNAME= dd23595b0 +COMMIT_DATE= 2026.09.18 LICENSE= LGPL21 BROKEN_i386= cannot bind to a temporary of type va_list WRKSRC_SUBDIR= ${PORTNAME} BUILD_DEPENDS= ksh93:shells/ksh \ bdftopcf:x11-fonts/bdftopcf \ mkfontscale>=0:x11-fonts/mkfontscale \ ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ onsgmls:textproc/opensp \ xrdb:x11/xrdb \ sessreg:x11/sessreg RUN_DEPENDS= ksh93:shells/ksh \ ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ xrdb:x11/xrdb \ xset:x11/xset \ sessreg:x11/sessreg LIB_DEPENDS= liblmdb.so:databases/lmdb0 USES= autoreconf:build iconv gmake jpeg libtool motif perl5 \ shebangfix tcl:86 xorg SHEBANG_LANG= pl SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate \ programs/dtdocbook/tcl/docbook.tcl DT_PREFIX= ${PREFIX}/dt USE_LDCONFIG= ${DT_PREFIX}/lib USE_RC_SUBR= dtcms dtlogin USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${DT_PREFIX} GNU_CONFIGURE_MANPREFIX= ${DT_PREFIX}/share MANDIRS= ${DT_PREFIX}/share/man INFODIR= ${DT_PREFIX}/share/info CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.6 MAKE="gmake" \ --enable-german \ --enable-italian \ --enable-french \ --enable-spanish \ --enable-japanese MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" MAKE_JOBS_UNSAFE=yes -MAKE_ENV= MALLOC_CONF=junk:false +MAKE_ENV= MALLOC_CONF=junk:false \ + IFFEFLAGS=-d1 +# IFFEFLAGS=-d1 is default for Linux builds. We do it here too. SUB_FILES= pkg-message CFLAGS+= -O -Wno-register -Wno-incompatible-function-pointer-types \ - -Wno-implicit-function-declaration + -Wno-implicit-function-declaration \ + -DSHOPT_DYNAMIC=1 +# SHOPT_DYNAMIC=1 fixes a symbol not found problem. LDFLAGS+= -z muldefs #--allow-multiple-definition CFFILES= Xaccess Xconfig Xfailsafe Xreset Xservers Xsetup Xstartup \ sys.dtprofile pre-configure: @cd ${WRKSRC} && ./autogen.sh 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 +# The below is to resolve an issue introduced by upstream that +# causes it to search ${LOCALBASE}/include for headers in +# precidence over those provided by the tarball. + @${FIND} ${WRKSRC}/programs/dtksh/ksh93/src -type f -name Mamfile | ${XARGS} ${REINPLACE_CMD} -E 's/(exec - \$$\{CC\}) \$$\{mam_cc_FLAGS\} \$$\{CCFLAGS\}(.*) -c (.+)$$/\1\2 \$${mam_cc_FLAGS} \$${CCFLAGS} -c \3/' # 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 # 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}/programs/dtinfo/tools/bin/ccdate @${FIND} ${WRKSRC} -type f ! -path doc/common | \ ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/dt|${DT_PREFIX}|g ; \ s|/etc/dt|${DT_PREFIX}/etc|g' # we need to remove a few LOCALBASE @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtsr|/etc/dtsr|g' -e \ 's|${LOCALBASE}/etc/dtinfo_start|/etc/dtinfo_start|g' \ ${WRKSRC}/programs/tttypes/dtinfo_start.ptype \ ${WRKSRC}/programs/tttypes/dtinfo.ptype # 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 # chown is not supported as install as user @${FIND} ${WRKSRC} -type f -name Makefile.am | ${XARGS} \ ${REINPLACE_CMD} -e '/chown /d; /chgrp /d;' post-install: @${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf \ ${STAGEDIR}${PREFIX}/etc/pam.d/cde.conf @${ECHO_CMD} MANPATH /usr/local/dt/share/man > ${STAGEDIR}/${PREFIX}/etc/man.d/cde.conf @${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; @${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -name '*.bak' -delete @cd ${WRKSRC}/examples && @${FIND} . | ${CPIO} -pd ${STAGEDIR}/${DT_PREFIX}/share @cd ${STAGEDIR}/${DT_PREFIX}; ${LN} -sf share/examples # Only a problem on armv7 so far ${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -name 'ecp.*' -delete .for f in ${CFFILES} @${MV} ${STAGEDIR}${PREFIX}/dt/config/${f} ${STAGEDIR}${PREFIX}/dt/config/${f}.sample .endfor .include diff --git a/x11/cde-devel/distinfo b/x11/cde-devel/distinfo index 73b180991e67..36582d0ac06a 100644 --- a/x11/cde-devel/distinfo +++ b/x11/cde-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1783465238 -SHA256 (cschuber-cdesktopenv-code-2026.07.06-d8cd65f3a_GH0.tar.gz) = ddaa5a690187d99863d3cbe1092b85c728d2371783bc77f559798449d4524468 -SIZE (cschuber-cdesktopenv-code-2026.07.06-d8cd65f3a_GH0.tar.gz) = 57484281 +TIMESTAMP = 1790106034 +SHA256 (cschuber-cdesktopenv-code-2026.09.18-dd23595b0_GH0.tar.gz) = 437b44de19e72f550378fa0af5404752a847d9dc10b6b29938e7fc1e40a7ff0f +SIZE (cschuber-cdesktopenv-code-2026.09.18-dd23595b0_GH0.tar.gz) = 57508076 diff --git a/x11/cde-devel/files/patch-programs_dtksh_Makefile.am b/x11/cde-devel/files/patch-programs_dtksh_Makefile.am new file mode 100644 index 000000000000..e46a56023c8c --- /dev/null +++ b/x11/cde-devel/files/patch-programs_dtksh_Makefile.am @@ -0,0 +1,11 @@ +--- programs/dtksh/Makefile.am.orig 2026-09-23 08:49:38.418321000 -0700 ++++ programs/dtksh/Makefile.am 2026-09-23 09:12:06.383846000 -0700 +@@ -59,7 +59,7 @@ + msgs.c + + ksh93/bin/ksh: +- ksh93/bin/package flat make CCFLAGS='$(CFLAGS) $(KSH93_SHOPTS)' ++ ksh93/bin/package flat make CCFLAGS='$(KSH93_SHOPTS)' + + init.c: ksh93/bin/ksh + $(CP) ksh93/src/cmd/ksh93/sh/init.c ./ diff --git a/x11/cde-devel/files/patch-programs_dtterm_Makefile.am b/x11/cde-devel/files/patch-programs_dtterm_Makefile.am deleted file mode 100644 index 898b2d687fe0..000000000000 --- a/x11/cde-devel/files/patch-programs_dtterm_Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ ---- programs/dtterm/Makefile.am.orig 2026-02-21 17:31:48.000000000 -0800 -+++ programs/dtterm/Makefile.am 2026-02-27 10:32:53.843208000 -0800 -@@ -52,4 +52,3 @@ - -chown root $(DESTDIR)$(bindir)/dtterm - -chmod 4755 $(DESTDIR)$(bindir)/dtterm - endif -- @TIC@ dtterm.ti