git: 223bd7be7329 - main - devel/subversion{,-lts}: remove port option STATIC

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Michael Osipov <michaelo_at_FreeBSD.org>
Date: Thu, 15 Aug 2024 10:09:02 UTC
The branch main has been updated by michaelo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=223bd7be732992fecbb2d554623c8322eb2dea2b

commit 223bd7be732992fecbb2d554623c8322eb2dea2b
Author:     Michael Osipov <michaelo@apache.org>
AuthorDate: 2024-07-22 20:44:53 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2024-08-15 10:07:59 +0000

    devel/subversion{,-lts}: remove port option STATIC
    
    Since the switch to CMake for textproc/utf8proc
    (207abfe1369d1ef1d89fae73b1091b37b9060ef7) the static library is not being built
    anymore. This means that the static build of Subversion has been broken since
    2022-01. For the past two years only one has complained (PR 279430) and
    the maintainer of textproc/utf8proc (PR 280429) cannot easily provide an archive
    with CMake anymore. Therefore, removing the STATIC port option for good.
    
    PR:             279430
    Approved by:    jrm (mentor)
    Differential Revision:  https://reviews.freebsd.org/D46096
---
 UPDATING                             |  7 +++
 devel/subversion-lts/Makefile        | 29 +-----------
 devel/subversion-lts/Makefile.common | 15 +-----
 devel/subversion-lts/pkg-plist       | 90 ++++++++++++++++++------------------
 devel/subversion/Makefile            | 29 +-----------
 devel/subversion/Makefile.common     | 15 +-----
 devel/subversion/pkg-plist           | 90 ++++++++++++++++++------------------
 7 files changed, 103 insertions(+), 172 deletions(-)

diff --git a/UPDATING b/UPDATING
index 424d99d37bf7..26cdd2303ef6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240815:
+  AFFECTS: users of devel/subversion-lts and devel/subversion
+  AUTHOR: michaelo@FreeBSD.org
+
+  The port option STATIC has been broken since 2022-01 because textproc/utf8proc
+  does not provide an archive with CMake. Therefore, it has been removed.
+
 20240809:
   AFFECTS: sysutils/amavisd-new
   AUTHOR: netchildFreeBSD.org
diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile
index 8e0387c3c657..c791f8b81d22 100644
--- a/devel/subversion-lts/Makefile
+++ b/devel/subversion-lts/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMESUFFIX=	-lts
 
 MAINTAINER=	michaelo@apache.org
@@ -18,7 +18,6 @@ OPTIONS_DEFINE=	\
 		NLS		\
 		SASL		\
 		SERF		\
-		STATIC		\
 		SVNSERVE_WRAPPER\
 		TEST		\
 		TOOLS
@@ -27,7 +26,6 @@ OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS
 
 GPG_AGENT_DESC=		Enable GPG agent password store
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
-STATIC_DESC=		No shared libs (disables SVN integration)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools
@@ -67,18 +65,6 @@ SVNSERVE_EXT=
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 .endif
 
-.if ${PORT_OPTIONS:MSTATIC}
-.  if ${PORT_OPTIONS:MNLS}
-USES+=			gettext-tools
-.  endif
-.  if ${PORT_OPTIONS:MBDB}
-BDB_BUILD_DEPENDS=	yes
-.  endif
-OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
-BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
-LIB_DEPENDS=
-.endif
-
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
@@ -116,9 +102,6 @@ pre-everything::
 .endif
 
 	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MSTATIC}
-	@${ECHO_MSG} "Static binaries will be built."
-.endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
@@ -134,12 +117,6 @@ pre-configure:
 		${FALSE} ; \
 	fi
 .endif
-.if ${PORT_OPTIONS:MSTATIC}
-LIBS_SQLITE3!=	pkgconf --libs --static sqlite3
-LIBS+=		${LIBS_SQLITE3}
-# for work with ICU
-LIBS+=		-lc++ -lm
-.endif
 
 post-configure:
 # Enable GNOME Keyring / KWallet support in main code, as it is harmless
@@ -161,14 +138,12 @@ post-install:	${MKREPOS_TARGET}
 	for F in ${BINS_TO_STRIP} ; do \
 	 ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
 	done
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-post-install-STATIC-off:
-	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
-
 post-install-SVNSERVE_WRAPPER-on:
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 
diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common
index c3c337a03829..d2da5e555494 100644
--- a/devel/subversion-lts/Makefile.common
+++ b/devel/subversion-lts/Makefile.common
@@ -22,8 +22,7 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
-CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
-			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
+CONFIGURE_ARGS+=	--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
 OPTIONS_SUB=			yes
@@ -48,8 +47,6 @@ GPG_AGENT_CONFIGURE_ON=		--with-gpg-agent
 GPG_AGENT_BUILD_DEPENDS=	gpg-agent:security/gnupg
 GPG_AGENT_RUN_DEPENDS=		gpg-agent:security/gnupg
 
-STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
-
 # ===============================================================
 .include <bsd.port.options.mk>
 
@@ -71,16 +68,6 @@ OPTIONS_FILE_SET?=""
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
-.if defined(SVN_BUILD_ADDONS)
-.if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC}
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${FALSE}
-.endif
-.endif
-
 pre-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
diff --git a/devel/subversion-lts/pkg-plist b/devel/subversion-lts/pkg-plist
index 0acabe3afa66..4dfea53fcf32 100644
--- a/devel/subversion-lts/pkg-plist
+++ b/devel/subversion-lts/pkg-plist
@@ -72,65 +72,65 @@ include/subversion-1/svn_wc.h
 include/subversion-1/svn_x509.h
 include/subversion-1/svn_xml.h
 lib/libsvn_client-1.a
-%%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_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_client-1.so.0.0.0
 lib/libsvn_delta-1.a
-%%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_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_delta-1.so.0.0.0
 lib/libsvn_diff-1.a
-%%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_diff-1.so
+lib/libsvn_diff-1.so.0
+lib/libsvn_diff-1.so.0.0.0
 lib/libsvn_fs-1.a
-%%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
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_fs-1.so.0.0.0
 %%BDB%%lib/libsvn_fs_base-1.a
-%%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
+%%BDB%%lib/libsvn_fs_base-1.so
+%%BDB%%lib/libsvn_fs_base-1.so.0
+%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
 lib/libsvn_fs_fs-1.a
-%%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_fs-1.so
+lib/libsvn_fs_fs-1.so.0
+lib/libsvn_fs_fs-1.so.0.0.0
 lib/libsvn_fs_util-1.a
-%%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_fs_util-1.so
+lib/libsvn_fs_util-1.so.0
+lib/libsvn_fs_util-1.so.0.0.0
 lib/libsvn_fs_x-1.a
-%%NO_STATIC%%lib/libsvn_fs_x-1.so
-%%NO_STATIC%%lib/libsvn_fs_x-1.so.0
-%%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0
+lib/libsvn_fs_x-1.so
+lib/libsvn_fs_x-1.so.0
+lib/libsvn_fs_x-1.so.0.0.0
 lib/libsvn_ra-1.a
-%%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-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra-1.so.0.0.0
 lib/libsvn_ra_local-1.a
-%%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
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_ra_local-1.so.0.0.0
 %%SERF%%lib/libsvn_ra_serf-1.a
-%%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
+%%SERF%%lib/libsvn_ra_serf-1.so
+%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
 lib/libsvn_ra_svn-1.a
-%%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_ra_svn-1.so
+lib/libsvn_ra_svn-1.so.0
+lib/libsvn_ra_svn-1.so.0.0.0
 lib/libsvn_repos-1.a
-%%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_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_repos-1.so.0.0.0
 lib/libsvn_subr-1.a
-%%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_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_subr-1.so.0.0.0
 lib/libsvn_wc-1.a
-%%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
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+lib/libsvn_wc-1.so.0.0.0
 libdata/pkgconfig/libsvn_client.pc
 libdata/pkgconfig/libsvn_delta.pc
 libdata/pkgconfig/libsvn_diff.pc
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 2dc0d42dc05f..fdb813d37a7c 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	7
+PORTREVISION=	8
 
 MAINTAINER=	michaelo@apache.org
 COMMENT=	Version control system
@@ -17,7 +17,6 @@ OPTIONS_DEFINE=	\
 		NLS		\
 		SASL		\
 		SERF		\
-		STATIC		\
 		SVNSERVE_WRAPPER\
 		TEST		\
 		TOOLS
@@ -26,7 +25,6 @@ OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS
 
 GPG_AGENT_DESC=		Enable GPG agent password store
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
-STATIC_DESC=		No shared libs (disables SVN integration)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools
@@ -66,18 +64,6 @@ SVNSERVE_EXT=
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 .endif
 
