16 files changed, 52 insertions, 64 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index ac3c387d472a..c6440acf1e31 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTVERSION=	0.24.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4807/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=		bmah
 
-MAINTAINER=	rodrigc@attbi.com
+MAINTAINER=	bmah@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
@@ -51,8 +50,8 @@ PKGDEINSTALL=	NONEXISTENT
 pre-extract:
 .if !defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X by defining"
-	@${ECHO_MSG} "WITH_MOD_DAV_SVN."
+	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
+	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN."
 	@${ECHO_MSG}
 .endif
 
@@ -69,7 +68,6 @@ pre-install:
 .endif
 
 post-install:
-	install-info ${PREFIX}/info/svn-design.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/book; \
 	${MAKE} INSTALL_DIR=${DOCSDIR} \
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 25720c2ec73f..554e7e1073b8 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1 +1 @@
-MD5 (subversion-0.23.0.tar.gz) = 59661f2145976437b371a0ab3a555dbd
+MD5 (subversion-0.24.2.tar.gz) = 535956794859aab9da34b78b6c783210
diff --git a/devel/subversion-devel/pkg-deinstall b/devel/subversion-devel/pkg-deinstall
index ced36ce3c20b..8a03c3956aac 100644
--- a/devel/subversion-devel/pkg-deinstall
+++ b/devel/subversion-devel/pkg-deinstall
@@ -46,9 +46,12 @@ if ! mkdir ${tmpdir}; then
 fi
 
 for i in ${conffile}; do
-	awk '{if (!/^LoadModule dav_svn_module/ && !/^AddModule mod_dav_svn.c/) \
+	awk '{if (!/^LoadModule dav_svn_module/ && 
+		  !/^AddModule mod_dav_svn.c/ &&\
+		  !/^LoadModule authz_svn_module/ &&\
+		  !/^AddModule mod_authz_svn.c/ ) \
 	    print $0}' < ${confdir}/$i > ${tmpdir}/$i
-	echo Removing dav_svn_module from $i in config dir: ${confdir}
+	echo Removing dav_svn_module and authz_svn_module from $i in config dir: ${confdir}
 	cat ${tmpdir}/$i > ${confdir}/$i
 done
 
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index ce52f64ea0c0..9b106140516a 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -4,6 +4,7 @@ bin/svndumpfilter
 bin/svnlook
 bin/svnserve
 bin/svnversion
+include/subversion-1/mod_dav_svn.h
 include/subversion-1/svn-revision.txt
 include/subversion-1/svn_auth.h
 include/subversion-1/svn_base64.h
@@ -37,12 +38,6 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
-@unexec install-info --delete %D/info/svn-design.info %D/info/dir
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-@exec install-info %D/info/svn-design.info %D/info/dir
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 lib/libsvn_client-1.so
@@ -88,6 +83,7 @@ lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
 %%PORTDOCS%%share/doc/subversion/book/images/ch02dia1.png
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index ac3c387d472a..c6440acf1e31 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTVERSION=	0.24.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4807/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=		bmah
 
-MAINTAINER=	rodrigc@attbi.com
+MAINTAINER=	bmah@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
@@ -51,8 +50,8 @@ PKGDEINSTALL=	NONEXISTENT
 pre-extract:
 .if !defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X by defining"
-	@${ECHO_MSG} "WITH_MOD_DAV_SVN."
+	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
+	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN."
 	@${ECHO_MSG}
 .endif
 
@@ -69,7 +68,6 @@ pre-install:
 .endif
 
 post-install:
-	install-info ${PREFIX}/info/svn-design.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/book; \
 	${MAKE} INSTALL_DIR=${DOCSDIR} \
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 25720c2ec73f..554e7e1073b8 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1 +1 @@
-MD5 (subversion-0.23.0.tar.gz) = 59661f2145976437b371a0ab3a555dbd
+MD5 (subversion-0.24.2.tar.gz) = 535956794859aab9da34b78b6c783210
diff --git a/devel/subversion-freebsd/pkg-deinstall b/devel/subversion-freebsd/pkg-deinstall
index ced36ce3c20b..8a03c3956aac 100644
--- a/devel/subversion-freebsd/pkg-deinstall
+++ b/devel/subversion-freebsd/pkg-deinstall
@@ -46,9 +46,12 @@ if ! mkdir ${tmpdir}; then
 fi
 
 for i in ${conffile}; do
-	awk '{if (!/^LoadModule dav_svn_module/ && !/^AddModule mod_dav_svn.c/) \
+	awk '{if (!/^LoadModule dav_svn_module/ && 
+		  !/^AddModule mod_dav_svn.c/ &&\
+		  !/^LoadModule authz_svn_module/ &&\
+		  !/^AddModule mod_authz_svn.c/ ) \
 	    print $0}' < ${confdir}/$i > ${tmpdir}/$i
-	echo Removing dav_svn_module from $i in config dir: ${confdir}
+	echo Removing dav_svn_module and authz_svn_module from $i in config dir: ${confdir}
 	cat ${tmpdir}/$i > ${confdir}/$i
 done
 
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index ce52f64ea0c0..9b106140516a 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -4,6 +4,7 @@ bin/svndumpfilter
 bin/svnlook
 bin/svnserve
 bin/svnversion
+include/subversion-1/mod_dav_svn.h
 include/subversion-1/svn-revision.txt
 include/subversion-1/svn_auth.h
 include/subversion-1/svn_base64.h
@@ -37,12 +38,6 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
-@unexec install-info --delete %D/info/svn-design.info %D/info/dir
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-@exec install-info %D/info/svn-design.info %D/info/dir
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 lib/libsvn_client-1.so
@@ -88,6 +83,7 @@ lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
 %%PORTDOCS%%share/doc/subversion/book/images/ch02dia1.png
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index ac3c387d472a..c6440acf1e31 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTVERSION=	0.24.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4807/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=		bmah
 
