From c30ab0bebf0251499429b7b783ddc25e69b6f4cd Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Mon, 23 Jun 2014 13:25:52 +0000
Subject: [PATCH] 1: Stagify. 2: use @sample on pkg-plist.

Approved by:	portmgr@
---
 net/ldapdiff/Makefile  | 17 +++++++----------
 net/ldapdiff/pkg-plist |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index fd5cf41d3dad..97acce81ebcd 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -19,13 +19,11 @@ CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
 		--with-ldap-dir=${LOCALBASE}
 SAMPLES=	addentry.sh webtomware_without_jpeg.user.ldif \
 		webtomware.init.ldif webtomware.user.ldif
-MAN1=		ldapdiff.1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	CHANGES ChangeLog README TODO
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ! empty(ICONV_LIB)
@@ -33,19 +31,18 @@ CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/ldapdiff.conf.sample ${PREFIX}/etc/
-	@${MKDIR} ${DATADIR}/samples
+	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/ldapdiff.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/ldapdiff.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	@${MKDIR} ${STAGEDIR}${DATADIR}/samples
 .for sample in ${SAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${sample} ${DATADIR}/samples
+	${INSTALL_DATA} ${WRKSRC}/samples/${sample} ${STAGEDIR}${DATADIR}/samples
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/ldapdiff/pkg-plist b/net/ldapdiff/pkg-plist
index 046d6379da13..296caa3ed1e1 100644
--- a/net/ldapdiff/pkg-plist
+++ b/net/ldapdiff/pkg-plist
@@ -1,6 +1,6 @@
-@unexec if cmp -s %D/etc/ldapdiff.conf %D/etc/ldapdiff.conf.sample; then rm -f %D/etc/ldapdiff.conf; fi
 bin/ldapdiff
-etc/ldapdiff.conf.sample
+@sample etc/ldapdiff.conf.sample
+man/man1/ldapdiff.1.gz
 %%DATADIR%%/samples/addentry.sh
 %%DATADIR%%/samples/webtomware_without_jpeg.user.ldif
 %%DATADIR%%/samples/webtomware.init.ldif