Date: Mon, 16 Jun 2014 16:17:21 +0200 From: Antoine Brodin <antoine@FreeBSD.org> To: "Lev A. Serebryakov" <lev@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: 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... Message-ID: <CAALwa8=rP1VD0c45yvQgqjTYR-cRXiybjZYYVzA4J2Xe5LR_Kw@mail.gmail.com> In-Reply-To: <201406161312.s5GDCLxO000653@svn.freebsd.org> References: <201406161312.s5GDCLxO000653@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jun 16, 2014 at 3:12 PM, Lev A. Serebryakov <lev@freebsd.org> wrote= : > 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 extracte= d > to separate ports. These ports are: s/overhaulted/totally broken/ Could you check it again please? it doesn't build at all Antoine > 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 c= hanged) > head/security/subversion-gnome-keyring/ > head/security/subversion-gnome-keyring/Makefile (contents, props chan= ged) > head/security/subversion-gnome-keyring/pkg-descr (contents, props cha= nged) > head/security/subversion-gnome-keyring/pkg-plist (contents, props cha= nged) > 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 tim= e > 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D ${.CURDIR} > USES=3D perl5 > USE_PERL5=3D build run fixpacklist > > -SVN_BUILD_BINDINGS=3Dyes > +SVN_BUILD_BINDINGS=3D yes > +SVN_BUILD_ADDONS=3D yes > > .include "${MASTERDIR}/Makefile.common" > > CATEGORIES+=3D perl5 > > -do-build: > - ${MAKE} -C ${WRKSRC} swig-pl-lib ${MAKE_ARGS} > - ${MAKE} -C ${WRKSRC} swig-pl ${MAKE_ARGS} > +ALL_TARGET=3D swig-pl-lib swig-pl > +INSTALL_TARGET=3D 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 <bsd.port.post.mk> > > Modified: head/devel/p5-subversion/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D ${.CURDIR} > USE_PYTHON=3D yes > > SVN_BUILD_BINDINGS=3D yes > +SVN_BUILD_ADDONS=3D yes > > .include "${MASTERDIR}/Makefile.common" > > CATEGORIES+=3D 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=3D swig-py-lib swig-py > +INSTALL_TARGET=3D install-swig-py > > .include <bsd.port.post.mk> > > Modified: head/devel/py-subversion/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D ${.CURDIR} > > USE_RUBY=3D yes > > -SVN_BUILD_BINDINGS=3Dyes > +SVN_BUILD_BINDINGS=3D yes > +SVN_BUILD_ADDONS=3D yes > > .include "${MASTERDIR}/Makefile.common" > > CATEGORIES+=3D 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=3D swig-rb-lib swig-rb > +INSTALL_TARGET=3D install-swig-rb > > .include <bsd.port.post.mk> > > Modified: head/devel/ruby-subversion/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D ${.CURDIR}/pkg-message > # Set these by hands, as options are undefined > PLIST_SUB+=3D TOOLS=3D"@comment " \ > SVNSERVE_WRAPPER=3D"@comment " \ > - GNOME_KEYRING=3D"@comment " \ > - KDE_KWALLET=3D"@comment " \ > BDB=3D"@comment " \ > - MOD_DAV_SVN=3D"@comment " \ > NLS=3D"@comment " > > .include "${MASTERDIR}/Makefile" > > Modified: head/devel/subversion/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D \ > BDB \ > DOCS \ > FREEBSD_TEMPLATE\ > - GNOME_KEYRING \ > - KDE_KWALLET \ > MAINTAINER_DEBUG\ > - MOD_DAV_SVN \ > NLS \ > P4_STYLE_MARKERS\ > SASL \ > @@ -30,19 +27,16 @@ OPTIONS_DEFINE=3D \ > > OPTIONS_DEFAULT=3DP4_STYLE_MARKERS \ > FREEBSD_TEMPLATE \ > - SERF > + SERF TOOLS > > FREEBSD_TEMPLATE_DESC=3D FreeBSD Project log template > -GNOME_KEYRING_DESC=3D Build with GNOME Keyring auth support > -KDE_KWALLET_DESC=3D Build with KDE KWallet auth support > MAINTAINER_DEBUG_DESC=3D Build debug version > -MOD_DAV_SVN_DESC=3D mod_dav_svn module for Apache 2.X > P4_STYLE_MARKERS_DESC=3D Perforce-style conflict markers > SERF_DESC=3D WebDAV/Delta-V (HTTP/HTTPS) repo access module > STATIC_DESC=3D Build static version (no shared libs) > SVNSERVE_WRAPPER_DESC=3D Enable svnserve wrapper (umask setter) > TEST_DESC=3D Run subversion test suite > -TOOLS_DESC=3D Install several tools (svnauthz-validate and mo= d_dontdothat are among them) > +TOOLS_DESC=3D Install several tools > > # Patches required for use with the FreeBSD Project repository only > P4_STYLE_MARKERS_EXTRA_PATCHES=3D ${PATCHDIR}/extra-patch-3way-co= nflict-markers > @@ -53,12 +47,12 @@ SVNSERVE_WRAPPER_EXTRA_PATCHES=3D ${PATCHD > > SVNREPOS?=3D /home/svn/repos > SVNFSTYPE?=3D fsfs > +SVNGROUP?=3D svn > +SVNUSER?=3D svn > > -SUB_FILES=3D pkg-install > - > -.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-Makefile.in > -.endif > +CONFIGURE_ARGS+=3D --without-gnome-keyring \ > + --without-kwallet \ > + --with-apxs=3Dno > > .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} > SUB_LIST+=3D SVNSERVE_BIN_EXT=3D".bin" > @@ -68,17 +62,6 @@ SUB_LIST+=3D SVNSERVE_BIN_EXT=3D"" > PLIST_SUB+=3D NO_SVNSERVE_WRAPPER=3D"" > .endif > > -.if ${PORT_OPTIONS:MMOD_DAV_SVN} > -SUB_LIST+=3D MOD_DAV_SVN_INSTALL=3D"YES" > -PLIST_SUB+=3D SED=3D${SED} > -SVNGROUP?=3D www > -SVNUSER?=3D www > -.else > -SUB_LIST+=3D MOD_DAV_SVN_INSTALL=3D"NO" > -SVNGROUP?=3D svn > -SVNUSER?=3D svn > -.endif > - > .if ${PORT_OPTIONS:MTEST} > TEST_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/= py-sqlite3 > .endif > @@ -89,7 +72,6 @@ USES+=3D gettext:build > . endif > . if ${PORT_OPTIONS:MBDB} > BDB_BUILD_DEPENDS=3D yes > -.else > . endif > OLD_LIB_DEPENDS:=3D ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.= [0-9]+)?:!.a:!} > BUILD_DEPENDS+=3D ${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 compatib= le !!!" > - @${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 ${DATADI= R}" > @@ -212,9 +176,6 @@ post-install: ${MKREPOS_TARGET} > repository: _mkrepos > > _SVNGRPFILES=3D db locks locks/db.lock locks/db-logs.lock > -.if ${PORT_OPTIONS:MMOD_DAV_SVN} > -_SVNGRPFILES+=3D dav > -.endif > SVNGRPFILES=3D ${_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}/ext= ra-patch-build.conf > cd ${WRKSRC} && python2 gen-make.py --release --installed-libs li= bsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsv= n_subr,libsvn_wc > - ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk > + ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.add= ons > > .include <bsd.port.post.mk> > > Modified: head/devel/subversion/Makefile.common > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D subversion > +PORTNAME?=3D subversion > PORTVERSION=3D 1.8.9 > -PORTREVISION?=3D 1 > +PORTREVISION?=3D 2 > CATEGORIES+=3D devel > MASTER_SITES=3D ${MASTER_SITE_APACHE} > DIST_SUBDIR=3D subversion18 > MASTER_SITE_SUBDIR=3D subversion > > -USE_KDE4=3D # Used below if KWallet support is enabled > GNU_CONFIGURE=3D yes > USES+=3D tar:bzip2 pkgconfig libtool > > @@ -25,10 +24,10 @@ CONFIGURE_ARGS+=3D --without-swig \ > --with-sqlite=3D${LOCALBASE} \ > --with-expat=3D${LOCALBASE}/include:${LOCALBASE}/= lib:expat > > -.if defined(SVN_BUILD_BINDINGS) > +.if defined(SVN_BUILD_ADDONS) > CONFLICTS_BUILD+=3D ${PORTNAME}-1.[^8].[0-9]* > LIB_DEPENDS+=3D libsvn_client-1.so:${PORTSDIR}/devel/subversion > -OPTIONSFILE=3D ${PORT_DBDIR}/${PORTNAME}/options > +OPTIONSFILE=3D ${PORT_DBDIR}/subversion/options > OPTIONS_NAME=3D devel_subversion > .endif > > @@ -38,21 +37,9 @@ OPTIONS_SUB=3D yes > BDB_CONFIGURE_OFF=3D --without-berkeley-db > BDB_USE=3D BDB=3D42+ > > -GNOME_KEYRING_CONFIGURE_OFF=3D --without-gnome-keyring > -GNOME_KEYRING_CONFIGURE_ON=3D --with-gnome-keyring > -GNOME_KEYRING_LIB_DEPENDS=3D libgcr.so:${PORTSDIR}/security/gnome-ke= yring > - > -KDE_KWALLET_CONFIGURE_OFF=3D --without-kwallet > -KDE_KWALLET_CONFIGURE_ON=3D --with-kwallet=3D${KDE4_PREFIX} > -KDE_KWALLET_USE=3D KDE4=3Dkdelibs,runtime > - > MAINTAINER_DEBUG_CFLAGS=3D -g > MAINTAINER_DEBUG_CONFIGURE_ON=3D --enable-maintainer-mode --enable-debug > > -MOD_DAV_SVN_CONFIGURE_OFF=3D --with-apxs=3Dno > -MOD_DAV_SVN_CONFIGURE_ON=3D --with-apxs=3D${APXS} --with-apache-lib= execdir > -MOD_DAV_SVN_USE=3D APACHE=3D22+ > - > NLS_CONFIGURE_OFF=3D --disable-nls > NLS_USES=3D gettext > > @@ -69,10 +56,6 @@ STATIC_CONFIGURE_ON=3D --enable-all-stati > # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > .include <bsd.port.options.mk> > > -.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN} > -IGNORE=3D to build mod_dontdothat OPTION mod_dav_svn is required > -.endif > - > APR_CONFIG=3D ${LOCALBASE}/bin/apr-1-config > APU_CONFIG=3D ${LOCALBASE}/bin/apu-1-config > > @@ -82,18 +65,22 @@ CONFIGURE_ARGS+=3D--with-apr=3D${APR_CONFIG} > CFLAGS+=3D -fpic -DPIC > .endif > > -.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) > +.if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD= _TEMPLATE}) && defined(ORGANIZATION) > CFLAGS+=3D -DHAS_ORGANIZATION_NAME > .endif > > +.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} && !${OPTIONS_FILE_SET:MMAINTAINE= R_DEBUG} > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-Makefile.in > +.endif > + > .include <bsd.port.pre.mk> > > 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 =3D.*#swig_pydir =3D ${PYTHON_SI= TELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in > @${REINPLACE_CMD} "s#^swig_pydir_extra =3D.*#swig_pydir_extra =3D= ${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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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/dif= f4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT= ) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/mod_dontdothat/mo= d_dontdothat.la tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server= -side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sh= aring-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/= svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconfl= ict$(EXEEXT) > +tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/dif= f4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT= ) tools/server-side/fsfs-stats$(EXEEXT) tools/client-side/svn-bench/svn-ben= ch$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tool= s/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EX= EEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeco= nflict/svnraisetreeconflict$(EXEEXT) > > > ######################################## > # Section 7: Install-Group install targets > ######################################## > > -install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mo= d_authz_svn/mod_authz_svn.la > +install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mo= d_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdotha= t.la > if $(INSTALL_APACHE_MODS) ; then cd subversion/mod_dav_svn ; $(MK= DIR) "$(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_auth= z_svn.la ; fi > + if $(INSTALL_APACHE_MODS) ; then cd tools/server-side/mod_dontdot= hat ; $(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$(EXEE= XT) $(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_dontd= othat/mod_dontdothat.la tools/client-side/svn-bench/svn-bench$(EXEEXT) tool= s/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/sv= n-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/serv= er-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraiset= reeconflict$(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$(EXEE= XT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svna= uthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnrai= setreeconflict/svnraisetreeconflict$(EXEEXT) > $(MKDIR) $(DESTDIR)$(toolsdir) > cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsd= ir)/diff$(EXEEXT) > cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(tools= dir)/diff3$(EXEEXT) > @@ -1142,7 +1143,6 @@ install-tools: tools/diff/diff$(EXEEXT) > cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDI= R)$(toolsdir)/fsfs-access-map$(EXEEXT) > cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(t= oolsdir)/fsfs-reorg$(EXEEXT) > cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DES= TDIR)$(toolsdir)/fsfs-stats$(EXEEXT) > - if $(INSTALL_APACHE_MODS) ; then cd tools/server-side/mod_dontdot= hat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat= mod_dontdothat.la ; fi > cd tools/client-side/svn-bench ; $(INSTALL_TOOLS) svn-bench$(EXEE= XT) $(DESTDIR)$(toolsdir)/svn-bench$(EXEEXT) > cd tools/server-side ; $(INSTALL_TOOLS) svn-populate-node-origins= -index$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-populate-node-origins-index$(EXEE= XT) > cd tools/server-side ; $(INSTALL_TOOLS) svn-rep-sharing-stats$(EX= EEXT) $(DESTDIR)$(toolsdir)/svn-rep-sharing-stats$(EXEEXT) > > Modified: head/devel/subversion/files/extra-patch-Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 =3D $(LIBTOOL) $(LTCXXFLAGS) --mode=3Dlink $(CXX) $(LT_= LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) > + > + INSTALL =3D @INSTALL@ > +-INSTALL_LIB =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > ++INSTALL_LIB =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) -s > + INSTALL_FSMOD_LIB =3D $(INSTALL_LIB) > + INSTALL_RAMOD_LIB =3D $(INSTALL_LIB) > + INSTALL_APR_MEMCACHE_LIB =3D $(INSTALL_LIB) > +@@ -262,9 +262,9 @@ > INSTALL_GNOME_KEYRING_LIB =3D $(INSTALL_LIB) > INSTALL_KWALLET_LIB =3D $(INSTALL_LIB) > INSTALL_SERF_LIB =3D $(INSTALL_LIB) > -INSTALL_BIN =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > +-INSTALL_CONTRIB =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > +-INSTALL_TOOLS =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > +INSTALL_BIN =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) -s > - INSTALL_CONTRIB =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > - INSTALL_TOOLS =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) > ++INSTALL_CONTRIB =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) -s > ++INSTALL_TOOLS =3D $(LIBTOOL) --mode=3Dinstall $(INSTALL) -s > INSTALL_INCLUDE =3D $(INSTALL) -m 644 > + INSTALL_MOD_SHARED =3D @APXS@ -i -S LIBEXECDIR=3D"$(APACHE_LIBEXECDIR)"= @MOD_ACTIVATION@ > + INSTALL_DATA =3D $(INSTALL) -m 644 > > Added: head/devel/subversion/files/extra-patch-build.conf > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 =3D tools/server-side/mod_dontdothat > + nonlibs =3D mod_dav_svn apr aprutil > + libs =3D libsvn_subr xml > +-install =3D tools > ++install =3D apache-mod > + msvc-libs =3D libhttpd.lib > + > + # ---------------------------------------------------------------------= ------- > > Modified: head/devel/subversion/files/patch-build-outputs.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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)$(toolsd= ir)/diff$(EXEEXT) > - cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(tools= dir)/diff3$(EXEEXT) > - cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(tools= dir)/diff4$(EXEEXT) > -+# cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsd= ir)/diff$(EXEEXT) > -+# cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(tools= dir)/diff3$(EXEEXT) > -+# cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(tools= dir)/diff4$(EXEEXT) > ++ cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsd= ir)/svndiff$(EXEEXT) > ++ cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(tools= dir)/svndiff3$(EXEEXT) > ++ cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(tools= dir)/svndiff4$(EXEEXT) > cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDI= R)$(toolsdir)/fsfs-access-map$(EXEEXT) > cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(t= oolsdir)/fsfs-reorg$(EXEEXT) > cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DES= TDIR)$(toolsdir)/fsfs-stats$(EXEEXT) > > Modified: head/devel/subversion/files/pkg-install.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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%%" !=3D "YES" ] ; then > - exit 0 > -fi > - > if [ "$2" !=3D "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 (typica= lly www)" > +echo "" > + > +exit 0 > + > APXSCMD=3D${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 (typica= lly www)" > +echo "" > + > + > exit 0 > > Modified: head/devel/subversion/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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, don= tdothat > -%%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_sv= n_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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 <lev@FreeBSD.org> > +# Created by: Lev Serebryakov <lev@FreeBSD.org> > # $FreeBSD$ > > PKGNAMEPREFIX=3D java- > @@ -24,11 +24,19 @@ JAVA_OS=3D native > JAVA_BUILD=3D yes > JAVA_RUN=3D yes > > -SVN_BUILD_BINDINGS=3Dyes > +SVN_BUILD_BINDINGS=3D yes > +SVN_BUILD_ADDONS=3D yes > > .include "${MASTERDIR}/Makefile.common" > > -CONFIGURE_ARGS+=3D --enable-javahl --with-jdk=3D${JAVA_HOME} --wit= h-jikes=3Dno > +CONFIGURE_ARGS+=3D --enable-javahl \ > + --with-jdk=3D${JAVA_HOME} \ > + --with-jikes=3Dno > + > +MAKE_JOBS_UNSAFE=3D yes > + > +ALL_TARGET=3D javahl > +INSTALL_TARGET=3D install-javahl > > post-configure: > .if ${COMPILER_TYPE} =3D=3D 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 <bsd.port.post.mk> > > Modified: head/java/java-subversion/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 +=3D strobe > SUBDIR +=3D strongswan > SUBDIR +=3D stunnel > + SUBDIR +=3D subversion-gnome-keyring > + SUBDIR +=3D subversion-kwallet > SUBDIR +=3D subweb > SUBDIR +=3D sud > SUBDIR +=3D sudo > > Added: head/security/subversion-gnome-keyring/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 <autrijus@autrijus.org> > +# $FreeBSD$ > + > +PKGNAMESUFFIX=3D -gnome-keyring > + > +MAINTAINER=3D lev@FreeBSD.org > +COMMENT=3D Gnome KWyring integration for Version control system > + > +MASTERDIR=3D ${.CURDIR}/../../devel/subversion > +PKGDIR=3D ${.CURDIR} > + > +SVN_BUILD_ADDONS=3D yes > + > +.include "${MASTERDIR}/Makefile.common" > + > +LIB_DEPENDS+=3D libgnome-keyring.so:${PORTSDIR}/security/libgno= me-keyring > + > +CONFIGURE_ARGS+=3D --with-gnome-keyring > + > +CATEGORIES+=3D gnome security > + > +ALL_TARGET=3D gnome-keyring-lib > +INSTALL_TARGET=3D install-gnome-keyring-lib > + > +.include <bsd.port.post.mk> > > Added: head/security/subversion-gnome-keyring/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 <autrijus@autrijus.org> > +# $FreeBSD$ > + > +PKGNAMESUFFIX=3D -kwallet > + > +MAINTAINER=3D lev@FreeBSD.org > +COMMENT=3D KDE KWallet integration for Version control system > + > +MASTERDIR=3D ${.CURDIR}/../../devel/subversion > +PKGDIR=3D ${.CURDIR} > + > +SVN_BUILD_ADDONS=3D yes > + > +USE_KDE4=3D kdelibs runtime > + > +.include "${MASTERDIR}/Makefile.common" > + > +CONFIGURE_ARGS+=3D --with-kwallet=3D${KDE4_PREFIX} > + > +CATEGORIES+=3D kde security > + > +ALL_TARGET=3D kwallet-lib > +INSTALL_TARGET=3D install-kwallet-lib > + > +.include <bsd.port.post.mk> > > Added: head/security/subversion-kwallet/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 +=3D mod_cloudflare > SUBDIR +=3D mod_cplusplus > SUBDIR +=3D mod_cvs2 > + SUBDIR +=3D mod_dav_svn > SUBDIR +=3D mod_dnssd > SUBDIR +=3D mod_domaintree > SUBDIR +=3D mod_encoding > > Added: head/www/mod_dav_svn/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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=3D mod_dav_svn > +DISTNAME=3D subversion-${PORTVERSION} > + > +MAINTAINER=3D lev@FreeBSD.org > +COMMENT=3D Apache module for subversion serving. > + > +MASTERDIR=3D ${.CURDIR}/../../devel/subversion > +PKGDIR=3D ${.CURDIR} > + > +SVN_BUILD_ADDONS=3D yes > + > +.include "${MASTERDIR}/Makefile.common" > + > +CATEGORIES+=3D www > + > +USE_APACHE=3D 22+ > + > +CONFIGURE_ARGS+=3D --with-apxs=3D${APXS} \ > + --with-apache-libexecdir > + > +SUB_FILES=3D pkg-install > + > +PLIST_SUB+=3D SED=3D${SED} > + > +ALL_TARGET=3D apache-mod > +INSTALL_TARGET=3D install-mods-shared > + > +.include <bsd.port.post.mk> > > Added: head/www/mod_dav_svn/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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, don= tdothat > +@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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8=rP1VD0c45yvQgqjTYR-cRXiybjZYYVzA4J2Xe5LR_Kw>