Re-add conditional PLIST entries that got lost by not building with

all options on

Add substitutions for PLIST generation
This commit is contained in:
hauke 2024-03-15 22:14:26 +00:00
parent 8e39afddf7
commit f51c90e52c
4 changed files with 46 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.62 2024/02/05 14:03:00 hauke Exp $
# $NetBSD: Makefile,v 1.63 2024/03/15 22:14:26 hauke Exp $
DISTNAME= netatalk-2.3.1
PKGNAME= ${DISTNAME:C/-/22-/}
@ -74,6 +74,19 @@ PLIST_VARS+= ea
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_SSP_SKIP+= libexec/netatalk/uams/*.a
.include "options.mk"

View File

@ -1,5 +1,5 @@
@comment $NetBSD: PLIST,v 1.8 2024/03/15 15:20:26 wiz Exp $
bin/ad
@comment $NetBSD: PLIST,v 1.9 2024/03/15 22:14:26 hauke Exp $
${PLIST.ea}bin/ad
bin/add_netatalk_printer
bin/adv1tov2
bin/aecho
@ -108,6 +108,7 @@ ${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
@ -166,6 +167,7 @@ man/man8/timelord.8
share/aclocal/netatalk.m4
share/examples/netatalk/AppleVolumes.default
share/examples/netatalk/AppleVolumes.system
${PLIST.ldap}share/examples/netatalk/afp_ldap.conf
share/examples/netatalk/afpd.conf
share/examples/netatalk/atalkd.conf
share/examples/netatalk/netatalk.conf

View File

@ -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

View File

@ -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