(1) Update ot 1.3.0.r4. It is official, public RC.

     Rollback to 1.2.3 is impossible with new apr and swig
     in ports tree: all bindings are broken with these
     versions :(
 (2) Fix problems with new apache build infrastructure.

 I'm sorry for long pause

6 files changed, 15 insertions, 73 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 0b36113d24bb..1acef9289264 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-DISTVERSION=	1.3.0-rc2
+DISTVERSION=	1.3.0-rc4
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://lolut.utbm.info/pub/subversion-1.3.0/rc2/:main \
+MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:book
-#MASTER_SITES=	http://subversion.tigris.org/tarballs/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
@@ -155,21 +154,18 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache20
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
-RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
-.if ${APACHE2_PORT} == "www/apache21"
-PLIST_SUB+=	APACHEDIR="apache21"
+USE_APACHE=	2.0+
+.include "${PORTSDIR}/Mk/bsd.apache.mk"
+.if ${APACHE_PORT} == "www/apache21"
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
-PLIST_SUB+=	APACHEDIR="apache2"
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
-APR_PORT=	${APACHE2_PORT}
+APR_PORT=	${APACHE_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
@@ -263,11 +259,11 @@ pre-extract:
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 44d871ab6d23..6ed3ae91ba2b 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion-1.3.0-rc2.tar.bz2) = 70a155ac00fdb71949f8fec761a8acca
-SHA256 (subversion-1.3.0-rc2.tar.bz2) = d61e242b2e165f9250b618f41c90e9490ee27eadf8fd02ef73499c6379c6de4b
-SIZE (subversion-1.3.0-rc2.tar.bz2) = 6781191
+MD5 (subversion-1.3.0-rc4.tar.bz2) = 32bd8a7ff6855151704ae5d5773f7028
+SHA256 (subversion-1.3.0-rc4.tar.bz2) = 3d7c48ce0a393b01351bcc41e423cdb6a106d25123cb81d555723fa77db30ddd
+SIZE (subversion-1.3.0-rc4.tar.bz2) = 6765797
 MD5 (svn-book.html) = 6dc63e7f59fc0b6bd0e15c49d92bdbbf
 SHA256 (svn-book.html) = c927e17cd56724ef05bd1b0ec062bad34e3e4861db970c4dad36cb908d5840b5
 SIZE (svn-book.html) = 1055047
diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg
deleted file mode 100644
index a5d22e3a076b..000000000000
--- a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/proxy/swig_perl_external_runtime.swg.orig	Sat Nov  5 16:48:10 2005
-+++ subversion/bindings/swig/proxy/swig_perl_external_runtime.swg	Sat Nov  5 16:49:08 2005
-@@ -945,13 +945,13 @@
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_TypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_TypeQueryModule(module, module, name);
- }
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_MangledTypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_MangledTypeQueryModule(module, module, name);
- }
- 
diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg
deleted file mode 100644
index b55a3cf20ee6..000000000000
--- a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/proxy/swig_python_external_runtime.swg.orig	Sat Nov  5 17:05:24 2005
-+++ subversion/bindings/swig/proxy/swig_python_external_runtime.swg	Sat Nov  5 17:05:38 2005
-@@ -1310,13 +1310,13 @@
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_TypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_TypeQueryModule(module, module, name);
- }
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_MangledTypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_MangledTypeQueryModule(module, module, name);
- }
- 
diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg
deleted file mode 100644
index f3ab75f1e85f..000000000000
--- a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg.orig	Sat Nov  5 17:05:55 2005
-+++ subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg	Sat Nov  5 17:06:07 2005
-@@ -757,13 +757,13 @@
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_TypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_TypeQueryModule(module, module, name);
- }
- 
- SWIGRUNTIMEINLINE swig_type_info *
- SWIG_MangledTypeQuery(const char *name) {
--  swig_module_info *module = SWIG_GetModule();
-+  swig_module_info *module = SWIG_GetModule(NULL);
-   return SWIG_MangledTypeQueryModule(module, module, name);
- }
- 
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index cc2fa9bc5c56..8cb8340179d2 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -181,10 +181,10 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/test-scripts/svntest/svntest.sh
 %%DATADIR%%/xslt/svnindex.css
 %%DATADIR%%/xslt/svnindex.xsl
-%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so
-%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so
-%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
-%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
 %%WITH_JAVA%%lib/libsvnjavahl-1.a
 %%WITH_JAVA%%lib/libsvnjavahl-1.so
 %%WITH_JAVA%%lib/libsvnjavahl-1.so.0