CVS commit: pkgsrc/wm/cde

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Mar  9 23:59:38 UTC 2024

Modified Files:
        pkgsrc/wm/cde: Makefile PLIST options.mk
        pkgsrc/wm/cde/files: README.pkgsrc

Log Message:
wm/cde: standardise pam policy files location


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/cde/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/cde/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/cde/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/cde/files/README.pkgsrc

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.5 pkgsrc/wm/cde/Makefile:1.6
--- pkgsrc/wm/cde/Makefile:1.5  Thu Jan 18 20:57:03 2024
+++ pkgsrc/wm/cde/Makefile      Sat Mar  9 23:59:38 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2024/01/18 20:57:03 vins Exp $
+# $NetBSD: Makefile,v 1.6 2024/03/09 23:59:38 vins Exp $
 
 DISTNAME=      cde-2.5.2
+PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cdesktopenv/files/src/}
 

Index: pkgsrc/wm/cde/PLIST
diff -u pkgsrc/wm/cde/PLIST:1.2 pkgsrc/wm/cde/PLIST:1.3
--- pkgsrc/wm/cde/PLIST:1.2     Thu Jan 18 20:57:03 2024
+++ pkgsrc/wm/cde/PLIST Sat Mar  9 23:59:38 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2024/01/18 20:57:03 vins Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/03/09 23:59:38 vins Exp $
 bin/startcde
 dt/app-defaults/C/Dt
 dt/app-defaults/C/Dtbuilder
@@ -3529,9 +3529,9 @@ share/doc/cde/HISTORY
 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
+${PLIST.pam}${PAMDIR}/cde
+${PLIST.pam}${PAMDIR}/dtlogin
+${PLIST.pam}${PAMDIR}/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/options.mk
diff -u pkgsrc/wm/cde/options.mk:1.3 pkgsrc/wm/cde/options.mk:1.4
--- pkgsrc/wm/cde/options.mk:1.3        Thu Jan 18 20:57:03 2024
+++ pkgsrc/wm/cde/options.mk    Sat Mar  9 23:59:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/01/18 20:57:03 vins Exp $
+# $NetBSD: options.mk,v 1.4 2024/03/09 23:59:38 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cde
 
@@ -37,23 +37,22 @@ DEPENDS+=           pam-pwauth_suid-[0-9]*:../../
 
 CONFIGURE_ENV+=                ac_cv_lib_pam_pam_start=yes
 
-EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=           ${EGDIR}/pam.d/cde \
-                       ${PKG_SYSCONFDIR}/pam.d/cde
+PAMDIR=                        share/examples/pam.d
+MAKE_DIRS+=            ${PAMDIR}
 
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}/pam.d
-INSTALLATION_DIRS+=    share/examples/${PKGBASE}/pam.d
+INSTALLATION_DIRS+=    ${PAMDIR}
 
 PLIST.pam=             yes
+PLIST_SUBST+=          PAMDIR=${PAMDIR:Q}
 
 .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
+               ${DESTDIR}${PREFIX}/${PAMDIR}/cde
+.  for i in dtlogin dtsession
+       ${INSTALL_DATA} ${WRKSRC}/programs/${i}/config/${i}     \
+               ${DESTDIR}${PREFIX}/${PAMDIR}
 .  endfor
 .else
 

Index: pkgsrc/wm/cde/files/README.pkgsrc
diff -u pkgsrc/wm/cde/files/README.pkgsrc:1.3 pkgsrc/wm/cde/files/README.pkgsrc:1.4
--- pkgsrc/wm/cde/files/README.pkgsrc:1.3       Thu Jan 18 20:57:03 2024
+++ pkgsrc/wm/cde/files/README.pkgsrc   Sat Mar  9 23:59:38 2024
@@ -4,8 +4,10 @@
 
 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
+
+       $ for i in cde dtlogin dtsession; do
+       > cp @PREFIX@/share/examples/pam.d/$i /etc/pam.d
+       > done
 
 -----------------------------------------------------------------------