From owner-svn-ports-all@FreeBSD.ORG Mon Jun 16 13:12:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0B1CE6F; Mon, 16 Jun 2014 13:12:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAC212FC5; Mon, 16 Jun 2014 13:12:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GDCRrO000691; Mon, 16 Jun 2014 13:12:27 GMT (envelope-from lev@svn.freebsd.org) Received: (from lev@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5GDCLxO000653; Mon, 16 Jun 2014 13:12:21 GMT (envelope-from lev@svn.freebsd.org) Message-Id: <201406161312.s5GDCLxO000653@svn.freebsd.org> From: "Lev A. Serebryakov" Date: Mon, 16 Jun 2014 13:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357986 - in head: . devel/p5-subversion devel/py-subversion devel/ruby-subversion devel/subversion devel/subversion-static devel/subversion/files java/java-subversion security security... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 13:12:28 -0000 Author: lev Date: Mon Jun 16 13:12:21 2014 New Revision: 357986 URL: http://svnweb.freebsd.org/changeset/ports/357986 QAT: https://qat.redports.org/buildarchive/r357986/ Log: subversion port has been overhauled. Some optional parts was extracted to separate ports. These ports are: www/mod_dav_svn instead of option MOD_DAV_SVN. security/subversion-gnome-keyring instead of option GNOME_KEYRING. security/subversion-kwallet instead of option KDE_KWALLET. If you used devel/subversion with one (or more) of these non-standard options, you should install appropriate port after subversion upgrade. "mod_dontdothat" is installed unconditionally by www/mod_dav_svn port (it has been depended on TOOLS option), but is not activated by default, you may need to edit apache's configuration file. devel/subversion port now installs svndiff, svndiff3 and svndiff4 commands if TOOLS option is enabled. They was skipped before. Official names "diff", "diff3" and "diff4" are prefixed with "svn" to avoid conflicts with base and other diff versions. All libraries and binaries are now stripped if MAINTAINER_DEBUG option is not selected (including all sub-ports, like bindings and mod_dav_svn). Added: head/devel/subversion/files/extra-patch-build.conf (contents, props changed) head/security/subversion-gnome-keyring/ head/security/subversion-gnome-keyring/Makefile (contents, props changed) head/security/subversion-gnome-keyring/pkg-descr (contents, props changed) head/security/subversion-gnome-keyring/pkg-plist (contents, props changed) head/security/subversion-kwallet/ head/security/subversion-kwallet/Makefile (contents, props changed) head/security/subversion-kwallet/pkg-descr (contents, props changed) head/security/subversion-kwallet/pkg-plist (contents, props changed) head/www/mod_dav_svn/ head/www/mod_dav_svn/Makefile (contents, props changed) head/www/mod_dav_svn/pkg-descr (contents, props changed) head/www/mod_dav_svn/pkg-plist (contents, props changed) Modified: head/UPDATING head/devel/p5-subversion/Makefile head/devel/p5-subversion/pkg-descr head/devel/py-subversion/Makefile head/devel/py-subversion/pkg-descr head/devel/ruby-subversion/Makefile head/devel/ruby-subversion/pkg-descr head/devel/subversion-static/Makefile head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/files/build-outputs.mk head/devel/subversion/files/extra-patch-Makefile.in head/devel/subversion/files/patch-build-outputs.mk head/devel/subversion/files/pkg-install.in head/devel/subversion/pkg-plist head/java/java-subversion/Makefile head/java/java-subversion/pkg-descr head/security/Makefile head/www/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jun 16 12:57:05 2014 (r357985) +++ head/UPDATING Mon Jun 16 13:12:21 2014 (r357986) @@ -5,6 +5,36 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140616: + AFFECTS: users of devel/subversion + AUTHOR: lev@FreeBSD.org + + subversion port has been overhauled. Some optional parts was extracted + to separate ports. These ports are: + + www/mod_dav_svn + instead of option MOD_DAV_SVN. + security/subversion-gnome-keyring + instead of option GNOME_KEYRING. + security/subversion-kwallet + instead of option KDE_KWALLET. + + If you used devel/subversion with one (or more) of these non-standard + options, you should install appropriate port after subversion upgrade. + + "mod_dontdothat" is installed unconditionally by www/mod_dav_svn + port (it has been depended on TOOLS option), but is not activated by + default, you may need to edit apache's configuration file. + + devel/subversion port now installs svndiff, svndiff3 and svndiff4 + commands if TOOLS option is enabled. They was skipped before. + Official names "diff", "diff3" and "diff4" are prefixed with "svn" to + avoid conflicts with base and other diff versions. + + All libraries and binaries are now stripped if MAINTAINER_DEBUG + option is not selected (including all sub-ports, like bindings + and mod_dav_svn). + 20140611: AFFECTS: users of devel/icu AUTHOR: bapt@FreeBSD.org Modified: head/devel/p5-subversion/Makefile ============================================================================== --- head/devel/p5-subversion/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/p5-subversion/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -18,20 +18,17 @@ PKGDIR= ${.CURDIR} USES= perl5 USE_PERL5= build run fixpacklist -SVN_BUILD_BINDINGS=yes +SVN_BUILD_BINDINGS= yes +SVN_BUILD_ADDONS= yes .include "${MASTERDIR}/Makefile.common" CATEGORIES+= perl5 -do-build: - ${MAKE} -C ${WRKSRC} swig-pl-lib ${MAKE_ARGS} - ${MAKE} -C ${WRKSRC} swig-pl ${MAKE_ARGS} +ALL_TARGET= swig-pl-lib swig-pl +INSTALL_TARGET= install-swig-pl pre-install: ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile -do-install: - ${MAKE} -C ${WRKSRC} install-swig-pl ${MAKE_ARGS} - .include Modified: head/devel/p5-subversion/pkg-descr ============================================================================== --- head/devel/p5-subversion/pkg-descr Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/p5-subversion/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -3,4 +3,4 @@ as possible, while fixing many outstandi This port adds Perl bindings to Subversion. -WWW: http://subversion.tigris.org/ +WWW: http://subversion.apache.org/ Modified: head/devel/py-subversion/Makefile ============================================================================== --- head/devel/py-subversion/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/py-subversion/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -18,16 +18,13 @@ PKGDIR= ${.CURDIR} USE_PYTHON= yes SVN_BUILD_BINDINGS= yes +SVN_BUILD_ADDONS= yes .include "${MASTERDIR}/Makefile.common" CATEGORIES+= python -do-build: - ${MAKE} -C ${WRKSRC} swig-py-lib ${MAKE_ARGS} - ${MAKE} -C ${WRKSRC} swig-py ${MAKE_ARGS} - -do-install: - ${MAKE} -C ${WRKSRC} install-swig-py ${MAKE_ARGS} +ALL_TARGET= swig-py-lib swig-py +INSTALL_TARGET= install-swig-py .include Modified: head/devel/py-subversion/pkg-descr ============================================================================== --- head/devel/py-subversion/pkg-descr Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/py-subversion/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -3,4 +3,4 @@ as possible, while fixing many outstandi This slave port adds Python bindings to Subversion. -WWW: http://subversion.tigris.org/ +WWW: http://subversion.apache.org/ Modified: head/devel/ruby-subversion/Makefile ============================================================================== --- head/devel/ruby-subversion/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/ruby-subversion/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -18,17 +18,14 @@ PKGDIR= ${.CURDIR} USE_RUBY= yes -SVN_BUILD_BINDINGS=yes +SVN_BUILD_BINDINGS= yes +SVN_BUILD_ADDONS= yes .include "${MASTERDIR}/Makefile.common" CATEGORIES+= ruby -do-build: - ${MAKE} -C ${WRKSRC} swig-rb-lib ${MAKE_ARGS} - ${MAKE} -C ${WRKSRC} swig-rb ${MAKE_ARGS} - -do-install: - ${MAKE} -C ${WRKSRC} install-swig-rb ${MAKE_ARGS} +ALL_TARGET= swig-rb-lib swig-rb +INSTALL_TARGET= install-swig-rb .include Modified: head/devel/ruby-subversion/pkg-descr ============================================================================== --- head/devel/ruby-subversion/pkg-descr Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/ruby-subversion/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -3,4 +3,4 @@ as possible, while fixing many outstandi This slave port adds Ruby bindings to Subversion. -WWW: http://subversion.tigris.org/ +WWW: http://subversion.apache.org/ Modified: head/devel/subversion-static/Makefile ============================================================================== --- head/devel/subversion-static/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion-static/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -14,10 +14,7 @@ PKGMESSAGE= ${.CURDIR}/pkg-message # Set these by hands, as options are undefined PLIST_SUB+= TOOLS="@comment " \ SVNSERVE_WRAPPER="@comment " \ - GNOME_KEYRING="@comment " \ - KDE_KWALLET="@comment " \ BDB="@comment " \ - MOD_DAV_SVN="@comment " \ NLS="@comment " .include "${MASTERDIR}/Makefile" Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -15,10 +15,7 @@ OPTIONS_DEFINE= \ BDB \ DOCS \ FREEBSD_TEMPLATE\ - GNOME_KEYRING \ - KDE_KWALLET \ MAINTAINER_DEBUG\ - MOD_DAV_SVN \ NLS \ P4_STYLE_MARKERS\ SASL \ @@ -30,19 +27,16 @@ OPTIONS_DEFINE= \ OPTIONS_DEFAULT=P4_STYLE_MARKERS \ FREEBSD_TEMPLATE \ - SERF + SERF TOOLS FREEBSD_TEMPLATE_DESC= FreeBSD Project log template -GNOME_KEYRING_DESC= Build with GNOME Keyring auth support -KDE_KWALLET_DESC= Build with KDE KWallet auth support MAINTAINER_DEBUG_DESC= Build debug version -MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X P4_STYLE_MARKERS_DESC= Perforce-style conflict markers SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite -TOOLS_DESC= Install several tools (svnauthz-validate and mod_dontdothat are among them) +TOOLS_DESC= Install several tools # Patches required for use with the FreeBSD Project repository only P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-3way-conflict-markers @@ -53,12 +47,12 @@ SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHD SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs +SVNGROUP?= svn +SVNUSER?= svn -SUB_FILES= pkg-install - -.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in -.endif +CONFIGURE_ARGS+= --without-gnome-keyring \ + --without-kwallet \ + --with-apxs=no .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" @@ -68,17 +62,6 @@ SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" .endif -.if ${PORT_OPTIONS:MMOD_DAV_SVN} -SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" -PLIST_SUB+= SED=${SED} -SVNGROUP?= www -SVNUSER?= www -.else -SUB_LIST+= MOD_DAV_SVN_INSTALL="NO" -SVNGROUP?= svn -SVNUSER?= svn -.endif - .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif @@ -89,7 +72,6 @@ USES+= gettext:build . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes -.else . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} @@ -135,24 +117,6 @@ pre-everything:: @${ECHO_MSG} "" .if ${PORT_OPTIONS:MSTATIC} -. if ${PORT_OPTIONS:MMOD_DAV_SVN} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -. endif -. if ${PORT_OPTIONS:MGNOME_KEYRING} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -. endif -. if ${PORT_OPTIONS:MKDE_WALLET} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -. endif @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" @@ -212,9 +176,6 @@ post-install: ${MKREPOS_TARGET} repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock -.if ${PORT_OPTIONS:MMOD_DAV_SVN} -_SVNGRPFILES+= dav -.endif SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE @@ -248,9 +209,6 @@ _mkrepos: .USE @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} -.if ${PORT_OPTIONS:MMOD_DAV_SVN} - @${MKDIR} ${SVNREPOS}/dav -.endif @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} @${CHMOD} g+w ${SVNGRPFILES} @for i in ${SVNREPOS}/db/* ; do \ @@ -266,7 +224,8 @@ _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_ra,libsvn_repos,libsvn_subr,libsvn_wc - ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk + ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/Makefile.common Mon Jun 16 13:12:21 2014 (r357986) @@ -1,15 +1,14 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTNAME= subversion +PORTNAME?= subversion PORTVERSION= 1.8.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion -USE_KDE4= # Used below if KWallet support is enabled GNU_CONFIGURE= yes USES+= tar:bzip2 pkgconfig libtool @@ -25,10 +24,10 @@ CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat -.if defined(SVN_BUILD_BINDINGS) +.if defined(SVN_BUILD_ADDONS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options +OPTIONSFILE= ${PORT_DBDIR}/subversion/options OPTIONS_NAME= devel_subversion .endif @@ -38,21 +37,9 @@ OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USE= BDB=42+ -GNOME_KEYRING_CONFIGURE_OFF= --without-gnome-keyring -GNOME_KEYRING_CONFIGURE_ON= --with-gnome-keyring -GNOME_KEYRING_LIB_DEPENDS= libgcr.so:${PORTSDIR}/security/gnome-keyring - -KDE_KWALLET_CONFIGURE_OFF= --without-kwallet -KDE_KWALLET_CONFIGURE_ON= --with-kwallet=${KDE4_PREFIX} -KDE_KWALLET_USE= KDE4=kdelibs,runtime - MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug -MOD_DAV_SVN_CONFIGURE_OFF= --with-apxs=no -MOD_DAV_SVN_CONFIGURE_ON= --with-apxs=${APXS} --with-apache-libexecdir -MOD_DAV_SVN_USE= APACHE=22+ - NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext @@ -69,10 +56,6 @@ STATIC_CONFIGURE_ON= --enable-all-stati # =============================================================== .include -.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN} -IGNORE= to build mod_dontdothat OPTION mod_dav_svn is required -.endif - APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config @@ -82,18 +65,22 @@ CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} CFLAGS+= -fpic -DPIC .endif -.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) +.if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION) CFLAGS+= -DHAS_ORGANIZATION_NAME .endif +.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} && !${OPTIONS_FILE_SET:MMAINTAINER_DEBUG} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in +.endif + .include pre-everything:: -.if defined(SVN_BUILD_BINDINGS) -.if ${PORT_OPTIONS:MSTATIC} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! bindings and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +.if defined(SVN_BUILD_ADDONS) +.if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} + @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" + @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif .endif @@ -105,10 +92,10 @@ post-patch: .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in -.if defined(SVN_BUILD_BINDINGS) +.if defined(SVN_BUILD_ADDONS) @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif -.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) +.if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix Modified: head/devel/subversion/files/build-outputs.mk ============================================================================== --- head/devel/subversion/files/build-outputs.mk Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/files/build-outputs.mk Mon Jun 16 13:12:21 2014 (r357986) @@ -909,7 +909,7 @@ subversion/tests/libsvn_delta/window-tes # 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 @@ -965,16 +965,17 @@ test: subversion/tests/cmdline/atomic-ra tests: subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) -tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) +tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(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) @@ -1134,7 +1135,7 @@ install-tests: subversion/bindings/cxxhl $(MKDIR) $(DESTDIR)$(testsdir) cd subversion/bindings/cxxhl ; $(INSTALL_TESTS) cxxhl-tests$(EXEEXT) $(DESTDIR)$(testsdir)/cxxhl-tests$(EXEEXT) -install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) +install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) $(MKDIR) $(DESTDIR)$(toolsdir) cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) @@ -1142,7 +1143,6 @@ install-tools: tools/diff/diff$(EXEEXT) cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT) cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-reorg$(EXEEXT) cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-stats$(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-bench ; $(INSTALL_TOOLS) svn-bench$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-bench$(EXEEXT) cd tools/server-side ; $(INSTALL_TOOLS) svn-populate-node-origins-index$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-populate-node-origins-index$(EXEEXT) cd tools/server-side ; $(INSTALL_TOOLS) svn-rep-sharing-stats$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-rep-sharing-stats$(EXEEXT) Modified: head/devel/subversion/files/extra-patch-Makefile.in ============================================================================== --- head/devel/subversion/files/extra-patch-Makefile.in Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/files/extra-patch-Makefile.in Mon Jun 16 13:12:21 2014 (r357986) @@ -1,11 +1,24 @@ ---- Makefile.in.orig 2013-06-20 01:29:45.000000000 +0400 -+++ Makefile.in 2013-06-20 01:29:45.000000000 +0400 -@@ -247,7 +247,7 @@ +--- Makefile.in.orig 2014-02-10 08:04:51.000000000 +0400 ++++ Makefile.in 2014-06-16 15:40:47.000000000 +0400 +@@ -253,7 +253,7 @@ + LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) + + INSTALL = @INSTALL@ +-INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) ++INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -s + INSTALL_FSMOD_LIB = $(INSTALL_LIB) + INSTALL_RAMOD_LIB = $(INSTALL_LIB) + INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB) +@@ -262,9 +262,9 @@ INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB) INSTALL_KWALLET_LIB = $(INSTALL_LIB) INSTALL_SERF_LIB = $(INSTALL_LIB) -INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) +-INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) +-INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) +INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s - INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) - INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) ++INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) -s ++INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) -s INSTALL_INCLUDE = $(INSTALL) -m 644 + INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@ + INSTALL_DATA = $(INSTALL) -m 644 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 Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,11 @@ +--- build.conf.orig 2014-02-10 08:04:51.000000000 +0400 ++++ build.conf 2014-06-15 19:45:52.000000000 +0400 +@@ -381,7 +381,7 @@ + path = tools/server-side/mod_dontdothat + nonlibs = mod_dav_svn apr aprutil + libs = libsvn_subr xml +-install = tools ++install = apache-mod + msvc-libs = libhttpd.lib + + # ---------------------------------------------------------------------------- Modified: head/devel/subversion/files/patch-build-outputs.mk ============================================================================== --- head/devel/subversion/files/patch-build-outputs.mk Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/files/patch-build-outputs.mk Mon Jun 16 13:12:21 2014 (r357986) @@ -7,9 +7,9 @@ - cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) - cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) - cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT) -+# cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) -+# cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) -+# cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT) ++ cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff$(EXEEXT) ++ cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff3$(EXEEXT) ++ cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff4$(EXEEXT) cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT) cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-reorg$(EXEEXT) cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-stats$(EXEEXT) Modified: head/devel/subversion/files/pkg-install.in ============================================================================== --- head/devel/subversion/files/pkg-install.in Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/files/pkg-install.in Mon Jun 16 13:12:21 2014 (r357986) @@ -10,14 +10,17 @@ # $FreeBSD$ # -if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then - exit 0 -fi - if [ "$2" != "PRE-INSTALL" ]; then exit 0 fi +echo "" +echo " Please check that your repository contains 'dav' subdirectory and" +echo " that all files in repositroy is accessible by apache user (typically www)" +echo "" + +exit 0 + APXSCMD=${PKG_PREFIX}/sbin/apxs if [ ! -x ${APXSCMD} ]; then @@ -54,4 +57,10 @@ else echo "dav_module already active in ${SYSCONFDIR}/${CONFFILE}" fi +echo "" +echo " Please check that your repository contains 'dav' subdirectory and" +echo " that all files in repositroy is accessible by apache user (typically www)" +echo "" + + exit 0 Modified: head/devel/subversion/pkg-plist ============================================================================== --- head/devel/subversion/pkg-plist Mon Jun 16 12:57:05 2014 (r357985) +++ head/devel/subversion/pkg-plist Mon Jun 16 13:12:21 2014 (r357986) @@ -8,6 +8,9 @@ bin/svn bin/svnadmin %%TOOLS%%bin/svnauthz %%TOOLS%%bin/svnauthz-validate +%%TOOLS%%bin/svndiff +%%TOOLS%%bin/svndiff3 +%%TOOLS%%bin/svndiff4 bin/svndumpfilter bin/svnlook bin/svnmucc @@ -64,14 +67,6 @@ include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h -%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0 -%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0 lib/libsvn_client-1.a %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0 @@ -128,16 +123,6 @@ lib/libsvn_wc-1.a %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0 -@comment enable / disable modules in this order: dav_svn, authz_svn, dontdothat -%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dav_svn %D/%F -%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F -%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so -%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz Modified: head/java/java-subversion/Makefile ============================================================================== --- head/java/java-subversion/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/java/java-subversion/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -1,4 +1,4 @@ -# Created by: Lev Serebryako +# Created by: Lev Serebryakov # $FreeBSD$ PKGNAMEPREFIX= java- @@ -24,11 +24,19 @@ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes -SVN_BUILD_BINDINGS=yes +SVN_BUILD_BINDINGS= yes +SVN_BUILD_ADDONS= yes .include "${MASTERDIR}/Makefile.common" -CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME} --with-jikes=no +CONFIGURE_ARGS+= --enable-javahl \ + --with-jdk=${JAVA_HOME} \ + --with-jikes=no + +MAKE_JOBS_UNSAFE= yes + +ALL_TARGET= javahl +INSTALL_TARGET= install-javahl post-configure: .if ${COMPILER_TYPE} == clang @@ -37,13 +45,7 @@ post-configure: @${DO_NADA} .endif -do-build: +pre-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes - cd ${WRKSRC} ; \ - ${MAKE} javahl ${MAKE_ARGS} - -do-install: - cd ${WRKSRC} ; \ - ${MAKE} install-javahl ${MAKE_ARGS} .include Modified: head/java/java-subversion/pkg-descr ============================================================================== --- head/java/java-subversion/pkg-descr Mon Jun 16 12:57:05 2014 (r357985) +++ head/java/java-subversion/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -3,4 +3,4 @@ as possible, while fixing many outstandi This port adds Java bindings to Subversion. -WWW: http://subversion.tigris.org/ +WWW: http://subversion.apache.org/ Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/security/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -962,6 +962,8 @@ SUBDIR += strobe SUBDIR += strongswan SUBDIR += stunnel + SUBDIR += subversion-gnome-keyring + SUBDIR += subversion-kwallet SUBDIR += subweb SUBDIR += sud SUBDIR += sudo Added: head/security/subversion-gnome-keyring/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-gnome-keyring/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,25 @@ +# Created by: Autrijus Tang +# $FreeBSD$ + +PKGNAMESUFFIX= -gnome-keyring + +MAINTAINER= lev@FreeBSD.org +COMMENT= Gnome KWyring integration for Version control system + +MASTERDIR= ${.CURDIR}/../../devel/subversion +PKGDIR= ${.CURDIR} + +SVN_BUILD_ADDONS= yes + +.include "${MASTERDIR}/Makefile.common" + +LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring + +CONFIGURE_ARGS+= --with-gnome-keyring + +CATEGORIES+= gnome security + +ALL_TARGET= gnome-keyring-lib +INSTALL_TARGET= install-gnome-keyring-lib + +.include Added: head/security/subversion-gnome-keyring/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-gnome-keyring/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,6 @@ +Subversion is a version control system designed to be as similar to cvs(1) +as possible, while fixing many outstanding problems with cvs(1). + +This port adds Gnome Keyring support to Subversion. + +WWW: http://subversion.apache.org/ Added: head/security/subversion-gnome-keyring/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-gnome-keyring/pkg-plist Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,4 @@ +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 Added: head/security/subversion-kwallet/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-kwallet/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,25 @@ +# Created by: Autrijus Tang +# $FreeBSD$ + +PKGNAMESUFFIX= -kwallet + +MAINTAINER= lev@FreeBSD.org +COMMENT= KDE KWallet integration for Version control system + +MASTERDIR= ${.CURDIR}/../../devel/subversion +PKGDIR= ${.CURDIR} + +SVN_BUILD_ADDONS= yes + +USE_KDE4= kdelibs runtime + +.include "${MASTERDIR}/Makefile.common" + +CONFIGURE_ARGS+= --with-kwallet=${KDE4_PREFIX} + +CATEGORIES+= kde security + +ALL_TARGET= kwallet-lib +INSTALL_TARGET= install-kwallet-lib + +.include Added: head/security/subversion-kwallet/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-kwallet/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,6 @@ +Subversion is a version control system designed to be as similar to cvs(1) +as possible, while fixing many outstanding problems with cvs(1). + +This port adds KDE KWallet support to Subversion. + +WWW: http://subversion.apache.org/ Added: head/security/subversion-kwallet/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/subversion-kwallet/pkg-plist Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,4 @@ +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/Makefile ============================================================================== --- head/www/Makefile Mon Jun 16 12:57:05 2014 (r357985) +++ head/www/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -473,6 +473,7 @@ SUBDIR += mod_cloudflare SUBDIR += mod_cplusplus SUBDIR += mod_cvs2 + SUBDIR += mod_dav_svn SUBDIR += mod_dnssd SUBDIR += mod_domaintree SUBDIR += mod_encoding Added: head/www/mod_dav_svn/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_dav_svn/Makefile Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,31 @@ +# Created by: lev@FreeBSD.org +# $FreeBSD$ + +PORTNAME= mod_dav_svn +DISTNAME= subversion-${PORTVERSION} + +MAINTAINER= lev@FreeBSD.org +COMMENT= Apache module for subversion serving. + +MASTERDIR= ${.CURDIR}/../../devel/subversion +PKGDIR= ${.CURDIR} + +SVN_BUILD_ADDONS= yes + +.include "${MASTERDIR}/Makefile.common" + +CATEGORIES+= www + +USE_APACHE= 22+ + +CONFIGURE_ARGS+= --with-apxs=${APXS} \ + --with-apache-libexecdir + +SUB_FILES= pkg-install + +PLIST_SUB+= SED=${SED} + +ALL_TARGET= apache-mod +INSTALL_TARGET= install-mods-shared + +.include Added: head/www/mod_dav_svn/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_dav_svn/pkg-descr Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,4 @@ +Installs the mod_dav_svn and mod_authz_svn apache modules for use with +subversion when serving the repository from Apache. + +WWW: http://subversion.apache.org/ Added: head/www/mod_dav_svn/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_dav_svn/pkg-plist Mon Jun 16 13:12:21 2014 (r357986) @@ -0,0 +1,10 @@ +@comment enable / disable modules in this order: dav_svn, authz_svn, dontdothat +@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%APACHEMODDIR%%/mod_dav_svn.so +@exec %D/sbin/apxs -e -a -n dav_svn %D/%F +@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%APACHEMODDIR%%/mod_authz_svn.so +@exec %D/sbin/apxs -e -a -n authz_svn %D/%F +@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%APACHEMODDIR%%/mod_dontdothat.so +@exec %D/sbin/apxs -e -A -n dontdothat %D/%F