From owner-svn-ports-all@freebsd.org Tue Feb 16 16:42:12 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89EA853F355; Tue, 16 Feb 2021 16:42:12 +0000 (UTC) (envelope-from crees@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 4Dg6Fc2fY0z4hhj; Tue, 16 Feb 2021 16:42:12 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A37314671; Tue, 16 Feb 2021 16:42:12 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11GGgCL6055071; Tue, 16 Feb 2021 16:42:12 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11GGgAlu055063; Tue, 16 Feb 2021 16:42:10 GMT (envelope-from crees@FreeBSD.org) Message-Id: <202102161642.11GGgAlu055063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Tue, 16 Feb 2021 16:42:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565414 - in head/x11/cde: . files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head/x11/cde: . files X-SVN-Commit-Revision: 565414 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2021 16:42:12 -0000 Author: crees Date: Tue Feb 16 16:42:10 2021 New Revision: 565414 URL: https://svnweb.freebsd.org/changeset/ports/565414 Log: x11/cde: Update to 2.3.2 Make a few fixes for head, and add appropriate messages for dtlogin Added: head/x11/cde/files/patch-Makefile (contents, props changed) head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h (contents, props changed) Deleted: head/x11/cde/files/dtspc.in Modified: head/x11/cde/Makefile head/x11/cde/distinfo head/x11/cde/files/dtlogin.in head/x11/cde/files/pkg-message.in Modified: head/x11/cde/Makefile ============================================================================== --- head/x11/cde/Makefile Tue Feb 16 16:38:58 2021 (r565413) +++ head/x11/cde/Makefile Tue Feb 16 16:42:10 2021 (r565414) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cde -DISTVERSION= 2.3.1 -PORTREVISION= 2 +DISTVERSION= 2.3.2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ @@ -13,7 +12,6 @@ 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_FreeBSD_13= fails to build: flex scanner jammed BUILD_DEPENDS= ksh93:shells/ksh93 \ bdftopcf:x11-fonts/bdftopcf \ @@ -21,25 +19,27 @@ BUILD_DEPENDS= ksh93:shells/ksh93 \ biconv:converters/iconv \ ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 -RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ +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 ksh tcl +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 dtspc dtlogin +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} +MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message +LDFLAGS+= -z muldefs #--allow-multiple-definition post-patch: @if [ -f /usr/include/iconv.h ]; then \ @@ -104,13 +104,6 @@ post-patch: ${WRKSRC}/programs/dtmail/libDtMail/Common/FileShare.C \ ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCMailBox.C -# The docs say not necessary, but unreliable without -# @${MKDIR} ${WRKSRC}/imports/x11/include -# @${LN} -s ${LOCALBASE}/include/X11 ${WRKSRC}/imports/x11/include -# @${LN} -s ${LOCALBASE}/include/Xm ${WRKSRC}/imports/x11/include -# @${LN} -s ${LOCALBASE}/include/fontconfig ${WRKSRC}/imports/x11/include -# @${LN} -s ${LOCALBASE}/include/freetype2 ${WRKSRC}/imports/x11/include - do-install: cd ${WRKSRC}/admin/IntegTools/dbTools && \ ./installCDE -s ${WRKSRC} -destdir ${STAGEDIR} @@ -123,9 +116,5 @@ do-install: post-install: ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; - -# Documented switches don't actually produce desired effect! -# ./installCDE -s ${WRKSRC} -pI ${STAGEDIR}${PREFIX}/dt \ -# -pV ${STAGEDIR}/var -pC ${STAGEDIR}${PREFIX}/etc .include Modified: head/x11/cde/distinfo ============================================================================== --- head/x11/cde/distinfo Tue Feb 16 16:38:58 2021 (r565413) +++ head/x11/cde/distinfo Tue Feb 16 16:42:10 2021 (r565414) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576421538 -SHA256 (cde-2.3.1.tar.gz) = f414ff60b1a4d7a7c96589d10b64cfafc08602a7b3a87d78b69c3f315e66c7a1 -SIZE (cde-2.3.1.tar.gz) = 57549415 +TIMESTAMP = 1612966762 +SHA256 (cde-2.3.2.tar.gz) = 7dd1f4e22dd018be2c310354314f469d835f8441f4b69f511f88e412a1a43909 +SIZE (cde-2.3.2.tar.gz) = 57552496 Modified: head/x11/cde/files/dtlogin.in ============================================================================== --- head/x11/cde/files/dtlogin.in Tue Feb 16 16:38:58 2021 (r565413) +++ head/x11/cde/files/dtlogin.in Tue Feb 16 16:42:10 2021 (r565414) @@ -6,7 +6,7 @@ # REQUIRE: LOGIN dbus dtspc # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable slim: +# Add the following line to /etc/rc.conf to enable dtlogin: # dtlogin_enable="YES" # @@ -22,5 +22,15 @@ load_rc_config dtlogin 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 Added: head/x11/cde/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/cde/files/patch-Makefile Tue Feb 16 16:42:10 2021 (r565414) @@ -0,0 +1,18 @@ +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 Added: head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h Tue Feb 16 16:42:10 2021 (r565414) @@ -0,0 +1,13 @@ +Remove unnecessary and conflicting global variable + +--- lib/DtSearch/raima/dbtype.h.orig 2021-02-11 09:26:30.733694000 +0000 ++++ lib/DtSearch/raima/dbtype.h 2021-02-11 09:25:05.275302000 +0000 +@@ -405,7 +405,7 @@ + struct sk { + INT sk_fld; + CHAR_P sk_val; +-} __SK__; ++}; + typedef struct { struct sk *ptr; LOCK_DESC } SK_P; + + /* node key search path stack entry: one per level per key field */ Modified: head/x11/cde/files/pkg-message.in ============================================================================== --- head/x11/cde/files/pkg-message.in Tue Feb 16 16:38:58 2021 (r565413) +++ head/x11/cde/files/pkg-message.in Tue Feb 16 16:42:10 2021 (r565414) @@ -5,21 +5,32 @@ This is ancient software that is ported for curiosity unlikely to be useful in everyday use, and should not be used in untrusted environments as there are highly likely to be unresolved security issues. -CDE unfortunately requires a symbolic link as it uses the build system imake, -as with X11R6. This is actually done by the dtspc rc script (and removed -afterwards). - It is also necessary to enable the Subprocess Control Service (and dtcms for the calendar to work). # sysrc rpcbind_enable=yes -# sysrc dtspc_enable=yes # sysrc dtcms_enable=yes -# service rpcbind start && service dtspc start && service dtcms start +# sysrc inetd_enable=yes +# service rpcbind start && service dtcms start +and + +Add the following line to /etc/inetd.conf: + +dtspc stream tcp nowait root %%PREFIX%%/dt/bin/dtspcd %%PREFIX%%/dt/bin/dtspcd + +and to /etc/services: + +dtspc 6112/tcp # CDE Subprocess Control Service + To start the Common Desktop Environment, % ln -s %%PREFIX%%/dt/bin/Xsession ~/.Xsession % env LANG=C startx + +If you want to use dtlogin as well, you'll need to create +%%LOCALBASE%%/etc/X11/Xwrapper.config and add this line: + +allowed_users=anybody EOM } ]