Fixed wrong use of WRKSRC.

9 files changed, 33 insertions, 32 deletions

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 4ecf4c37db8..1ff7ab35bf2 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/24 19:18:57 kristerw Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/03 22:49:40 rillig Exp $
 
 DISTNAME=	rp-pppoe-3.5
 PKGREVISION=	2
@@ -12,18 +12,19 @@ COMMENT=	Roaring Penguin's PPP over Ethernet client
 
 CONFLICTS+=	mouse_pppoe<20000912nb1
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_PKGINSTALL=	YES
 USE_TOOLS+=	id
 GNU_CONFIGURE=	YES
+CONFIGURE_DIRS=	src
 CONFIGURE_ENV+=	PPPD=${PPPD}
 CONFIGURE_ENV+=	ID="${TOOLS_ID}"
+BUILD_DIRS=	src
 
 RCD_SCRIPTS=	pppoe
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rp-pppoe
-	cd ${WRKSRC}/../configs && \
+	cd ${WRKSRC}/configs && \
 	${INSTALL_DATA} pppoe.conf pppoe-server-options \
 	  ${PREFIX}/share/examples/rp-pppoe
 
diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo
index 5eb083a2b41..22596c6a2dd 100644
--- a/net/rp-pppoe/distinfo
+++ b/net/rp-pppoe/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:14:03 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/11/03 22:49:40 rillig Exp $
 
 SHA1 (rp-pppoe-3.5.tar.gz) = f81f351e8559b4c861c9b99adc4ef9756cecab83
 RMD160 (rp-pppoe-3.5.tar.gz) = 2746444a209fec0fcca23bcafa5ba884cbeeb7e4
 Size (rp-pppoe-3.5.tar.gz) = 189321 bytes
-SHA1 (patch-aa) = d01a245850e077d10c6219eb441911e1f5d40cdb
-SHA1 (patch-ab) = 4a16b96d6b2069fab9efb42c856b71af14f672f1
-SHA1 (patch-ac) = 2c76eded4e98fb3564a70dd136f4c66fe41a165f
-SHA1 (patch-ad) = b56e4e664902f0e3518678ac3b1e3c66c602a956
-SHA1 (patch-ae) = 5fa68935a3dc116a26062730cc00e56399575bd6
-SHA1 (patch-af) = 9a8a5973a99faa5fcc315c231c81d4d87f7b0955
-SHA1 (patch-ag) = 8dc96cb3084e7b3f2bf70a21f1c5d686ec887541
+SHA1 (patch-aa) = 381c1a90115565066dd67837206c1da816b1c718
+SHA1 (patch-ab) = 2c2287a02383d611b42c026d4ac66a5c48ad52e1
+SHA1 (patch-ac) = 04f8bcfb039305d580265c27321bcb4aa15cdb54
+SHA1 (patch-ad) = 555943ea178124ac17bbbd223da77f0e89b07632
+SHA1 (patch-ae) = 0ad70a1320c5a1d56b8b6781c9187566534e8968
+SHA1 (patch-af) = b6e6371a021916b127a474ca6ee7c9212627fd96
+SHA1 (patch-ag) = 6ee706683df96ff7fb0aa5a93626265c2177d543
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index 68f5d2d949b..19854434748 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2002/10/09 08:30:42 tron Exp $
+$NetBSD: patch-aa,v 1.9 2005/11/03 22:49:41 rillig Exp $
 
---- Makefile.in.orig	Mon Jul  8 16:38:24 2002
-+++ Makefile.in	Mon Oct  7 21:56:42 2002
+--- src/Makefile.in.orig	Mon Jul  8 16:38:24 2002
++++ src/Makefile.in	Mon Oct  7 21:56:42 2002
 @@ -22,7 +22,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
diff --git a/net/rp-pppoe/patches/patch-ab b/net/rp-pppoe/patches/patch-ab
index 65f5d22b6a8..94d8fa664fc 100644
--- a/net/rp-pppoe/patches/patch-ab
+++ b/net/rp-pppoe/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/03/18 18:55:29 tron Exp $
+$NetBSD: patch-ab,v 1.5 2005/11/03 22:49:41 rillig Exp $
 
