Update to version 0.26.3, the latest current version, which features

several bug fixes, improved CGI support, and a more mandoc-friendly
man page.

Provided by Jeff Woodall in PR 49585.

7 files changed, 37 insertions, 151 deletions

diff --git a/net/Geomyidae/DESCR b/net/Geomyidae/DESCR
index 15c50312225..fc9f2b4468d 100644
--- a/net/Geomyidae/DESCR
+++ b/net/Geomyidae/DESCR
@@ -1,4 +1,4 @@
-Geomyidae is a daemon for serving the protocol specified in RFC
+geomyidae is a daemon for serving the protocol specified in RFC
 1436 (Gopher). Under 1000 lines of C by design, it is lightweight
 yet supports dynamic content, automatic file/directory indexing,
 logging and privilege separation.
diff --git a/net/Geomyidae/MESSAGE b/net/Geomyidae/MESSAGE
index 9ddc2951e43..d62bea797b6 100644
--- a/net/Geomyidae/MESSAGE
+++ b/net/Geomyidae/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/04/06 11:50:36 obache Exp $
+$NetBSD: MESSAGE,v 1.2 2015/04/19 19:21:15 wiz Exp $
 
-Geomyidae options can be specified in referenced rc.d startup script;
-see ${PREFIX}/share/examples/rc.d/Geomyidae for details.
+For documentation, license, rc.d scripts and configuration examples see:
 
-For documentation, license, and examples see Geomyidae(8) and/or
-${PREFIX}/share/{doc,examples}/Geomyidae/
+  geomyidae(8)
+  ${PREFIX}/share/doc/geomyidae
+  ${PREFIX}/share/examples/geomyidae
 ===========================================================================
diff --git a/net/Geomyidae/Makefile b/net/Geomyidae/Makefile
index 78f0de180a9..8d2e86c9252 100644
--- a/net/Geomyidae/Makefile
+++ b/net/Geomyidae/Makefile
@@ -1,31 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2013/12/10 14:05:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/19 19:21:15 wiz Exp $
 #
 
-DISTNAME=	Geomyidae-0.12
-PKGREVISION=	1
+DISTNAME=	geomyidae-0.26.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.r-36.net/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://r-36.net/src/geomyidae/
 
-MAINTAINER=	jgw@freeshell.org
-HOMEPAGE=	http://www.r-36.net/
+MAINTAINER=	jgw@sdf.org
+HOMEPAGE=	http://r-36.net/src/geomyidae/
 COMMENT=	Gopher daemon for Linux/BSD
+LICENSE=	mit AND x11
 
 NO_CONFIGURE=	yes
 
-EGDIR=		${PREFIX}/share/examples/Geomyidae
-DOCDIR=		${PREFIX}/share/doc/Geomyidae
-RCD_SCRIPTS=	Geomyidae
+EGDIR=		${PREFIX}/share/examples/geomyidae
+DOCDIR=		${PREFIX}/share/doc/geomyidae
 
-INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${EGDIR} ${EGDIR}/rc.d ${DOCDIR}
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Geomyidae ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/Geomyidae.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/geomyidae ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/geomyidae.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/CGI ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.gph ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/rc.d/* ${DESTDIR}${EGDIR}/rc.d
 
+# url2pkg-marker (please do not remove this line.)
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/Geomyidae/PLIST b/net/Geomyidae/PLIST
index 434c856af67..b49ac842a71 100644
--- a/net/Geomyidae/PLIST
+++ b/net/Geomyidae/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:06 jperkin Exp $
-man/man8/Geomyidae.8
-sbin/Geomyidae
-share/doc/Geomyidae/LICENSE
-share/doc/Geomyidae/README
-share/examples/Geomyidae/index.gph
+@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:21:15 wiz Exp $
+man/man8/geomyidae.8
+sbin/geomyidae
+share/doc/geomyidae/CGI
+share/doc/geomyidae/LICENSE
+share/doc/geomyidae/README
+share/examples/geomyidae/index.gph
+share/examples/geomyidae/rc.d/Archlinux.conf.d
+share/examples/geomyidae/rc.d/Archlinux.rc.d
+share/examples/geomyidae/rc.d/Gentoo.conf.d
+share/examples/geomyidae/rc.d/Gentoo.init.d
+share/examples/geomyidae/rc.d/NetBSD.rc.d
+share/examples/geomyidae/rc.d/README
diff --git a/net/Geomyidae/distinfo b/net/Geomyidae/distinfo
index 420dde617a4..1001c2bdb74 100644
--- a/net/Geomyidae/distinfo
+++ b/net/Geomyidae/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/01/24 22:21:43 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/04/19 19:21:15 wiz Exp $
 
-SHA1 (Geomyidae-0.12.tgz) = 0a3cfbf26ca867b585d95d0db6f15c26ceed8887
-RMD160 (Geomyidae-0.12.tgz) = db8389297d9a3324305b4795df2051159032be30
-Size (Geomyidae-0.12.tgz) = 11014 bytes
-SHA1 (patch-Geomyidae.8) = 0a7c5304d7bac1ca31c40d975d5b9c85e08bf34f
+SHA1 (geomyidae-0.26.3.tar.gz) = 7eb018bb7436f9f2ae4e3123bb8d11f69085bb01
+RMD160 (geomyidae-0.26.3.tar.gz) = d5d843ee0f498972eb72f9f663eb550a2b3e7a31
+Size (geomyidae-0.26.3.tar.gz) = 15556 bytes
diff --git a/net/Geomyidae/files/Geomyidae.sh b/net/Geomyidae/files/Geomyidae.sh
deleted file mode 100644
index af40fb81a87..00000000000
--- a/net/Geomyidae/files/Geomyidae.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: Geomyidae.sh,v 1.2 2008/08/12 14:59:44 reed Exp $
-#
-
-# PROVIDE: Geomyidae
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-#. /etc/rc.subr
-
-name="Geomyidae"
-rcvar="$name"
-command="@PREFIX@/sbin/$name"
-
-#####################################################
-# Geomyidae Options Setion - "?" => Geomyidae(8)    #
-#  Uncomment & define options (defaults are shown)  #
-#####################################################
-#
-#LOGFILE="-l /var/log/gopherd.log"
-#LOGLEVEL="-v 15"
-#HTDOCS="-b /var/gopher"
-#PORT="-p 70"
-#SPORT="-o 70"
-#USR="-u $USER"
-#GRP="-g $GROUP"
-#HOST="-h localhost"
-#IP="-i 127.0.0.1"
-
-######################################################
-# Now remove any UNDEFINED options from line below:  #
-######################################################
-#
-command_args="$LOGFILE $LOGLEVEL $HTDOCS $PORT $SPORT $USR $GRP $HOST $IP"
-
-
-######################################################
-#  Uncomment this section if a PID file is desired   #
-######################################################
-#
-#pidfile="/var/run/${name}.pid"
-#start_cmd="Geomyidae_start"
-#
-#Geomyidae_start()
-#{
-#        echo "Starting $name"
-#        $name $command_args
-#        pgrep -x $name > $pidfile
-#}
-
-######################################################
-#  Lastly, add the following to /etc/rc.conf:        #
-#  "Geomyidae=YES"  (without the quotes)             #
-######################################################
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/Geomyidae/patches/patch-Geomyidae.8 b/net/Geomyidae/patches/patch-Geomyidae.8
deleted file mode 100644
index 0d81ce041f5..00000000000
--- a/net/Geomyidae/patches/patch-Geomyidae.8
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-Geomyidae.8,v 1.1 2012/01/24 22:21:43 joerg Exp $
-
---- Geomyidae.8.orig	2012-01-24 20:25:55.000000000 +0000
-+++ Geomyidae.8
-@@ -226,7 +226,7 @@ Links and Searches
- The above looks something like this in a text-based gopher client:
- .Pp
- .Bl -tag -width ".It Ic WIDTHS" -compact -offset indent
--.D1 Welcome to Frog.bog
-+.It Li Welcome to Frog.bog
- .Pp
- .It Ic (FILE)
- About this server
-@@ -241,7 +241,7 @@ Snowflake picture
- .El
- .Pp
- .Bl -tag -width ".It Ic WIDTHS" -compact -offset indent
--.D1 Links and Searches
-+.It Li Links and Searches
- .It Ic (DIR)
- Go to R-36.net
- .It Ic (HTML)
-@@ -326,34 +326,34 @@ where,
- .It Ic <date>
- = access date and time (std 'date' format)
- .Bl -inset -offset indent
--ex.
-+.It ex.
- .Qq "Sun Feb 17 06:11:10 PST 2008"
- .El
- .It Ic <IP:port>
- = client IP address and port served
- .Bl -inset -offset indent
--ex.
-+.It ex.
- .Qq "24.208.18.127:16857"
- .El
- .Pp
- .It Ic <item path>
- = full path to item served
- .Bl -inset -offset indent
--ex.
-+.It ex.
- .D1 Qo "/PICS/simple2.jpg" Qc for an image file
- .D1 Qo "/PICS" Qc for a directory access
- .El
- .It Ic <query>
- = query term submitted (Type 7 requests only)
- .Bl -inset -offset indent
--ex.
-+.It ex.
- .Dl % snarf Qq "gopher://frog.bog/7/hello.cgi?Christoph"
- .Dl would log Qo "Christoph" Qc as the query term.
- .El
- .It Ic (<status>)
- = status of client request
- .Bl -inset -offset indent
--ex. - some common status entries:
-+.It ex. - some common status entries:
- .El
- .Pp
- .Bl -hang -width XXXXXXXXXXXXXXXX -compact -offset XXXXXXXXXXXX