diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2013-10-14 19:42:48 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-10-14 19:42:48 +0000 |
commit | db533faaee0de0b5a2a81dd9a26d7113d0ad4682 (patch) | |
tree | 10b5a306426d9726f728692c7751ecbb7ac4eaa0 /devel/subversion | |
parent | - Support STAGEDIR (diff) |
- 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]
Notes
Notes:
svn path=/head/; revision=330346
Diffstat (limited to 'devel/subversion')
-rw-r--r-- | devel/subversion/Makefile | 2 | ||||
-rw-r--r-- | devel/subversion/Makefile.common | 16 |
2 files changed, 9 insertions, 9 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 |