CVS commit: pkgsrc/wm/cde

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/cde
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Thu, 18 Jan 2024 20:57:04 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Jan 18 20:57:04 UTC 2024

Modified Files:
        pkgsrc/wm/cde: Makefile PLIST distinfo options.mk
        pkgsrc/wm/cde/files: README.pkgsrc dtlogin.sh
        pkgsrc/wm/cde/patches: patch-programs_dtlogin_Makefile.am
Added Files:
        pkgsrc/wm/cde/files: cde.desktop
        pkgsrc/wm/cde/patches: patch-doc_Makefile.am

Log Message:
wm/cde: update to 2.5.2

This is mainly a bugfix release addressing various issues.
Noticeably, this release included a fix to a bug reported on #netbsd
irc by a couple of of users, resulting in a frozen display on saved
sessions.

# pkgsrc changes

  * Add session file for CDE to use with other display managers.
  * Update dtlogin service script and README.
  * Explcitely set utmp/wtmp file paths.
  * Use a PHONY target instead of pre-install for PAM files.
  * Remove redundant dependencies.

# upstream changes (since 2.5.1)

### 2.5.2 (stable) 11/18/2023

Shortlog:

Cy Schubert (1):
       * Fix build under LLVM15

Jon Trulson (9):
       * Apply various patches from Giacomo Comes <co...@na...>
       * Patch from Giacomo Comes: rename ksh manpage to ksh-cde
       * Add DesktopNames=CDE to cde.desktop
       * pgadmin.dt: set icon from pgadmin to pgadmin3
       * dtfile/dterror.ds: fix script defines typo
       * dtksh: enable SHOPT_ECHOPRINT
       * dticon, dtpad, dtterm: fix session save issues (sprintf bogosity)
         lib/DtHelp: strmove(): return memmove() result
       * .gitignore: add new locations of dtsession/dtlogin PAM files

Peter Howkins (3):
       * (Pascal Stumpf) Makefile.am change several places where ${prefix}
         Dshould be $(CDE_INSTALLATION_TOP)
       * (Pascal Stumpf) CDE doesn't provide the ksh binary, don't install
             the manpage for it
       * (Pascal Stumpf) dtlogin: On OpenBSD start X as root (it drops
             privileges later)

hyousatsu (15):
       * DtTerm: fix a segfault by allocating a string dynamically.
       * dtwm: fix a title bar resizing issue.
       * dtwm: fix compiler warnings.
       * dtwm: add support for _NET_WM_VISIBLE_NAME and
             _NET_WM_VISIBLE_ICON_NAME.
       * dtwm: optimize EWMH processing.
       * localized: fix the character encoding errors in zh_TW.UTF-8.
       * dtwm: add a new feature -- window rename.
       * dtwm: optimize EWMH processing.
       * dtwm: support _NET_WM_STATE_ABOVE and _NET_WM_STATE_BELOW.
       * dtsession: change the maximum size of cover dialog to fullscreen.
       * dtlogin: use sessreg to manage utmp/wtmp.
       * dtwm: fix a segfault.
       * dtstyle: make the style manager recognize wheel mouse correctly.
       * tt: make the ttserver process events properly.
       * dtsession: fix a crash.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/cde/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/cde/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/cde/distinfo pkgsrc/wm/cde/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/cde/files/README.pkgsrc
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/cde/files/cde.desktop
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/cde/files/dtlogin.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/cde/patches/patch-doc_Makefile.am
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/cde/Makefile
diff -u pkgsrc/wm/cde/Makefile:1.4 pkgsrc/wm/cde/Makefile:1.5
--- pkgsrc/wm/cde/Makefile:1.4  Sun Nov 12 13:23:46 2023
+++ pkgsrc/wm/cde/Makefile      Thu Jan 18 20:57:03 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2023/11/12 13:23:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/01/18 20:57:03 vins Exp $
 
-DISTNAME=      cde-2.5.1
-PKGREVISION=   3
+DISTNAME=      cde-2.5.2
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cdesktopenv/files/src/}
 
@@ -30,6 +29,7 @@ DEPENDS+=     font-adobe-100dpi-[0-9]*:../..
 .if ${X11_TYPE} == "modular"
 DEPENDS+=      xrdb-[0-9]*:../../x11/xrdb
 DEPENDS+=      xset-[0-9]*:../../x11/xset
