svn commit: r467834 - in head: . devel/p5-subversion devel/py-subversion devel/ruby-subversion devel/subversion devel/subversion/files devel/subversion18 devel/subversion19 java/java-subversion sec...

Fri Apr 20 15:39:02 UTC 2018

Author: lev
Date: Fri Apr 20 15:38:58 2018
New Revision: 467834
URL: https://svnweb.freebsd.org/changeset/ports/467834

Log:
   (1) Remove devel/subversion18
   (2) Intoroduce devel/subversion19 from latest pre-1.10 devel/subversion
   (3) Rework all addons to unify versioning code.
       FLAVORS is not used because it will conflict with Python FLAVORS
   (4) Restore mod_dontdothat for www/mod_dav_svn

Added:
  head/devel/subversion/Makefile.addons   (contents, props changed)
  head/devel/subversion/files/extra-patch-build.conf   (contents, props changed)
  head/devel/subversion19/
     - copied from r467477, head/devel/subversion/
Deleted:
  head/devel/subversion18/
Modified:
  head/MOVED
  head/devel/p5-subversion/Makefile
  head/devel/py-subversion/Makefile
  head/devel/ruby-subversion/Makefile
  head/devel/subversion/Makefile
  head/devel/subversion/Makefile.common
  head/devel/subversion/files/build-outputs.mk.addons
  head/devel/subversion19/Makefile
  head/devel/subversion19/Makefile.common
  head/devel/subversion19/distinfo
  head/java/java-subversion/Makefile
  head/security/subversion-gnome-keyring/Makefile
  head/security/subversion-gnome-keyring/pkg-plist
  head/security/subversion-kwallet/Makefile
  head/security/subversion-kwallet/pkg-plist
  head/www/mod_dav_svn/Makefile
  head/www/mod_dav_svn/pkg-plist

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/MOVED	Fri Apr 20 15:38:58 2018	(r467834)
@@ -10177,3 +10177,4 @@ irc/xchat|irc/hexchat|2018-04-17|Has expired: Unmainta
 irc/xchat-fish|irc/hexchat-fish|2018-04-17|Removed, master port irc/xchat expired
 irc/xchat-mircryption||2018-04-17|Removed, master port irc/xchat expired
 irc/xchat-ruby||2018-04-17|Removed, master port irc/xchat expired
+devel/subversion18|devel/subversion|2018-04-19|Has expired: EoL, use devel/subversion or devel/subversion19

Modified: head/devel/p5-subversion/Makefile
==============================================================================
--- head/devel/p5-subversion/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/p5-subversion/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -2,27 +2,19 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	p5-
-PORTREVISION=	0
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Perl bindings for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
-
 USES=		perl5
 USE_PERL5=	build run
 
+PORTREVISION_110=	1
+PORTREVISION_19=	0
+
 SVN_BUILD_BINDINGS=	yes
-SVN_BUILD_ADDONS=	yes
 
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${MASTERDIR}/Makefile.common"
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CATEGORIES+=	perl5
 

Modified: head/devel/py-subversion/Makefile
==============================================================================
--- head/devel/py-subversion/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/py-subversion/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -7,20 +7,15 @@ PORTREVISION=	0
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Python bindings for version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
-
 USES+=		python
 USE_PYTHON=	flavors py3kplist
 
+PORTREVISION_110=	1
+PORTREVISION_19=	0
+
 SVN_BUILD_BINDINGS=	yes
-SVN_BUILD_ADDONS=	yes
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CATEGORIES+=	python
 

Modified: head/devel/ruby-subversion/Makefile
==============================================================================
--- head/devel/ruby-subversion/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/ruby-subversion/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -2,26 +2,20 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	ruby-
-PORTREVISION=	0
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Ruby bindings for version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
-
 BROKEN_powerpc64=	fails to compile: swigutil_rb.c: 'ruby_errinfo' undeclared
 
 USE_RUBY=	yes
 
+PORTREVISION_110=	1
+PORTREVISION_19=	0
+
 SVN_BUILD_BINDINGS=	yes
-SVN_BUILD_ADDONS=	yes
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CATEGORIES+=	ruby
 

Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/subversion/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -224,6 +224,7 @@ _mkrepos:	.USE
 .endif
 
 svn-build-outputs-hack:
