(1) Move all options-related logic into Makefile.common, so bindings ports

      have proper CONFIGURE_ARGS now and will not fail to build when
      subversion was built with apache's apr
  (2) Bump devel/apr library version to 1.3
  (3) Increase PORTREVISION, of course.

5 files changed, 174 insertions, 159 deletions

diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 4fd80033d9f0..b302b5b499fc 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,7 +5,6 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-freebsd
-PORTREVISION?=	1
 
 COMMENT=	Version control system with FreeBSD Project repo customizations
 
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 73462666eb31..1fc3e76cc38d 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -41,84 +41,6 @@ WITH_REPOSITORY_CREATION=	yes
 MKREPOS_TARGET=	_mkrepos
 .endif
 
-CONFIGURE_ARGS+=	--without-swig
-
-.if defined(WITH_NEON)
-LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
-PLIST_SUB+=		NEON=""
-.else
-CONFIGURE_ARGS+=	--without-neon
-PLIST_SUB+=		NEON="@comment "
-.endif
-
-.if defined(WITH_SERF)
-LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
-CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
-PLIST_SUB+=		SERF=""
-.else
-PLIST_SUB+=		SERF="@comment "
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-PLIST_SUB+=		SASL=""
-.else
-PLIST_SUB+=		SASL="@comment "
-.endif
-
-.if defined(WITH_BDB)
-PLIST_SUB+=		BDB=""
-.else
-CONFIGURE_ARGS+=	--without-berkeley-db
-PLIST_SUB+=		BDB="@comment "
-.endif
-
-.if defined(WITH_MOD_DAV_SVN)
-WITH_APACHE2_APR=	yes
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
-PLIST_SUB+=	MOD_DAV_SVN=""
-SVNGROUP?=	www
-.else
-PLIST_SUB+=	MOD_DAV_SVN="@comment "
-PKGDEINSTALL=	NONEXISTENT
-SVNGROUP?=	svn
-.endif
-
-.if defined(WITH_APACHE2_APR)
-USE_APACHE=	2.0+
-.include "${PORTSDIR}/Mk/bsd.apache.mk"
-.if ${APACHE_VERSION} >= 21
-APR_APU_DIR=	${LOCALBASE}/bin
-APR_CONFIG=	apr-1-config
-APU_CONFIG=	apu-1-config
-.else
-APR_APU_DIR=	${LOCALBASE}/lib/apache2
-APR_CONFIG=	apr-config
-APU_CONFIG=	apu-config
-.endif
-APR_PORT=	${APACHE_PORT}
-.if defined(WITH_BDB)
-DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
-OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
-.endif
-.else
-APR_APU_DIR=	${LOCALBASE}/bin
-APR_CONFIG=	apr-1-config
-APU_CONFIG=	apu-1-config
-.if defined(WITH_BDB)
-LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
-APR_PORT=	devel/apr-svn
-OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
-.else
-LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
-APR_PORT=	devel/apr
-.endif
-.endif
-CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
-		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
-
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4388524e10a7..8f1f53c36432 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.4/:book
@@ -20,8 +20,94 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 WANT_PERL=	yes
 
+.if defined(SVN_BUILD_BINDINGS)
+# Bindings ports should use the same, as main port
+OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
+# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
+OPTIONS=
+.endif
+
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS+=	--without-swig
+
+.if defined(WITH_NEON)
+LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+PLIST_SUB+=		NEON=""
+.else
+CONFIGURE_ARGS+=	--without-neon
+PLIST_SUB+=		NEON="@comment "
+.endif
+
+.if defined(WITH_SERF)
+LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
+CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
+PLIST_SUB+=		SERF=""
+.else
+PLIST_SUB+=		SERF="@comment "
+.endif
+
+.if defined(WITH_SASL)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
+PLIST_SUB+=		SASL=""
+.else
+CONFIGURE_ARGS+=	--without-sasl
+PLIST_SUB+=		SASL="@comment "
+.endif
+
+.if defined(WITH_BDB)
+PLIST_SUB+=		BDB=""
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+PLIST_SUB+=		BDB="@comment "
+.endif
+
+.if defined(WITH_MOD_DAV_SVN)
+WITH_APACHE2_APR=	yes
+CONFIGURE_ARGS+=	--with-apxs=${APXS}
+PLIST_SUB+=	MOD_DAV_SVN=""
+SVNGROUP?=	www
+.else
+PLIST_SUB+=	MOD_DAV_SVN="@comment "
+PKGDEINSTALL=	NONEXISTENT
+SVNGROUP?=	svn
+.endif
+
+.if defined(WITH_APACHE2_APR)
+USE_APACHE=	2.0+
+.include "${PORTSDIR}/Mk/bsd.apache.mk"
+.if ${APACHE_VERSION} >= 21
+APR_APU_DIR=	${LOCALBASE}/bin
+APR_CONFIG=	apr-1-config
+APU_CONFIG=	apu-1-config
+.else
+APR_APU_DIR=	${LOCALBASE}/lib/apache2
+APR_CONFIG=	apr-config
+APU_CONFIG=	apu-config
+.endif
+APR_PORT=	${APACHE_PORT}
+.if defined(WITH_BDB)
+DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
+OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
+.endif
+.else
+APR_APU_DIR=	${LOCALBASE}/bin
+APR_CONFIG=	apr-1-config
+APU_CONFIG=	apu-1-config
+.if defined(WITH_BDB)
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr-svn
+APR_PORT=	devel/apr-svn
+OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
+.else
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
+APR_PORT=	devel/apr
+.endif
+.endif
+CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
+		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
+
 .if defined(SVN_BUILD_BINDINGS)
 .if defined(WITH_FREEBSD_SUBVERSION)
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 73462666eb31..1fc3e76cc38d 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -41,84 +41,6 @@ WITH_REPOSITORY_CREATION=	yes
 MKREPOS_TARGET=	_mkrepos
 .endif
 
