Update to version 3.0.9

Changes:
- use PKG_SYSCONFIG

Upstream changelog nonexistent, security fixes for CAN-2005-1853.

7 files changed, 132 insertions, 21 deletions

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 233c632f8bd..bc6887f6eac 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,18 +1,29 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/05 12:14:51 salo Exp $
 #
 
-DISTNAME=	gopher_3.0.6
-PKGNAME=	${DISTNAME:S/_/-/}
-CATEGORIES=	net
-MASTER_SITES=	http://gopher.quux.org:70/give-me-gopher/
+DISTNAME=		gopher_3.0.9
+PKGNAME=		${DISTNAME:S/_/-/}
+CATEGORIES=		net
+MASTER_SITES=		http://quux.org/devel/gopher/Downloads/
 
-MAINTAINER=	jgoerzen@complete.org
-HOMEPAGE=	gopher://quux.org/1/devel/gopher/
-COMMENT=	Distributed document delivery client and server
+MAINTAINER=		jgoerzen@complete.org
+HOMEPAGE=		gopher://quux.org/1/devel/gopher/
+COMMENT=		Distributed document delivery client and server
 
-WRKSRC=		${WRKDIR}/gopher
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-CONFIGURE_ARGS+=--disable-auth
+WRKSRC=			${WRKDIR}/gopher
+PKG_SYSCONFSUBDIR?=	${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/gopher
+MAKE_ENV+=		EGDIR=${EGDIR:Q}
+
+GNU_CONFIGURE=		yes
+USE_PKGINSTALL=		yes
+USE_TOOLS+=		gmake
+
+CONFIGURE_ARGS+=	--disable-auth
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+CONF_FILES+=		${EGDIR}/gopher.hlp ${PKG_SYSCONFDIR}/gopher.hlp
+CONF_FILES+=		${EGDIR}/gopher.rc ${PKG_SYSCONFDIR}/gopher.rc
+CONF_FILES+=		${EGDIR}/gopherremote.rc ${PKG_SYSCONFDIR}/gopherremote.rc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gopher/PLIST b/net/gopher/PLIST
index 1554409b656..c538e8dda27 100644
--- a/net/gopher/PLIST
+++ b/net/gopher/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/24 00:06:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/08/05 12:14:51 salo Exp $
 bin/gopher
 bin/gophfilt
-etc/gopher/gopher.hlp
-etc/gopher/gopher.rc
-etc/gopher/gopherremote.rc
 man/man1/gopher.1
 man/man1/gophfilt.1
 man/man5/gopherrc.5
-@dirrm etc/gopher
+share/examples/gopher/gopher.hlp
+share/examples/gopher/gopher.rc
+share/examples/gopher/gopherremote.rc
+@dirrm share/examples/gopher
diff --git a/net/gopher/distinfo b/net/gopher/distinfo
index 09f41100c0e..d52df7c39a8 100644
--- a/net/gopher/distinfo
+++ b/net/gopher/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:13:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/05 12:14:51 salo Exp $
 
-SHA1 (gopher_3.0.6.tar.gz) = c5b17445c7be11658fe9247edd1767f4f58eacbd
-RMD160 (gopher_3.0.6.tar.gz) = 03fed73732c85e49130f0b376606ca367148e7a4
-Size (gopher_3.0.6.tar.gz) = 677753 bytes
+SHA1 (gopher_3.0.9.tar.gz) = 2f4dc2681c6f44f770b36292ca275f094fccfe0c
+RMD160 (gopher_3.0.9.tar.gz) = b30e0fa8864b82962e9b1036c7eeed0b79c16eed
+Size (gopher_3.0.9.tar.gz) = 317945 bytes
+SHA1 (patch-aa) = 650c84593fb2c8b2fe7673f222f8409e3324f79d
+SHA1 (patch-ab) = 436aeab07e3c4d24e06fbe58b83182b330b7c0c4
+SHA1 (patch-ac) = 6fe32b527205649fb4d45618643ccd0815c55724
+SHA1 (patch-ad) = 84a286204f59828d1a70f8b7152b37b2d3ff5593
diff --git a/net/gopher/patches/patch-aa b/net/gopher/patches/patch-aa
new file mode 100644
index 00000000000..37a08d8d796
--- /dev/null
+++ b/net/gopher/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2005/08/05 12:14:51 salo Exp $
+
+--- Makefile.config.in.orig	2005-07-20 17:28:53.000000000 +0200
++++ Makefile.config.in	2005-08-05 13:54:44.000000000 +0200
+@@ -157,7 +157,7 @@
+ # Your favorite C compiler..
+ #
+ 
+-CC = @CC@
++#CC = @CC@
+ 
+ #------------------------------------------------
+ # Optimization level.
+@@ -165,11 +165,11 @@
+ 
+ #OPT=-g
+ #OPT=-g -Wunused -W
+-OPT=@OPT@ -Wall
++OPT= ${CFLAGS}
+ #------------------------------------------------
+ # The ranlib command on your system.  Systems without it should still survive
+ 
+-RANLIB = @RANLIB@
++#RANLIB = @RANLIB@
+ 
+ #------------------------------------------------
+ # The install command on your system.  cp works in most cases...
+@@ -181,7 +181,7 @@
+ prefix		= @prefix@
+ SYSCONFDIR	= @sysconfdir@
+ CLIENTDIR	= $(PREFIX)/bin
+-CLIENTLIB       = $(DESTDIR)/$(SYSCONFDIR)/gopher
++CLIENTLIB       = $(DESTDIR)/$(SYSCONFDIR)
+ SERVERDIR	= $(PREFIX)/sbin
+ 
+ # On SCO manuals are in /usr/man but its easiest to do a 
diff --git a/net/gopher/patches/patch-ab b/net/gopher/patches/patch-ab
new file mode 100644
index 00000000000..d932e7604c3
--- /dev/null
+++ b/net/gopher/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2005/08/05 12:14:51 salo Exp $
+
+--- gopher/Makefile.in.orig	2005-07-20 17:28:52.000000000 +0200
++++ gopher/Makefile.in	2005-08-05 14:01:36.000000000 +0200
+@@ -152,14 +152,12 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS)  ../object/libgopher.a @CLIENTLIBS@ @REGEXLIBS@ @LIBS@
+ 
+ install : all
+-	-mv $(CLIENTDIR)/$(TARGET) $(CLIENTDIR)/$(TARGET).old
+-	-mkdir $(CLIENTDIR)
+-	-mkdir $(CLIENTLIB)
+-	@INSTALL@ $(TARGET) $(CLIENTDIR)
+-	@INSTALL@ -d $(CLIENTLIB)
+-	@INSTALL@ gopher.rc $(CLIENTLIB)
+-	@INSTALL@ gopherremote.rc $(CLIENTLIB)
+-	@INSTALL@ gopher.hlp $(CLIENTLIB)
++	$(BSD_INSTALL_PROGRAM_DIR) $(CLIENTDIR)
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(CLIENTDIR)/
++	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/
++	$(BSD_INSTALL_DATA) gopher.rc $(EGDIR)/
++	$(BSD_INSTALL_DATA) gopherremote.rc $(EGDIR)/
++	$(BSD_INSTALL_DATA) gopher.hlp $(EGDIR)/
+ 
+ clean:
+ 	-rm -f $(TARGET) $(OBJS) *.out *~ core
diff --git a/net/gopher/patches/patch-ac b/net/gopher/patches/patch-ac
new file mode 100644
index 00000000000..a21b366e58f
--- /dev/null
+++ b/net/gopher/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/08/05 12:14:51 salo Exp $
+
+--- gophfilt/Makefile.in.orig	2005-07-20 17:28:52.000000000 +0200
++++ gophfilt/Makefile.in	2005-08-05 14:02:39.000000000 +0200
+@@ -83,8 +83,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../object/libgopher.a @REGEXLIBS@ @LIBS@ 
+ 
+ install : all
+-	-mv $(CLIENTDIR)/$(TARGET) $(CLIENTDIR)/$(TARGET).old
+-	@INSTALL@ $(TARGET) $(CLIENTDIR)
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(CLIENTDIR)/
+ 
+ clean:
+ 	-rm -f $(TARGET) $(OBJS) *.out *~ core
diff --git a/net/gopher/patches/patch-ad b/net/gopher/patches/patch-ad
new file mode 100644
index 00000000000..572e09331ff
--- /dev/null
+++ b/net/gopher/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2005/08/05 12:14:51 salo Exp $
+
+--- doc/Makefile.in.orig	2005-07-20 17:28:53.000000000 +0200
++++ doc/Makefile.in	2005-08-05 14:04:11.000000000 +0200
+@@ -4,11 +4,11 @@
+ 	 gophfilt.1 gopherrc.5
+ 
+ install: $(TARGET)
+-	@INSTALL@ -d -m 0755 $(MAN1DIR)
+-	@INSTALL@ -d -m 0755 $(MAN5DIR)
+-	@INSTALL@ -m 0644 gopher.1 $(MAN1DIR)
+-	@INSTALL@ -m 0644 gophfilt.1 $(MAN1DIR)
+-	@INSTALL@ -m 0644 gopherrc.5 $(MAN5DIR)
++	$(BSD_INSTALL_MAN_DIR) $(MAN1DIR)
++	$(BSD_INSTALL_MAN_DIR) $(MAN5DIR)
++	$(BSD_INSTALL_MAN) gopher.1 $(MAN1DIR)/
++	$(BSD_INSTALL_MAN) gophfilt.1 $(MAN1DIR)/
++	$(BSD_INSTALL_MAN) gopherrc.5 $(MAN5DIR)/
+ 
+ all:
+ 	$(NROFF)    gopher.1       >gopher.cat