- update pygopherd to 2.0.3

- preserve config file

PR:             59984
Approved by:    erwin (mentor)

4 files changed, 26 insertions, 11 deletions

diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index eade0088af5f..f29819e1ef71 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	pygopherd
-PORTVERSION=	1.1.0
+PORTVERSION=	2.0.3
 CATEGORIES=	net python
-MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
+MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,7 +18,7 @@ COMMENT=	Multiprotocol Information Server
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN8=	pygopherd.8
 
@@ -30,8 +30,11 @@ post-patch:
 		${WRKSRC}/bin/pygopherd
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} \
 		-e "s|/usr/bin/python2.2|${SETENV} python|g"
+	@${MV} ${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/conf/pygopherd.conf-dist
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
+	@[ -f ${PREFIX}/etc/pygopherd/pygopherd.conf ] || \
+			${CP} ${PREFIX}/etc/pygopherd/pygopherd.conf-dist ${PREFIX}/etc/pygopherd/pygopherd.conf
 
 .include <bsd.port.mk>
diff --git a/net/pygopherd/distinfo b/net/pygopherd/distinfo
index 0b508a6e9823..00ec2058a0b0 100644
--- a/net/pygopherd/distinfo
+++ b/net/pygopherd/distinfo
@@ -1 +1 @@
-MD5 (pygopherd_1.1.0.tar.gz) = 8ce1fd82845a8a9fc2a003840cdeb5b2
+MD5 (pygopherd_2.0.3.tar.gz) = e79144cb93eab75fef01a4018d55f9d9
diff --git a/net/pygopherd/files/patch-setup.py b/net/pygopherd/files/patch-setup.py
index ff32df5d3b39..8e7ea6cc736e 100644
--- a/net/pygopherd/files/patch-setup.py
+++ b/net/pygopherd/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	Sun Sep  8 02:47:43 2002
-+++ setup.py	Sun Sep  8 02:48:06 2002
-@@ -34,7 +34,7 @@
+--- setup.py.orig	Sat Aug 23 16:31:00 2003
++++ setup.py	Fri Dec  5 21:24:43 2003
+@@ -33,7 +33,7 @@
        url = pygopherd.version.homepage,
        packages = ['pygopherd', 'pygopherd.handlers', 'pygopherd.protocols'],
        scripts = ['bin/pygopherd'],
 -      data_files = [ ('/etc/pygopherd', ['conf/pygopherd.conf',
-+      data_files = [ ('%%PREFIX%%/etc/pygopherd', ['conf/pygopherd.conf',
++      data_files = [ ('%%PREFIX%%/etc/pygopherd', ['conf/pygopherd.conf-dist',
                                           'conf/mime.types'] ) ],
        license = pygopherd.version.license
  )
diff --git a/net/pygopherd/pkg-plist b/net/pygopherd/pkg-plist
index 3c29313d3bf2..9266d42bda02 100644
--- a/net/pygopherd/pkg-plist
+++ b/net/pygopherd/pkg-plist
@@ -1,7 +1,8 @@
 bin/pygopherd
 etc/pygopherd/mime.types
-etc/pygopherd/pygopherd.conf
-@dirrm etc/pygopherd
+@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
+@exec [ -f %B/pygopherd.conf ] || cp %B/%f %B/pygopherd.conf
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.py
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyo
@@ -62,6 +63,9 @@ etc/pygopherd/pygopherd.conf
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.pyo
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.py
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.pyc
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.py
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.pyo
@@ -110,6 +114,9 @@ etc/pygopherd/pygopherd.conf
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.pyo
+%%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.py
+%%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.pyc
+%%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.py
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyo
@@ -119,6 +126,11 @@ etc/pygopherd/pygopherd.conf
 %%PYTHON_SITELIBDIR%%/pygopherd/version.py
 %%PYTHON_SITELIBDIR%%/pygopherd/version.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/version.pyo
+%%PYTHON_SITELIBDIR%%/pygopherd/zipfile.py
+%%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyc
+%%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd/handlers
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd/protocols
 @dirrm %%PYTHON_SITELIBDIR%%/pygopherd
+@unexec rmdir %D/etc/pygopherd 2> /dev/null || echo "If you do not plan on reinstalling pygopherd, you can safely remove %D/etc/pygopherd"
+