-.if ${PORT_OPTIONS:MSTATIC}
-.  if ${PORT_OPTIONS:MNLS}
-USES+=			gettext-tools
-.  endif
-.  if ${PORT_OPTIONS:MBDB}
-BDB_BUILD_DEPENDS=	yes
-.  endif
-OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
-BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
-LIB_DEPENDS=
-.endif
-
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
@@ -115,9 +101,6 @@ pre-everything::
 .endif
 
 	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MSTATIC}
-	@${ECHO_MSG} "Static binaries will be built."
-.endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
@@ -133,12 +116,6 @@ pre-configure:
 		${FALSE} ; \
 	fi
 .endif
-.if ${PORT_OPTIONS:MSTATIC}
-LIBS_SQLITE3!=	pkgconf --libs --static sqlite3
-LIBS+=		${LIBS_SQLITE3}
-# for work with ICU
-LIBS+=		-lc++ -lm
-.endif
 
 post-configure:
 # Enable GNOME Keyring / KWallet support in main code, as it is harmless
@@ -160,14 +137,12 @@ post-install:	${MKREPOS_TARGET}
 	for F in ${BINS_TO_STRIP} ; do \
 	 ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
 	done
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-post-install-STATIC-off:
-	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
-
 post-install-SVNSERVE_WRAPPER-on:
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index f6c11d1d00cb..d0bbee7ad73b 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -22,8 +22,7 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
-CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
-			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
+CONFIGURE_ARGS+=	--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
 OPTIONS_SUB=			yes
@@ -48,8 +47,6 @@ GPG_AGENT_CONFIGURE_ON=		--with-gpg-agent
 GPG_AGENT_BUILD_DEPENDS=	gpg-agent:security/gnupg
 GPG_AGENT_RUN_DEPENDS=		gpg-agent:security/gnupg
 
-STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
-
 # ===============================================================
 .include <bsd.port.options.mk>
 
@@ -71,16 +68,6 @@ OPTIONS_FILE_SET?=""
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
-.if defined(SVN_BUILD_ADDONS)
-.if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC}
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${FALSE}
-.endif
-.endif
-
 pre-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 75fae3738043..48d92eddac9c 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -72,65 +72,65 @@ include/subversion-1/svn_wc.h
 include/subversion-1/svn_x509.h
 include/subversion-1/svn_xml.h
 lib/libsvn_client-1.a
-%%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_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_client-1.so.0.0.0
 lib/libsvn_delta-1.a
-%%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_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_delta-1.so.0.0.0
 lib/libsvn_diff-1.a
-%%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_diff-1.so
+lib/libsvn_diff-1.so.0
+lib/libsvn_diff-1.so.0.0.0
 lib/libsvn_fs-1.a
-%%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
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_fs-1.so.0.0.0
 %%BDB%%lib/libsvn_fs_base-1.a
-%%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
+%%BDB%%lib/libsvn_fs_base-1.so
+%%BDB%%lib/libsvn_fs_base-1.so.0
+%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
 lib/libsvn_fs_fs-1.a
-%%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_fs-1.so
+lib/libsvn_fs_fs-1.so.0
+lib/libsvn_fs_fs-1.so.0.0.0
 lib/libsvn_fs_util-1.a
-%%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_fs_util-1.so
+lib/libsvn_fs_util-1.so.0
+lib/libsvn_fs_util-1.so.0.0.0
 lib/libsvn_fs_x-1.a
-%%NO_STATIC%%lib/libsvn_fs_x-1.so
-%%NO_STATIC%%lib/libsvn_fs_x-1.so.0
-%%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0
+lib/libsvn_fs_x-1.so
+lib/libsvn_fs_x-1.so.0
+lib/libsvn_fs_x-1.so.0.0.0
 lib/libsvn_ra-1.a
-%%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-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra-1.so.0.0.0
 lib/libsvn_ra_local-1.a
-%%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
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_ra_local-1.so.0.0.0
 %%SERF%%lib/libsvn_ra_serf-1.a
-%%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
+%%SERF%%lib/libsvn_ra_serf-1.so
+%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
 lib/libsvn_ra_svn-1.a
-%%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_ra_svn-1.so
+lib/libsvn_ra_svn-1.so.0
+lib/libsvn_ra_svn-1.so.0.0.0
 lib/libsvn_repos-1.a
-%%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_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_repos-1.so.0.0.0
 lib/libsvn_subr-1.a
-%%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_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_subr-1.so.0.0.0
 lib/libsvn_wc-1.a
-%%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
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+lib/libsvn_wc-1.so.0.0.0
 libdata/pkgconfig/libsvn_client.pc
 libdata/pkgconfig/libsvn_delta.pc
 libdata/pkgconfig/libsvn_diff.pc