summaryrefslogtreecommitdiff
path: root/devel/subversion-devel
diff options
context:
space:
mode:
authorLev A. Serebryakov <lev@FreeBSD.org>2004-01-12 10:59:32 +0000
committerLev A. Serebryakov <lev@FreeBSD.org>2004-01-12 10:59:32 +0000
commit96e6d394555c177ae942bea5977d54b0b081a04c (patch)
tree68c0695dd3337c3e38192c76597c3645e4812ced /devel/subversion-devel
parent1) Fix build for the WITHOUT_ALT_CONFIG_PREFIX case. (diff)
Fix building with apache2 port.
Now subversion needs apache2 with db4 support, check this condition. Sorry, but everybody, who uses subversion with apache, will need to rebuild apache2 port :(
Notes
Notes: svn path=/head/; revision=97985
Diffstat (limited to 'devel/subversion-devel')
-rw-r--r--devel/subversion-devel/Makefile28
1 files changed, 25 insertions, 3 deletions
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 8fbe32bac250..3d59c7091c80 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= subversion
PORTVERSION= 0.35.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -37,8 +38,7 @@ SVNREPOS?= /home/svn/repos
.if defined(WITH_MOD_DAV_SVN)
WITH_APACHE2_APR= yes
-CONFIGURE_ARGS+= \
- --with-apxs=${APXS}
+CONFIGURE_ARGS+= --with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SVNGROUP?= www
.else
@@ -53,10 +53,16 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
+APU_CONFIG= ${LOCALBASE}/lib/apache2/apu-config
+APU_PORT= www/apache2
+OPT_NAME= WITH_BERKELEYDB=db4
.else
-LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr
+LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr
CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \
--with-apr-util=${LOCALBASE}
+APU_CONFIG= ${LOCALBASE}/bin/apu-config
+APU_PORT= devel/apr
+OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
.endif
.if defined(WITH_SVNSERVE_WRAPPER)
@@ -128,6 +134,22 @@ post-patch:
@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
.endif
+pre-configure:
+ @if [ ! -x ${APU_CONFIG} ] ; then \
+ ${ECHO_MSG} "" ; \
+ ${ECHO_MSG} 'You select to use`'"${APU_PORT}' for apr library." ; \
+ ${ECHO_MSG} 'It seems that `'"${APU_PORT}' is not properly installed." ; \
+ ${ECHO_MSG} "" ; \
+ ${FALSE} ; \
+ fi
+ @if [ `${APU_CONFIG} --db-version` != "4" ] ; then \
+ ${ECHO_MSG} "" ; \
+ ${ECHO_MSG} 'You should build `'"${APU_PORT}' with db4 support to use subversion with it." ; \
+ ${ECHO_MSG} 'Please, rebuild `'"${APU_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+ ${ECHO_MSG} "" ; \
+ ${FALSE} ; \
+ fi
+
.if defined(WITH_MOD_DAV_SVN)
pre-install:
${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so