+DEPENDS+=      sessreg-[0-9]*:../../x11/sessreg
 .endif
 TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
 
@@ -41,6 +41,8 @@ CONFIGURE_ARGS+=      MAKE=${MAKE_PROGRAM:Q}
 CONFIGURE_ARGS+=       --with-x
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/dt
+CONFIGURE_ARGS+=       --with-utmp-file=${VARBASE}/run/utmp
+CONFIGURE_ARGS+=       --with-wtmp-file=${VARBASE}/log/wtmp
 
 .include "options.mk"
 
@@ -69,9 +71,8 @@ SUBST_MESSAGE.iconv=  Fix for GNU iconv.
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths+=    configure.ac
-SUBST_FILES.paths+=    pkgsrc/startcde
-SUBST_FILES.paths+=    pkgsrc/README.*
-SUBST_FILES.paths+=    programs/dtlogin/Makefile.am
+SUBST_FILES.paths+=    pkgsrc/cde.desktop pkgsrc/startcde
+SUBST_FILES.paths+=    pkgsrc/README.* programs/dtlogin/Makefile.am
 SUBST_VARS.paths=      PKG_SYSCONFDIR PREFIX REAL_ROOT_GROUP VARBASE X11BASE
 SUBST_MESSAGE.paths=   Replacing path placeholders.
 
@@ -102,12 +103,13 @@ OWN_DIRS+=                ${PKG_SYSCONFDIR}/dt/config
 OWN_DIRS+=             ${PKG_SYSCONFDIR}/dt/config/Xsession.d
 OWN_DIRS+=             ${PKG_SYSCONFDIR}/dt/config/xfonts/C
 
+MAKE_DIRS+=            share/xsessions
 INSTALLATION_DIRS+=    bin share/doc/${PKGBASE}
 
 post-extract:
        ${RUN}${MKDIR} ${WRKSRC}/pkgsrc
        ${RUN}${CP} ${FILESDIR}/startcde.sh ${WRKSRC}/pkgsrc/startcde
-.for f in README.*
+.for f in cde.desktop README.*
        ${RUN}${CP} ${FILESDIR}/${f} ${WRKSRC}/pkgsrc
 .endfor
 
@@ -127,18 +129,22 @@ pre-configure:
        done
        ${RUN}set -e; cd ${WRKSRC} && autoreconf -fiv
 
-post-install:
+post-install: pam-install
        ${RUN}${FIND} ${DESTDIR}${PREFIX}/dt -type f -perm -111 -exec   \
                ${SH} -c '${STRIP} --strip-unneeded {} > /dev/null 2>&1' \;
        ${INSTALL_SCRIPT} ${WRKSRC}/pkgsrc/startcde ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/pkgsrc/cde.desktop    \
+               ${DESTDIR}${PREFIX}/share/xsessions
 .for f in CONTRIBUTORS COPYING HISTORY README.md
-       ${RUN}${MV} ${DESTDIR}${PREFIX}/dt/${f}                         \
+       ${RUN}${MV} ${DESTDIR}${PREFIX}/dt/${f}         \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .endfor
 .for r in README.*
-       ${INSTALL_DATA} ${WRKSRC}/pkgsrc/${r}                           \
+       ${INSTALL_DATA} ${WRKSRC}/pkgsrc/${r}           \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .endfor
+       ${INSTALL_DATA} ${WRKSRC}/pkgsrc/cde.desktop    \
+               ${DESTDIR}${PREFIX}/share/xsessions
 
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
@@ -147,17 +153,12 @@ post-install:
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/opensp/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"

Index: pkgsrc/wm/cde/PLIST
diff -u pkgsrc/wm/cde/PLIST:1.1 pkgsrc/wm/cde/PLIST:1.2
--- pkgsrc/wm/cde/PLIST:1.1     Sun Feb 12 16:34:15 2023
+++ pkgsrc/wm/cde/PLIST Thu Jan 18 20:57:03 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/02/12 16:34:15 vins Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/01/18 20:57:03 vins Exp $
 bin/startcde
 dt/app-defaults/C/Dt
 dt/app-defaults/C/Dtbuilder
@@ -2619,12 +2619,12 @@ dt/include/Dt/MenuButton.h
 dt/include/Dt/Mmdb.h
 dt/include/Dt/Mrm.h
 dt/include/Dt/MsgLog.h
-dt/include/Dt/PamSvc.h
 dt/include/Dt/Print.h
 dt/include/Dt/Saver.h
 dt/include/Dt/Search.h
 dt/include/Dt/Session.h
 dt/include/Dt/SpinBox.h
+dt/include/Dt/SvcPam.h
 dt/include/Dt/Term.h
 dt/include/Dt/TermPrim.h
 dt/include/Dt/Wsm.h
@@ -2659,7 +2659,6 @@ dt/lib/dtksh/DtFuncs.dtsh
 dt/lib/libDtHelp.la
 dt/lib/libDtMmdb.la
 dt/lib/libDtMrm.la
-${PLIST.pam}dt/lib/libDtPamSvc.la
 dt/lib/libDtPrint.la
 dt/lib/libDtSearch.la
 dt/lib/libDtSvc.la
@@ -2786,7 +2785,7 @@ dt/man/man1/dtudcexch.1
 dt/man/man1/dtudcfonted.1
 dt/man/man1/dtwm.1
 dt/man/man1/huffcode.1
-dt/man/man1/ksh.1
+dt/man/man1/ksh-cde.1
 dt/man/man1/tt_type_comp.1
 dt/man/man1/ttcp.1
 dt/man/man1/ttmv.1
@@ -3531,6 +3530,8 @@ share/doc/cde/README.md
 share/doc/cde/README.netbsd
 share/doc/cde/README.pkgsrc
 ${PLIST.pam}share/examples/cde/pam.d/cde
+${PLIST.pam}share/examples/cde/pam.d/dtlogin
+${PLIST.pam}share/examples/cde/pam.d/dtsession
 @pkgdir etc/dt/cde/fontaliases
 ${PLIST.nls}dt/app-defaults/de_DE.UTF-8/Dt
 ${PLIST.nls}dt/app-defaults/de_DE.UTF-8/Dtbuilder

Index: pkgsrc/wm/cde/distinfo
diff -u pkgsrc/wm/cde/distinfo:1.2 pkgsrc/wm/cde/distinfo:1.3
--- pkgsrc/wm/cde/distinfo:1.2  Mon Feb 13 13:47:33 2023
+++ pkgsrc/wm/cde/distinfo      Thu Jan 18 20:57:03 2024
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.2 2023/02/13 13:47:33 tnn Exp $
+$NetBSD: distinfo,v 1.3 2024/01/18 20:57:03 vins Exp $
 
-BLAKE2s (cde-2.5.1.tar.gz) = 33d94122ff02dbabc3ea246f2af18b12a3d05b48ade9137c9c6cfd685d1eb3a3
-SHA512 (cde-2.5.1.tar.gz) = cacb9a1df21eb9959886ec2f6816fe99ec585e7264f548a85b03990f0e7fbc2dc6fa440cfe5e9ad29281360c30789c1b9ef3f96e1a711bfd2157064c640e803e
-Size (cde-2.5.1.tar.gz) = 57543245 bytes
+BLAKE2s (cde-2.5.2.tar.gz) = 7f5e4c662903fb75e8c8bf5a7f643abc7ef20c77721c95b8605d8ad6bb5037e9
+SHA512 (cde-2.5.2.tar.gz) = caee4f1b3bb470b9a8d2c0f06d9fc574a1f5e4180f0e734c0cee419f900455e16412ba88247f32740ee793a2521856067b31e2db7926043aee64c3b24a127b85
+Size (cde-2.5.2.tar.gz) = 57551944 bytes
 SHA1 (patch-configure.ac) = 7730332dd970729872687757701454dd285a8100
+SHA1 (patch-doc_Makefile.am) = e034bf61b9ce714a5eb5f2ccee229f252b6806db
 SHA1 (patch-lib_DtMmdb_btree__berkeley_memmove.c) = 50249e82ee21c012c46bd633fd8f3b640bc6dbc9
 SHA1 (patch-lib_DtMmdb_btree__berkeley_snprintf.c) = 93270c3217129086174c22b964e62c14c57f7d47
 SHA1 (patch-lib_tt_ttinstall.sh) = 28fa72978fd31af3bb6ec95c7bebc28534a66fec
 SHA1 (patch-programs_dtcm_libDtCmP_util.h) = 15f6d2595d30bbb1b432f4e557182e90dcd9803d