+	(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
 	(cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 

Added: head/devel/subversion/Makefile.addons
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/subversion/Makefile.addons	Fri Apr 20 15:38:58 2018	(r467834)
@@ -0,0 +1,36 @@
+# Created by: lev at FreeBSD.org
+# $FreeBSD$
+
+# We can not use FLAVORS - pyhton uses them
+#FLAVORS=	svn110 svn19
+#FLAVOR?=	${FLAVORS:[1]}
+
+WITH_SUBVERSION_VER?=	110
+
+PKGDIR=			${.CURDIR}
+
+SVN_BUILD_ADDONS=	yes
+
+.if ${WITH_SUBVERSION_VER} == 110
+CONFLICTS_BUILD+=	${PORTNAME}-1.[0-9].[0-9]* \
+			${PORTNAME}-1.[^1][0-9].[0-9]*
+PORTREVISION=		${PORTREVISION_110}
+PLIST_SUB+=		SVN19="@comment " SVN110=""
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
+OPTIONS_NAME=		devel_subversion
+MASTERDIR=		${.CURDIR}/../../devel/subversion
+.include		"${MASTERDIR}/Makefile.common"
+.elif ${WITH_SUBVERSION_VER} == 19
+PKGNAMESUFFIX:=		${PKGNAMESUFFIX}19
+CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]* \
+			${PORTNAME}-1.[0-9][0-9].[0-9]*
+PORTREVISION=		${PORTREVISION_19}
+PLIST_SUB+=		SVN19="" SVN110="@comment "
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion19
+OPTIONS_NAME=		devel_subversion19
+MASTERDIR=		${.CURDIR}/../../devel/subversion19
+.include		"${MASTERDIR}/Makefile.common"
+.else
+BROKEN=			Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 110 (default) and 19 are supported
+.endif
+

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/subversion/Makefile.common	Fri Apr 20 15:38:58 2018	(r467834)
@@ -16,7 +16,8 @@ LICENSE=	APACHE20
 
 CPE_VENDOR=	apache
 
-CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]*
+CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \
+			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^1][0-9].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libsqlite3.so:databases/sqlite3 \
@@ -27,12 +28,6 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
-
-.if defined(SVN_BUILD_ADDONS)
-CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
-OPTIONS_NAME=		devel_subversion
-.endif
 
 .if defined(SVN_BUILD_BINDINGS)
 BUILD_DEPENDS+=		swig3.0:devel/swig30

Modified: head/devel/subversion/files/build-outputs.mk.addons
==============================================================================
--- head/devel/subversion/files/build-outputs.mk.addons	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/devel/subversion/files/build-outputs.mk.addons	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1081,7 +1081,7 @@ subversion/tests/libsvn_subr/xml-test$(EXEEXT): $(xml_
 # Section 6: Install-Group build targets
 ########################################
 
-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
 
 bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
 
@@ -1141,16 +1141,17 @@ swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig
 
 test: subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/test
 s/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/test
 s/libsvn_subr/prefix-string-test$(EXEEXT) su!
 bversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/t
 ests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT)
 
-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT)
+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT)
 
 
 ########################################
 # Section 7: Install-Group install targets
 ########################################
 
-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
 	if $(INSTALL_APACHE_MODS) ; then cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la ; fi
 	if $(INSTALL_APACHE_MODS) ; then cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la ; fi
+	if $(INSTALL_APACHE_MODS) ; then cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la ; fi
 
 install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
 	$(MKDIR) $(DESTDIR)$(bdb_libdir) $(DESTDIR)$(pkgconfig_dir)
@@ -1375,7 +1376,7 @@ install-swig-rb-lib: subversion/bindings/swig/ruby/lib
 	cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
 	
 
-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT)
+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT)
 	$(MKDIR) $(DESTDIR)$(toolsdir)
 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
 	
@@ -1385,7 +1386,6 @@ install-tools: tools/diff/diff$(EXEEXT) tools/diff/dif
 	
 	cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT)
 	
