From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 23 13:25:53 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 47E42F88;
 Mon, 23 Jun 2014 13:25:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1AFF627A2;
 Mon, 23 Jun 2014 13:25:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NDPqVm033153;
 Mon, 23 Jun 2014 13:25:52 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NDPqG8033150;
 Mon, 23 Jun 2014 13:25:52 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201406231325.s5NDPqG8033150@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Mon, 23 Jun 2014 13:25:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358940 - head/net/ldapdiff
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Jun 2014 13:25:53 -0000

Author: vanilla
Date: Mon Jun 23 13:25:52 2014
New Revision: 358940
URL: http://svnweb.freebsd.org/changeset/ports/358940
QAT: https://qat.redports.org/buildarchive/r358940/

Log:
  1: Stagify.
  2: use @sample on pkg-plist.
  
  Approved by:	portmgr@

Modified:
  head/net/ldapdiff/Makefile
  head/net/ldapdiff/pkg-plist

Modified: head/net/ldapdiff/Makefile
==============================================================================
--- head/net/ldapdiff/Makefile	Mon Jun 23 13:22:22 2014	(r358939)
+++ head/net/ldapdiff/Makefile	Mon Jun 23 13:25:52 2014	(r358940)
@@ -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=${LOCAL
 .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>

Modified: head/net/ldapdiff/pkg-plist
==============================================================================
--- head/net/ldapdiff/pkg-plist	Mon Jun 23 13:22:22 2014	(r358939)
+++ head/net/ldapdiff/pkg-plist	Mon Jun 23 13:25:52 2014	(r358940)
@@ -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