4 files changed, 13 insertions, 59 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index d4d97095e792..6284ae54212d 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.3
-PORTREVISION?=	2
+PORTVERSION=	1.4.4
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -28,7 +27,7 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
-USE_RC_SUBR=	svnserve.sh
+USE_RC_SUBR=	svnserve
 
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1
 MAN5=		svnserve.conf.5
@@ -196,10 +195,10 @@ 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=""
+PLIST_SUB+=	SVNSERVE_WRAPPER="" SVNSERVE_BIN_EXT=".bin"
 EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 .else
-PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
+PLIST_SUB+=	SVNSERVE_WRAPPER="@comment " SVNSERVE_BIN_EXT=""
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
@@ -329,10 +328,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
 
-#post-extract:
-#	@${RM} -r ${WRKSRC}/neon
-#	@${RM} -r ${WRKSRC}/apr
-#	@${RM} -r ${WRKSRC}/apr-util
+post-extract:
+	@${RM} -rf ${WRKSRC}/neon
+	@${RM} -rf ${WRKSRC}/apr
+	@${RM} -rf ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 17941d8afaef..f08abc2e7f48 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,48 +1,3 @@
-MD5 (subversion/subversion-1.4.3.tar.bz2) = de0e792c9804c7bce397d267af5eb30d
-SHA256 (subversion/subversion-1.4.3.tar.bz2) = 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
-SIZE (subversion/subversion-1.4.3.tar.bz2) = 4721031
-MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
-SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
-SIZE (subversion/svn-book.html) = 1151598
-MD5 (subversion/ch01dia1.png) = d5cf54020bcbb99fb12150481d94bffa
-SHA256 (subversion/ch01dia1.png) = cffbe5942f45561567b92899d61a3ee8251384667454a8eb9d7bf0cd54b9a5ad
-SIZE (subversion/ch01dia1.png) = 55406
-MD5 (subversion/ch02dia1.png) = 9f98bd2bd15fabc36d55db0572a7b32b
-SHA256 (subversion/ch02dia1.png) = 77b8551c1714539d083ce8f3a26e51392b53d1298255cdb82bfe4a67cd32ab16
-SIZE (subversion/ch02dia1.png) = 2544
-MD5 (subversion/ch02dia2.png) = 4c3e6e55f9a0c50d6925f5ca4587e47b
-SHA256 (subversion/ch02dia2.png) = 140e3517a6f770a5b12d4bd598171b8d4ea3a12edea1cc2f161dfda3bbd88a8b
-SIZE (subversion/ch02dia2.png) = 11754
-MD5 (subversion/ch02dia3.png) = e9cd778666a999ab329a069efed37500
-SHA256 (subversion/ch02dia3.png) = ede7d162f22e208b61f1350f923c2db10e8df73b0b7895d8619a5512640a7f86
-SIZE (subversion/ch02dia3.png) = 14307
-MD5 (subversion/ch02dia5.png) = f4ec352cd843cf130fe500cfdbc358ca
-SHA256 (subversion/ch02dia5.png) = bb0a96acc02c877b5129cce42feccec7287b226db474f5726551881571e1608c
-SIZE (subversion/ch02dia5.png) = 12176
-MD5 (subversion/ch02dia6.png) = d4eac305c63464419d945a616284c4ce
-SHA256 (subversion/ch02dia6.png) = 8a3b9952ad43945063faeb7c02b476ebde1b1095f7418073637b9ca22613019e
-SIZE (subversion/ch02dia6.png) = 4023
-MD5 (subversion/ch02dia7.png) = 067bb47f6fe3dcdeefac6755da876cdf
-SHA256 (subversion/ch02dia7.png) = 8d14d9d5634e2bcaa839a96295cbd351b366bd20cf84d09b14d6870248bf5a7e
-SIZE (subversion/ch02dia7.png) = 5495
-MD5 (subversion/ch04dia1.png) = a157a2c9fc737cab3db918aaf489bf7e
-SHA256 (subversion/ch04dia1.png) = 8af0c00ca180323ab6a343579400d40f804104d5d9524db477bec2e4d1be5a58
-SIZE (subversion/ch04dia1.png) = 2713
-MD5 (subversion/ch04dia2.png) = 5c6b571282ff05d99a99d69fdef50378
-SHA256 (subversion/ch04dia2.png) = c007babb6fcb339e741ee241c987375dc216cd2355c21edcdc68b49c8e346d47
-SIZE (subversion/ch04dia2.png) = 4127
-MD5 (subversion/ch04dia3.png) = 7226def64bf6dea42b547d968b853a08
-SHA256 (subversion/ch04dia3.png) = 258d1fd04ea2d2ec9ed6943130d802ffa28bffb066a9fba3ca78ea593fa7e4d3
-SIZE (subversion/ch04dia3.png) = 6537
-MD5 (subversion/ch04dia4.png) = 03cbad24eee5abe0cadc452be19c2613
-SHA256 (subversion/ch04dia4.png) = fbe91cc08a34630929bc9608d0121041c3135b9afcfe513e0fa1665e2cda7cdc
-SIZE (subversion/ch04dia4.png) = 3849
-MD5 (subversion/ch08dia1.png) = 870a5b07012b21f7b187fdb1d912d8d6
-SHA256 (subversion/ch08dia1.png) = 6217bba808c33d80ce2be59e4972d5387de267d21a4e7e96c79bab05d84320da
-SIZE (subversion/ch08dia1.png) = 2644
-MD5 (subversion/ch08dia2.png) = a72633f0cc8f6f83fa4d8a96b47202ca
-SHA256 (subversion/ch08dia2.png) = da286b9a8cd3224226d28b9662904ef2c362cf56dbec23a2f119e96e9fd36daf
-SIZE (subversion/ch08dia2.png) = 3910
-MD5 (subversion/svn-book.pdf) = 37ecce7fa958e320b9b7e09edc2e2d46
-SHA256 (subversion/svn-book.pdf) = 43e226b7210b71a1220e60ac425412405a184767ee363960ef3c4464605947d2
-SIZE (subversion/svn-book.pdf) = 1336362
+MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
+SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
+SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure
index 00585c90f32f..f5d6cf5fed7e 100644
--- a/devel/subversion16/files/patch-configure
+++ b/devel/subversion16/files/patch-configure
@@ -5,7 +5,7 @@
  # Either a space-separated list of allowable Neon versions, or "any" to
  # mean allow anything.
 -NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3"
++NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
  NEON_LATEST_WORKING_VER=0.25.5
  NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
  # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
diff --git a/devel/subversion16/files/svnserve.sh.in b/devel/subversion16/files/svnserve.in
index 62d349a1c2ec..809bf08c440e 100644
--- a/devel/subversion16/files/svnserve.sh.in
+++ b/devel/subversion16/files/svnserve.in
@@ -29,7 +29,7 @@ svnserve_group=${svnserve_group:-"svn"}
 name=svnserve
 rcvar=`set_rcvar`
 load_rc_config $name
-command=%%PREFIX%%/bin/svnserve
+command=%%PREFIX%%/bin/svnserve%%SVNSERVE_BIN_EXT%%
 command_args="-r ${svnserve_data}"
 
 run_rc_command "$1"