From nobody Sat Aug 06 03:39:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M07WL2DfTz4Xgm7; Sat, 6 Aug 2022 03:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M07WL0Pzfz3cyN; Sat, 6 Aug 2022 03:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659757182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynAhLxeN5YfY/Y/IDv5Sv7j5MDHxPEEpMAn8rObOqX0=; b=fgP1bfUw+ll/2hDESjGEuiXGIb30ZpAflBgLxMBcjDM04LTxy2og7TEFFUNmVRyURY+oVm F3SbSrQ1Fk6lWFcbILES16jGzpn1dPAS/0mqMUk0ClDYh+TeWCuBKe09W2je9zuNxvmx+g fvOQb4+Tgc5mihwEAggy0OLP9jxmfBA0DPIzs4fXyqI0ufM52l+YMWxAZ/0mY5ZNROmjkl eyM3MfSx55MO/0QN5bN64Uy/A6pGBqf7JYoOCNFkH69b5Uc7SPxbvK5nTLbYr9hX5yIIbl aXsrBOacQSXf4gw7zgjRdc6zOZSPP0x5eFj2qk5bDbcaINtkliyo6GfzVAuanQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M07WK6LJYzJxv; Sat, 6 Aug 2022 03:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2763df0I027923; Sat, 6 Aug 2022 03:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2763dfgx027922; Sat, 6 Aug 2022 03:39:41 GMT (envelope-from git) Date: Sat, 6 Aug 2022 03:39:41 GMT Message-Id: <202208060339.2763dfgx027922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c8e0c7d6091c - main - x11/cde-25: Introduce the new x11/cde-25 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8e0c7d6091caf050b55cc256fb335e7ffc77db5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659757182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynAhLxeN5YfY/Y/IDv5Sv7j5MDHxPEEpMAn8rObOqX0=; b=DEIdayXN3gZ/ck6eFvOOqp4MZFNeH9xd1HXyEKUlrUYJsX3rhxQJLWHkhZDvw1icN2G9/5 adLBlJite+2WmmTtzs6UUayuUjbSW4UeK76hJ3wbzQ2YWh93otP+0JMrTGYF6tiG95lZSn DUej14KqEoKu/FwmWpmb01VJBVwlFjMe7On4XIuw2Gsn77bjIDNCLxvdQV/YteOOjtZsXy cjoqI7gblcaZROMPqqzLSbNpN3rDLRJ+ydALyMerolysShkRvemBN0qc9Ps1Zh7QnALrYS JAFb1o6UTLv3cxVNwxB/jushLOAztlAbaGc72nVD9v/DqpPIdWlFusUNeMzQqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659757182; a=rsa-sha256; cv=none; b=LvStCSkllBTAmGlTS4YZ7EX5UmmNgWuj3g4xjkr1huSdlfhW1QPjJ4BU8NGFLzwcYMQlME BoOb9ey8+d3qexXUGyY9l8tZV+aPwZQFsmE0u/KaKifHcJFZIrPQaQ65TUBX4Os/1q6FtO si6VG3qqcyHzux+2QCSZMCTB7Lpi4L3P4ZIKpz2nZ9nq6G1DQywoz6ZoUzah3lo6bLwI2X 1AVphyR/C4leZDVzQtYfUy5MKFLLs1eEXND3/uPYBTEDzHZdPYeGicll9I+lUZS/Fy1OXG SIG09tWIZE5FjTQD7bKB2FvgrKKFTN90ByxFKFL7XVgCWksRwmZpHlQuExtoEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8e0c7d6091caf050b55cc256fb335e7ffc77db5 commit c8e0c7d6091caf050b55cc256fb335e7ffc77db5 Author: Cy Schubert AuthorDate: 2022-08-05 15:31:23 +0000 Commit: Cy Schubert CommitDate: 2022-08-06 03:38:57 +0000 x11/cde-25: Introduce the new x11/cde-25 CDE 2.5.0 has many improvements however some users may discover that fonts used by legacy Xm and Xaw apps are unreadable due to legacy apps using the gb2312.1980 font registry. For now cde-24 will remain the default cde however users can install cde-25 for new features and bugfixes. --- x11/Makefile | 1 + x11/cde-25/Makefile | 111 + x11/cde-25/distinfo | 3 + x11/cde-25/files/dtcms.in | 26 + x11/cde-25/files/dtlogin.in | 34 + x11/cde-25/files/patch-configure.ac | 24 + .../files/patch-lib_DtMmdb_StyleSheet_Makefile.am | 19 + .../files/patch-programs_dtcm_dtcm_calendarA.c | 11 + x11/cde-25/files/patch-programs_dtterm_Makefile.am | 7 + .../files/patch-programs_fontaliases_Makefile.am | 8 + x11/cde-25/files/pkg-message.in | 36 + x11/cde-25/pkg-descr | 6 + x11/cde-25/pkg-plist | 4068 ++++++++++++++++++++ x11/cde/Makefile | 2 +- 14 files changed, 4355 insertions(+), 1 deletion(-) diff --git a/x11/Makefile b/x11/Makefile index 2b62f0380cd5..ac6b625f72f7 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -30,6 +30,7 @@ SUBDIR += brisk-menu SUBDIR += cde SUBDIR += cde-24 + SUBDIR += cde-25 SUBDIR += cinnamon SUBDIR += cinnamon-desktop SUBDIR += cinnamon-menus diff --git a/x11/cde-25/Makefile b/x11/cde-25/Makefile new file mode 100644 index 000000000000..7c97a51a53a6 --- /dev/null +++ b/x11/cde-25/Makefile @@ -0,0 +1,111 @@ +PORTNAME= cde +DISTVERSION= 2.5.0 +CATEGORIES= x11 +MASTER_SITES= SF/cdesktopenv/src/ +.if !defined(MASTERDIR) +PKGNAMESUFFIX= -25 +.endif + +MAINTAINER= cy@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_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 \ + onsgmls:textproc/opensp \ + xrdb:x11/xrdb +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= 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 +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} +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.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' \; + @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/distinfo b/x11/cde-25/distinfo new file mode 100644 index 000000000000..97424cbcbdfe --- /dev/null +++ b/x11/cde-25/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1658932097 +SHA256 (cde-2.5.0.tar.gz) = 794f3d8f5283e7a32de5c6e388ef7e458f0268b44da0b99abc7df47e48f01b55 +SIZE (cde-2.5.0.tar.gz) = 57736957 diff --git a/x11/cde-25/files/dtcms.in b/x11/cde-25/files/dtcms.in new file mode 100644 index 000000000000..1afb03b937af --- /dev/null +++ b/x11/cde-25/files/dtcms.in @@ -0,0 +1,26 @@ +#!/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-25/files/dtlogin.in b/x11/cde-25/files/dtlogin.in new file mode 100644 index 000000000000..570282e43fdd --- /dev/null +++ b/x11/cde-25/files/dtlogin.in @@ -0,0 +1,34 @@ +#!/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-25/files/patch-configure.ac b/x11/cde-25/files/patch-configure.ac new file mode 100644 index 000000000000..8aa1829c207c --- /dev/null +++ b/x11/cde-25/files/patch-configure.ac @@ -0,0 +1,24 @@ +--- configure.ac.orig 2021-11-30 19:54:11.356382000 -0800 ++++ configure.ac 2021-11-30 20:19:10.923347000 -0800 +@@ -305,9 +305,6 @@ + AC_PATH_XTRA + + dnl check some compiler flags +-C_FLAG_CHECK([-Wno-format-truncation]) +-CXX_FLAG_CHECK([-Wno-format-truncation]) +- + C_FLAG_CHECK([-fno-strict-aliasing]) + CXX_FLAG_CHECK([-fno-strict-aliasing]) + +@@ -327,9 +324,9 @@ + dnl programs with full paths + + dnl - KSH, some systems call it as ksh93 +-AC_PATH_PROG(KSH, ksh) ++AC_PATH_PROG(KSH, ksh93) + if test -z "$ac_cv_path_KSH"; then +- AC_PATH_PROG(KSH, ksh93) ++ AC_PATH_PROG(KSH, ksh) + if test -z "$ac_cv_path_KSH"; then + MISSING_PROGS="[ksh or ksh93] ${MISSING_PROGS}" + fi diff --git a/x11/cde-25/files/patch-lib_DtMmdb_StyleSheet_Makefile.am b/x11/cde-25/files/patch-lib_DtMmdb_StyleSheet_Makefile.am new file mode 100644 index 000000000000..ee046fe0c058 --- /dev/null +++ b/x11/cde-25/files/patch-lib_DtMmdb_StyleSheet_Makefile.am @@ -0,0 +1,19 @@ +--- lib/DtMmdb/StyleSheet/Makefile.am.orig 2022-02-15 09:36:38.828203000 -0800 ++++ lib/DtMmdb/StyleSheet/Makefile.am 2022-02-15 10:20:50.149152000 -0800 +@@ -41,14 +41,14 @@ + tokenStyle.C + + defParser.C: defParser.yy +- $(YACC) $(AM_YFLAGS) -p defParser -b defParser $< ++ $(YACC) $(AM_YFLAGS) -o defParser.tab.c -p defParser -b defParser $< + mv defParser.tab.c $@ + + defToken.C: defToken.ll + $(LEX) $(AM_LFLAGS) -P defParser -o $@ $< + + style.C: style.yy +- $(YACC) $(AM_YFLAGS) -p style -b style $< ++ $(YACC) $(AM_YFLAGS) -o style.tab.c -p style -b style $< + mv style.tab.c style.C + + tokenStyle.C: tokenStyle.ll diff --git a/x11/cde-25/files/patch-programs_dtcm_dtcm_calendarA.c b/x11/cde-25/files/patch-programs_dtcm_dtcm_calendarA.c new file mode 100644 index 000000000000..ab3f91b3887e --- /dev/null +++ b/x11/cde-25/files/patch-programs_dtcm_dtcm_calendarA.c @@ -0,0 +1,11 @@ +--- 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-25/files/patch-programs_dtterm_Makefile.am b/x11/cde-25/files/patch-programs_dtterm_Makefile.am new file mode 100644 index 000000000000..49e9dda2cdd7 --- /dev/null +++ b/x11/cde-25/files/patch-programs_dtterm_Makefile.am @@ -0,0 +1,7 @@ +--- programs/dtterm/Makefile.am.orig 2021-11-25 16:40:19.896057000 -0800 ++++ programs/dtterm/Makefile.am 2021-11-25 17:19:24.691922000 -0800 +@@ -51,4 +51,3 @@ + if !HAS_UTEMPTER_LIBRARY + chmod 4755 $(DESTDIR)$(bindir)/dtterm + endif +- @TIC@ dtterm.ti diff --git a/x11/cde-25/files/patch-programs_fontaliases_Makefile.am b/x11/cde-25/files/patch-programs_fontaliases_Makefile.am new file mode 100644 index 000000000000..c47286ee7c11 --- /dev/null +++ b/x11/cde-25/files/patch-programs_fontaliases_Makefile.am @@ -0,0 +1,8 @@ +--- programs/fontaliases/Makefile.am.orig 2022-07-27 09:52:05.850328000 -0700 ++++ programs/fontaliases/Makefile.am 2022-07-27 10:37:08.405264000 -0700 +@@ -33,4 +33,4 @@ + + install-data-hook: + $(MKDIR_P) $(DESTDIR)$(fontaliasesconfdir) +- $(CP) $(fontaliasesdatadir)/$(FONTS_ALIAS) $(DESTDIR)$(fontaliasesconfdir)/fonts.alias ++ $(CP) $(DESTDIR)$(fontaliasesdatadir)/$(FONTS_ALIAS) $(DESTDIR)$(fontaliasesconfdir)/fonts.alias diff --git a/x11/cde-25/files/pkg-message.in b/x11/cde-25/files/pkg-message.in new file mode 100644 index 000000000000..0473e1afad24 --- /dev/null +++ b/x11/cde-25/files/pkg-message.in @@ -0,0 +1,36 @@ +[ +{ type: install + message: <