Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jun 2014 15:08:56 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359859 - head/sysutils/py-stdiff
Message-ID:  <201406301508.s5UF8u8q044644@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406301508.s5UF8u8q044644>