From b1e66ba68f97aca3ceede1884fe1e5c320998707 Mon Sep 17 00:00:00 2001
From: deanna <deanna@openbsd.org>
Date: Wed, 13 Dec 2006 23:14:28 +0000
Subject: [PATCH] The gopher project is now at quux.org, make this the default
 server so the client will start up without a server argument.

Use PREFIX for substitutions instead of LOCALBASE.

Update my email address.

ok sturm@
---
 net/gopher/Makefile                         | 13 +++++++------
 net/gopher/patches/patch-conf_h             | 12 ++++++++++++
 net/gopher/patches/patch-doc_gopher_1       |  4 ++--
 net/gopher/patches/patch-gopher_Makefile_in |  4 ++--
 4 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 net/gopher/patches/patch-conf_h

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 2b906322b55..e50006bd099 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/13 23:14:28 deanna Exp $
 
 COMMENT=	"distributed document delivery client"
 
-DISTNAME=	gopher_3.0.11
-PKGNAME=	${DISTNAME:S/_/-/}
+V=		3.0.11
+DISTNAME=	gopher_${V}
+PKGNAME=	gopher-${V}p0
 CATEGORIES=	net
 
 HOMEPAGE=	http://quux.org/devel/gopher/Downloads/
 
-MAINTAINER=	Deanna Phillips <deanna@sdf.lonestar.org>
+MAINTAINER=	Deanna Phillips <deanna@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -26,8 +27,8 @@ MAKE_FLAGS=	CLIENTLIB=${SYSCONFDIR}/gopher
 WRKDIST=	${WRKDIR}/gopher
 NO_REGRESS=	Yes
 
-pre-install:
-	@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
+pre-configure:
+	@perl -pi -e "s,!!PREFIX!!,${PREFIX},g;" \
 		-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" ${WRKSRC}/doc/gopher.1
 
 do-install:
diff --git a/net/gopher/patches/patch-conf_h b/net/gopher/patches/patch-conf_h
new file mode 100644
index 00000000000..ef15e1e0a38
--- /dev/null
+++ b/net/gopher/patches/patch-conf_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-conf_h,v 1.1 2006/12/13 23:14:28 deanna Exp $
+--- conf.h.orig	Wed Jul 20 11:28:52 2005
++++ conf.h	Wed Dec 13 12:42:51 2006
+@@ -144,7 +144,7 @@
+  * Set CLIENT2_PORT to 0 if you only want one root machine
+  */
+ 
+-#define CLIENT1_HOST "gopherproject.org"
++#define CLIENT1_HOST "quux.org"
+ #define CLIENT1_PATH "/Software/Gopher"
+ #define CLIENT1_PORT 70
+ 
diff --git a/net/gopher/patches/patch-doc_gopher_1 b/net/gopher/patches/patch-doc_gopher_1
index 6a65d325d25..d9434e09945 100644
--- a/net/gopher/patches/patch-doc_gopher_1
+++ b/net/gopher/patches/patch-doc_gopher_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-doc_gopher_1,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
+$OpenBSD: patch-doc_gopher_1,v 1.2 2006/12/13 23:14:29 deanna Exp $
 --- doc/gopher.1.orig	Sun Jul 30 21:52:38 2006
 +++ doc/gopher.1	Sun Jul 30 21:55:12 2006
 @@ -227,11 +227,11 @@ The program used to print from a pipe.
@@ -11,7 +11,7 @@ $OpenBSD: patch-doc_gopher_1,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
  somewhere else on your system)
  .TP
 -/usr/local/lib/gopher.hlp
-+!!LOCALBASE!!/share/gopher/gopher.hlp
++!!PREFIX!!/share/gopher/gopher.hlp
  client help file displayed by the '?' command (default location - may be
  somewhere else on your system)
   
diff --git a/net/gopher/patches/patch-gopher_Makefile_in b/net/gopher/patches/patch-gopher_Makefile_in
index 2abe6681320..46f2196ee82 100644
--- a/net/gopher/patches/patch-gopher_Makefile_in
+++ b/net/gopher/patches/patch-gopher_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-gopher_Makefile_in,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
+$OpenBSD: patch-gopher_Makefile_in,v 1.2 2006/12/13 23:14:29 deanna Exp $
 --- gopher/Makefile.in.orig	Fri Jul 28 20:19:27 2006
 +++ gopher/Makefile.in	Fri Jul 28 20:20:44 2006
 @@ -132,7 +132,7 @@ OBJS	= manager.o gopher.o globals.o ouru
@@ -6,7 +6,7 @@ $OpenBSD: patch-gopher_Makefile_in,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
  CCFLAGS	= $(OPT) $(DEBUGGING) -I.. -I$(top_srcdir) -I$(top_srcdir)/object \
  	  $(INTLOPTS) $(CLIENTOPTS)  -DGOPHERLIB=\"$(CLIENTLIB)\" \
 -	 -DGOPHERHELP=\"$(CLIENTLIB)/gopher.hlp\" \
-+	 -DGOPHERHELP=\"${LOCALBASE}/share/gopher/gopher.hlp\" \
++	 -DGOPHERHELP=\"${PREFIX}/share/gopher/gopher.hlp\" \
  	 -DGLOBALRC=\"$(CLIENTLIB)/gopher.rc\" \
  	 -DREMOTERC=\"$(CLIENTLIB)/gopherremote.rc\"