-SHA1 (patch-programs_dtlogin_Makefile.am) = 775e5417f7f0c38a70f6e3f85629940351ffad6a
+SHA1 (patch-programs_dtlogin_Makefile.am) = 56d8fd7d8c5f4a7778bd40c68d13a65d53e9352b
 SHA1 (patch-programs_dtsearchpath_dtappg_Makefile.am) = b0a13e4b1b935c055736daa48302dafc1f9333c4
 SHA1 (patch-programs_dtsession_Makefile.am) = d946fb0335c1a7def4064e2c91cbf768b6ae599b
 SHA1 (patch-programs_dtterm_Makefile.am) = fb54156e1dd1c27a979c6aeb26e1679e1eb07ab6
Index: pkgsrc/wm/cde/options.mk
diff -u pkgsrc/wm/cde/options.mk:1.2 pkgsrc/wm/cde/options.mk:1.3
--- pkgsrc/wm/cde/options.mk:1.2        Thu Feb 23 19:10:06 2023
+++ pkgsrc/wm/cde/options.mk    Thu Jan 18 20:57:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/02/23 19:10:06 vins Exp $
+# $NetBSD: options.mk,v 1.3 2024/01/18 20:57:03 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cde
 
@@ -46,10 +46,17 @@ INSTALLATION_DIRS+= share/examples/${PKG
 
 PLIST.pam=             yes
 
-pre-install:
+.PHONY:        pam-install
+
+pam-install:
        ${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf       \
                ${DESTDIR}${EGDIR}/pam.d/cde
+.  for p in dtlogin dtsession
+       ${INSTALL_DATA} ${WRKSRC}/programs/${p}/config/${p}     \
+               ${DESTDIR}${EGDIR}/pam.d
+.  endfor
 .else
+
 CONFIGURE_ENV+=                ac_cv_lib_pam_pam_start=no
 SPECIAL_PERMS+=                ${PREFIX}/dt/bin/dtsession ${SETUID_ROOT_PERMS}
 .endif

Index: pkgsrc/wm/cde/files/README.pkgsrc
diff -u pkgsrc/wm/cde/files/README.pkgsrc:1.2 pkgsrc/wm/cde/files/README.pkgsrc:1.3
--- pkgsrc/wm/cde/files/README.pkgsrc:1.2       Thu Feb 23 21:38:48 2023
+++ pkgsrc/wm/cde/files/README.pkgsrc   Thu Jan 18 20:57:03 2024
@@ -1,4 +1,14 @@
++----------------------------------------------------------------------
+| First steps with CDE on pkgsrc
++----------------------------------------------------------------------
+
+To add the required authenticaion policies to your PAM configuration,
+import the policy files provided with the package:
+       
+       $ cp @PREFIX@/share/examples/cde/pam.d/* /etc/pam.d
+
 -----------------------------------------------------------------------
+
 To provide support for CDE font aliases, the required font paths must
 appended to the standard X server configuration.
   
@@ -18,16 +28,16 @@ Place the file inside either: 
 
 -----------------------------------------------------------------------
 
-To use CDE applications, adjust your environment as follows:
+To better access CDE applications, adjust your environment as follows:
 
-    $ export PATH=$PATH:${PREFIX}/dt/bin
-    $ export MANPATH=$MANPATH:${PREFIX}/dt/man
+       $ export PATH=$PATH:${PREFIX}/dt/bin
+       $ export MANPATH=$MANPATH:${PREFIX}/dt/man
 
 -----------------------------------------------------------------------
 
 To start the Common Desktop Environment,
 
-    $ env LANG=C startx ${PREFIX}/dt/bin/Xsession
+       $ env LANG=C startx ${PREFIX}/dt/bin/Xsession
 
 Or use the provided `@PREFIX@/bin/startcde' script.
 

Index: pkgsrc/wm/cde/files/dtlogin.sh
diff -u pkgsrc/wm/cde/files/dtlogin.sh:1.1 pkgsrc/wm/cde/files/dtlogin.sh:1.2
--- pkgsrc/wm/cde/files/dtlogin.sh:1.1  Sun Feb 12 16:34:15 2023
+++ pkgsrc/wm/cde/files/dtlogin.sh      Thu Jan 18 20:57:03 2024
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dtlogin.sh,v 1.1 2023/02/12 16:34:15 vins Exp $
+# $NetBSD: dtlogin.sh,v 1.2 2024/01/18 20:57:03 vins Exp $
 #
 # PROVIDE: dtlogin
-# REQUIRE: DAEMON LOGIN
+# REQUIRE: DAEMON LOGIN wscons
 # KEYWORD: shutdown
 #
 
@@ -11,22 +11,10 @@
 
 name="dtlogin"
 rcvar=$name
-command="@PREFIX@/dt/bin/dtlogin"
+command="@PREFIX@/dt/bin/${name}"
 command_args="-daemon"
 pidfile="@VARBASE@/dt/Xpid"
 extra_commands="reload"
 
 load_rc_config $name
-
-
-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"

Index: pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am
diff -u pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am:1.1 pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am:1.2
--- pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am:1.1        Sun Feb 12 16:34:15 2023
+++ pkgsrc/wm/cde/patches/patch-programs_dtlogin_Makefile.am    Thu Jan 18 20:57:04 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-programs_dtlogin_Makefile.am,v 1.1 2023/02/12 16:34:15 vins Exp $
+$NetBSD: patch-programs_dtlogin_Makefile.am,v 1.2 2024/01/18 20:57:04 vins Exp $
 
 Avoid reference to build dir in dtlogin. 
 Fix X11 binary path.
 
---- programs/dtlogin/Makefile.am.orig  2022-10-01 17:18:27.000000000 +0000
+--- programs/dtlogin/Makefile.am.orig  2023-11-18 22:38:09.000000000 +0000
 +++ programs/dtlogin/Makefile.am
-@@ -11,10 +11,11 @@ DTPAMSVCLIB =
- endif
+@@ -3,10 +3,11 @@ SUBDIRS = config
+ bin_PROGRAMS = dtlogin dtgreet dtchooser
  
  XDMDIR = $(CDE_LOGFILES_TOP)
 +XBINDIR = @X11BASE@/bin
@@ -19,7 +19,7 @@ Fix X11 binary path.
  
  DEF_BM_PATH = 
$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
  DEF_PM_PATH = 
$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
-@@ -66,28 +67,20 @@ dtchooser_LDADD = $(DTCLIENTLIBS) $(XDMC
+@@ -58,28 +59,20 @@ dtchooser_LDADD = $(DTCLIENTLIBS) $(XDMC
  
  if LINUX
  AM_CFLAGS += -DHASDES -DHASXDMAUTH

Added files:

Index: pkgsrc/wm/cde/files/cde.desktop
diff -u /dev/null pkgsrc/wm/cde/files/cde.desktop:1.1
--- /dev/null   Thu Jan 18 20:57:04 2024
+++ pkgsrc/wm/cde/files/cde.desktop     Thu Jan 18 20:57:03 2024
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=CDE
+DesktopNames=CDE
+Comment=Use this session to boot into the Common Desktop Environment
+Keywords=Common Desktop Environment
+Exec=@PREFIX@/dt/bin/Xsession
+Icon=Dtlogo.pm
+Type=Application

Index: pkgsrc/wm/cde/patches/patch-doc_Makefile.am
diff -u /dev/null pkgsrc/wm/cde/patches/patch-doc_Makefile.am:1.1
--- /dev/null   Thu Jan 18 20:57:04 2024
+++ pkgsrc/wm/cde/patches/patch-doc_Makefile.am Thu Jan 18 20:57:03 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-doc_Makefile.am,v 1.1 2024/01/18 20:57:03 vins Exp $
+
+mandir and CDE prefix don't differ in our case. 
+
+--- doc/Makefile.am.orig       2024-01-17 17:47:42.495001531 +0000
++++ doc/Makefile.am
+@@ -23,5 +23,5 @@ SUBDIRS += ja_JP.UTF-8
+ endif
+ 
+ install-data-hook:
+-      $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/man
+-      cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/ && $(LN_S) $(mandir) man
++      -if [ $(CDE_INSTALLATION_TOP)/man != $(mandir) ];then \
++              cd $(DESTDIR)$(CDE_INSTALLATION_TOP) && $(LN_S) $(mandir) man; fi

Prev by Date: CVS commit: pkgsrc/meta-pkgs/texlive-collection-publishers
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/meta-pkgs/texlive-collection-publishers
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index