Fixed wrong use of WRKSRC.

5 files changed, 22 insertions, 25 deletions

diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index a60e83ab23e..88500f45c42 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/09/11 11:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/03 23:12:43 rillig Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -19,24 +19,21 @@ DEPENDS+=		p5-IMAP-Admin>=1.2.5:../../mail/p5-IMAP-Admin
 DEPENDS+=		p5-Convert-ASN1>=0.07:../../textproc/p5-Convert-ASN1
 DEPENDS+=		p5-IO-stringy>=1.213:../../devel/p5-IO-stringy
 
-WRKSRC=			${WRKDIR}/ispman/Modules/ISPMan
+WRKSRC=			${WRKDIR}/ispman/Modules
 PERL5_PACKLIST=		auto/ISPMan/.packlist
-PERL5_CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/../IO-stringy-1.212_patched
+PERL5_CONFIGURE_DIRS=	${WRKSRC}/ISPMan ${WRKSRC}/IO-stringy-1.212_patched
 BUILD_DIRS=		${PERL5_CONFIGURE_DIRS}
-INSTALL_DIRS=		${WRKSRC}
+INSTALL_DIRS=		${WRKSRC}/ISPMan
 
 MAKE_PARAMS+=		--noprompt
 
-pre-configure:
-	cd ${WRKSRC} &&							\
-	for i in `${FIND} * -type f -print` ; do			\
-		${CP} $$i $$i.old &&					\
-		${SED} < $$i.old > $$i -e 's:/etc:${PREFIX}/etc:g' &&	\
-		${RM} $$i.old ;						\
-	done
+SUBST_CLASSES+=		etc-fix
+SUBST_STAGE.etc-fix=	pre-configure
+SUBST_FILES.etc-fix=	ISPMan/*
+SUBST_SED.etc-fix=	-e 's:/etc:${PREFIX}/etc:g'
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/../IO-stringy-1.212_patched/lib/IO/Scalar.pm \
+	${INSTALL_DATA} ${WRKSRC}/IO-stringy-1.212_patched/lib/IO/Scalar.pm \
 		${PERL5_INSTALLVENDORLIB}/IO/ScalarPatched.pm
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-ispman/distinfo b/net/p5-ispman/distinfo
index 0fec4aeda32..182f255cd04 100644
--- a/net/p5-ispman/distinfo
+++ b/net/p5-ispman/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:59 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 23:12:43 rillig Exp $
 
 SHA1 (ispman-0.5.tar.gz) = e42c9fd4bd5fb2f7ac97140dfafe708fceaaccf8
 RMD160 (ispman-0.5.tar.gz) = 45f8442954ab7080732332a26aa1ae5893d1132e
 Size (ispman-0.5.tar.gz) = 942170 bytes
-SHA1 (patch-aa) = a4319eab69a25ccaaadb8e2a8d089d24460fe6cc
-SHA1 (patch-ab) = 5d1c6b43999b75b34d999958dffc55ae939b633c
-SHA1 (patch-ac) = 614222eef5edb9b5726140d7e7a1f142d28845d8
+SHA1 (patch-aa) = 3aac30a7f0cbd351fa385386519f42cbd48c08b6
+SHA1 (patch-ab) = b37a6558ba7f3b3f8a7e5e98943360c18113a569
+SHA1 (patch-ac) = d43feab466ce95a0da951eddc418d4b4e2f54fc2
diff --git a/net/p5-ispman/patches/patch-aa b/net/p5-ispman/patches/patch-aa
index 7660cf270b8..e88ca8a31fe 100644
--- a/net/p5-ispman/patches/patch-aa
+++ b/net/p5-ispman/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/21 18:57:04 rh Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 23:12:43 rillig Exp $
 
---- ISPMan.pm.orig	Sat Sep 23 15:48:00 2000
-+++ ISPMan.pm
+--- ISPMan/ISPMan.pm.orig	Sat Sep 23 15:48:00 2000
++++ ISPMan/ISPMan.pm
 @@ -1,4 +1,5 @@
  package ISPMan;
 +use AutoLoader 'AUTOLOAD';
diff --git a/net/p5-ispman/patches/patch-ab b/net/p5-ispman/patches/patch-ab
index 447f0db76cf..5f9571b78a6 100644
--- a/net/p5-ispman/patches/patch-ab
+++ b/net/p5-ispman/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/21 18:57:04 rh Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 23:12:43 rillig Exp $
 
---- ISPMan/Config.pm.orig	Tue Aug  1 16:18:21 2000
-+++ ISPMan/Config.pm
+--- ISPMan/ISPMan/Config.pm.orig	Tue Aug  1 16:18:21 2000
++++ ISPMan/ISPMan/Config.pm
 @@ -16,7 +16,7 @@
     my $class = ref($proto) || $proto;   
     
diff --git a/net/p5-ispman/patches/patch-ac b/net/p5-ispman/patches/patch-ac
index c7ea6f19a46..913224268fc 100644
--- a/net/p5-ispman/patches/patch-ac
+++ b/net/p5-ispman/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/10/21 18:57:04 rh Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 23:12:43 rillig Exp $
 
---- ISPMan/LDAP.pm.orig	Thu Oct 19 16:39:09 2000
-+++ ISPMan/LDAP.pm
+--- ISPMan/ISPMan/LDAP.pm.orig	Thu Oct 19 16:39:09 2000
++++ ISPMan/ISPMan/LDAP.pm
 @@ -4,7 +4,7 @@
  use Net::LDAP;
  use Net::LDAP::Entry;