diff --git a/MOVED b/MOVED index d3d24758c0f68..a90370b21abe2 100644 --- a/MOVED +++ b/MOVED @@ -7777,3 +7777,4 @@ x11-wm/cage-devel|x11-wm/cage|2023-07-27|Out of date: use x11-wm/cage for now games/cockatrice||2023-07-31|Has expired: Upstream releases haven't occured for multiple years and will require a new portbuild graphics/blender-lts29||2023-07-31|Has expired: Deprecated upstream x11-fm/wcmcommander||2023-07-31|Has expired: Abandoned upstream +x11/cde-24|x11/cde-25|2023-08-01|Has expired: Desupported by upstream diff --git a/x11/Makefile b/x11/Makefile index 82e9e91d72c0e..a0c9f2610c403 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -32,7 +32,6 @@ SUBDIR += budgie-desktop SUBDIR += budgie-screensaver SUBDIR += cde - SUBDIR += cde-24 SUBDIR += cde-25 SUBDIR += cde-devel SUBDIR += cinnamon diff --git a/x11/cde-24/Makefile b/x11/cde-24/Makefile deleted file mode 100644 index db5e087133678..0000000000000 --- a/x11/cde-24/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -PORTNAME= cde -DISTVERSION= 2.4.0 -PORTREVISION= 3 -CATEGORIES= x11 -MASTER_SITES= SF/cdesktopenv/src/ -.if !defined(MASTERDIR) -PKGNAMESUFFIX= -24 -.endif - -MAINTAINER= cy@FreeBSD.org -COMMENT= Common Desktop Environment -WWW= https://sourceforge.net/p/cdesktopenv/wiki/Home/ - -LICENSE= LGPL21 - -BROKEN= fails to build es locale help files -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_i386= cannot bind to a temporary of type va_list -DEPRECATED= Desupported by upstream -EXPIRATION_DATE= 2023-08-01 - -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= 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 -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 dtlogin -USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -ALL_TARGET= World -MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" -MAKE_JOBS_UNSAFE=yes -MAKE_ENV= MALLOC_CONF=junk:false -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.src \ - ${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.src \ - ${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 - -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' \; - # Only a problem on armv7 so far - ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete -.if !defined(MASTERDIR) - ${RM} ${STAGEDIR}/${PREFIX}/libdata/ldconfig/cde -.endif - -.include diff --git a/x11/cde-24/distinfo b/x11/cde-24/distinfo deleted file mode 100644 index 567c823b4138c..0000000000000 --- a/x11/cde-24/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1626123275 -SHA256 (cde-2.4.0.tar.gz) = 023df9d71f625583f36c2e3f7e57ddf85a8798eda203b40ba583c12c0c446e1e -SIZE (cde-2.4.0.tar.gz) = 58841593 diff --git a/x11/cde-24/files/dtcms.in b/x11/cde-24/files/dtcms.in deleted file mode 100644 index 1afb03b937afb..0000000000000 --- a/x11/cde-24/files/dtcms.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# 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" - -load_rc_config $name - -: ${dtcms_enable:=NO} - -start_precmd="force_depend rpcbind || exit 1" -pidfile=/var/run/dtcms.pid -command=/usr/sbin/daemon -command_args="-P $pidfile %%PREFIX%%/dt/bin/rpc.cmsd" - -run_rc_command $1 diff --git a/x11/cde-24/files/dtlogin.in b/x11/cde-24/files/dtlogin.in deleted file mode 100644 index 570282e43fdd7..0000000000000 --- a/x11/cde-24/files/dtlogin.in +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# PROVIDE: dtlogin -# REQUIRE: LOGIN dbus dtspc -# KEYWORD: shutdown -# -# 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 diff --git a/x11/cde-24/files/patch-Makefile b/x11/cde-24/files/patch-Makefile deleted file mode 100644 index 2c22ea54b01de..0000000000000 --- a/x11/cde-24/files/patch-Makefile +++ /dev/null @@ -1,18 +0,0 @@ -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 diff --git a/x11/cde-24/files/patch-admin_IntegTools_dbTools_installCDE b/x11/cde-24/files/patch-admin_IntegTools_dbTools_installCDE deleted file mode 100644 index 65125aa543d49..0000000000000 --- a/x11/cde-24/files/patch-admin_IntegTools_dbTools_installCDE +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" - diff --git a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configMin.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configMin.src deleted file mode 100644 index 361269d0e35a7..0000000000000 --- a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configMin.src +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 - diff --git a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configRun.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configRun.src deleted file mode 100644 index b74b734b9667e..0000000000000 --- a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configRun.src +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 diff --git a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src deleted file mode 100644 index 860fb04e0da91..0000000000000 --- a/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 diff --git a/x11/cde-24/files/patch-config_cf_Imake.cf b/x11/cde-24/files/patch-config_cf_Imake.cf deleted file mode 100644 index c5f3c2e0b71a9..0000000000000 --- a/x11/cde-24/files/patch-config_cf_Imake.cf +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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 diff --git a/x11/cde-24/files/patch-config_cf_Imake.rules b/x11/cde-24/files/patch-config_cf_Imake.rules deleted file mode 100644 index e7852ef34d2f4..0000000000000 --- a/x11/cde-24/files/patch-config_cf_Imake.rules +++ /dev/null @@ -1,30 +0,0 @@ -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 diff --git a/x11/cde-24/files/patch-lib_DtHelp_Imakefile b/x11/cde-24/files/patch-lib_DtHelp_Imakefile deleted file mode 100644 index b06027f746eec..0000000000000 --- a/x11/cde-24/files/patch-lib_DtHelp_Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/DtHelp/Imakefile.orig 2019-12-15 16:29:42.835693000 +0100 -+++ lib/DtHelp/Imakefile 2019-12-15 16:29:57.238969000 +0100 -@@ -42,6 +42,8 @@ DEFINES = -DDTLIB $(LOCAL_DEFINES) \ - REQUIREDLIBS = SharedDtHelpReqs - #endif - -+REQUIREDLIBS += -ljpeg -+ - HEADERS = \ - CanvasP.h CanvasSegP.h Help.h \ - HelpDialog.h HelpDialogP.h HelpP.h \ diff --git a/x11/cde-24/files/patch-programs_dtcm_dtcm_calendarA.c b/x11/cde-24/files/patch-programs_dtcm_dtcm_calendarA.c deleted file mode 100644 index ab3f91b3887e4..0000000000000 --- a/x11/cde-24/files/patch-programs_dtcm_dtcm_calendarA.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/dtcm/dtcm/calendarA.c.orig 2021-07-03 12:35:15.000000000 -0700 -+++ programs/dtcm/dtcm/calendarA.c 2021-07-12 13:58:22.306477000 -0700 -@@ -2047,7 +2047,7 @@ - set_message(c->message_text, buf); - - sprintf(buf, "%s\n%s: %s, %s: %s", CATGETS(c->DT_catd, 1, 91, -- "rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin inetd.conf for rpc.cmsd is correct for your host."), -+ "rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin /etc/rc.conf for rpc.cmsd is correct for your host."), - nl_user, name, - nl_host, host); - diff --git a/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c deleted file mode 100644 index ee691a8d5b184..0000000000000 --- a/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 10:43:01.353775000 -0800 -+++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:50:35.918370000 -0800 -@@ -960,7 +960,7 @@ - */ - if (tzname==NULL) system("unset TZ\n"); - #else -- if (tzname==NULL) tzsetwall(); -+ if (tzname==NULL) tzset(); - #endif /* SVR4 */ - - else { diff --git a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h deleted file mode 100644 index b04314918f6ef..0000000000000 --- a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h +++ /dev/null @@ -1,16 +0,0 @@ ---- programs/dtinfo/DtMmdb/btree_berkeley/compat.h.orig 2021-12-14 13:35:18 UTC -+++ programs/dtinfo/DtMmdb/btree_berkeley/compat.h -@@ -147,11 +147,11 @@ void * __fix_realloc __P((void*, size_t)); - #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ - #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ - --#ifdef MMDB_LITTLE_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define BYTE_ORDER LITTLE_ENDIAN /* Set for your system. */ - #endif - --#ifdef MMDB_BIG_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - #define BYTE_ORDER BIG_ENDIAN /* Set for your system. */ - #endif - diff --git a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C deleted file mode 100644 index 175de96d7e6fa..0000000000000 --- a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C +++ /dev/null @@ -1,30 +0,0 @@ ---- programs/dtinfo/DtMmdb/schema/store_desc.C.orig 2021-12-14 19:59:51 UTC -+++ programs/dtinfo/DtMmdb/schema/store_desc.C -@@ -66,11 +66,11 @@ store_desc::store_desc(const char* name) : desc(name) - mode_str = strdup(""); - order_str = 0; - --#ifdef MMDB_BIG_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - order_str = strdup("big_endian"); - #endif - --#ifdef MMDB_LITTLE_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - order_str = strdup("little_endian"); - #endif - -@@ -87,11 +87,11 @@ store_desc::store_desc(int tp, const char* comment): - - order_str = 0; - --#ifdef MMDB_BIG_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - order_str = strdup("big_endian"); - #endif - --#ifdef MMDB_LITTLE_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - order_str = strdup("little_endian"); - #endif - diff --git a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h deleted file mode 100644 index 6b9a5a8c3be32..0000000000000 --- a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/dtinfo/DtMmdb/storage/spointer.h.orig 2021-12-14 10:42:39 UTC -+++ programs/dtinfo/DtMmdb/storage/spointer.h -@@ -52,7 +52,7 @@ - - struct header_t - { --#ifdef MMDB_BIG_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - unsigned spointer : 14; - unsigned length : 14; - unsigned is_object : 1; diff --git a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C deleted file mode 100644 index 8f86f16517cbd..0000000000000 --- a/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C +++ /dev/null @@ -1,19 +0,0 @@ ---- programs/dtinfo/DtMmdb/utility/atoi_pearson.C.orig 2021-12-14 01:08:51 UTC -+++ programs/dtinfo/DtMmdb/utility/atoi_pearson.C -@@ -107,14 +107,14 @@ atoi_pearson::~atoi_pearson() - } - - struct reg_t { --#ifdef MMDB_BIG_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - unsigned b4: 8; - unsigned b3: 8; - unsigned b2: 8; - unsigned b1: 8; - #endif - --#ifdef MMDB_LITTLE_ENDIAN -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - unsigned b1: 8; - unsigned b2: 8; - unsigned b3: 8; diff --git a/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c deleted file mode 100644 index e729a3b2dcf2d..0000000000000 --- a/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c +++ /dev/null @@ -1,25 +0,0 @@ ---- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig 2022-01-20 12:56:31.275926000 -0800 -+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c 2022-01-20 12:59:47.461533000 -0800 -@@ -49,6 +49,9 @@ - va_list* vp = va; - Hash_region_f region = 0; - void* handle; -+#ifdef __powerpc64__ -+ va_listarg tmpval; -+#endif - - va_start(ap, ref); - -@@ -151,7 +154,12 @@ - va_copy(*vp, ap); - vp++; - } -+#ifdef __powerpc64__ -+ tmpval = va_listval(va_arg(ap, va_listarg)); -+ va_copy(ap, tmpval); -+#else - va_copy(ap, va_listval(va_arg(ap, va_listarg))); -+#endif - break; - case 0: - if (vp > va) diff --git a/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c deleted file mode 100644 index 8e6ada6ebe27c..0000000000000 --- a/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c +++ /dev/null @@ -1,25 +0,0 @@ ---- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig 2022-01-20 12:56:38.679529000 -0800 -+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c 2022-01-20 13:02:26.179022000 -0800 -@@ -188,6 +188,9 @@ - char** p_string; - char* prv_f = 0; - va_list prv_ap; -+#ifdef __powerpc64__ -+ va_listarg tmpval; -+#endif - - va_start(ap, fmt); - if (!*s || *s == '\n') -@@ -233,7 +236,12 @@ - prv_f = f; - f = va_arg(ap, char*); - va_copy(prv_ap, ap); -+#ifdef __powerpc64__ -+ tmpval = va_listval(va_arg(ap, va_listarg)); -+ va_copy(ap, tmpval); -+#else - va_copy(ap, va_listval(va_arg(ap, va_listarg))); -+#endif - continue; - case 'c': - p_char = va_arg(ap, char*); diff --git a/x11/cde-24/files/pkg-message.in b/x11/cde-24/files/pkg-message.in deleted file mode 100644 index 0473e1afad245..0000000000000 --- a/x11/cde-24/files/pkg-message.in +++ /dev/null @@ -1,36 +0,0 @@ -[ -{ type: install - message: <