From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 30 15:08:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6936C94D;
 Mon, 30 Jun 2014 15:08:57 +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 3E32B2173;
 Mon, 30 Jun 2014 15:08:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UF8veq044647;
 Mon, 30 Jun 2014 15:08:57 GMT (envelope-from araujo@svn.freebsd.org)
Received: (from araujo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UF8u8q044644;
 Mon, 30 Jun 2014 15:08:56 GMT (envelope-from araujo@svn.freebsd.org)
Message-Id: <201406301508.s5UF8u8q044644@svn.freebsd.org>
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Mon, 30 Jun 2014 15:08:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359859 - head/sysutils/py-stdiff
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, 30 Jun 2014 15:08:57 -0000

Author: araujo
Date: Mon Jun 30 15:08:56 2014
New Revision: 359859
URL: http://svnweb.freebsd.org/changeset/ports/359859
QAT: https://qat.redports.org/buildarchive/r359859/

Log:
  - Drop NOPORTDOCS.
  - Use @sample macro.
  
  Reported by: wg@

Modified:
  head/sysutils/py-stdiff/Makefile
  head/sysutils/py-stdiff/pkg-plist

Modified: head/sysutils/py-stdiff/Makefile
==============================================================================
--- head/sysutils/py-stdiff/Makefile	Mon Jun 30 15:06:17 2014	(r359858)
+++ head/sysutils/py-stdiff/Makefile	Mon Jun 30 15:08:56 2014	(r359859)
@@ -11,18 +11,13 @@ COMMENT=		Spot The Difference is a file 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
-.endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	$(INSTALL_MAN) ${WRKSRC}/INSTALL.txt ${STAGEDIR}/${DOCSDIR}/
 	$(INSTALL_MAN) ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DOCSDIR}/
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
-.endif
-	@if [ ! -f ${PREFIX}/etc/stdiff.conf ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/stdiff.conf.sample \
-		${PREFIX}/etc/stdiff.conf; fi
 .include <bsd.port.mk>

Modified: head/sysutils/py-stdiff/pkg-plist
==============================================================================
--- head/sysutils/py-stdiff/pkg-plist	Mon Jun 30 15:06:17 2014	(r359858)
+++ head/sysutils/py-stdiff/pkg-plist	Mon Jun 30 15:08:56 2014	(r359859)
@@ -1,5 +1,6 @@
 bin/stdiff.py
 bin/stdiff_install_db.py
+@sample etc/stdiff.conf.sample
 %%PYTHON_SITELIBDIR%%/spot/Parser.py
 %%PYTHON_SITELIBDIR%%/spot/Parser.pyc
 %%PYTHON_SITELIBDIR%%/spot/Parser.pyo
@@ -28,6 +29,3 @@ bin/stdiff_install_db.py
 %%PYTHON_SITELIBDIR%%/spot/spot_sqlite.pyc
 %%PYTHON_SITELIBDIR%%/spot/spot_sqlite.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/spot
-@unexec if cmp -s %D/etc/stdiff.conf.sample %D/etc/stdiff.conf; then rm -f %D/etc/stdiff.conf ; fi
-etc/stdiff.conf.sample
-@exec if [ ! -f %D/etc/stdiff.conf ]; then cp -p %D/%F %B/stdiff.conf; fi