update to 2.0.9

changes:

pygopherd (2.0.9) unstable; urgency=low
  * Don't crash if simpletal is unavailable.

pygopherd (2.0.8) unstable; urgency=low
  * Fixed a logic error in the Numb handling fix.

pygopherd (2.0.7) unstable; urgency=low
  * Fixed UMN.py to properly handle Numb=.

pygopherd (2.0.6) unstable; urgency=low
  * Updated debian/docs.

pygopherd (2.0.5) unstable; urgency=low
  * Added build-dep on python2.3-dev.  Closes: #213938.

pygopherd (2.0.4) unstable; urgency=low
  * Eliminated outdated import of xreadlines, clearing up a warning
    with Python 2.3.

4 files changed, 51 insertions, 35 deletions

diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 861588d5309..4502f1d8a99 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/30 17:27:29 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 19:44:00 recht Exp $
 #
 
-DISTNAME=	pygopherd_2.0.3
+DISTNAME=	pygopherd_2.0.9
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	net
 MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/
@@ -30,8 +30,6 @@ CONF_FILES+=	${EXAMPLEDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 EGFILES=	${WRKSRC}/examples/gophermap
 EGFILES+=	${WRKSRC}/conf/mime.types
 EGFILES+=	${WRKSRC}/conf/pygopherd.conf
-SEDFILES=	${WRKSRC}/setup.py ${WRKSRC}/bin/pygopherd
-SEDFILES+=	${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/pygopherd.8
 
 RCD_SCRIPTS=	pygopherd
 FILES_SUBST+=	RUNTIMEDIR=${RUNTIMEDIR}
@@ -46,29 +44,25 @@ PYTHON_PATCH_SCRIPTS+=	pygopherd/testutil.py
 
 PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth
 
+SUBST_CLASSES+=		man
+SUBST_STAGE.man=	post-patch
+SUBST_FILES.man=	setup.py
+SUBST_FILES.man+=	bin/pygopherd
+SUBST_FILES.man+=	conf/pygopherd.conf
+SUBST_FILES.man+=	doc/pygopherd.8
+SUBST_SED.man=		-e 's,%%PREFIX%%,${PREFIX},g'
+SUBST_SED.man+=		-e 's,%%EXAMPLEDIR%%,${EXAMPLEDIR},g'
+
 # XXX this is needed for the RCD script
 post-extract:
-	${MV} ${WRKDIR}/pygopherd ${WRKDIR}/pygopherd_2.0.3
-
-post-patch:
-	for sedfile in ${SEDFILES}; do \
-		${MV} $$sedfile $$sedfile.sed; \
-		${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-			-e "s|%%EXAMPLEDIR%%|${EXAMPLEDIR}|g" \
-			$$sedfile.sed > $$sedfile; \
-	done
-	for pyfile in ${PYSED}; do\
-		${MV} $$pyfile $$pyfile.sed; \
-		${SED} -e "s|/usr/bin/python2.2|${PYTHONBIN}|g" \
-			$$pyfile.sed > $$pyfile; \
-	done
+	${MV} ${WRKDIR}/pygopherd ${WRKDIR}/${DISTNAME}
 
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	for egfile in ${EGFILES}; do \
 		${INSTALL_DATA} $$egfile ${EXAMPLEDIR}; \
 	done
-	${INSTALL_MAN} ${WRKSRC}/pygopherd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${PREFIX}/man/man8
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pygopherd/PLIST b/net/pygopherd/PLIST
index f0fbcd7b476..fadb0e84f39 100644
--- a/net/pygopherd/PLIST
+++ b/net/pygopherd/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/30 17:27:28 recht Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/24 19:44:00 recht Exp $
 bin/pygopherd
+etc/rc.d/pygopherd
 ${PYSITELIB}/pygopherd/GopherExceptions.py
 ${PYSITELIB}/pygopherd/GopherExceptions.pyc
 ${PYSITELIB}/pygopherd/GopherExceptions.pyo
@@ -57,6 +58,9 @@ ${PYSITELIB}/pygopherd/handlers/pyg.pyo
 ${PYSITELIB}/pygopherd/handlers/scriptexec.py
 ${PYSITELIB}/pygopherd/handlers/scriptexec.pyc
 ${PYSITELIB}/pygopherd/handlers/scriptexec.pyo
+${PYSITELIB}/pygopherd/handlers/tal.py
+${PYSITELIB}/pygopherd/handlers/tal.pyc
+${PYSITELIB}/pygopherd/handlers/tal.pyo
 ${PYSITELIB}/pygopherd/handlers/url.py
 ${PYSITELIB}/pygopherd/handlers/url.pyc
 ${PYSITELIB}/pygopherd/handlers/url.pyo
diff --git a/net/pygopherd/distinfo b/net/pygopherd/distinfo
index 8ab5ec46ebb..632b4bc7126 100644
--- a/net/pygopherd/distinfo
+++ b/net/pygopherd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/09/30 17:27:28 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/01/24 19:44:00 recht Exp $
 
-SHA1 (pygopherd_2.0.3.tar.gz) = bf7d1247d86e8466091bded0de337eba54a3613d
-Size (pygopherd_2.0.3.tar.gz) = 429559 bytes
+SHA1 (pygopherd_2.0.9.tar.gz) = 7c843298e44a44adbfa293193fe81d3f293e4bfe
+Size (pygopherd_2.0.9.tar.gz) = 577514 bytes
 SHA1 (patch-aa) = c6843f58f104fa93454f152c7b077d28b2d6f5ad
-SHA1 (patch-ab) = 3e7fe3cb4db5eabd99c910eb1d9f61654d48063b
+SHA1 (patch-ab) = 89bf03853edf358550beace11274e4ff6e20b148
 SHA1 (patch-ac) = 5dcb518e8405f57877dcc7d5f1d894f61a351432
 SHA1 (patch-ad) = 09fab9dae45edf043483cb8f7314cc946683674d
diff --git a/net/pygopherd/patches/patch-ab b/net/pygopherd/patches/patch-ab
index 87315d50970..7a3b94551dc 100644
--- a/net/pygopherd/patches/patch-ab
+++ b/net/pygopherd/patches/patch-ab
@@ -1,13 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/09/30 17:27:29 recht Exp $
+$NetBSD: patch-ab,v 1.2 2004/01/24 19:44:00 recht Exp $
 
---- pygopherd.8.orig	2003-08-23 18:31:53.000000000 +0200
-+++ pygopherd.8	2003-08-28 20:40:02.000000000 +0200
-@@ -188,7 +188,7 @@
- .B python2.2.
- 
+--- doc/pygopherd.8.orig	2004-01-24 20:21:51.000000000 +0100
++++ doc/pygopherd.8	2004-01-24 20:22:45.000000000 +0100
+@@ -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
+@@ -242,7 +242,7 @@
+ \fBpython2.2\fR.
+ .PP
  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).
- 
+-\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