(1) Update to 1.3.2.

  (2) Fix installation of apache module in case of apache > 2.0.
  (3) Fix some portlint warnings.

PR:		ports/97932 [2]

4 files changed, 24 insertions, 65 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index eaecaa83604e..2a574ac8b7f7 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.3.1
-PORTREVISION?=	1
+PORTVERSION=	1.3.2
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:bookhtml \
@@ -87,7 +87,7 @@ PLIST_SUB+=		WITHOUT_BDB=""
 
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
+IGNORE=	subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again
 .endif
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
@@ -124,19 +124,20 @@ PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if defined(WITH_JAVA)
+CATEGORIES+=	java
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .include "${PORTSDIR}/Mk/bsd.java.mk"
-CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME}
 PLIST_SUB+=		WITH_JAVA=""
 .else
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif
 
-.if defined(WITH_JAVA) && ${OSVERSION} < 503000 
+.if defined(WITH_JAVA) && ${OSVERSION} < 503000
 BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
@@ -370,7 +371,7 @@ post-build:
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav libexec/apache2/mod_dav.so
+	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so
 .endif
 
 post-install:	${MKREPOS_TARGET}
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index d5eb964237a9..f4e236c7a410 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion-1.3.1.tar.bz2) = 07b95963968ae345541ca99d0e7bf082
-SHA256 (subversion-1.3.1.tar.bz2) = 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
-SIZE (subversion-1.3.1.tar.bz2) = 6796453
+MD5 (subversion-1.3.2.tar.bz2) = 34aaac35a8326eba1c8076ee9e93fb6c
+SHA256 (subversion-1.3.2.tar.bz2) = 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185
+SIZE (subversion-1.3.2.tar.bz2) = 6834364
 MD5 (svn-book.html) = 1800ef7abfa35df7f2e6f4776d74c37f
 SHA256 (svn-book.html) = dfa12f00574523e601c18a590cfbf0c76df10d090da0db9b7e41b152840e1403
 SIZE (svn-book.html) = 1055053
diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure
index 01adf4e8d169..f4507ca50d20 100644
--- a/devel/subversion16/files/patch-configure
+++ b/devel/subversion16/files/patch-configure
@@ -1,59 +1,15 @@
---- configure.orig	Sat Mar 25 05:00:55 2006
-+++ configure	Thu May 25 12:50:00 2006
-@@ -2934,12 +2934,15 @@
- 
- 
- APR_VER_REGEX="0\.9\.[5-9]"
-+APR_VER_REGEX_AP20="0\.9\.1[2-9]"
- APR_VER_REGEX_TOO="1\."
- APU_VER_REGEX="0\.9\.[5-9]"
-+APU_VER_REGEX_AP20="0\.9\.1[2-9]"
- APU_VER_REGEX_TOO="1\."
- 
- 
-   APR_WANTED_REGEX="$APR_VER_REGEX"
-+  APR_WANTED_REGEX_AP20="$APR_VER_REGEX_AP20"
-   APR_WANTED_REGEX_TOO="$APR_VER_REGEX_TOO"
- 
-   { echo "$as_me:$LINENO: Apache Portable Runtime (APR) library configuration" >&5
-@@ -3215,6 +3218,7 @@
- echo "${ECHO_T}$apr_version" >&6
- 
-   if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
-+       -a `expr $apr_version : $APR_WANTED_REGEX_AP20` -eq 0 \
-        -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
-     echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
-     { { echo "$as_me:$LINENO: error: invalid apr version found" >&5
-@@ -3287,6 +3291,7 @@
- 
- 
-   APRUTIL_WANTED_REGEX="$APU_VER_REGEX"
-+  APRUTIL_WANTED_REGEX_AP20="$APU_VER_REGEX_AP20"
-   APRUTIL_WANTED_REGEX_TOO="$APU_VER_REGEX_TOO"
- 
-   { echo "$as_me:$LINENO: Apache Portable Runtime Utility (APRUTIL) library configuration" >&5
-@@ -3559,6 +3564,7 @@
- echo "${ECHO_T}$apu_version" >&6
- 
-   if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
-+       -a `expr $apr_version : $APRUTIL_WANTED_REGEX_AP20` -eq 0 \
-        -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
-     echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
-     { { echo "$as_me:$LINENO: error: invalid apr-util version found" >&5
-@@ -19784,10 +19790,10 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
- 
- # Prevent multiple expansion
- 
-@@ -19933,7 +19939,7 @@
+--- configure.orig	Tue Jun  6 20:18:54 2006
++++ configure	Tue Jun  6 20:19:34 2006
+@@ -18861,7 +18861,7 @@
+         if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
+             svn_allowed_neon_on_system="yes"
+             SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+-            NEON_LIBS=`$neon_config --la-file`
++            NEON_LIBS=`$neon_config --libs`
+             CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+             svn_lib_neon="yes"
+             break
+@@ -19184,7 +19184,7 @@
          if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
              svn_allowed_neon_on_system="yes"
              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 5f4cc0435425..1341f6223109 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -179,6 +179,7 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/hook-scripts/verify-po.py
 %%DATADIR%%/po/svn-po-status-report.sh
 %%DATADIR%%/po/svn-po-status-run.sh
+%%DATADIR%%/server-side/svnauthz-validate.c
 %%DATADIR%%/test-scripts/svntest/README
 %%DATADIR%%/test-scripts/svntest/dav_svn.passwd
 %%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf
@@ -349,6 +350,7 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/hook-scripts/mailer
 @dirrm %%DATADIR%%/hook-scripts
 @dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/server-side
 @dirrm %%DATADIR%%/test-scripts/svntest
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt