svn commit: r359514 - in head/net/pygopherd: . files

[Pawel Pekala]

Author: pawel
Date: Fri Jun 27 12:40:36 2014
New Revision: 359514
URL: http://svnweb.freebsd.org/changeset/ports/359514
QAT: https://qat.redports.org/buildarchive/r359514/

Log:
  - Add staging support
  - Use @sample for config file

Modified:
  head/net/pygopherd/Makefile
  head/net/pygopherd/files/patch-setup.py
  head/net/pygopherd/pkg-plist

Modified: head/net/pygopherd/Makefile
==============================================================================
--- head/net/pygopherd/Makefile	Fri Jun 27 12:37:43 2014	(r359513)
+++ head/net/pygopherd/Makefile	Fri Jun 27 12:40:36 2014	(r359514)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pygopherd
 PORTVERSION=	2.0.16
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/ \
 		http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
@@ -16,9 +17,6 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	2.0.15
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN8=	pygopherd.8
-
-NO_STAGE=	yes
 post-patch:
 .for f in setup.py bin/pygopherd conf/pygopherd.conf doc/pygopherd.8
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${f}
@@ -27,11 +25,9 @@ post-patch:
 		${WRKSRC}/bin/pygopherd
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} \
 		-e "s|/usr/bin/python2.2|${PYTHON_CMD}|g"
-	@${MV} ${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/conf/pygopherd.conf-dist
+	@${MV} ${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/conf/pygopherd.conf.sample
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN8} ${MANPREFIX}/man/man8
-	@[ -f ${PREFIX}/etc/pygopherd/pygopherd.conf ] || \
-			${CP} ${PREFIX}/etc/pygopherd/pygopherd.conf-dist ${PREFIX}/etc/pygopherd/pygopherd.conf
+	${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>

Modified: head/net/pygopherd/files/patch-setup.py
==============================================================================
--- head/net/pygopherd/files/patch-setup.py	Fri Jun 27 12:37:43 2014	(r359513)
+++ head/net/pygopherd/files/patch-setup.py	Fri Jun 27 12:40:36 2014	(r359514)
@@ -5,7 +5,7 @@
        packages = ['pygopherd', 'pygopherd.handlers', 'pygopherd.protocols'],
        scripts = ['bin/pygopherd'],
 -      data_files = [ ('/etc/pygopherd', ['conf/pygopherd.conf',
-+      data_files = [ ('%%PREFIX%%/etc/pygopherd', ['conf/pygopherd.conf-dist',
++      data_files = [ ('%%PREFIX%%/etc/pygopherd', ['conf/pygopherd.conf.sample',
                                           'conf/mime.types'] ) ],
        license = pygopherd.version.license
  )

Modified: head/net/pygopherd/pkg-plist
==============================================================================
--- head/net/pygopherd/pkg-plist	Fri Jun 27 12:37:43 2014	(r359513)
+++ head/net/pygopherd/pkg-plist	Fri Jun 27 12:40:36 2014	(r359514)
@@ -1,8 +1,6 @@
 bin/pygopherd
 etc/pygopherd/mime.types
- at unexec if cmp -s %D/etc/pygopherd/pygopherd.conf %D/etc/pygopherd/pygopherd.conf-dist; then rm -f %D/etc/pygopherd/pygopherd.conf; fi
-etc/pygopherd/pygopherd.conf-dist
- at exec [ -f %B/pygopherd.conf ] || cp %B/%f %B/pygopherd.conf
+ at sample etc/pygopherd/pygopherd.conf.sample
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.py
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyo
@@ -132,6 +130,7 @@ etc/pygopherd/pygopherd.conf-dist
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.py
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyo
+man/man8/pygopherd.8.gz
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd/handlers
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd/protocols
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd