- Enable staging

- Fix display of pkg-message not showing %%ETCDIR%%
- Always stage documentation

3 files changed, 34 insertions, 24 deletions

diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index a44ff23e1c16..afd2eec46da7 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ldapscripts
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.org/ldapscripts/
@@ -26,20 +27,10 @@ LIBDIR=	${PREFIX}/lib/${PORTNAME}
 MAKE_ENV+=	MANDIR=${MANPREFIX}/man \
 		ETCDIR=${ETCDIR}
 
-MANCOMPRESSED=	yes
-MAN1=	ldapaddgroup.1 ldapaddmachine.1 ldapadduser.1 ldapaddusertogroup.1 \
-	ldapdeletegroup.1 ldapdeleteuser.1 ldapdeleteuserfromgroup.1 \
-	ldaprenameuser.1 ldapsetprimarygroup.1 lsldap.1 ldaprenamemachine.1 \
-	ldaprenamegroup.1 ldapinit.1 ldapdeletemachine.1 ldapsetpasswd.1 \
-	ldapfinger.1 ldapgid.1 ldapid.1 ldapmodifygroup.1 ldapmodifymachine.1 \
-	ldapmodifyuser.1
-MAN5=	ldapscripts.5
+SUB_FILES=	pkg-message
 
 PORTDOCS=	README CHANGELOG VERSION TODO
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 # Unset 'all' target set by default to 'help'
 # and set paths to OpenLDAP binaries
 post-patch:
@@ -57,12 +48,9 @@ post-patch:
 
 # Install remaining stuff
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${RM} ${STAGEDIR}${ETCDIR}/ldapscripts.conf \
+		${STAGEDIR}${ETCDIR}/ldapscripts.passwd
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/ldapscripts/pkg-message b/net/ldapscripts/files/pkg-message.in
index 9047a1d229d7..51a29712516b 100644
--- a/net/ldapscripts/pkg-message
+++ b/net/ldapscripts/files/pkg-message.in
@@ -8,10 +8,10 @@
  forget to fine-tune ownership of these two files before using
  the scripts (and to make them read-only if they are not).
 
- e.g. : chmod 0440 ${ETCDIR}/ldapscripts.conf
-        chgrp ldapadmins ${ETCDIR}/ldapscripts.conf
-        chmod 0440 ${ETCDIR}/ldapscripts.passwd
-        chgrp ldapadmins ${ETCDIR}/ldapscripts.passwd
+ e.g. : chmod 0440 %%ETCDIR%%/ldapscripts.conf
+        chgrp ldapadmins %%ETCDIR%%/ldapscripts.conf
+        chmod 0440 %%ETCDIR%%/ldapscripts.passwd
+        chgrp ldapadmins %%ETCDIR%%/ldapscripts.passwd
 
  The ldapscripts are now installed, enjoy !
 
diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist
index 253fba89a9b7..63e6ec37e68c 100644
--- a/net/ldapscripts/pkg-plist
+++ b/net/ldapscripts/pkg-plist
@@ -1,7 +1,7 @@
-@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.conf.sample %D/%%ETCDIR%%/ldapscripts.conf; then rm -f %D/%%ETCDIR%%/ldapscripts.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.conf %D/%%ETCDIR%%/ldapscripts.conf.sample; then rm -f %D/%%ETCDIR%%/ldapscripts.conf; fi
 %%ETCDIR%%/ldapscripts.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/ldapscripts.conf ] ; then cp -p %D/%F %B/ldapscripts.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.passwd.sample %D/%%ETCDIR%%/ldapscripts.passwd; then rm -f %D/%%ETCDIR%%/ldapscripts.passwd; fi
+@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.passwd %D/%%ETCDIR%%/ldapscripts.passwd.sample; then rm -f %D/%%ETCDIR%%/ldapscripts.passwd; fi
 %%ETCDIR%%/ldapscripts.passwd.sample
 @exec if [ ! -f %D/%%ETCDIR%%/ldapscripts.passwd ] ; then cp -p %D/%F %B/ldapscripts.passwd; fi
 %%ETCDIR%%/ldapaddgroup.template.sample
@@ -31,3 +31,25 @@ sbin/ldapid
 sbin/ldapmodifygroup
 sbin/ldapmodifymachine
 sbin/ldapmodifyuser
+man/man1/ldapaddgroup.1.gz
+man/man1/ldapaddmachine.1.gz
+man/man1/ldapadduser.1.gz
+man/man1/ldapaddusertogroup.1.gz
+man/man1/ldapdeletegroup.1.gz
+man/man1/ldapdeletemachine.1.gz
+man/man1/ldapdeleteuser.1.gz
+man/man1/ldapdeleteuserfromgroup.1.gz
+man/man1/ldapfinger.1.gz
+man/man1/ldapgid.1.gz
+man/man1/ldapid.1.gz
+man/man1/ldapinit.1.gz
+man/man1/ldapmodifygroup.1.gz
+man/man1/ldapmodifymachine.1.gz
+man/man1/ldapmodifyuser.1.gz
+man/man1/ldaprenamegroup.1.gz
+man/man1/ldaprenamemachine.1.gz
+man/man1/ldaprenameuser.1.gz
+man/man1/ldapsetpasswd.1.gz
+man/man1/ldapsetprimarygroup.1.gz
+man/man1/lsldap.1.gz
+man/man5/ldapscripts.5.gz