- Stage support

- Pass maintainership to emulation@
- Use options framework instead of WITH_PAM and NOPORTDOCS knobs
- Mention PORTDOCS files explicitly
- Replace some static text in Makefile by variables

2 files changed, 37 insertions, 26 deletions

diff --git a/net/linux-f10-nss_ldap/Makefile b/net/linux-f10-nss_ldap/Makefile
index 5f0ff4f381d8..2340fec41a16 100644
--- a/net/linux-f10-nss_ldap/Makefile
+++ b/net/linux-f10-nss_ldap/Makefile
@@ -10,12 +10,14 @@ MASTER_SITES=	ftp://ftp.pbone.net/mirror/archive.fedoraproject.org/fedora/linux/
 PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${NSS_LDAP_VERSION}-${RPMVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2307 NSS Module (Linux Fedora 10)
 
 #LICENSE=	GPLv2
 #NO_LICENSES_INSTALL=yes	# license framework does not rm the "share" directory
 
+OPTIONS_DEFINE=	DOCS PAM
+
 NSS_LDAP_VERSION=264
 
 USE_LINUX_RPM=	yes
@@ -27,48 +29,54 @@ USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}
 
 MANPREFIX=	${PREFIX}/usr/share
-MANCOMPRESSED=	no
-MAN5=		nss_ldap.5.gz
 
-.if defined(WITH_PAM)
-PLIST_SUB+=	PAM=""
-MAN5+=		pam_ldap.5.gz
-.else
-PLIST_SUB+=	PAM="@comment "
-.endif
+OPTIONS_SUB=	yes
+
+PORTDOCS=	ANNOUNCE.nss_ldap AUTHORS.nss_ldap COPYING.nss_ldap \
+		ChangeLog.nss_ldap NEWS.nss_ldap README.TLS README.nss_ldap \
+		ldap.conf.nss_ldap ldapns.schema ns-pwd-policy.schema \
+		nsswitch.ldap
 
-PORTDOCS=*
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPAM}
+PORTDOCS+=	AUTHORS.pam_ldap COPYING.LIB.pam_ldap COPYING.pam_ldap \
+		ChangeLog.pam_ldap NEWS.pam_ldap README.pam_ldap \
+		ldap.conf.pam_ldap pam.d/chfn pam.d/chsh pam.d/ftp \
+		pam.d/gdm pam.d/halt pam.d/imap pam.d/kde pam.d/linuxconf \
+		pam.d/linuxconf-pair pam.d/login pam.d/mcserv pam.d/other \
+		pam.d/passwd pam.d/pop pam.d/poweroff pam.d/ppp pam.d/reboot \
+		pam.d/rexec pam.d/rlogin pam.d/rsh pam.d/samba pam.d/shutdown \
+		pam.d/ssh pam.d/su pam.d/vlock pam.d/xdm pam.d/xlock \
+		pam.d/xscreensaver pam.d/xserver
+.endif
 
-NO_STAGE=	yes
 pre-fetch:
-.if !defined(WITH_PAM)
-	@${ECHO_MSG} "Use WITH_PAM if you require more advanced ldap support in the linuxulator"
+.if !${PORT_OPTIONS:MPAM}
+	@${ECHO_MSG} "Select PAM if you require more advanced ldap support in the linuxulator"
 .endif
 
 post-extract:
 	@if [ -f ${WRKDIR}/etc/ldap.conf ]; then \
 		${MV} ${WRKDIR}/etc/ldap.conf ${WRKDIR}/etc/ldap.conf.dist; \
 	fi
-.if !defined(WITH_PAM)
+.if !${PORT_OPTIONS:MPAM}
 	@if [ -f ${WRKDIR}/lib/security/pam_ldap.so ]; then \
 		${RM} -rf ${WRKDIR}/lib/; \
 	fi
-	@if [ -f ${WRKDIR}/usr/share/doc/nss_ldap-264/COPYING.pam_ldap ]; then \
-		${RM} ${WRKDIR}/usr/share/doc/nss_ldap-264/*.pam*; \
-		${RM} -rf ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d; \
+	@if [ -f ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/COPYING.pam_ldap ]; then \
+		${RM} ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/*.pam*; \
+		${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d; \
 	fi
 	@if [ -f ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz ]; then \
 		${RM} ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz; \
 	fi
 .else
-.if defined(NOPORTDOCS)
-	@if [ -d ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d ]; then \
-		${RM} -rf ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d/; \
+.if !${PORT_OPTIONS:MDOCS}
+	@if [ -d ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d ]; then \
+		${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d/; \
 	fi
 .endif
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE};
-
 .include <bsd.port.mk>
diff --git a/net/linux-f10-nss_ldap/pkg-plist b/net/linux-f10-nss_ldap/pkg-plist
index 829a81397242..560036339610 100644
--- a/net/linux-f10-nss_ldap/pkg-plist
+++ b/net/linux-f10-nss_ldap/pkg-plist
@@ -1,5 +1,8 @@
-usr/lib/libnss_ldap.so.2
-usr/lib/libnss_ldap.so
-usr/lib/libnss_ldap-264.so
 etc/ldap.conf.dist
+usr/lib/libnss_ldap-264.so
+usr/lib/libnss_ldap.so
+usr/lib/libnss_ldap.so.2
+%%PAM%%usr/share/man/man5/pam_ldap.5.gz
 %%PAM%%lib/security/pam_ldap.so
+usr/share/man/man5/nss_ldap.5.gz
+%%PAM%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pam.d