Date: Tue, 5 Nov 2013 22:05:38 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332916 - in head/devel/subversion: . files Message-ID: <201311052205.rA5M5cbn060795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Tue Nov 5 22:05:38 2013 New Revision: 332916 URL: http://svnweb.freebsd.org/changeset/ports/332916 Log: - update to version 1.8.4 - add stage support Version 1.8.4 User-visible changes: - Client- and server-side bugfixes: * fix assertion on urls of the form 'file://./' (r1516806) * stop linking against psapi.dll on Windows (r1534102) * translation updates for Swedish - Client-side bugfixes: * revert: fix problems reverting moves (issue #4436) * update: fix assertion when file external access is denied (issue #4422) * merge: reduce network connections for automatic merge (r1468980 et al) * merge: fix path corruption during reintegration (r1523666) * mergeinfo: fix crash (r1519955) * ra_serf: verify the result of xml parsing (r1501199 et al) * ra_serf: improve error messages during commit (r1526439) * ra_local: fix error with repository in Windows drive root (r1518184) * fix crash on windows when piped command is interrupted (r1522892) * fix crash in the crash handler on windows (r1532023) * fix assertion when upgrading old working copies (r1520529) - Server-side bugfixes: * hotcopy: cleanup unpacked revprops with '--incremental' (r1512300 et al) * fix OOM on concurrent requests at threaded server start (r1527103 et al) * fsfs: improve error message when unsupported fsfs format found (r1534158) * fix memory problem in 3rd party FS module loader (r1519615 et al) Developer-visible changes: - General: * allow compiling against serf 1.3 and later on Windows (r1517123) - Bindings: * javahl: canonicalize path for streaFileContent method (r1524869) Approved by: lev@ (explicit) Modified: head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/distinfo head/devel/subversion/files/patch-Makefile.in head/devel/subversion/pkg-plist Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Tue Nov 5 22:02:04 2013 (r332915) +++ head/devel/subversion/Makefile Tue Nov 5 22:05:38 2013 (r332916) @@ -4,20 +4,15 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-1.[6|7].[0-9]* +_CONFLICTS_INSTALL= subversion-1.[^8].[0-9]* \ + subversion1[^8]-1.[^8].[0-9]* USE_RC_SUBR= svnserve -MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \ - svnsync.1 svnversion.1 svnmucc.1 -MAN5= svnserve.conf.5 -MAN8= svnserve.8 - -TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README +PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ - BOOK \ DOCS \ FREEBSD_TEMPLATE\ GNOME_KEYRING \ @@ -37,7 +32,6 @@ OPTIONS_DEFAULT=P4_STYLE_MARKERS \ FREEBSD_TEMPLATE \ SERF -BOOK_DESC= Install the Subversion Book FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GNOME_KEYRING_DESC= Build with GNOME Keyring auth support KDE_KWALLET_DESC= Build with KDE KWallet auth support @@ -55,28 +49,17 @@ P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHD FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper -NO_STAGE= yes .include "Makefile.common" -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SUB_FILES= pkg-install -BOOK_VERSION= 4515 - .if !${PORT_OPTIONS:MMAINTAINER_DEBUG} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif -.if ${PORT_OPTIONS:MDOCS} && ${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 -.endif - .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" .else @@ -123,38 +106,6 @@ MKREPOS_TARGET= _mkrepos pre-everything:: @${ECHO_MSG} "" -.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 ${PORT_OPTIONS:MMAINTAINER_DEBUG} - @${ECHO_MSG} "Build debug version." - @${ECHO_MSG} "" -.endif -.if ${PORT_OPTIONS:MTOOLS} - @${ECHO_MSG} "Several tools enabled." -.else - @${ECHO_MSG} "You can enable installation fo tools" -.endif - @${ECHO_MSG} "" -.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 ${PORT_OPTIONS:MTOOLS} && ${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 ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${ECHO_MSG} "svnserve wrapper enabled." - @${ECHO_MSG} "" -.endif .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group." @${ECHO_MSG} "Make sure that all committers are its members." @@ -174,10 +125,6 @@ pre-everything:: .endif @${ECHO_MSG} "" -.if !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK} - @${ECHO_MSG} "Subversion Book will be installed." - @${ECHO_MSG} "" -.endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MMOD_DAV_SVN} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @@ -185,12 +132,6 @@ pre-everything:: @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} . endif -. if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -. endif . if ${PORT_OPTIONS:MGNOME_KEYRING} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!" @@ -246,40 +187,18 @@ post-build: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} .endif -pre-install: -.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 ${PORT_OPTIONS:MTOOLS} @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} .endif + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) - @${MKDIR} ${DATADIR} - @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xof - ) - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${TXT_DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -. if ${PORT_OPTIONS:MBOOK} - ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR} - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf -. endif -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve -.endif - -.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 ${PORT_OPTIONS:MTOOLS} - ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so -. endif + @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve .endif # =============================================================================== Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Tue Nov 5 22:02:04 2013 (r332915) +++ head/devel/subversion/Makefile.common Tue Nov 5 22:05:38 2013 (r332916) @@ -2,23 +2,21 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 PORTREVISION?= 0 CATEGORIES+= devel -MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ - ${MASTER_SITE_LOCAL:S/$/:book/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main +MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 -MASTER_SITE_SUBDIR= subversion/:main \ - lev/:book +MASTER_SITE_SUBDIR= subversion/ USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled +USES= pkgconfig LICENSE= AL2 -CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]* +CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ @@ -26,10 +24,10 @@ LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/d CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ - --with-expat=/usr/local/include:/usr/local/lib:expat + --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat .if defined(SVN_BUILD_BINDINGS) -CONFLICTS_BUILD+= ${PORTNAME}-1.[6|7].[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included @@ -72,10 +70,6 @@ STATIC_CONFIGURE_ON= --enable-all-stati # =============================================================== .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MBOOK} && !${PORT_OPTIONS:MDOCS} -IGNORE= SVN book requires OPTION DOCS set to ON -.endif - .if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN} IGNORE= to build mod_dontdothat OPTION mod_dav_svn is required .endif Modified: head/devel/subversion/distinfo ============================================================================== --- head/devel/subversion/distinfo Tue Nov 5 22:02:04 2013 (r332915) +++ head/devel/subversion/distinfo Tue Nov 5 22:05:38 2013 (r332916) @@ -1,6 +1,2 @@ -SHA256 (subversion18/subversion-1.8.3.tar.bz2) = fd8817b3d96530dfcc7f0a0b5d42f80f2b704ed23aaab580b72a146383d6271b -SIZE (subversion18/subversion-1.8.3.tar.bz2) = 6773731 -SHA256 (subversion18/svn-book-html-r4515.tar.bz2) = 666cef147abc9b917a6bb6527da4f4869221d793126289c715f002bfb2baa508 -SIZE (subversion18/svn-book-html-r4515.tar.bz2) = 473182 -SHA256 (subversion18/svn-book-r4515.pdf) = 962d524ae2c861ec48a45723c484f4f5e1826ee2f9ccfe58b07b96af67b0bf5e -SIZE (subversion18/svn-book-r4515.pdf) = 1943481 +SHA256 (subversion18/subversion-1.8.4.tar.bz2) = 87df1e36750d20b8206b97c2603848da6ccbf8d1ec40cf62c1d7a83b0f2f8276 +SIZE (subversion18/subversion-1.8.4.tar.bz2) = 6777387 Modified: head/devel/subversion/files/patch-Makefile.in ============================================================================== --- head/devel/subversion/files/patch-Makefile.in Tue Nov 5 22:02:04 2013 (r332915) +++ head/devel/subversion/files/patch-Makefile.in Tue Nov 5 22:05:38 2013 (r332916) @@ -1,5 +1,8 @@ ---- Makefile.in.orig 2013-06-06 21:01:29.000000000 +0400 -+++ Makefile.in 2013-06-20 01:28:44.000000000 +0400 +======================================================================== +This patch is required to build SVN Apache modules with staging support +======================================================================== +--- ./Makefile.in.orig 2013-10-21 21:12:04.000000000 +0200 ++++ ./Makefile.in 2013-10-21 21:13:30.000000000 +0200 @@ -85,7 +85,7 @@ swig_pydir_extra = @libdir@/svn-python/svn swig_pldir = @libdir@/svn-perl @@ -9,3 +12,12 @@ javahl_javadir = @libdir@/svn-javahl javahl_javahdir = @libdir@/svn-javahl/include +@@ -207,7 +207,7 @@ + LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) + + # special link rule for mod_dav_svn +-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) ++LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -inst-prefix-dir ${DESTDIR} + + # Special LDFLAGS for some libraries + libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@ Modified: head/devel/subversion/pkg-plist ============================================================================== --- head/devel/subversion/pkg-plist Tue Nov 5 22:02:04 2013 (r332915) +++ head/devel/subversion/pkg-plist Tue Nov 5 22:05:38 2013 (r332916) @@ -1,18 +1,18 @@ @comment $FreeBSD$ -bin/svn %%TOOLS%%bin/fsfs-access-map %%TOOLS%%bin/fsfs-reorg %%TOOLS%%bin/fsfs-stats +bin/svn %%TOOLS%%bin/svn-bench %%TOOLS%%bin/svn-populate-node-origins-index %%TOOLS%%bin/svn-rep-sharing-stats +bin/svnadmin %%TOOLS%%bin/svnauthz %%TOOLS%%bin/svnauthz-validate -%%TOOLS%%bin/svnraisetreeconflict -bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnmucc +%%TOOLS%%bin/svnraisetreeconflict bin/svnrdump bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin @@ -136,32 +136,21 @@ lib/libsvn_wc-1.la %%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 +man/man1/svnlook.1.gz +man/man1/svnmucc.1.gz +man/man1/svnrdump.1.gz +man/man1/svnsync.1.gz +man/man1/svnversion.1.gz +man/man5/svnserve.conf.5.gz +man/man8/svnserve.8.gz %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch01dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia3.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia4.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia5.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia6.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia7.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia3.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia4.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/draft.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/note.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/tip.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/warning.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/styles.css -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/svn-book.html -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book.pdf %%NLS%%share/locale/de/LC_MESSAGES/subversion.mo %%NLS%%share/locale/es/LC_MESSAGES/subversion.mo %%NLS%%share/locale/fr/LC_MESSAGES/subversion.mo @@ -466,7 +455,5 @@ lib/libsvn_wc-1.la @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%% -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/subversion-1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311052205.rA5M5cbn060795>