diff --git a/x11/cde-24/Makefile b/x11/cde-24/Makefile index 13b965fcba40..b721c769f828 100644 --- a/x11/cde-24/Makefile +++ b/x11/cde-24/Makefile @@ -1,129 +1,130 @@ PORTNAME= cde DISTVERSION= 2.4.0 +PORTREVISION= 2 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_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 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/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..ee691a8d5b18 --- /dev/null +++ b/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- 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-25/Makefile b/x11/cde-25/Makefile index 73067122110c..a0100ca8ea14 100644 --- a/x11/cde-25/Makefile +++ b/x11/cde-25/Makefile @@ -1,119 +1,119 @@ PORTNAME= cde DISTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ .if !defined(MASTERDIR) PKGNAMESUFFIX= -25 .endif MAINTAINER= cy@FreeBSD.org COMMENT= Common Desktop Environment WWW= https://sourceforge.net/p/cdesktopenv/wiki/Home/ LICENSE= LGPL21 BROKEN_i386= cannot bind to a temporary of type va_list # For concurrent testing purposes only. Define DT_ID in make.conf to build # a cde-25 pkg which will coexist with cde-24. .if defined(CDE_CONCURRENT) && !defined(MASTERDIR) DT_ID= 25 .else DT_ID= .endif PLIST_SUB= DT_ID=${DT_ID} BUILD_DEPENDS= ksh93:shells/ksh \ 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 \ onsgmls:textproc/opensp \ xrdb:x11/xrdb 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 USES= autoreconf:build iconv:wchar_t gmake jpeg libtool motif perl5 \ shebangfix tcl:86 xorg SHEBANG_LANG= pl SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate DT_PREFIX= ${PREFIX}/dt${DT_ID} USE_LDCONFIG= ${DT_PREFIX}/lib USE_RC_SUBR= dtcms${DT_ID} dtlogin${DT_ID} USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${DT_PREFIX} MANPREFIX= ${DT_PREFIX}/share INFODIR= ${DT_PREFIX}/share/info CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.6 MAKE="gmake" 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 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 # 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${DT_ID}.conf @${ECHO_CMD} MANPATH /usr/local/dt/share/man > ${STAGEDIR}/${PREFIX}/etc/man.d/cde${DT_ID}.conf @${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; @cd ${WRKSRC}/examples && @${FIND} . | ${CPIO} -pd ${STAGEDIR}/${DT_PREFIX}/share @cd ${STAGEDIR}/${DT_PREFIX}; ${LN} -s share/examples # Only a problem on armv7 so far ${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -name 'ecp.*' -delete .include diff --git a/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..efb412aa000f --- /dev/null +++ b/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 09:58:33.955866000 -0800 ++++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:47:36.739851000 -0800 +@@ -963,7 +963,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-devel/Makefile b/x11/cde-devel/Makefile index 2774b00592d3..1757e62e1a49 100644 --- a/x11/cde-devel/Makefile +++ b/x11/cde-devel/Makefile @@ -1,126 +1,126 @@ PORTNAME= cde PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 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= 503d09172 COMMIT_DATE= 2022.10.01 LICENSE= LGPL21 BROKEN_i386= cannot bind to a temporary of type va_list WRKSRC_SUBDIR= ${PORTNAME} # For concurrent testing purposes only. Define DT_ID in make.conf to build # a cde-25 pkg which will coexist with cde-24. .if defined(CDE_CONCURRENT) && !defined(MASTERDIR) DT_ID= ${PKGNAMESUFFIX} .else DT_ID= .endif PLIST_SUB= DT_ID=${DT_ID} BUILD_DEPENDS= ksh93:shells/ksh \ 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 \ onsgmls:textproc/opensp \ xrdb:x11/xrdb 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 USES= autoreconf:build iconv:wchar_t gmake jpeg libtool motif perl5 \ shebangfix tcl:86 xorg SHEBANG_LANG= pl SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate DT_PREFIX= ${PREFIX}/dt${DT_ID} USE_LDCONFIG= ${DT_PREFIX}/lib USE_RC_SUBR= dtcms${DT_ID} dtlogin${DT_ID} USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${DT_PREFIX} MANPREFIX= ${DT_PREFIX}/share INFODIR= ${DT_PREFIX}/share/info CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.6 MAKE="gmake" 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 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 # 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${DT_ID}.conf @${ECHO_CMD} MANPATH /usr/local/dt/share/man > ${STAGEDIR}/${PREFIX}/etc/man.d/cde${DT_ID}.conf @${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; @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 .include diff --git a/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..3723b2e4d24d --- /dev/null +++ b/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 09:59:52.166236000 -0800 ++++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:43:55.531953000 -0800 +@@ -963,7 +963,7 @@ + */ + if (tzname==NULL) system("unset TZ\n"); + #else +- if (tzname==NULL) tzsetwall(); ++ if (tzname==NULL) tzset(); + #endif /* SVR4 */ + + else {