Avoid hardcoding /usr/pkg in patch files, doing replacements from the

pre-configure target.

4 files changed, 22 insertions, 10 deletions

diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 1b125f7e2ed..18a00c1c83e 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2003/05/25 09:31:28 epg Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/06/06 11:05:01 jmmv Exp $
 
 DISTNAME=		subversion-${SVNVER}
 CATEGORIES=		devel
@@ -25,3 +25,15 @@ CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include/db4:${LOCALBASE}
 CONFIGURE_ARGS+=	--with-neon=${BUILDLINK_PREFIX.neon}
 CONFIGURE_ARGS+=	--with-ssl
+
+pre-configure:
+	${SED} -e 's|@BUILDLINK_PREFIX.db4@|${BUILDLINK_PREFIX.db4}|g' \
+		< ${WRKSRC}/tools/backup/hot-backup.py.in \
+		> ${WRKSRC}/tools/backup/hot-backup.py.in.new
+	${MV} ${WRKSRC}/tools/backup/hot-backup.py.in.new \
+		${WRKSRC}/tools/backup/hot-backup.py.in
+	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+		< ${WRKSRC}/tools/cgi/tweak-log.cgi \
+		> ${WRKSRC}/tools/cgi/tweak-log.cgi.new
+	${MV} ${WRKSRC}/tools/cgi/tweak-log.cgi.new \
+		${WRKSRC}/tools/cgi/tweak-log.cgi
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 6842700e230..21b9852fa4b 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/05/25 09:31:29 epg Exp $
+$NetBSD: distinfo,v 1.7 2003/06/06 11:05:01 jmmv Exp $
 
 SHA1 (subversion-0.23.0.tar.gz) = c19fc76f49734556d053b4fa53f4bbe06004c12f
 Size (subversion-0.23.0.tar.gz) = 7700961 bytes
 SHA1 (patch-aa) = 9d35603f24c1dfab3c8dd3019778196ea519f228
-SHA1 (patch-ab) = 706c596c8319722a43eecb2281c6574538a71670
-SHA1 (patch-ac) = ae609ba0d3f7c9ff2c1419af335d0a363404a9be
+SHA1 (patch-ab) = 55574e8d6ce0c697444745c018390e9efd83f5f1
+SHA1 (patch-ac) = 4468a8196a1cc151ed4bc626bbebf0bf622d5871
 SHA1 (patch-ad) = b152158db469cd5c7e5e4b5b10c341983725fa39
 SHA1 (patch-ae) = e60fdf9d8a978dfb12fdfe627c988e87a59e7dff
diff --git a/devel/subversion/patches/patch-ab b/devel/subversion/patches/patch-ab
index daa3da57e2b..3d009dea8f3 100644
--- a/devel/subversion/patches/patch-ab
+++ b/devel/subversion/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2003/05/25 09:31:29 epg Exp $
+$NetBSD: patch-ab,v 1.4 2003/06/06 11:05:01 jmmv Exp $
 
 --- tools/backup/hot-backup.py.in.orig	Wed Mar 12 21:09:33 2003
 +++ tools/backup/hot-backup.py.in
@@ -7,11 +7,11 @@ $NetBSD: patch-ab,v 1.3 2003/05/25 09:31:29 epg Exp $
  
  # Path to db_archive program
 -db_archive = "/usr/local/BerkeleyDB.4.0/bin/db_archive"
-+db_archive = "/usr/pkg/bin/db4_archive"
++db_archive = "@BUILDLINK_PREFIX.db4@/bin/db4_archive"
  
  # Path to db_recover progrem
 -db_recover = "/usr/local/BerkeleyDB.4.0/bin/db_recover"
-+db_recover = "/usr/pkg/bin/db4_recover"
++db_recover = "@BUILDLINK_PREFIX.db4@/bin/db4_recover"
  
  # Number of backups to keep around (0 for "keep them all")
  num_backups = 64
diff --git a/devel/subversion/patches/patch-ac b/devel/subversion/patches/patch-ac
index 8b4a85fb66b..5d42cb92bb2 100644
--- a/devel/subversion/patches/patch-ac
+++ b/devel/subversion/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/05/25 09:31:29 epg Exp $
+$NetBSD: patch-ac,v 1.4 2003/06/06 11:05:02 jmmv Exp $
 
 --- tools/cgi/tweak-log.cgi.orig	Wed Jan 22 02:15:35 2003
 +++ tools/cgi/tweak-log.cgi
@@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.3 2003/05/25 09:31:29 epg Exp $
  
 -my $gSvnlookCmd = '/usr/local/bin/svnlook';
 -my $gSvnadminCmd = '/usr/local/bin/svnadmin';
-+my $gSvnlookCmd = '/usr/pkg/bin/svnlook';
-+my $gSvnadminCmd = '/usr/pkg/bin/svnadmin';
++my $gSvnlookCmd = '@PREFIX@/bin/svnlook';
++my $gSvnadminCmd = '@PREFIX@/bin/svnadmin';
  my $gReposPath = '/usr/www/repositories/svn';
  my $gActionURL = './tweak-log.cgi';
  my $gTempfilePrefix = '/tmp/tweak-cgi';