-	if $(INSTALL_APACHE_MODS) ; then cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la ; fi
 	cd tools/client-side/svn-mergeinfo-normalizer ; $(INSTALL_TOOLS) svn-mergeinfo-normalizer$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-mergeinfo-normalizer$(EXEEXT)
 	
 	cd tools/server-side ; $(INSTALL_TOOLS) svn-populate-node-origins-index$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-populate-node-origins-index$(EXEEXT)

Added: head/devel/subversion/files/extra-patch-build.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/subversion/files/extra-patch-build.conf	Fri Apr 20 15:38:58 2018	(r467834)
@@ -0,0 +1,11 @@
+--- build.conf.orig	2018-04-19 20:21:34.859567000 +0300
++++ build.conf	2018-04-19 20:21:55.939112000 +0300
+@@ -430,7 +430,7 @@
+ path = tools/server-side/mod_dontdothat
+ nonlibs = mod_dav_svn apr aprutil
+ libs = libsvn_subr libhttpd
+-install = tools
++install = apache-mod
+ 
+ # The Subversion FSFS repository manipulation tool
+ [svnfsfs]

Modified: head/devel/subversion19/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Mon Apr 16 11:18:24 2018	(r467477)
+++ head/devel/subversion19/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1,12 +1,14 @@
 # Created by: rooneg at electricjellyfish.net
 # $FreeBSD$
 
-PORTREVISION=	4
+PORTREVISION=	0
+PKGNAMESUFFIX=  19
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Version control system
 
 CONFLICTS_INSTALL=	subversion-1.[^9].[0-9]* \
+			subversion-1.1[0-9].[0-9]* \
 			subversion1[^9]-1.[^9].[0-9]*
 
 USE_RC_SUBR=	svnserve

Modified: head/devel/subversion19/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Mon Apr 16 11:18:24 2018	(r467477)
+++ head/devel/subversion19/Makefile.common	Fri Apr 20 15:38:58 2018	(r467834)
@@ -6,7 +6,6 @@ PORTVERSION=	1.9.7
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
-DIST_SUBDIR=	subversion19
 
 GNU_CONFIGURE=	yes
 USES+=		cpe libtool pathfix pkgconfig shebangfix tar:bzip2
@@ -17,7 +16,8 @@ LICENSE=	APACHE20
 
 CPE_VENDOR=	apache
 
-CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
+CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]* \
+			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9][0-9].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libsqlite3.so:databases/sqlite3 \
@@ -26,12 +26,6 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
-
-.if defined(SVN_BUILD_ADDONS)
-CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
-OPTIONS_NAME=		devel_subversion
-.endif
 
 # ===============================================================
 OPTIONS_SUB=			yes

Modified: head/devel/subversion19/distinfo
==============================================================================
--- head/devel/subversion/distinfo	Mon Apr 16 11:18:24 2018	(r467477)
+++ head/devel/subversion19/distinfo	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502460058
-SHA256 (subversion19/subversion-1.9.7.tar.bz2) = c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623
-SIZE (subversion19/subversion-1.9.7.tar.bz2) = 7881909
+TIMESTAMP = 1524233918
+SHA256 (subversion-1.9.7.tar.bz2) = c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623
+SIZE (subversion-1.9.7.tar.bz2) = 7881909

Modified: head/java/java-subversion/Makefile
==============================================================================
--- head/java/java-subversion/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/java/java-subversion/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -3,18 +3,10 @@
 
 PKGNAMEPREFIX=	java-
 CATEGORIES=	java
-PORTREVISION=	0
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Java bindings for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
-
 USES+=		compiler
 
 USE_JAVA=	yes
@@ -23,10 +15,13 @@ JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
+
+PORTREVISION_110=	1
+PORTREVISION_19=	0
+
 SVN_BUILD_BINDINGS=	yes
-SVN_BUILD_ADDONS=	yes
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CONFIGURE_ARGS+=	--enable-javahl \
 			--with-jdk=${JAVA_HOME} \

Modified: head/security/subversion-gnome-keyring/Makefile
==============================================================================
--- head/security/subversion-gnome-keyring/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/security/subversion-gnome-keyring/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -3,23 +3,20 @@
 
 PKGNAMESUFFIX=	-gnome-keyring
 CATEGORIES=	security gnome
-PORTREVISION=	3
 
 MAINTAINER=	lev at FreeBSD.org