-CONFIGURE_ARGS+=	--without-swig
-
-.if defined(WITH_NEON)
-LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
-PLIST_SUB+=		NEON=""
-.else
-CONFIGURE_ARGS+=	--without-neon
-PLIST_SUB+=		NEON="@comment "
-.endif
-
-.if defined(WITH_SERF)
-LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
-CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
-PLIST_SUB+=		SERF=""
-.else
-PLIST_SUB+=		SERF="@comment "
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-PLIST_SUB+=		SASL=""
-.else
-PLIST_SUB+=		SASL="@comment "
-.endif
-
-.if defined(WITH_BDB)
-PLIST_SUB+=		BDB=""
-.else
-CONFIGURE_ARGS+=	--without-berkeley-db
-PLIST_SUB+=		BDB="@comment "
-.endif
-
-.if defined(WITH_MOD_DAV_SVN)
-WITH_APACHE2_APR=	yes
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
-PLIST_SUB+=	MOD_DAV_SVN=""
-SVNGROUP?=	www
-.else
-PLIST_SUB+=	MOD_DAV_SVN="@comment "
-PKGDEINSTALL=	NONEXISTENT
-SVNGROUP?=	svn
-.endif
-
-.if defined(WITH_APACHE2_APR)
-USE_APACHE=	2.0+
-.include "${PORTSDIR}/Mk/bsd.apache.mk"
-.if ${APACHE_VERSION} >= 21
-APR_APU_DIR=	${LOCALBASE}/bin
-APR_CONFIG=	apr-1-config
-APU_CONFIG=	apu-1-config
-.else
-APR_APU_DIR=	${LOCALBASE}/lib/apache2
-APR_CONFIG=	apr-config
-APU_CONFIG=	apu-config
-.endif
-APR_PORT=	${APACHE_PORT}
-.if defined(WITH_BDB)
-DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
-OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
-.endif
-.else
-APR_APU_DIR=	${LOCALBASE}/bin
-APR_CONFIG=	apr-1-config
-APU_CONFIG=	apu-1-config
-.if defined(WITH_BDB)
-LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
-APR_PORT=	devel/apr-svn
-OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
-.else
-LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
-APR_PORT=	devel/apr
-.endif
-.endif
-CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
-		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
-
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 4388524e10a7..8f1f53c36432 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.4/:book
@@ -20,8 +20,94 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 WANT_PERL=	yes
 
+.if defined(SVN_BUILD_BINDINGS)
+# Bindings ports should use the same, as main port
+OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
+# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
+OPTIONS=
+.endif
+
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS+=	--without-swig
+
+.if defined(WITH_NEON)
+LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+PLIST_SUB+=		NEON=""
+.else
+CONFIGURE_ARGS+=	--without-neon
+PLIST_SUB+=		NEON="@comment "
+.endif
+
+.if defined(WITH_SERF)
+LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
+CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
+PLIST_SUB+=		SERF=""
+.else
+PLIST_SUB+=		SERF="@comment "
+.endif
+
+.if defined(WITH_SASL)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
+PLIST_SUB+=		SASL=""
+.else
+CONFIGURE_ARGS+=	--without-sasl
+PLIST_SUB+=		SASL="@comment "
+.endif
+
+.if defined(WITH_BDB)
+PLIST_SUB+=		BDB=""
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+PLIST_SUB+=		BDB="@comment "
+.endif
+
+.if defined(WITH_MOD_DAV_SVN)
+WITH_APACHE2_APR=	yes
+CONFIGURE_ARGS+=	--with-apxs=${APXS}
+PLIST_SUB+=	MOD_DAV_SVN=""
+SVNGROUP?=	www
+.else
+PLIST_SUB+=	MOD_DAV_SVN="@comment "
+PKGDEINSTALL=	NONEXISTENT
+SVNGROUP?=	svn
+.endif
+
+.if defined(WITH_APACHE2_APR)
+USE_APACHE=	2.0+
+.include "${PORTSDIR}/Mk/bsd.apache.mk"
+.if ${APACHE_VERSION} >= 21
+APR_APU_DIR=	${LOCALBASE}/bin
+APR_CONFIG=	apr-1-config
+APU_CONFIG=	apu-1-config
+.else
+APR_APU_DIR=	${LOCALBASE}/lib/apache2
+APR_CONFIG=	apr-config
+APU_CONFIG=	apu-config
+.endif
+APR_PORT=	${APACHE_PORT}
+.if defined(WITH_BDB)
+DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
+OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
+.endif
+.else
+APR_APU_DIR=	${LOCALBASE}/bin
+APR_CONFIG=	apr-1-config
+APU_CONFIG=	apu-1-config
+.if defined(WITH_BDB)
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr-svn
+APR_PORT=	devel/apr-svn
+OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
+.else
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
+APR_PORT=	devel/apr
+.endif
+.endif
+CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
+		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
+
 .if defined(SVN_BUILD_BINDINGS)
 .if defined(WITH_FREEBSD_SUBVERSION)
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd