- Update to 2.0.9

- Make portlint happy

Suggested by:       edwin
Approved by:        erwin (mentor) (implicitly)

5 files changed, 59 insertions, 19 deletions

diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 0112da261060..033fbd0eee2c 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	pygopherd
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.9
 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/ \
+		http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,17 +24,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN8=	pygopherd.8
 
 post-patch:
-.for file in setup.py bin/pygopherd conf/pygopherd.conf pygopherd.8
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.for f in setup.py bin/pygopherd conf/pygopherd.conf doc/pygopherd.8
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${f}
 .endfor
-	@${REINPLACE_CMD} -e "s|/usr/bin/python2.2|${SETENV} python|g" \
+	@${REINPLACE_CMD} -e "s|/usr/bin/python2.2|${PYTHON_CMD}|g" \
 		${WRKSRC}/bin/pygopherd
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/bin/python2.2|${SETENV} python|g"
+		-e "s|/usr/bin/python2.2|${PYTHON_CMD}|g"
 	@${MV} ${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/conf/pygopherd.conf-dist
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
+	@${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
 
diff --git a/net/pygopherd/distinfo b/net/pygopherd/distinfo
index 00ec2058a0b0..021c870d6291 100644
--- a/net/pygopherd/distinfo
+++ b/net/pygopherd/distinfo
@@ -1 +1 @@
-MD5 (pygopherd_2.0.3.tar.gz) = e79144cb93eab75fef01a4018d55f9d9
+MD5 (pygopherd_2.0.9.tar.gz) = 98f552fc13edefdd5fd3e70db07eed0b
diff --git a/net/pygopherd/files/patch-doc::pygopherd.8 b/net/pygopherd/files/patch-doc::pygopherd.8
new file mode 100644
index 000000000000..6c462c896cfe
--- /dev/null
+++ b/net/pygopherd/files/patch-doc::pygopherd.8
@@ -0,0 +1,47 @@
+--- doc/pygopherd.8.orig	Sun Jan 18 02:26:38 2004
++++ doc/pygopherd.8	Sun Jan 18 02:29:01 2004
+@@ -180,7 +180,7 @@
+ \fIconf/pygopherd.conf\fR and
+ \fIconf/mime.types\fR.  Debian users will find
+ the configuration file pre-installed in
+-\fI/etc/pygopherd/pygopherd.conf\fR and the
++\fI%%PREFIX%%/etc/pygopherd/pygopherd.conf\fR and the
+ \fImime.types\fR file provided by the system
+ already.
+ .PP
+@@ -196,7 +196,7 @@
+ .PP
+ Invoke \fBPyGopherd\fR with \fBpygopherd
+ path/to/configfile\fR (or
+-\fB/etc/init.d/pygopherd start\fR on Debian).
++\fB%%PREFIX%%/etc/init.d/pygopherd start\fR on Debian).
+ Place some files in the location specified by the
+ \fIroot\fR directive in the config file and
+ you're ready to run!
+@@ -221,7 +221,7 @@
+ package from the \fBPyGopherd\fR website and then run
+ \fBdpkg -i\fR to install the downloaded
+ package.  Then, skip to the configuration section below.
+-You will use \fB/etc/init.d/pygopherd start\fR
++You will use \fB%%PREFIX%%/etc/init.d/pygopherd start\fR
+ to start the program.
+ .SS "OTHER SYSTEM-WIDE INSTALLATION"
+ .PP
+@@ -242,7 +242,7 @@
+ \fBpython2.2\fR.
+ .PP
+ Next, proceed to configuration.  Make sure that the
+-\fI/etc/pygopherd/pygopherd.conf\fR file
++\fI%%PREFIX%%/etc/pygopherd/pygopherd.conf\fR file
+ names valid users (\fIsetuid\fR and
+ \fIsetgid\fR options) and a valid document
+ root (\fIroot\fR option).
+@@ -287,7 +287,7 @@
+ .SH "CONFIGURATION"
+ .PP
+ \fBPyGopherd\fR is regulated by a configuratoin file normally
+-stored in \fI/etc/pygopherd/pygopherd.conf\fR.
++stored in \fI%%PREFIX%%/etc/pygopherd/pygopherd.conf\fR.
+ You can specify an alternate configuration file on the command
+ line.  The \fBPyGopherd\fR distribution ships
+ with a sample \fIpygopherd.conf\fR file that
diff --git a/net/pygopherd/files/patch-pygopherd.8 b/net/pygopherd/files/patch-pygopherd.8
deleted file mode 100644
index b50e5b799acc..000000000000
--- a/net/pygopherd/files/patch-pygopherd.8
+++ /dev/null
@@ -1,11 +0,0 @@
---- pygopherd.8.orig	Sun Sep  8 03:02:36 2002
-+++ pygopherd.8	Sun Sep  8 03:02:51 2002
-@@ -188,7 +188,7 @@
- .B python2.2.
- 
- Next, proceed to configuration.  Make sure that the
--\fI/etc/pygopherd/pygopherd.conf\fP file names valid users
-+\fI%%PREFIX%%/etc/pygopherd/pygopherd.conf\fP file names valid users
- (\fBsetuid\fP and \fBsetgid\fP options) and a valid document root
- (\fBroot\fP option).
- 
diff --git a/net/pygopherd/pkg-plist b/net/pygopherd/pkg-plist
index 9266d42bda02..e560df505970 100644
--- a/net/pygopherd/pkg-plist
+++ b/net/pygopherd/pkg-plist
@@ -120,6 +120,9 @@ etc/pygopherd/pygopherd.conf-dist
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.py
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyo
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.py 
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.pyc
+%%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.py
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.pyo