diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2013-07-06 09:03:04 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-07-06 09:03:04 +0000 |
commit | 2b14975a72590fd2bad663187fe36399fba76813 (patch) | |
tree | b5392fc5daf053d812beb739bd4b32e56d731ff0 /devel/subversion | |
parent | - enable NSS crypto driver (diff) |
- cleanup APACHE version check
- bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=322371
Diffstat (limited to 'devel/subversion')
-rw-r--r-- | devel/subversion/Makefile.common | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 22752e6aebb5..0a358f81f210 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= 1.8.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ ${MASTER_SITE_LOCAL:S/$/:book/} @@ -56,7 +56,7 @@ PLIST_SUB+= BDB="@comment " .endif .if ${PORT_OPTIONS:MMOD_DAV_SVN} -WITH_APACHE= yes +USE_APACHE= 22+ CONFIGURE_ARGS+=--with-apxs=${APXS} --with-apache-libexecdir PLIST_SUB+= MOD_DAV_SVN="" SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" @@ -70,21 +70,9 @@ SVNGROUP?= svn SVNUSER?= svn .endif -.if defined(WITH_APACHE) -USE_APACHE= 22+ -.include "${PORTSDIR}/Mk/bsd.apache.mk" -.if ${APACHE_VERSION} > 20 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config -.else -IGNORE= please update to apache22 -.endif -.else -LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 -APR_CONFIG= ${LOCALBASE}/bin/apr-1-config -APU_CONFIG= ${LOCALBASE}/bin/apu-1-config -.endif CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} |