aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2014-08-13 19:35:57 +0800
committerlev <lev@FreeBSD.org>2014-08-13 19:35:57 +0800
commitbb6e9f0aae730a904fb5ef7eb751040e2d41b3d6 (patch)
tree77d53fbb8a48ff2444190d0cadda73663bca653d
parentcb0770a179d6d622b3739b09bb7273dee688fe07 (diff)
downloadfreebsd-ports-gnome-bb6e9f0aae730a904fb5ef7eb751040e2d41b3d6.tar.gz
freebsd-ports-gnome-bb6e9f0aae730a904fb5ef7eb751040e2d41b3d6.tar.zst
freebsd-ports-gnome-bb6e9f0aae730a904fb5ef7eb751040e2d41b3d6.zip
Properly build addons, with all (future) patches to build-outputs.mk
-rw-r--r--devel/subversion/Makefile.common10
1 files changed, 6 insertions, 4 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 0a1bab08f44f..3701c5cce70e 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -3,7 +3,7 @@
PORTNAME?= subversion
PORTVERSION= 1.8.10
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion18
@@ -90,6 +90,11 @@ pre-everything::
.endif
.endif
+pre-patch:
+.if defined(SVN_BUILD_ADDONS)
+ @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
+.endif
+
post-patch:
.if ${PREFIX} != "/usr"
@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
@@ -97,9 +102,6 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-.if defined(SVN_BUILD_ADDONS)
- @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
-.endif
.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
.endif