-MAINTAINER=	rodrigc@attbi.com
+MAINTAINER=	bmah@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
@@ -51,8 +50,8 @@ PKGDEINSTALL=	NONEXISTENT
 pre-extract:
 .if !defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X by defining"
-	@${ECHO_MSG} "WITH_MOD_DAV_SVN."
+	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
+	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN."
 	@${ECHO_MSG}
 .endif
 
@@ -69,7 +68,6 @@ pre-install:
 .endif
 
 post-install:
-	install-info ${PREFIX}/info/svn-design.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/book; \
 	${MAKE} INSTALL_DIR=${DOCSDIR} \
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 25720c2ec73f..554e7e1073b8 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1 +1 @@
-MD5 (subversion-0.23.0.tar.gz) = 59661f2145976437b371a0ab3a555dbd
+MD5 (subversion-0.24.2.tar.gz) = 535956794859aab9da34b78b6c783210
diff --git a/devel/subversion/pkg-deinstall b/devel/subversion/pkg-deinstall
index ced36ce3c20b..8a03c3956aac 100644
--- a/devel/subversion/pkg-deinstall
+++ b/devel/subversion/pkg-deinstall
@@ -46,9 +46,12 @@ if ! mkdir ${tmpdir}; then
 fi
 
 for i in ${conffile}; do
-	awk '{if (!/^LoadModule dav_svn_module/ && !/^AddModule mod_dav_svn.c/) \
+	awk '{if (!/^LoadModule dav_svn_module/ && 
+		  !/^AddModule mod_dav_svn.c/ &&\
+		  !/^LoadModule authz_svn_module/ &&\
+		  !/^AddModule mod_authz_svn.c/ ) \
 	    print $0}' < ${confdir}/$i > ${tmpdir}/$i
-	echo Removing dav_svn_module from $i in config dir: ${confdir}
+	echo Removing dav_svn_module and authz_svn_module from $i in config dir: ${confdir}
 	cat ${tmpdir}/$i > ${confdir}/$i
 done
 
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index ce52f64ea0c0..9b106140516a 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -4,6 +4,7 @@ bin/svndumpfilter
 bin/svnlook
 bin/svnserve
 bin/svnversion
+include/subversion-1/mod_dav_svn.h
 include/subversion-1/svn-revision.txt
 include/subversion-1/svn_auth.h
 include/subversion-1/svn_base64.h
@@ -37,12 +38,6 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
-@unexec install-info --delete %D/info/svn-design.info %D/info/dir
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-@exec install-info %D/info/svn-design.info %D/info/dir
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 lib/libsvn_client-1.so
@@ -88,6 +83,7 @@ lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
 %%PORTDOCS%%share/doc/subversion/book/images/ch02dia1.png
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index ac3c387d472a..c6440acf1e31 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTVERSION=	0.24.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4807/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=		bmah
 
-MAINTAINER=	rodrigc@attbi.com
+MAINTAINER=	bmah@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
@@ -51,8 +50,8 @@ PKGDEINSTALL=	NONEXISTENT
 pre-extract:
 .if !defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X by defining"
-	@${ECHO_MSG} "WITH_MOD_DAV_SVN."
+	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
+	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN."
 	@${ECHO_MSG}
 .endif
 
@@ -69,7 +68,6 @@ pre-install:
 .endif
 
 post-install:
-	install-info ${PREFIX}/info/svn-design.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/book; \
 	${MAKE} INSTALL_DIR=${DOCSDIR} \
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 25720c2ec73f..554e7e1073b8 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1 +1 @@
-MD5 (subversion-0.23.0.tar.gz) = 59661f2145976437b371a0ab3a555dbd
+MD5 (subversion-0.24.2.tar.gz) = 535956794859aab9da34b78b6c783210
diff --git a/devel/subversion16/pkg-deinstall b/devel/subversion16/pkg-deinstall
index ced36ce3c20b..8a03c3956aac 100644
--- a/devel/subversion16/pkg-deinstall
+++ b/devel/subversion16/pkg-deinstall
@@ -46,9 +46,12 @@ if ! mkdir ${tmpdir}; then
 fi
 
 for i in ${conffile}; do
-	awk '{if (!/^LoadModule dav_svn_module/ && !/^AddModule mod_dav_svn.c/) \
+	awk '{if (!/^LoadModule dav_svn_module/ && 
+		  !/^AddModule mod_dav_svn.c/ &&\
+		  !/^LoadModule authz_svn_module/ &&\
+		  !/^AddModule mod_authz_svn.c/ ) \
 	    print $0}' < ${confdir}/$i > ${tmpdir}/$i
-	echo Removing dav_svn_module from $i in config dir: ${confdir}
+	echo Removing dav_svn_module and authz_svn_module from $i in config dir: ${confdir}
 	cat ${tmpdir}/$i > ${confdir}/$i
 done
 
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index ce52f64ea0c0..9b106140516a 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -4,6 +4,7 @@ bin/svndumpfilter
 bin/svnlook
 bin/svnserve
 bin/svnversion
+include/subversion-1/mod_dav_svn.h
 include/subversion-1/svn-revision.txt
 include/subversion-1/svn_auth.h
 include/subversion-1/svn_base64.h
@@ -37,12 +38,6 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
-@unexec install-info --delete %D/info/svn-design.info %D/info/dir
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-@exec install-info %D/info/svn-design.info %D/info/dir
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 lib/libsvn_client-1.so
@@ -88,6 +83,7 @@ lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
 %%PORTDOCS%%share/doc/subversion/book/images/ch02dia1.png