diff options
author | Lev A. Serebryakov <lev@FreeBSD.org> | 2012-09-14 14:59:58 +0000 |
---|---|---|
committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2012-09-14 14:59:58 +0000 |
commit | eab941cd9c6c370bd972f3bb6f1a94680014b23e (patch) | |
tree | 4a7c01aeee9c4784882101daa9048b310c4a32ad /devel/subversion | |
parent | - Update to 0.11 (diff) |
(1) Update to latest 1.7.6
(2) Convert to new OPTIONS framework.
(3) Check for proper sqlite3 for STATIC build.
(4) Don't require NLS and BDB unconditionally for static build.
(5) Add option to build Multiple URL Command Client
Submitted by: Warren Block <wblock@wonkity.com> [5]
Notes
Notes:
svn path=/head/; revision=304273
Diffstat (limited to 'devel/subversion')
-rw-r--r-- | devel/subversion/Makefile | 149 | ||||
-rw-r--r-- | devel/subversion/Makefile.common | 32 | ||||
-rw-r--r-- | devel/subversion/distinfo | 12 | ||||
-rw-r--r-- | devel/subversion/files/build-outputs.mk | 62 | ||||
-rw-r--r-- | devel/subversion/files/extra-patch-Makefile.in | 11 | ||||
-rw-r--r-- | devel/subversion/files/patch-build-outputs.mk | 48 | ||||
-rw-r--r-- | devel/subversion/pkg-plist | 1 |
7 files changed, 206 insertions, 109 deletions
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 7594b979932b..30a573280178 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -18,34 +18,46 @@ MAN8= svnserve.8 TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README -OPTIONS= P4_STYLE_MARKERS "Perforce-style conflict markers" on \ - ENHANCED_KEYWORD "Enhanced svn:keyword support" on \ - FREEBSD_TEMPLATE "FreeBSD Project log template" on \ - MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \ - MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \ - NEON "WebDAV/Delta-V repo access module (neon)" on \ - SERF "WebDAV/Delta-V repo access module (serf)" off \ - SASL "SASL2 authorization support" off \ - BDB "Berkeley DB (4 or 5) repository backend" on \ - MAINTAINER_DEBUG "Build debug version" off \ - SVNSERVE_WRAPPER "Enable svnserve wrapper" off \ - SVNAUTHZ_VALIDATE "install svnauthz-validate" off \ - STATIC "Build static version (no shared libs)" off \ - GNOME_KEYRING "Build with GNOME Keyring auth support" off \ - KDE_KWALLET "Build with KDE KWallet auth support" off \ - BOOK "Install the Subversion Book" off \ - TEST "Run subversion test suite" off -# ASVN "Build and install Archive SVN (asvn)" off \ +OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \ + MOD_DAV_SVN MOD_DONTDOTHAT SVNAUTHZ_VALIDATE \ + NEON SERF \ + SASL BDB \ + MAINTAINER_DEBUG \ + SVNSERVE_WRAPPER SVNMUCC \ + STATIC \ + GNOME_KEYRING KDE_KWALLET \ + BOOK TEST + +OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON + +P4_STYLE_MARKERS_DESC= Perforce-style conflict markers +ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support +FREEBSD_TEMPLATE_DESC= FreeBSD Project log template +MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X +MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X +NEON_DESC= WebDAV/Delta-V repo access module (neon) +SERF_DESC= WebDAV/Delta-V repo access module (serf) +MAINTAINER_DEBUG_DESC= Build debug version +SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper +SVNMUCC_DESC= Install Multiple URL Command Client +SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate +STATIC_DESC= Build static version (no shared libs) +GNOME_KEYRING_DESC= Build with GNOME Keyring auth support +KDE_KWALLET_DESC= Build with KDE KWallet auth support +BOOK_DESC= Install the Subversion Book +TEST_DESC= Run subversion test suite .include "Makefile.common" +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SUB_FILES= pkg-install \ pkg-deinstall -BOOK_VERSION= 4259 +BOOK_VERSION= 4304 .if make(repository) WITH_REPOSITORY_CREATION= yes @@ -56,17 +68,21 @@ MKREPOS_TARGET= _mkrepos .endif # Patches required for use with the FreeBSD Project repository only -.if !defined(WITHOUT_P4_STYLE_MARKERS) +.if ${PORT_OPTIONS:MP4_STYLE_MARKERS} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers .endif -.if !defined(WITHOUT_ENHANCED_KEYWORD) +.if ${PORT_OPTIONS:MENHANCED_KEYWORD} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword .endif -.if !defined(WITHOUT_FREEBSD_TEMPLATE) +.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template .endif -.if defined(WITH_SVNSERVE_WRAPPER) +.if empty(PORT_OPTIONS:MMAINTAINER_DEBUG) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in +.endif + +.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} PLIST_SUB+= SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT=".bin" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper @@ -75,7 +91,13 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" .endif -.if !defined(NOPORTDOCS) && defined(WITH_BOOK) +.if ${PORT_OPTIONS:MSVNMUCC} +PLIST_SUB+= SVNMUCC="" +.else +PLIST_SUB+= SVNMUCC="@comment " +.endif + +.if !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK} BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2 BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book @@ -85,11 +107,11 @@ PLIST_SUB+= BOOK="@comment " .endif # testsuite will fail until PR156076 is committed -.if defined(WITH_TEST) +.if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 .endif -#.if defined(WITH_ASVN) +#.if ${PORT_OPTIONS:MASVN} #RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install #PLIST_SUB+= ASVN="" #.else @@ -100,9 +122,13 @@ SCRIPTS= SCRIPTS_DATA= -.ifdef (WITH_STATIC) +.if ${PORT_OPTIONS:MSTATIC} +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= build +.endif +.if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes +.endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/lib!:C!(\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= @@ -110,39 +136,39 @@ LIB_DEPENDS= pre-everything:: @${ECHO_MSG} "" -.if defined(WITH_NEON) +.if ${PORT_OPTIONS:MNEON} @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." .else @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." .endif @${ECHO_MSG} "" -.if defined(WITH_BDB) +.if ${PORT_OPTIONS:MBDB} @${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled." .else @${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled." .endif @${ECHO_MSG} "" -.if defined(WITH_MAINTAINER_DEBUG) +.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} @${ECHO_MSG} "Build debug version." @${ECHO_MSG} "" .endif -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DAV_SVN} @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" .endif @${ECHO_MSG} "" -.if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && ${PORT_OPTIONS:MMOD_DAV_SVN} @${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X" .endif @${ECHO_MSG} "" -.if defined(WITH_SVNSERVE_WRAPPER) +.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${ECHO_MSG} "svnserve wrapper enabled." @${ECHO_MSG} "" .endif -.if defined(WITH_SVNAUTHZ_VALIDATE) +.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} @${ECHO_MSG} "svnauthz-validate enabled." @${ECHO_MSG} "" .endif @@ -164,34 +190,34 @@ pre-everything:: @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif @${ECHO_MSG} "" -.if !defined(NOPORTDOCS) && defined(WITH_BOOK) +.if !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK} @${ECHO_MSG} "Subversion Book will be installed." @${ECHO_MSG} "" .endif -#.if defined(WITH_ASVN) +#.if ${PORT_OPTIONS:MASVN} # @${ECHO_MSG} "asvn will be installed" # @${ECHO_MSG} "" #.endif -.if defined(WITH_STATIC) -.if defined(WITH_MOD_DAV_SVN) +.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 defined(WITH_SVNAUTHZ_VALIDATE) +.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif -.if defined(WITH_GNOME_KEYRING) +.if ${PORT_OPTIONS:MGNOME_KEYRING} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif -.if defined(WITH_KDE_WALLET) +.if ${PORT_OPTIONS:MKDE_WALLET} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @@ -202,7 +228,7 @@ pre-everything:: @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: -.if !defined(WITHOUT_BDB) +.if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \ ${ECHO_MSG} "" ; \ @@ -210,34 +236,42 @@ pre-configure: ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ - ${ECHO_MSG} "To disable Berkeley DB support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif +.if ${PORT_OPTIONS:MSTATIC} + @if grep -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ + ${ECHO_MSG} "" ; \ + ${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \ + ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \ + ${ECHO_MSG} "" ; \ + ${FALSE} ; \ + fi +.endif # takes a long time, and will fail but gives maintainer a good oversight -.if defined(WITH_TEST) +.if ${PORT_OPTIONS:MTEST} test: make check -C ${WRKSRC} .endif pre-install: -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DAV_SVN} # activate dav_module now in pkg-install to prevent double activation. # workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397 @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif post-install: ${MKREPOS_TARGET} -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DAV_SVN} ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so -.if defined(WITH_MOD_DONTDOTHAT) +.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so .endif .endif -.if defined(WITH_SVNAUTHZ_VALIDATE) +.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} ${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin .endif @${MKDIR} ${DATADIR} @@ -251,29 +285,32 @@ post-install: ${MKREPOS_TARGET} for f in ${TXT_DOCS}; do \ ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \ done -.if defined(WITH_BOOK) +.if ${PORT_OPTIONS:MBOOK} ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR} - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR} + ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf .endif .endif -.if defined(WITH_ASVN) +.if ${PORT_OPTIONS:MASVN} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin .endif -.if defined(WITH_SVNSERVE_WRAPPER) +.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve .endif +.if ${PORT_OPTIONS:MSVNMUCC} + @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/.libs/svnmucc ${PREFIX}/bin +.endif repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DAV_SVN} _SVNGRPFILES+= dav .endif SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) -.if defined(WITH_SVNSERVE_WRAPPER) +.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \ else \ @@ -301,8 +338,8 @@ _mkrepos: .USE .endif @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} -.if defined(WITH_SVNSERVE_WRAPPER) -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} +.if ${PORT_OPTIONS:MMOD_DAV_SVN} @${MKDIR} ${SVNREPOS}/dav .endif @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 4e67b49a9606..1aff822d0ff6 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -5,12 +5,12 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.7.5 +PORTVERSION= 1.7.6 #PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ ${MASTER_SITE_LOCAL:S/$/:book/} -DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main DIST_SUBDIR= subversion17 MASTER_SITE_SUBDIR= subversion/:main \ lev/:book @@ -42,7 +42,7 @@ OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu .include <bsd.port.options.mk> # Default is "on" -.if !defined(WITHOUT_NEON) +.if ${PORT_OPTIONS:MNEON} LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 PLIST_SUB+= NEON="" .else @@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--without-neon PLIST_SUB+= NEON="@comment " .endif -.if defined(WITH_SASL) +.if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} PLIST_SUB+= SASL="" @@ -60,7 +60,7 @@ PLIST_SUB+= SASL="@comment " .endif # Default is "on" -.if !defined(WITHOUT_BDB) +.if ${PORT_OPTIONS:MBDB} USE_BDB= 42+ PLIST_SUB+= BDB="" .else @@ -68,18 +68,18 @@ CONFIGURE_ARGS+=--without-berkeley-db PLIST_SUB+= BDB="@comment " .endif -.if defined(WITH_MOD_DONTDOTHAT) && defined(WITHOUT_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && empty(PORT_OPTIONS:MMOD_DAV_SVN) IGNORE= to build mod_dontdothat option mod_dav_svn is required .endif -.if defined(WITH_MOD_DAV_SVN) +.if ${PORT_OPTIONS:MMOD_DAV_SVN} WITH_APACHE= yes CONFIGURE_ARGS+=--with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" SVNGROUP?= www SVNUSER?= www -.if defined(WITH_MOD_DONTDOTHAT) +.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} PLIST_SUB+= MOD_DONTDOTHAT="" .else PLIST_SUB+= MOD_DONTDOTHAT="@comment " @@ -111,14 +111,14 @@ APU_CONFIG= ${LOCALBASE}/bin/apu-1-config CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} -.if defined(WITH_SVNAUTHZ_VALIDATE) +.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} APR_INCLUDE_DIR!= ${APR_CONFIG} --includedir PLIST_SUB+= SVNAUTHZ_VALIDATE="" .else PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment " .endif -.if defined(WITH_SERF) +.if ${PORT_OPTIONS:MSERF} LIB_DEPENDS+= serf-1:${PORTSDIR}/www/serf CONFIGURE_ARGS+=--with-serf=${LOCALBASE} PLIST_SUB+= SERF="" @@ -131,7 +131,7 @@ LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion .endif # KWallet requires NLS to be enabled. -.if !defined(WITHOUT_NLS) || defined(WITH_KDE_KWALLET) +.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET} USE_GETTEXT= yes PLIST_SUB+= WITHOUT_GETTEXT="" .else @@ -143,19 +143,19 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment " CFLAGS+= -fpic -DPIC .endif -.if defined(WITH_MAINTAINER_DEBUG) +.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug CFLAGS+= -g .endif -.if defined(WITH_STATIC) +.if ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+=--enable-all-static PLIST_SUB+= DYNAMIC_ENABLED="@comment " .else PLIST_SUB+= DYNAMIC_ENABLED="" .endif -.if defined(WITH_GNOME_KEYRING) +.if ${PORT_OPTIONS:MGNOME_KEYRING} LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring CONFIGURE_ARGS+=--with-gnome-keyring PLIST_SUB+= GNOME_KEYRING="" @@ -164,7 +164,7 @@ CONFIGURE_ARGS+=--without-gnome-keyring PLIST_SUB+= GNOME_KEYRING="@comment " .endif -.if defined(WITH_KDE_KWALLET) +.if ${PORT_OPTIONS:MKDE_KWALLET} USE_KDE4= kdelibs runtime CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX} PLIST_SUB+= KDE_KWALLET="" @@ -177,7 +177,7 @@ PLIST_SUB+= KDE_KWALLET="@comment " pre-everything:: .if defined(SVN_BUILD_BINDINGS) -.if defined(WITH_STATIC) +.if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! bindings and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index 01edcc183437..ea3f3a6aaf37 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,6 +1,6 @@ -SHA256 (subversion17/subversion-1.7.5.tar.bz2) = cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec -SIZE (subversion17/subversion-1.7.5.tar.bz2) = 6002955 -SHA256 (subversion17/svn-book-html-r4259.tar.bz2) = f02b64ad255b507325a960586225d721e086ec6f2a1843214202814e7fee3ac3 -SIZE (subversion17/svn-book-html-r4259.tar.bz2) = 467637 -SHA256 (subversion17/svn-book-r4259.pdf) = c091c598b2964f9692f3b3ffb7585c14f7d4e70793dd7e0fb862e30d9a98d289 -SIZE (subversion17/svn-book-r4259.pdf) = 1921400 +SHA256 (subversion17/subversion-1.7.6.tar.bz2) = d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 +SIZE (subversion17/subversion-1.7.6.tar.bz2) = 6006767 +SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14 +SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806 +SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2 +SIZE (subversion17/svn-book-r4304.pdf) = 1921443 diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk index 4ab76a46dc43..e676875705ce 100644 --- a/devel/subversion/files/build-outputs.mk +++ b/devel/subversion/files/build-outputs.mk @@ -825,7 +825,7 @@ subversion/tests/libsvn_delta/window-test$(EXEEXT): $(window_test_DEPS) # Section 6: Install-Group build targets ######################################## -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 +apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la @@ -877,23 +877,22 @@ swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.l test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-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/config-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_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-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/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-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_delta/window-test$(EXEEXT) -tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) +tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(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 tools/server-side/mod_dontdothat/mod_dontdothat.la +install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la - cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la -install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la +install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la $(MKDIR) $(DESTDIR)$(bdb_libdir) cd subversion/libsvn_fs_base ; $(INSTALL_BDB_LIB) libsvn_fs_base-1.la $(DESTDIR)$(bdb_libdir)/libsvn_fs_base-1.la -install-bin: subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) +install-bin: subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) $(MKDIR) $(DESTDIR)$(bindir) cd subversion/svn ; $(INSTALL_BIN) svn$(EXEEXT) $(DESTDIR)$(bindir)/svn$(EXEEXT) cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT) @@ -904,62 +903,62 @@ install-bin: subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) s cd subversion/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT) cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT) -install-fsmod-lib: subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la +install-fsmod-lib: subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la $(MKDIR) $(DESTDIR)$(fsmod_libdir) cd subversion/libsvn_subr ; $(INSTALL_FSMOD_LIB) libsvn_subr-1.la $(DESTDIR)$(fsmod_libdir)/libsvn_subr-1.la cd subversion/libsvn_delta ; $(INSTALL_FSMOD_LIB) libsvn_delta-1.la $(DESTDIR)$(fsmod_libdir)/libsvn_delta-1.la cd subversion/libsvn_fs_util ; $(INSTALL_FSMOD_LIB) libsvn_fs_util-1.la $(DESTDIR)$(fsmod_libdir)/libsvn_fs_util-1.la cd subversion/libsvn_fs_fs ; $(INSTALL_FSMOD_LIB) libsvn_fs_fs-1.la $(DESTDIR)$(fsmod_libdir)/libsvn_fs_fs-1.la -install-gnome-keyring-lib: subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring-1.la +install-gnome-keyring-lib: subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring-1.la $(MKDIR) $(DESTDIR)$(gnome_keyring_libdir) cd subversion/libsvn_auth_gnome_keyring ; $(INSTALL_GNOME_KEYRING_LIB) libsvn_auth_gnome_keyring-1.la $(DESTDIR)$(gnome_keyring_libdir)/libsvn_auth_gnome_keyring-1.la -install-javahl-callback-javah: +install-javahl-callback-javah: $(MKDIR) $(DESTDIR)$(javahl_callback_javahdir) $(INSTALL_EXTRA_JAVAHL_CALLBACK_JAVAH) -install-javahl-compat-java: +install-javahl-compat-java: $(MKDIR) $(DESTDIR)$(javahl_compat_javadir) $(INSTALL_EXTRA_JAVAHL_COMPAT_JAVA) -install-javahl-compat-tests: +install-javahl-compat-tests: $(MKDIR) $(DESTDIR)$(javahl_compat_testsdir) $(INSTALL_EXTRA_JAVAHL_COMPAT_TESTS) -install-javahl-java: +install-javahl-java: $(MKDIR) $(DESTDIR)$(javahl_javadir) $(INSTALL_EXTRA_JAVAHL_JAVA) -install-javahl-javah: +install-javahl-javah: $(MKDIR) $(DESTDIR)$(javahl_javahdir) $(INSTALL_EXTRA_JAVAHL_JAVAH) -install-javahl-lib: subversion/bindings/javahl/native/libsvnjavahl-1.la +install-javahl-lib: subversion/bindings/javahl/native/libsvnjavahl-1.la $(MKDIR) $(DESTDIR)$(javahl_libdir) cd subversion/bindings/javahl/native ; $(INSTALL_JAVAHL_LIB) libsvnjavahl-1.la $(DESTDIR)$(javahl_libdir)/libsvnjavahl-1.la $(INSTALL_EXTRA_JAVAHL_LIB) -install-javahl-tests: +install-javahl-tests: $(MKDIR) $(DESTDIR)$(javahl_testsdir) $(INSTALL_EXTRA_JAVAHL_TESTS) -install-javahl-types-javah: +install-javahl-types-javah: $(MKDIR) $(DESTDIR)$(javahl_types_javahdir) $(INSTALL_EXTRA_JAVAHL_TYPES_JAVAH) -install-kwallet-lib: subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la +install-kwallet-lib: subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la $(MKDIR) $(DESTDIR)$(kwallet_libdir) cd subversion/libsvn_auth_kwallet ; $(INSTALL_KWALLET_LIB) libsvn_auth_kwallet-1.la $(DESTDIR)$(kwallet_libdir)/libsvn_auth_kwallet-1.la -install-lib: subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_client/libsvn_client-1.la +install-lib: subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_client/libsvn_client-1.la $(MKDIR) $(DESTDIR)$(libdir) cd subversion/libsvn_diff ; $(INSTALL_LIB) libsvn_diff-1.la $(DESTDIR)$(libdir)/libsvn_diff-1.la cd subversion/libsvn_ra ; $(INSTALL_LIB) libsvn_ra-1.la $(DESTDIR)$(libdir)/libsvn_ra-1.la cd subversion/libsvn_wc ; $(INSTALL_LIB) libsvn_wc-1.la $(DESTDIR)$(libdir)/libsvn_wc-1.la cd subversion/libsvn_client ; $(INSTALL_LIB) libsvn_client-1.la $(DESTDIR)$(libdir)/libsvn_client-1.la -install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo +install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo $(MKDIR) $(DESTDIR)$(localedir) $(MKDIR) $(DESTDIR)$(localedir)/de/LC_MESSAGES cd subversion/po ; $(INSTALL_LOCALE) de.mo $(DESTDIR)$(localedir)/de/LC_MESSAGES/$(PACKAGE_NAME).mo @@ -986,26 +985,26 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo -install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la +install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(MKDIR) $(DESTDIR)$(neon_libdir) cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la -install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la +install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la $(MKDIR) $(DESTDIR)$(ramod_libdir) cd subversion/libsvn_fs ; $(INSTALL_RAMOD_LIB) libsvn_fs-1.la $(DESTDIR)$(ramod_libdir)/libsvn_fs-1.la cd subversion/libsvn_ra_svn ; $(INSTALL_RAMOD_LIB) libsvn_ra_svn-1.la $(DESTDIR)$(ramod_libdir)/libsvn_ra_svn-1.la cd subversion/libsvn_repos ; $(INSTALL_RAMOD_LIB) libsvn_repos-1.la $(DESTDIR)$(ramod_libdir)/libsvn_repos-1.la cd subversion/libsvn_ra_local ; $(INSTALL_RAMOD_LIB) libsvn_ra_local-1.la $(DESTDIR)$(ramod_libdir)/libsvn_ra_local-1.la -install-serf-lib: subversion/libsvn_ra_serf/libsvn_ra_serf-1.la +install-serf-lib: subversion/libsvn_ra_serf/libsvn_ra_serf-1.la $(MKDIR) $(DESTDIR)$(serf_libdir) cd subversion/libsvn_ra_serf ; $(INSTALL_SERF_LIB) libsvn_ra_serf-1.la $(DESTDIR)$(serf_libdir)/libsvn_ra_serf-1.la -install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la +install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la $(MKDIR) $(DESTDIR)$(swig_pl_libdir) cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la -install-swig-py: subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_diff.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la +install-swig-py: subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_diff.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la $(MKDIR) $(DESTDIR)$(swig_pydir) cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _core.la $(DESTDIR)$(swig_pydir)/_core.la cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _client.la $(DESTDIR)$(swig_pydir)/_client.la @@ -1017,11 +1016,11 @@ install-swig-py: subversion/bindings/swig/python/_core.la subversion/bindings/sw cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _wc.la $(DESTDIR)$(swig_pydir)/_wc.la $(INSTALL_EXTRA_SWIG_PY) -install-swig-py-lib: subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la +install-swig-py-lib: subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la $(MKDIR) $(DESTDIR)$(swig_py_libdir) cd subversion/bindings/swig/python/libsvn_swig_py ; $(INSTALL_SWIG_PY_LIB) libsvn_swig_py-1.la $(DESTDIR)$(swig_py_libdir)/libsvn_swig_py-1.la -install-swig-rb: subversion/bindings/swig/ruby/core.la subversion/bindings/swig/ruby/client.la subversion/bindings/swig/ruby/delta.la subversion/bindings/swig/ruby/diff.la subversion/bindings/swig/ruby/fs.la subversion/bindings/swig/ruby/ra.la subversion/bindings/swig/ruby/repos.la subversion/bindings/swig/ruby/wc.la +install-swig-rb: subversion/bindings/swig/ruby/core.la subversion/bindings/swig/ruby/client.la subversion/bindings/swig/ruby/delta.la subversion/bindings/swig/ruby/diff.la subversion/bindings/swig/ruby/fs.la subversion/bindings/swig/ruby/ra.la subversion/bindings/swig/ruby/repos.la subversion/bindings/swig/ruby/wc.la $(MKDIR) $(DESTDIR)$(swig_rbdir) cd subversion/bindings/swig/ruby ; $(INSTALL_SWIG_RB) core.la $(DESTDIR)$(swig_rbdir)/core.la cd subversion/bindings/swig/ruby ; $(INSTALL_SWIG_RB) client.la $(DESTDIR)$(swig_rbdir)/client.la @@ -1033,11 +1032,11 @@ install-swig-rb: subversion/bindings/swig/ruby/core.la subversion/bindings/swig/ cd subversion/bindings/swig/ruby ; $(INSTALL_SWIG_RB) wc.la $(DESTDIR)$(swig_rbdir)/wc.la $(INSTALL_EXTRA_SWIG_RB) -install-swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la +install-swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la $(MKDIR) $(DESTDIR)$(swig_rb_libdir) 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/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) +install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la $(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) @@ -1047,6 +1046,7 @@ install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/dif cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) + cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la ######################################## @@ -2314,7 +2314,7 @@ subversion/libsvn_wc/relocate.lo: subversion/libsvn_wc/relocate.c subversion/inc subversion/libsvn_wc/revision_status.lo: subversion/libsvn_wc/revision_status.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/status.lo: subversion/libsvn_wc/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/status.lo: subversion/libsvn_wc/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/libsvn_wc/translate.lo: subversion/libsvn_wc/translate.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subst_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h @@ -2483,11 +2483,11 @@ subversion/svn/propdel-cmd.lo: subversion/svn/propdel-cmd.c subversion/include/p subversion/svn/propedit-cmd.lo: subversion/svn/propedit-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/propget-cmd.lo: subversion/svn/propget-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/propget-cmd.lo: subversion/svn/propget-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h subversion/svn/proplist-cmd.lo: subversion/svn/proplist-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/props.lo: subversion/svn/props.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/props.lo: subversion/svn/props.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h subversion/svn/propset-cmd.lo: subversion/svn/propset-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h diff --git a/devel/subversion/files/extra-patch-Makefile.in b/devel/subversion/files/extra-patch-Makefile.in new file mode 100644 index 000000000000..1fbc1e54eb49 --- /dev/null +++ b/devel/subversion/files/extra-patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2012-09-14 18:34:40.000000000 +0400 ++++ Makefile.in 2011-07-16 15:50:53.000000000 +0400 +@@ -251,7 +251,7 @@ + INSTALL_KWALLET_LIB = $(INSTALL_LIB) + INSTALL_NEON_LIB = $(INSTALL_LIB) + INSTALL_SERF_LIB = $(INSTALL_LIB) +-INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) ++INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s + INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) + INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) + INSTALL_INCLUDE = $(INSTALL) -m 644 diff --git a/devel/subversion/files/patch-build-outputs.mk b/devel/subversion/files/patch-build-outputs.mk new file mode 100644 index 000000000000..d564b7b0afdb --- /dev/null +++ b/devel/subversion/files/patch-build-outputs.mk @@ -0,0 +1,48 @@ +--- build-outputs.mk.orig 2012-08-08 18:21:32.000000000 +0400 ++++ build-outputs.mk 2012-09-14 15:47:59.000000000 +0400 +@@ -825,7 +825,7 @@ + # 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 + +@@ -877,16 +877,17 @@ + + test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-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/config-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_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-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/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-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_delta/window-test$(EXEEXT) + +-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) ++tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(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 + cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la + cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la ++ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + $(MKDIR) $(DESTDIR)$(bdb_libdir) +@@ -1036,7 +1037,7 @@ + $(MKDIR) $(DESTDIR)$(swig_rb_libdir) + 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/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la ++install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(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) +@@ -1046,7 +1047,6 @@ + cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) + cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) + cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) +- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + + ######################################## diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist index 5415c96261c6..03bb53473e7d 100644 --- a/devel/subversion/pkg-plist +++ b/devel/subversion/pkg-plist @@ -9,6 +9,7 @@ bin/svnsync %%ASVN%%bin/asvn %%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate %%SVNSERVE_WRAPPER%%bin/svnserve.bin +%%SVNMUCC%%bin/svnmucc bin/svnversion include/subversion-1/mod_authz_svn.h include/subversion-1/mod_dav_svn.h |