cde: fix OWN_DIRS perms + minor tweaks

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Thu Jan 19 10:15:38 2023 +0100
Changeset:	1a6d05d5e9885a7c6839509a0158fac1b357a371

Modified Files:
	cde/Makefile
	cde/PLIST
	cde/files/README.netbsd
	cde/files/README.pkgsrc

Log Message:
cde: fix OWN_DIRS perms + minor tweaks

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a6d05d5e9885a7c6839509a0158fac1b357a371

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

diffstat:
 cde/Makefile            | 30 ++++++++++++++----------------
 cde/PLIST               |  2 +-
 cde/files/README.netbsd |  3 +++
 cde/files/README.pkgsrc |  3 +++
 4 files changed, 21 insertions(+), 17 deletions(-)

diffs:
diff --git a/cde/Makefile b/cde/Makefile
index efd1ebcf37..06207e972a 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -15,9 +15,10 @@ USE_TOOLS+=	aclocal autoconf automake autoreconf
 USE_TOOLS+=	awk:run bdftopcf gettext gmake gzip ksh
 USE_TOOLS+=	lex msgfmt mkfontdir perl pkg-config yacc
 
-PTHREAD_AUTO_VARS=	yes
 MAKE_JOBS_SAFE=		no
 
+PTHREAD_AUTO_VARS=		yes
+BUILDLINK_TRANSFORM+=		rm:-pthread
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/dt/lib
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -69,7 +70,7 @@ SUBST_FILES.paths+=	configure.ac
 SUBST_FILES.paths+=	pkgsrc/startcde
 SUBST_FILES.paths+=	pkgsrc/README.*
 SUBST_FILES.paths+=	programs/dtlogin/Makefile.am
-SUBST_VARS.paths=	PREFIX VARBASE PKG_SYSCONFDIR X11BASE
+SUBST_VARS.paths=	PKG_SYSCONFDIR PREFIX REAL_ROOT_GROUP VARBASE X11BASE
 SUBST_MESSAGE.paths=	Replacing path placeholders.
 
 MAKE_ENV+=	x_includes=${X11BASE}/include
@@ -84,26 +85,23 @@ SPECIAL_PERMS+=	${PREFIX}/dt/bin/dtmail ${REAL_ROOT_USER} mail 2755
 RCD_SCRIPTS=	dtlogin
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=	${EGDIR}/pam.d/cde.conf \
-		${PKG_SYSCONFDIR}/pam.d/cde.conf
+CONF_FILES+=	${EGDIR}/pam.d/cde \
+		${PKG_SYSCONFDIR}/pam.d/cde
 .for i in .alias .dir
 CONF_FILES+=	${PREFIX}/dt/share/cde/fontaliases/fonts${i} \
 		${PKG_SYSCONFDIR}/dt/config/xfonts/C/fonts${i}
 .endfor
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/pam.d
 
-BUILD_DEFS+=	VARBASE
-OWN_DIRS+=	${VARBASE}/dt
-OWN_DIRS+=	${VARBASE}/spool/calendar
-OWN_DIRS+=	${VARBASE}/dt/appconfig/appmanager
-.for i in appmanager help icons types
-.  for j in C de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
-OWN_DIRS+=	${PKG_SYSCONFDIR}/appconfig/${i}/${j}
-.  endfor
+BUILD_DEFS+=		VARBASE
+OWN_DIRS+=		${VARBASE}/dt
+.for d in dt/appconfig/appmanager dt/tmp spool/calendar
+OWN_DIRS+=		${VARBASE}/${d}
+OWN_DIRS_PERMS+=	${VARBASE}/${d} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0770
 .endfor
-OWN_DIRS+=	${PKG_SYSCONFDIR}/dt/config
-OWN_DIRS+=	${PKG_SYSCONFDIR}/dt/config/Xsession.d
-OWN_DIRS+=	${PKG_SYSCONFDIR}/dt/config/xfonts/C
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dt/config
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dt/config/Xsession.d
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dt/config/xfonts/C
 
 INSTALLATION_DIRS+=	bin share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	share/examples/${PKGBASE}/pam.d
@@ -135,7 +133,7 @@ post-install:
 	${RUN}${FIND} ${DESTDIR}${PREFIX}/dt -type f -perm -111 -exec	\
 		${SH} -c '${STRIP} --strip-unneeded {} > /dev/null 2>&1' \;
 	${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf		\
-		${DESTDIR}${EGDIR}/pam.d/cde.conf
+		${DESTDIR}${EGDIR}/pam.d/cde
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgsrc/startcde ${DESTDIR}${PREFIX}/bin
 .for f in CONTRIBUTORS COPYING HISTORY README.md
 	${RUN}${MV} ${DESTDIR}${PREFIX}/dt/${f}				\
diff --git a/cde/PLIST b/cde/PLIST
index ee14fe0538..e2582163fa 100644
--- a/cde/PLIST
+++ b/cde/PLIST
@@ -3530,5 +3530,5 @@ share/doc/cde/HISTORY
 share/doc/cde/README.md
 share/doc/cde/README.netbsd
 share/doc/cde/README.pkgsrc
-share/examples/cde/pam.d/cde.conf
+share/examples/cde/pam.d/cde
 @pkgdir etc/dt/cde/fontaliases
diff --git a/cde/files/README.netbsd b/cde/files/README.netbsd
index 54dfe8876a..7a35b7f4c5 100644
--- a/cde/files/README.netbsd
+++ b/cde/files/README.netbsd
@@ -14,4 +14,7 @@ ttdbserver/1	stream	rpc/tcp wait	root	@PREFIX@/dt/bin/rpc.ttdbserver	rpc.ttdbser
 /etc/rpc:
 cmsd		100068	dtcalendar
 ttdbserver	100083	ttooltalk
+
+/etc/hosts
+127.0.0.1		localhost localhost.my.domain hostname 
 -----------------------------------------------------------------------
diff --git a/cde/files/README.pkgsrc b/cde/files/README.pkgsrc
index 983c41427b..84272656ad 100644
--- a/cde/files/README.pkgsrc
+++ b/cde/files/README.pkgsrc
@@ -8,6 +8,7 @@ content:
 Section "Files"
     FontPath    "${PREFIX}/share/fonts/100dpi/"
     FontPath    "${PREFIX}/share/fonts/75dpi/"
+    FontPath    "${PREFIX}/dt/share/cde/fontaliases"
 EndSection
 
 Place the file inside either: 
@@ -30,6 +31,8 @@ To start the Common Desktop Environment,
 
 Or use the provided `@PREFIX@/bin/startcde' script.
 
+Your user should be part of the '@REAL_ROOT_GROUP@' group to allow CDE
+to create the required directories upon startup.
 -----------------------------------------------------------------------
 
 To start the Dt Login Manager,