Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1710541396145990"
MIME-Version: 1.0
Date: Fri, 15 Mar 2024 22:23:16 +0000
From: "Hauke Fath" <hauke@netbsd.org>
Subject: CVS commit: pkgsrc/net/netatalk3
To: pkgsrc-changes@NetBSD.org
Reply-To: hauke@netbsd.org
Message-Id: <20240315222316.7CCF1FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1710541396145990
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	hauke
Date:		Fri Mar 15 22:23:16 UTC 2024

Modified Files:
	pkgsrc/net/netatalk3: Makefile PLIST

Log Message:
Re-add conditional PLIST entries that got lost by not building with
all options on

Add substitutions for PLIST generation


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/netatalk3/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk3/PLIST

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


--_----------=_1710541396145990
Content-Disposition: inline
Content-Length: 2563
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/netatalk3/Makefile
diff -u pkgsrc/net/netatalk3/Makefile:1.60 pkgsrc/net/netatalk3/Makefile:1.61
--- pkgsrc/net/netatalk3/Makefile:1.60	Mon Feb  5 15:02:15 2024
+++ pkgsrc/net/netatalk3/Makefile	Fri Mar 15 22:23:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2024/02/05 15:02:15 hauke Exp $
+# $NetBSD: Makefile,v 1.61 2024/03/15 22:23:16 hauke Exp $
 
 DISTNAME=	netatalk-3.1.18
 PKGNAME=	${DISTNAME:C/-/3-/}
@@ -68,6 +68,26 @@ PLIST.ea=		yes
 
 CONFIGURE_ARGS.NetBSD+=	--without-dtrace
 
+PLIST_VARS+=		ea
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
+	(${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \
+	${OPSYS} == "FreeBSD"
+PLIST.ea=		yes
+.endif
+
+# ea
+PRINT_PLIST_AWK+=	{ gsub(/^bin\/ad$$/, "$${PLIST.ea}&"); }
+
+# pam
+PRINT_PLIST_AWK+=	{ gsub(/^libexec\/netatalk\/uams\/.+_pam\.la$$/, "$${PLIST.pam}&"); }
+PRINT_PLIST_AWK+=	{ gsub(/^share\/examples\/netatalk\/netatalk\.pam$$/, "$${PLIST.pam}&"); }
+
+# ldap
+PRINT_PLIST_AWK+=	{ gsub(/^share\/examples\/netatalk\/afp_ldap\.conf$$/, "$${PLIST.ldap}&"); }
+
+# gssapi
+PRINT_PLIST_AWK+=	{ gsub(/^libexec\/netatalk\/uams\/.+_gss\.la$$/, "$${PLIST.gssapi}&"); }
+
 CHECK_RELRO_SKIP+=	libexec/netatalk/uams/*.a
 CHECK_SSP_SKIP+=	libexec/netatalk/uams/*.a
 

Index: pkgsrc/net/netatalk3/PLIST
diff -u pkgsrc/net/netatalk3/PLIST:1.3 pkgsrc/net/netatalk3/PLIST:1.4
--- pkgsrc/net/netatalk3/PLIST:1.3	Mon Feb  5 15:02:15 2024
+++ pkgsrc/net/netatalk3/PLIST	Fri Mar 15 22:23:16 2024
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2024/02/05 15:02:15 hauke Exp $
-bin/ad
+@comment $NetBSD: PLIST,v 1.4 2024/03/15 22:23:16 hauke Exp $
+${PLIST.ea}bin/ad
 bin/afpldaptest
 bin/afppasswd
 bin/afpstats
@@ -38,9 +38,13 @@ libexec/netatalk/netatalk
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx2.so
+${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la
 libexec/netatalk/uams/uams_dhx2_passwd.la
+${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
 libexec/netatalk/uams/uams_dhx_passwd.la
+${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
+${PLIST.pam}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
 man/man1/ad.1
@@ -64,5 +68,6 @@ share/aclocal/netatalk.m4
 share/examples/netatalk/afp.conf
 share/examples/netatalk/dbus-session.conf
 share/examples/netatalk/extmap.conf
+${PLIST.pam}share/examples/netatalk/netatalk.pam
 @pkgdir libexec/psffilters
 @pkgdir etc/netatalk


--_----------=_1710541396145990--