Instead of "patch-and-substitute", just do "substitute" step by using

SUBST_CLASSES.  Removes the need for patch-ac.  Also improve the comment
for the post-build step since the workaround is here to stay.

3 files changed, 9 insertions, 31 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 6ee11fc6489..3701baf018b 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/11/23 00:37:04 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/11/23 04:21:34 jlam Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -22,22 +22,16 @@ PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 CONFIGURE_ARGS+=	--without-berkeley-db
 .endif
 
-# XXX Timestamps are broken in 1.0.1 tar file; should go away in 1.0.2.
+SUBST_CLASSES=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=      contrib/cgi/tweak-log.cgi
+SUBST_SED.paths=        -e "s|/usr/local/bin/|${PREFIX}/bin|g"
+SUBST_MESSAGE.paths=    "Fixing hardcoded /usr/local/bin paths."
+
+# Suppress attempt to build the .info documentation.
 post-build:
 	${TOUCH} ${WRKSRC}/doc/programmer/design/svn-design.info
 
-post-patch:
-	${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}/contrib/cgi/tweak-log.cgi \
-		> ${WRKSRC}/contrib/cgi/tweak-log.cgi.new
-	${MV} ${WRKSRC}/contrib/cgi/tweak-log.cgi.new \
-		${WRKSRC}/contrib/cgi/tweak-log.cgi
-
 post-install:
 	${INSTALL_DATA_DIR} ${SVNDOC}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${SVNDOC}
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 10be03e4503..462f1fa2843 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.36 2004/10/23 06:11:09 epg Exp $
+$NetBSD: distinfo,v 1.37 2004/11/23 04:21:34 jlam Exp $
 
 SHA1 (subversion-1.1.1.tar.gz) = b9afbcc211673ce2a1bf9778b6fa519f740e7ebd
 Size (subversion-1.1.1.tar.gz) = 8101813 bytes
 SHA1 (patch-aa) = 593ff1e235cc918e533f75f2d56fb575adcc7f6d
-SHA1 (patch-ac) = 7f0669a6f684583ff0ca4a443be356ae2fca06db
diff --git a/devel/subversion/patches/patch-ac b/devel/subversion/patches/patch-ac
deleted file mode 100644
index 0d1934e0db3..00000000000
--- a/devel/subversion/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2003/12/03 15:20:44 epg Exp $
-
---- contrib/cgi/tweak-log.cgi.orig	Tue Oct  7 08:42:53 2003
-+++ contrib/cgi/tweak-log.cgi
-@@ -29,8 +29,8 @@ use CGI qw(:standard);
- ###############################################################################
- # Configuration Section
- 
--my $gSvnlookCmd = '/usr/local/bin/svnlook';
--my $gSvnadminCmd = '/usr/local/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';