svn commit: r354594 - head/devel/subversion17
Olli Hauer
ohauer at FreeBSD.org
Tue May 20 05:18:24 UTC 2014
Author: ohauer
Date: Tue May 20 05:18:23 2014
New Revision: 354594
URL: http://svnweb.freebsd.org/changeset/ports/354594
QAT: https://qat.redports.org/buildarchive/r354594/
Log:
- update to 1.7.17
- s/USE_AUTOTOOLS=libtool/USES=libtool/
- strip
Version 1.7.17
User-visible changes:
- Client-side bugfixes:
* log: use proper peg revision over DAV (r1568872)
* move: fix errors when moving files between an external and the parent
working copy (r1551579)
* copy: fix 'svn copy URL WC' on relocated working copies
(r1580626, r1580650)
- Server-side bugfixes:
* mod_dav_svn: blacklist building with broken versions of httpd; 2.2.25,
2.4.5 and 2.4.6 (r1545835)
* mod_dav_svn: detect out of dateness correctly during commit (issue #4480)
Developer-visible changes:
- General:
* fix libmagic detection with custom LDFLAGS (r1577200)
* fix a missing null byte when handling old pre-1.4 deltas (r1587968)
* support building with Serf 1.3.x (r1517123, r1535139)
- Bindings:
* javahl: fix crash from resolve callback throwing an exception (r1586439)
Modified:
head/devel/subversion17/Makefile
head/devel/subversion17/Makefile.common
head/devel/subversion17/distinfo
head/devel/subversion17/pkg-plist
Modified: head/devel/subversion17/Makefile
==============================================================================
--- head/devel/subversion17/Makefile Tue May 20 05:07:41 2014 (r354593)
+++ head/devel/subversion17/Makefile Tue May 20 05:18:23 2014 (r354594)
@@ -204,6 +204,8 @@ post-build:
post-install: ${MKREPOS_TARGET}
.if ${PORT_OPTIONS:MTOOLS}
@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/*
.endif
@${MKDIR} ${STAGEDIR}${DATADIR}
@(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
@@ -215,6 +217,13 @@ post-install: ${MKREPOS_TARGET}
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve
.endif
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/*.so
+.endif
+
+.if !${PORT_OPTIONS:MSTATIC}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+.endif
# ===============================================================================
repository: _mkrepos
Modified: head/devel/subversion17/Makefile.common
==============================================================================
--- head/devel/subversion17/Makefile.common Tue May 20 05:07:41 2014 (r354593)
+++ head/devel/subversion17/Makefile.common Tue May 20 05:18:23 2014 (r354594)
@@ -2,18 +2,17 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.7.16
-PORTREVISION?= 2
+PORTVERSION= 1.7.17
+PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion17
PKGNAMESUFFIX= 17
MASTER_SITE_SUBDIR= subversion
-USE_BZIP2= yes
-USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
-USES+= pkgconfig
+GNU_CONFIGURE= yes
+USES+= tar:bzip2 pkgconfig libtool
LICENSE= APACHE20
@@ -116,7 +115,6 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
.if defined(SVN_BUILD_BINDINGS)
@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
.endif
@@ -124,10 +122,10 @@ post-patch:
@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
.endif
# shebangfix
- ${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \
+ @${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \
| ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \
-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
# remove all .bak files to clean the stage
- ${FIND} ${WRKSRC} -name '*.bak' -delete
+ @${FIND} ${WRKSRC} -name '*.bak' -delete
Modified: head/devel/subversion17/distinfo
==============================================================================
--- head/devel/subversion17/distinfo Tue May 20 05:07:41 2014 (r354593)
+++ head/devel/subversion17/distinfo Tue May 20 05:18:23 2014 (r354594)
@@ -1,2 +1,2 @@
-SHA256 (subversion17/subversion-1.7.16.tar.bz2) = 9dcbd8622045c5a9ab381d70754304030f180967d6e3db694baaf708f3253238
-SIZE (subversion17/subversion-1.7.16.tar.bz2) = 6006359
+SHA256 (subversion17/subversion-1.7.17.tar.bz2) = 2a66e4c5d2a8a919914a2e75f76467ef5457d0f96efc1e1c080fa02675867be3
+SIZE (subversion17/subversion-1.7.17.tar.bz2) = 6008028
Modified: head/devel/subversion17/pkg-plist
==============================================================================
--- head/devel/subversion17/pkg-plist Tue May 20 05:07:41 2014 (r354593)
+++ head/devel/subversion17/pkg-plist Tue May 20 05:18:23 2014 (r354594)
@@ -60,73 +60,73 @@ 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
-%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
%%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
-%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
%%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
-lib/libsvn_client-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0
lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0
lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0
lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0
%%BDB%%lib/libsvn_fs_base-1.a
-%%BDB%%lib/libsvn_fs_base-1.la
%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
+%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
lib/libsvn_fs_fs-1.a
-lib/libsvn_fs_fs-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0
lib/libsvn_fs_util-1.a
-lib/libsvn_fs_util-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0
lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0
lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0
%%NEON%%lib/libsvn_ra_neon-1.a
-%%NEON%%lib/libsvn_ra_neon-1.la
%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0
+%%SERF%%lib/libsvn_ra_serf-1.a
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0
lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
-%%SERF%%lib/libsvn_ra_serf-1.a
-%%SERF%%lib/libsvn_ra_serf-1.la
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0
lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0
lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
%%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 modules in this order: dav_svn, authz_svn, dontdothat
%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
@@ -354,43 +354,43 @@ man/man8/svnserve.8.gz
%%DATADIR%%/server-side/test_svn_server_log_parse.py
%%DATADIR%%/xslt/svnindex.css
%%DATADIR%%/xslt/svnindex.xsl
- at dirrm %%DATADIR%%/xslt
- at dirrm %%DATADIR%%/server-side/mod_dontdothat
- at dirrm %%DATADIR%%/server-side
- at dirrm %%DATADIR%%/po
- at dirrm %%DATADIR%%/hook-scripts/mailer/tests
- at dirrm %%DATADIR%%/hook-scripts/mailer
- at dirrm %%DATADIR%%/hook-scripts
- at dirrm %%DATADIR%%/examples
- at dirrm %%DATADIR%%/dist/templates
- at dirrm %%DATADIR%%/dist
- at dirrm %%DATADIR%%/diff
- at dirrm %%DATADIR%%/dev/windows-build
- at dirrm %%DATADIR%%/dev/wc-ng
- at dirrm %%DATADIR%%/dev/unix-build
- at dirrm %%DATADIR%%/dev/svnraisetreeconflict
- at dirrm %%DATADIR%%/dev/iz
- at dirrm %%DATADIR%%/dev/benchmarks/suite1
- at dirrm %%DATADIR%%/dev/benchmarks/large_dirs
- at dirrm %%DATADIR%%/dev/benchmarks
- at dirrm %%DATADIR%%/dev
- at dirrm %%DATADIR%%/client-side/svnmucc
- at dirrm %%DATADIR%%/client-side
- at dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
- at dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005
- at dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn
- at dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
- at dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf
- at dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared
- at dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
- at dirrm %%DATADIR%%/buildbot/slaves/centos
- at dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd
- at dirrm %%DATADIR%%/buildbot/slaves
+%%TOOLS%%@dirrm bin/svn-tools
+ at dirrm include/subversion-1
+ at dirrm %%DATADIR%%/backup
+ at dirrm %%DATADIR%%/bdb
@dirrm %%DATADIR%%/buildbot/master/public_html
@dirrm %%DATADIR%%/buildbot/master
+ at dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd
+ at dirrm %%DATADIR%%/buildbot/slaves/centos
+ at dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
+ at dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared
+ at dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf
+ at dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
+ at dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn
+ at dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005
+ at dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
+ at dirrm %%DATADIR%%/buildbot/slaves
@dirrm %%DATADIR%%/buildbot
- at dirrm %%DATADIR%%/bdb
- at dirrm %%DATADIR%%/backup
+ at dirrm %%DATADIR%%/client-side/svnmucc
+ at dirrm %%DATADIR%%/client-side
+ at dirrm %%DATADIR%%/dev/benchmarks/large_dirs
+ at dirrm %%DATADIR%%/dev/benchmarks/suite1
+ at dirrm %%DATADIR%%/dev/benchmarks
+ at dirrm %%DATADIR%%/dev/iz
+ at dirrm %%DATADIR%%/dev/svnraisetreeconflict
+ at dirrm %%DATADIR%%/dev/unix-build
+ at dirrm %%DATADIR%%/dev/wc-ng
+ at dirrm %%DATADIR%%/dev/windows-build
+ at dirrm %%DATADIR%%/dev
+ at dirrm %%DATADIR%%/diff
+ at dirrm %%DATADIR%%/dist/templates
+ at dirrm %%DATADIR%%/dist
+ at dirrm %%DATADIR%%/examples
+ at dirrm %%DATADIR%%/hook-scripts/mailer/tests
+ at dirrm %%DATADIR%%/hook-scripts/mailer
+ at dirrm %%DATADIR%%/hook-scripts
+ at dirrm %%DATADIR%%/po
+ at dirrm %%DATADIR%%/server-side/mod_dontdothat
+ at dirrm %%DATADIR%%/server-side
+ at dirrm %%DATADIR%%/xslt
@dirrm %%DATADIR%%
- at dirrm include/subversion-1
-%%TOOLS%%@dirrm bin/svn-tools
More information about the svn-ports-all
mailing list