-COMMENT=	Gnome KWyring integration for Version control system
+COMMENT=	Gnome Keyring integration for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
+PORTREVISION_110=	4
+PORTREVISION_19=	0
 
-SVN_BUILD_ADDONS=	yes
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
-.include "${MASTERDIR}/Makefile.common"
-
-LIB_DEPENDS+=		libsecret-1.so:security/libsecret
+.if ${WITH_SUBVERSION_VER} == 19
+LIB_DEPENDS+=	libgnome-keyring.so:security/libgnome-keyring
+.else
+LIB_DEPENDS+=	libsecret-1.so:security/libsecret
+.endif
 
 CONFIGURE_ARGS+=	--with-gnome-keyring
 

Modified: head/security/subversion-gnome-keyring/pkg-plist
==============================================================================
--- head/security/subversion-gnome-keyring/pkg-plist	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/security/subversion-gnome-keyring/pkg-plist	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1,3 +1,4 @@
+%%SVN19%%lib/libsvn_auth_gnome_keyring-1.a
 lib/libsvn_auth_gnome_keyring-1.so
 lib/libsvn_auth_gnome_keyring-1.so.0
 lib/libsvn_auth_gnome_keyring-1.so.0.0.0

Modified: head/security/subversion-kwallet/Makefile
==============================================================================
--- head/security/subversion-kwallet/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/security/subversion-kwallet/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -2,28 +2,24 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-kwallet
-PORTREVISION=	5
 CATEGORIES=	security kde
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	KDE KWallet integration for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-PORTREVISION=	2
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
+USE_KDE=	kdelibs runtime
+USES+=		kde:4
 
-SVN_BUILD_ADDONS=	yes
+PORTREVISION_110=	6
+PORTREVISION_19=	0
 
-USE_KDE=		kdelibs runtime
-USES+=			kde:4
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
-.include "${MASTERDIR}/Makefile.common"
-
+.if ${WITH_SUBVERSION_VER} == 19
+CONFIGURE_ARGS+=	--with-kwallet=${KDE_PREFIX}
+.else
 CONFIGURE_ARGS+=	--with-kwallet=${KDE_PREFIX}/include/kde4:${KDE_PREFIX}/lib
+.endif
 
 ALL_TARGET=	kwallet-lib
 INSTALL_TARGET=	install-kwallet-lib

Modified: head/security/subversion-kwallet/pkg-plist
==============================================================================
--- head/security/subversion-kwallet/pkg-plist	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/security/subversion-kwallet/pkg-plist	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1,3 +1,4 @@
+%%SVN19%%lib/libsvn_auth_kwallet-1.a
 lib/libsvn_auth_kwallet-1.so
 lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_auth_kwallet-1.so.0.0.0

Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/www/mod_dav_svn/Makefile	Fri Apr 20 15:38:58 2018	(r467834)
@@ -3,25 +3,18 @@
 
 PORTNAME=	mod_dav_svn
 DISTNAME=	subversion-${PORTVERSION}
-PORTREVISION=	0
 
 CATEGORIES=	www
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Apache module for subversion serving
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
-MASTERDIR=	${.CURDIR}/../../devel/subversion18
-.else
-MASTERDIR=	${.CURDIR}/../../devel/subversion
-.endif
-PKGDIR=		${.CURDIR}
-
-SVN_BUILD_ADDONS=	yes
-
 USES=		apache:2.2+
 
-.include "${MASTERDIR}/Makefile.common"
+PORTREVISION_110=	1
+PORTREVISION_19=	0
+
+.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS} \
 			--with-apache-libexecdir \

Modified: head/www/mod_dav_svn/pkg-plist
==============================================================================
--- head/www/mod_dav_svn/pkg-plist	Fri Apr 20 15:12:35 2018	(r467833)
+++ head/www/mod_dav_svn/pkg-plist	Fri Apr 20 15:38:58 2018	(r467834)
@@ -1,4 +1,5 @@
 @sample %%APACHEETCDIR%%/modules.d/220_subversion.conf.sample
 %%APACHEMODDIR%%/mod_dav_svn.so
+%%APACHEMODDIR%%/mod_dontdothat.so
 %%APACHEMODDIR%%/mod_authz_svn.so
 
