summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorepg <epg@pkgsrc.org>2003-12-07 01:21:03 +0000
committerepg <epg@pkgsrc.org>2003-12-07 01:21:03 +0000
commitefffc8c45c271cc47ef2a930fd3e8a8709b640ab (patch)
tree91572a30d1e9553e930d15772f794723572d17c3 /devel
parent0f23ded48d5406d32f8fa1438f785556daa0d411 (diff)
downloadpkgsrc-efffc8c45c271cc47ef2a930fd3e8a8709b640ab.tar.gz
Move the massaging of hot-backup.py and tweak-log.cgi from a
pre-configure target in subversion/Makefile.common to a post-patch target in subversion-base/Makefile.
Diffstat (limited to 'devel')
-rw-r--r--devel/subversion-base/Makefile14
-rw-r--r--devel/subversion/Makefile.common14
2 files changed, 14 insertions, 14 deletions
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 6229a6817c5..b19e5af3d66 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/12/06 03:01:58 epg Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/07 01:21:03 epg Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
@@ -7,6 +7,18 @@ PLIST_SUBST+= INSTALL_INFO=${INSTALL_INFO}
.include "../subversion/Makefile.common"
+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/Makefile.common b/devel/subversion/Makefile.common
index 2274b6e26ce..1fe47756e3f 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/12/07 01:06:05 epg Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/12/07 01:21:03 epg Exp $
DISTNAME= subversion-${SVNVER}
CATEGORIES= devel
@@ -25,15 +25,3 @@ CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
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}/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