- On second thought, put config files in ${PREFIX}/etc/ppp.

- Update man page references to match file locations.

6 files changed, 47 insertions, 15 deletions

diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index ddfca668eee..043005da398 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+# $NetBSD: Makefile,v 1.2 2000/11/07 18:11:46 ad Exp $
 
 DISTNAME=		userppp-001107
 CATEGORIES=		net
@@ -10,6 +10,14 @@ HOMEPAGE=		http://www.awfulhak.org/~brian/
 
 WRKSRC=			${WRKDIR}/ppp-001107
 
+post-patch:
+		(cd ${WRKSRC}; \
+		for i in ppp/ppp.8 pppctl/pppctl.8; do \
+			${CP} $$i $$i.bak; \
+			${SED} s@/etc/ppp@${PREFIX}/etc/ppp@ < $$i.bak | \
+			    ${SED} s@/usr/share@${PREFIX}/share@ > $$i; \
+		done)
+
 pre-install:
 		${GREP} "^network:" /etc/group >/dev/null || \
 		    /usr/sbin/groupadd -g 40 network
diff --git a/net/userppp/files/patch-sum b/net/userppp/files/patch-sum
index 83fe5af740a..bac79107470 100644
--- a/net/userppp/files/patch-sum
+++ b/net/userppp/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+$NetBSD: patch-sum,v 1.2 2000/11/07 18:11:47 ad Exp $
 
-MD5 (patch-aa) = 94ddec58e9d70124d48b0c37aee9ebcd
-MD5 (patch-ab) = 2949cc5344332ab1fbf3c8ef49b80e06
+MD5 (patch-aa) = 354ec23280a74ec5a34f32df68d02f5a
+MD5 (patch-ab) = 4e849b882fa232ea77efef54d0749f44
 MD5 (patch-ac) = 21148a0431f6326289414525ada478c9
 MD5 (patch-ad) = 68bb63d69846a116e2808b7a63abda05
 MD5 (patch-ae) = 601856884f45d9333f03ddc62fc1bd2c
+MD5 (patch-af) = bb164fb966afe3bd743645dd8ecf91e2
diff --git a/net/userppp/patches/patch-aa b/net/userppp/patches/patch-aa
index 2fd12e4eaa9..1969d33a89d 100644
--- a/net/userppp/patches/patch-aa
+++ b/net/userppp/patches/patch-aa
@@ -1,11 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+$NetBSD: patch-aa,v 1.2 2000/11/07 18:11:47 ad Exp $
 
---- Makefile.orig	Tue Nov  7 15:27:16 2000
-+++ Makefile	Tue Nov  7 15:27:25 2000
-@@ -1,5 +1,5 @@
+--- Makefile.orig	Tue Nov  7 05:45:45 2000
++++ Makefile	Tue Nov  7 16:42:17 2000
+@@ -1,8 +1,9 @@
  SUBDIR+=libhack ppp pppctl
 -EXAMPLES=/usr/share/examples/ppp
 +EXAMPLES=${PREFIX}/share/examples/ppp
++MYCONFDIR=${PREFIX}/etc/ppp
  .include <bsd.subdir.mk>
  afterinstall:
- 	if [ ! -d /etc/ppp ]; then mkdir -p /etc/ppp; chmod 755 /etc/ppp; fi
+-	if [ ! -d /etc/ppp ]; then mkdir -p /etc/ppp; chmod 755 /etc/ppp; fi
++	if [ ! -d {$MYCONFDIR} ]; then mkdir -p ${MYCONFDIR}; chmod 755 ${MYCONFDIR}; fi
+ 	mkdir -p $(EXAMPLES)
+ 	for cfg in examples/ppp/*; \
+ 	do \
diff --git a/net/userppp/patches/patch-ab b/net/userppp/patches/patch-ab
index 206b6e61a40..1b8fdf4aeb1 100644
--- a/net/userppp/patches/patch-ab
+++ b/net/userppp/patches/patch-ab
@@ -1,10 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+$NetBSD: patch-ab,v 1.2 2000/11/07 18:11:48 ad Exp $
 
---- ppp/Makefile	Tue Nov  7 15:40:44 2000
-+++ ppp/Makefile	Tue Nov  7 15:40:49 2000
-@@ -123,7 +123,6 @@
+--- ppp/Makefile.orig	Tue Nov  7 05:45:44 2000
++++ ppp/Makefile	Tue Nov  7 16:37:01 2000
+@@ -121,9 +121,8 @@
+ 
+ # To cope with uucplock changes:
  # Note, uucplock.c and libutil.h do not really belong here !
- CFLAGS+=-I. -I../libhack
+-CFLAGS+=-I. -I../libhack
++CFLAGS+=-D_PATH_PPP=\"${PREFIX}/etc/ppp\" -I. -I../libhack
  SRCS+=uucplock.c
 -BINDIR=/usr/sbin
  
diff --git a/net/userppp/patches/patch-af b/net/userppp/patches/patch-af
new file mode 100644
index 00000000000..fa4f825823c
--- /dev/null
+++ b/net/userppp/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2000/11/07 18:11:48 ad Exp $
+
+--- ppp/defs.h.orig	Tue Nov  7 16:36:02 2000
++++ ppp/defs.h	Tue Nov  7 16:36:26 2000
+@@ -32,8 +32,6 @@
+ #endif
+ #define NMODEMS		2
+ 
+-#define _PATH_PPP	"/etc/ppp"
+-
+ #define TUN_NAME	"tun"
+ #define TUN_PREFIX	(_PATH_DEV TUN_NAME)	/* /dev/tun */
+ 
diff --git a/net/userppp/pkg/PLIST b/net/userppp/pkg/PLIST
index 7595eed490a..764aca656a5 100644
--- a/net/userppp/pkg/PLIST
+++ b/net/userppp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/11/07 18:11:48 ad Exp $
 man/cat8/ppp.0
 man/cat8/pppctl.0
 man/man8/ppp.8
@@ -21,3 +21,5 @@ share/examples/ppp/ppp.linkup.span-isp.working
 share/examples/ppp/ppp.secret.sample
 share/examples/ppp/ppp.secret.span-isp
 share/examples/ppp/ppp.secret.span-isp.working
+@dirrm etc/ppp
+@dirrm share/examples/ppp