diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2026-09-23 23:19:19 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2026-09-23 23:23:31 +0000 |
| commit | e4db654d831aca1d70ed7e4918a4c80fc02f510f (patch) | |
| tree | 06d413772de85070752e9c7e2f4512873e3150a8 | |
| parent | 82038fcb62bfecd75a034a6253a7ab198c604532 (diff) | |
x11/cde-devel: Update to the latest cdesktopenv-code commit
Update to the latest cdedesktop-code commit proxied through my GH account
| -rw-r--r-- | x11/cde-devel/Makefile | 16 | ||||
| -rw-r--r-- | x11/cde-devel/distinfo | 6 | ||||
| -rw-r--r-- | x11/cde-devel/files/patch-programs_dtksh_Makefile.am | 11 | ||||
| -rw-r--r-- | x11/cde-devel/files/patch-programs_dtterm_Makefile.am | 7 |
4 files changed, 26 insertions, 14 deletions
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 @@ -12,8 +12,8 @@ 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 @@ -60,10 +60,14 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.6 MAKE="gmake" \ --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 \ @@ -78,6 +82,10 @@ post-patch: ${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' \ 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 |
