diff options
| -rw-r--r-- | net/pygopherd/Makefile | 16 | ||||
| -rw-r--r-- | net/pygopherd/PLIST | 3 | ||||
| -rw-r--r-- | net/pygopherd/distinfo | 10 | ||||
| -rw-r--r-- | net/pygopherd/files/pygopherd.sh | 4 | ||||
| -rw-r--r-- | net/pygopherd/patches/patch-aa | 4 | ||||
| -rw-r--r-- | net/pygopherd/patches/patch-ab | 18 | ||||
| -rw-r--r-- | net/pygopherd/patches/patch-ac | 37 | ||||
| -rw-r--r-- | net/pygopherd/patches/patch-ad | 4 |
8 files changed, 63 insertions, 33 deletions
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index 54ebc1c0a4e..49aa38748e4 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:43 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2011/10/31 08:45:08 obache Exp $ # DISTNAME= pygopherd_2.0.16 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= net MASTER_SITES= http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/ @@ -13,12 +13,12 @@ COMMENT= Gopher server PKG_DESTDIR_SUPPORT= user-destdir -PYDISTUTILSPKG= yes - PKG_SYSCONFSUBDIR= pygopherd EXAMPLEDIR= ${PREFIX}/share/examples/pygopherd RUNTIMEDIR= ${VARBASE}/gopher +BUILD_DEFS+= VARBASE + GOPHER_USER= gopher GOPHER_GROUP= gopher PKG_GROUPS= ${GOPHER_GROUP} @@ -48,8 +48,10 @@ 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' +SUBST_VARS.man= PKG_SYSCONFDIR EXAMPLEDIR VARBASE +SUBST_VARS.man+= GOPHER_USER GOPHER_GROUP RUNTIMEDIR + +EGG_NAME= ${PKGBASE}-2.0.15 INSTALLATION_DIRS= share/examples/pygopherd ${PKGMANDIR}/man8 @@ -63,6 +65,6 @@ post-install: done ${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pygopherd/PLIST b/net/pygopherd/PLIST index 1936f529c87..ad9d458a19d 100644 --- a/net/pygopherd/PLIST +++ b/net/pygopherd/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.6 2009/08/14 14:20:51 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2011/10/31 08:45:08 obache Exp $ bin/pygopherd +${PLIST.eggfile}${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/pygopherd/GopherExceptions.py ${PYSITELIB}/pygopherd/GopherExceptions.pyc ${PYSITELIB}/pygopherd/GopherExceptions.pyo diff --git a/net/pygopherd/distinfo b/net/pygopherd/distinfo index 1cb5cf0a1a7..c16e502e274 100644 --- a/net/pygopherd/distinfo +++ b/net/pygopherd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2009/08/14 14:20:51 joerg Exp $ +$NetBSD: distinfo,v 1.5 2011/10/31 08:45:08 obache Exp $ SHA1 (pygopherd_2.0.16.tar.gz) = 1851105d7bb2eda055c0a399168cf1799bd5e453 RMD160 (pygopherd_2.0.16.tar.gz) = 3b99e7a2474c8e6a90cf987c59ab877d165c07c9 Size (pygopherd_2.0.16.tar.gz) = 255475 bytes -SHA1 (patch-aa) = c6843f58f104fa93454f152c7b077d28b2d6f5ad -SHA1 (patch-ab) = 89bf03853edf358550beace11274e4ff6e20b148 -SHA1 (patch-ac) = 5dcb518e8405f57877dcc7d5f1d894f61a351432 -SHA1 (patch-ad) = 09fab9dae45edf043483cb8f7314cc946683674d +SHA1 (patch-aa) = 5baa1dac1d4ae5728ea83355efe8bbe3f9df153f +SHA1 (patch-ab) = 41fd7ded966d943511cc45436f630722fa8a8336 +SHA1 (patch-ac) = 5e93805b2f731073b614caa30361fce18958b2a3 +SHA1 (patch-ad) = d2dd4c57a2bc11c44a813c67cbc38caf0d5d5cc2 diff --git a/net/pygopherd/files/pygopherd.sh b/net/pygopherd/files/pygopherd.sh index 3390299ebd7..ea12f983e20 100644 --- a/net/pygopherd/files/pygopherd.sh +++ b/net/pygopherd/files/pygopherd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: pygopherd.sh,v 1.1.1.1 2003/09/30 17:27:30 recht Exp $ +# $NetBSD: pygopherd.sh,v 1.2 2011/10/31 08:45:08 obache Exp $ # # PROVIDE: pygopherd # REQUIRE: DAEMON @@ -20,7 +20,7 @@ name="pygopherd" rcvar=$name command="@PREFIX@/bin/${name}" command_interpreter="@PYTHONBIN@" -pidfile="/var/run/${name}.pid" +pidfile="@VARBASE@/run/${name}.pid" conf_file="@PKG_SYSCONFDIR@/${name}.conf" mime_file="@PKG_SYSCONFDIR@/mime.types" required_files="${conf_file} ${mime_file}" diff --git a/net/pygopherd/patches/patch-aa b/net/pygopherd/patches/patch-aa index 2f372f5f02d..4e02cc53c72 100644 --- a/net/pygopherd/patches/patch-aa +++ b/net/pygopherd/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/30 17:27:29 recht Exp $ +$NetBSD: patch-aa,v 1.2 2011/10/31 08:45:08 obache Exp $ --- bin/pygopherd.orig 2003-08-23 18:31:54.000000000 +0200 +++ bin/pygopherd 2003-08-28 20:39:34.000000000 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/30 17:27:29 recht Exp $ import sys -conffile = '/etc/pygopherd/pygopherd.conf' -+conffile = '%%PREFIX%%/etc/pygopherd/pygopherd.conf' ++conffile = '@PKG_SYSCONFDIR@/pygopherd.conf' if len(sys.argv) > 1: conffile = sys.argv[1] diff --git a/net/pygopherd/patches/patch-ab b/net/pygopherd/patches/patch-ab index 7a3b94551dc..98c6c3c1beb 100644 --- a/net/pygopherd/patches/patch-ab +++ b/net/pygopherd/patches/patch-ab @@ -1,31 +1,31 @@ -$NetBSD: patch-ab,v 1.2 2004/01/24 19:44:00 recht Exp $ +$NetBSD: patch-ab,v 1.3 2011/10/31 08:45:08 obache Exp $ ---- 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 @@ +--- doc/pygopherd.8.orig 2005-09-22 13:00:21.000000000 +0000 ++++ doc/pygopherd.8 +@@ -180,7 +180,7 @@ distribution includes two files of inter \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 ++\fI@PKG_SYSCONFDIR@/pygopherd.conf\fR and the \fImime.types\fR file provided by the system already. .PP -@@ -242,7 +242,7 @@ +@@ -242,7 +242,7 @@ Some systems will use \fBpython\fR or \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 ++\fI@PKG_SYSCONFDIR@/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 @@ +@@ -287,7 +287,7 @@ installation step necessary. .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. ++stored in \fI@PKG_SYSCONFDIR@/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/patches/patch-ac b/net/pygopherd/patches/patch-ac index 8384e8db80a..3597ad66337 100644 --- a/net/pygopherd/patches/patch-ac +++ b/net/pygopherd/patches/patch-ac @@ -1,13 +1,40 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/09/30 17:27:30 recht Exp $ +$NetBSD: patch-ac,v 1.2 2011/10/31 08:45:08 obache Exp $ ---- conf/pygopherd.conf.orig 2003-08-23 23:31:03.000000000 +0200 -+++ conf/pygopherd.conf 2003-08-28 20:40:35.000000000 +0200 -@@ -119,7 +119,7 @@ +--- conf/pygopherd.conf.orig 2006-09-11 14:10:13.000000000 +0000 ++++ conf/pygopherd.conf +@@ -16,7 +16,7 @@ detach = yes + # If you want gopherd to write a PID file, set this to the location + # where you want it. Otherwise, comment out this line. + +-pidfile = /var/run/pygopherd.pid ++pidfile = @VARBASE@/run/pygopherd.pid + + ################################################## + # Network +@@ -110,8 +110,8 @@ usechroot = yes + ## starting pygopherd as root. Comment out if you don't want this + ## functionality. NOTE: DO NOT RUN AS ROOT UNLESS YOU USE THESE! BAD BAD BAD! + +-setuid = gopher +-setgid = gopher ++setuid = @GOPHER_USER@ ++setgid = @GOPHER_GROUP@ + + ################################################## + # Filesystem and MIME +@@ -119,13 +119,13 @@ setgid = gopher + + # Where the documents are stored. + +-root = /var/gopher ++root = @RUNTIMEDIR@ + + # Location of a file to use to figure out MIME types. You can # specify multiple files here -- just separate them with a colon. # ALL of them that are found will be read. -mimetypes = ./conf/mime.types:/etc/pygopherd/mime.types:/etc/mime.types -+mimetypes = ./conf/mime.types:%%PREFIX%%/etc/pygopherd/mime.types:/etc/mime.types ++mimetypes = ./conf/mime.types:@PKG_SYSCONFDIR@/mime.types:/etc/mime.types # Encodings. You can use the default with the following syntax. The # mimetypex.encodings_map is {'.Z': 'compress', '.gz': 'gzip'}. diff --git a/net/pygopherd/patches/patch-ad b/net/pygopherd/patches/patch-ad index c9e2a41933b..7900b212ba7 100644 --- a/net/pygopherd/patches/patch-ad +++ b/net/pygopherd/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/09/30 17:27:30 recht Exp $ +$NetBSD: patch-ad,v 1.2 2011/10/31 08:45:08 obache Exp $ --- setup.py.orig 2003-08-23 18:31:00.000000000 +0200 +++ setup.py 2003-08-28 20:40:53.000000000 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/09/30 17:27:30 recht Exp $ packages = ['pygopherd', 'pygopherd.handlers', 'pygopherd.protocols'], scripts = ['bin/pygopherd'], - data_files = [ ('/etc/pygopherd', ['conf/pygopherd.conf', -+ data_files = [ ('%%EXAMPLEDIR%%', ['conf/pygopherd.conf', ++ data_files = [ ('@EXAMPLEDIR@', ['conf/pygopherd.conf', 'conf/mime.types'] ) ], license = pygopherd.version.license ) |