Date: Sat, 9 Aug 2014 21:22:13 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364479 - in branches/2014Q3/devel: subversion subversion16 subversion17 subversion17/files Message-ID: <53e69105.2ae7.4ed93262@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Aug 9 21:22:12 2014 New Revision: 364479 URL: http://svnweb.freebsd.org/changeset/ports/364479 QAT: https://qat.redports.org/buildarchive/r364479/ Log: MFH: r364463 - add CPE information - use NO_STATIC instead DYNAMIC_ENABLED in pkg-plist Approved by: portmgr (erwin@) Modified: branches/2014Q3/devel/subversion/Makefile branches/2014Q3/devel/subversion/Makefile.common branches/2014Q3/devel/subversion/pkg-plist branches/2014Q3/devel/subversion16/Makefile branches/2014Q3/devel/subversion16/Makefile.common branches/2014Q3/devel/subversion16/pkg-plist branches/2014Q3/devel/subversion17/Makefile branches/2014Q3/devel/subversion17/Makefile.common branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template branches/2014Q3/devel/subversion17/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/subversion/Makefile ============================================================================== --- branches/2014Q3/devel/subversion/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -77,9 +77,6 @@ BDB_BUILD_DEPENDS= yes OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" .endif .if ${PORT_OPTIONS:MBDB} @@ -227,8 +224,8 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf - cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc + (cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf) + (cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include <bsd.port.post.mk> Modified: branches/2014Q3/devel/subversion/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -10,10 +10,12 @@ DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion GNU_CONFIGURE= yes -USES+= tar:bzip2 pkgconfig libtool +USES+= tar:bzip2 pkgconfig libtool cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ Modified: branches/2014Q3/devel/subversion/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -68,61 +68,61 @@ include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h lib/libsvn_client-1.a -%%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 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.0 +%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%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 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.0 +%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%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 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.0 +%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%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 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.0 +%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_local-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 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%lib/libsvn_repos-1.so.0 +%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%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 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.0 +%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 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 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.0 +%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz Modified: branches/2014Q3/devel/subversion16/Makefile ============================================================================== --- branches/2014Q3/devel/subversion16/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -88,12 +88,6 @@ SVNGROUP?= svn SVNUSER?= svn .endif -.if ${PORT_OPTIONS:MSTATIC} -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" -.endif - .if make(repository) WITH_REPOSITORY_CREATION= yes .endif Modified: branches/2014Q3/devel/subversion16/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion16/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -11,13 +11,14 @@ DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} -USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled -USES+= pkgconfig +USES+= pkgconfig tar:bzip2 cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ Modified: branches/2014Q3/devel/subversion16/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion16/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -55,72 +55,72 @@ 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 +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.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 +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.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 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.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 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.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 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.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 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.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 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.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 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.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 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.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 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.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 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.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 +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.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 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.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 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%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 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.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 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.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 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.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 Modified: branches/2014Q3/devel/subversion17/Makefile ============================================================================== --- branches/2014Q3/devel/subversion17/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -94,14 +94,10 @@ USES+= gettext:build . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes -.else . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" .endif .if make(repository) @@ -282,7 +278,7 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - (cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) - ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk + (cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) + ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include <bsd.port.post.mk> Modified: branches/2014Q3/devel/subversion17/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion17/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -12,10 +12,12 @@ MASTER_SITE_SUBDIR= subversion USE_KDE4= # Used below if KWallet support is enabled GNU_CONFIGURE= yes -USES+= tar:bzip2 pkgconfig libtool +USES+= tar:bzip2 pkgconfig libtool cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ @@ -116,7 +118,7 @@ post-patch: @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_BINDINGS) - @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} + ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h Modified: branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template ============================================================================== --- branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template Sat Aug 9 21:22:12 2014 (r364479) @@ -91,7 +91,7 @@ + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "MFH:\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" Modified: branches/2014Q3/devel/subversion17/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion17/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -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 -%%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 +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 +%%NO_STATIC%%%%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 +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 +%%NO_STATIC%%%%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 -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.0 +%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%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 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.0 +%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%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 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.0 +%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%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 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%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 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.0 +%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 %%NEON%%lib/libsvn_ra_neon-1.a -%%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 +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0 +%%NO_STATIC%%%%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 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%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 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%lib/libsvn_repos-1.so.0 +%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%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 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.0 +%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 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 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.0 +%%NO_STATIC%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e69105.2ae7.4ed93262>