---- ../scripts/adsl-setup.in.orig	Mon Jan  8 15:58:35 2001
-+++ ../scripts/adsl-setup.in	Mon Feb 19 22:23:47 2001
+--- scripts/adsl-setup.in.orig	Mon Jan  8 15:58:35 2001
++++ scripts/adsl-setup.in	Mon Feb 19 22:23:47 2001
 @@ -304,6 +304,7 @@
  	if [ "$DNS2" != "" ] ; then
  	    $ECHO "nameserver $DNS2" >> /etc/resolv.conf
diff --git a/net/rp-pppoe/patches/patch-ac b/net/rp-pppoe/patches/patch-ac
index 53cb2ad3f06..983d509171d 100644
--- a/net/rp-pppoe/patches/patch-ac
+++ b/net/rp-pppoe/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2001/03/18 18:55:29 tron Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/03 22:49:41 rillig Exp $
 
---- pppoe.h.orig	Mon Feb  5 17:34:49 2001
-+++ pppoe.h	Sun Mar 18 19:11:33 2001
+--- src/pppoe.h.orig	Mon Feb  5 17:34:49 2001
++++ src/pppoe.h	Sun Mar 18 19:11:33 2001
 @@ -72,7 +72,9 @@
  #ifdef USE_BPF
  extern int bpfSize;
diff --git a/net/rp-pppoe/patches/patch-ad b/net/rp-pppoe/patches/patch-ad
index 758e2358f59..0ac3f0c0814 100644
--- a/net/rp-pppoe/patches/patch-ad
+++ b/net/rp-pppoe/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2001/10/07 13:26:38 tron Exp $
+$NetBSD: patch-ad,v 1.3 2005/11/03 22:49:41 rillig Exp $
 
---- pppoe.c.orig	Fri Sep 14 21:18:53 2001
-+++ pppoe.c	Sun Oct  7 14:15:21 2001
+--- src/pppoe.c.orig	Fri Sep 14 21:18:53 2001
++++ src/pppoe.c	Sun Oct  7 14:15:21 2001
 @@ -113,7 +113,7 @@
  * packet before passing it here.
  ***********************************************************************/
diff --git a/net/rp-pppoe/patches/patch-ae b/net/rp-pppoe/patches/patch-ae
index 3bc6cbceb6c..6ef77ecf30e 100644
--- a/net/rp-pppoe/patches/patch-ae
+++ b/net/rp-pppoe/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2001/12/07 18:35:51 martin Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 22:49:41 rillig Exp $
 
---- pppoe-server.c.orig	Fri Sep 14 21:18:53 2001
-+++ pppoe-server.c	Fri Dec  7 19:24:14 2001
+--- src/pppoe-server.c.orig	Fri Sep 14 21:18:53 2001
++++ src/pppoe-server.c	Fri Dec  7 19:24:14 2001
 @@ -25,7 +25,7 @@
  #define _BSD_SOURCE 1 /* for gethostname */
  
diff --git a/net/rp-pppoe/patches/patch-af b/net/rp-pppoe/patches/patch-af
index 81613fffc60..5f31f4abf41 100644
--- a/net/rp-pppoe/patches/patch-af
+++ b/net/rp-pppoe/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2002/10/09 08:30:43 tron Exp $
+$NetBSD: patch-af,v 1.2 2005/11/03 22:49:41 rillig Exp $
 
---- ../scripts/adsl-connect.in.orig	Mon Jul  8 16:38:24 2002
-+++ ../scripts/adsl-connect.in	Mon Oct  7 22:31:42 2002
+--- scripts/adsl-connect.in.orig	Mon Jul  8 16:38:24 2002
++++ scripts/adsl-connect.in	Mon Oct  7 22:31:42 2002
 @@ -218,12 +218,20 @@
  
  # Jigger DNS if required...
diff --git a/net/rp-pppoe/patches/patch-ag b/net/rp-pppoe/patches/patch-ag
index 913d4882a39..ef020119b92 100644
--- a/net/rp-pppoe/patches/patch-ag
+++ b/net/rp-pppoe/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2004/01/27 13:29:43 grant Exp $
+$NetBSD: patch-ag,v 1.4 2005/11/03 22:49:41 rillig Exp $
 
---- common.c.orig	2002-07-09 00:38:24.000000000 +1000
-+++ common.c
+--- src/common.c.orig	2002-07-09 00:38:24.000000000 +1000
++++ src/common.c
 @@ -20,3 +20,5 @@ static char const RCSID[] =
  /* For vsnprintf prototype */
 +#ifndef __NetBSD__