- use new LIB_DEPENDS notation in subversion ports

- use new LIB_DEPENDS notation in Mk/Uses to fix static svn building [1]

Approved by:	portmgr (babt@) [1]

5 files changed, 27 insertions, 27 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index acf5692bfbea..0f2e8adbadcc 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -115,7 +115,7 @@ USES+=		gettext:build
 .if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
 .endif
-OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/lib!:C!(\.[0-9]+)?:!.a:!}
+OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
 .endif
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 51684d3ff8b1..41ac9d8ec903 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -20,8 +20,8 @@ LICENSE=	AL2
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]*
 
-LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-			expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+			libexpat.so:${PORTSDIR}/textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-swig \
 
 .if defined(SVN_BUILD_BINDINGS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[6|7].[0-9]*
-LIB_DEPENDS+=		svn_client-1.0:${PORTSDIR}/devel/subversion
+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
 .endif
@@ -37,7 +37,7 @@ OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
 PLIST_SUB+=	SASL=""
 .else
@@ -69,7 +69,7 @@ SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
-LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
 
@@ -83,7 +83,7 @@ PLIST_SUB+=     SVNAUTHZ_VALIDATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSERF}
-LIB_DEPENDS+=	serf-1:${PORTSDIR}/www/serf
+LIB_DEPENDS+=	libserf-1.so:${PORTSDIR}/www/serf
 CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
 PLIST_SUB+=	SERF=""
 .else
@@ -92,7 +92,7 @@ PLIST_SUB+=	SERF="@comment "
 .endif
 
 .if defined(SVN_BUILD_BINDINGS)
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+LIB_DEPENDS+=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
 .endif
 
 # KWallet requires NLS to be enabled.
@@ -125,7 +125,7 @@ PLIST_SUB+=	DYNAMIC_ENABLED=""
 .endif
 
 .if ${PORT_OPTIONS:MGNOME_KEYRING}
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS+=	libgcr.so:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
 PLIST_SUB+=	GNOME_KEYRING=""
 .else
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 5235e5101ed1..40c70a5709bc 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -20,8 +20,8 @@ LICENSE=	AL2
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[7|8].[0-9]*
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX}
 
-LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-			expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+			libexpat.so:${PORTSDIR}/textproc/expat2
 
 CONFIGURE_ARGS+=	--with-ssl \
 			--without-swig \
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--with-ssl \
 
 .if defined(SVN_BUILD_BINDINGS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[7|8].[0-9]*
-LIB_DEPENDS+=		svn_client-1.0:${PORTSDIR}/devel/subversion16
+LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion16
 OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}16/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 .endif
@@ -40,7 +40,7 @@ OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu
 
 # Default is "on"
 .if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
 PLIST_SUB+=	NEON=""
 .else
 CONFIGURE_ARGS+=--without-neon
@@ -48,7 +48,7 @@ PLIST_SUB+=	NEON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
 PLIST_SUB+=	SASL=""
 .else
@@ -86,7 +86,7 @@ SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
-LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
 
@@ -100,7 +100,7 @@ PLIST_SUB+=     SVNAUTHZ_VALIDATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSERF}
-LIB_DEPENDS+=	serf-1:${PORTSDIR}/www/serf
+LIB_DEPENDS+=	libserf-1.so:${PORTSDIR}/www/serf
 CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
 PLIST_SUB+=	SERF=""
 .else
@@ -133,7 +133,7 @@ PLIST_SUB+=	DYNAMIC_ENABLED=""
 .endif
 
 .if ${PORT_OPTIONS:MGNOME_KEYRING}
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS+=	libgcr.so:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
 PLIST_SUB+=	GNOME_KEYRING=""
 .else
diff --git a/devel/subversion17/Makefile b/devel/subversion17/Makefile
index e7e1e0765679..0a4132fb0023 100644
--- a/devel/subversion17/Makefile
+++ b/devel/subversion17/Makefile
@@ -127,7 +127,7 @@ USES+=		gettext:build
 .if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
 .endif
-OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/lib!:C!(\.[0-9]+)?:!.a:!}
+OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
 .endif
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index 78f323e6ba23..26d3d53ea799 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -21,8 +21,8 @@ LICENSE=	AL2
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]*
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}17${PKGNAMESUFFIX}
 
-LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3 \
-			expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+			libexpat.so:${PORTSDIR}/textproc/expat2
 
 CONFIGURE_ARGS+=	--with-ssl \
 			--without-swig \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--with-ssl \
 
 .if defined(SVN_BUILD_BINDINGS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[6|8].[0-9]*
-LIB_DEPENDS+=		svn_client-1.0:${PORTSDIR}/devel/subversion17
+LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion17
 OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 .endif
@@ -40,7 +40,7 @@ OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu
 
 # Default is "on"
 .if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+=	neon:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
 PLIST_SUB+=	NEON=""
 .else
 CONFIGURE_ARGS+=--without-neon
@@ -48,7 +48,7 @@ PLIST_SUB+=	NEON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
 PLIST_SUB+=	SASL=""
 .else
@@ -90,7 +90,7 @@ SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
-LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
 
@@ -104,7 +104,7 @@ PLIST_SUB+=     SVNAUTHZ_VALIDATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSERF}
-LIB_DEPENDS+=	serf-1:${PORTSDIR}/www/serf
+LIB_DEPENDS+=	libserf-1.so:${PORTSDIR}/www/serf
 CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
 PLIST_SUB+=	SERF=""
 .else
@@ -113,7 +113,7 @@ PLIST_SUB+=	SERF="@comment "
 .endif
 
 .if defined(SVN_BUILD_BINDINGS)
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion17
+LIB_DEPENDS+=	libsvn_client-1.so:${PORTSDIR}/devel/subversion17
 .endif
 
 # KWallet requires NLS to be enabled.
@@ -146,7 +146,7 @@ PLIST_SUB+=	DYNAMIC_ENABLED=""
 .endif
 
 .if ${PORT_OPTIONS:MGNOME_KEYRING}
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS+=	libgcr.so:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
 PLIST_SUB+=	GNOME_KEYRING=""
 .else