From owner-svn-ports-all@FreeBSD.ORG Mon Oct 14 19:42:50 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8BDC7CCC; Mon, 14 Oct 2013 19:42:50 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A02621F0; Mon, 14 Oct 2013 19:42:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EJgoL9014292; Mon, 14 Oct 2013 19:42:50 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EJgmn8014285; Mon, 14 Oct 2013 19:42:48 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201310141942.r9EJgmn8014285@svn.freebsd.org> From: Olli Hauer Date: Mon, 14 Oct 2013 19:42:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330346 - in head: Mk/Uses devel/subversion devel/subversion16 devel/subversion17 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 19:42:50 -0000 Author: ohauer Date: Mon Oct 14 19:42:48 2013 New Revision: 330346 URL: http://svnweb.freebsd.org/changeset/ports/330346 Log: - 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] Modified: head/Mk/Uses/fuse.mk head/Mk/Uses/gettext.mk head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion16/Makefile.common head/devel/subversion17/Makefile head/devel/subversion17/Makefile.common Modified: head/Mk/Uses/fuse.mk ============================================================================== --- head/Mk/Uses/fuse.mk Mon Oct 14 19:42:26 2013 (r330345) +++ head/Mk/Uses/fuse.mk Mon Oct 14 19:42:48 2013 (r330346) @@ -16,7 +16,7 @@ _INCLUDE_USES_FUSE_MK= yes IGNORE= USES=fuse does not require args .endif -LIB_DEPENDS+= fuse:${PORTSDIR}/sysutils/fusefs-libs +LIB_DEPENDS+= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs .if !exists(/sbin/mount_fusefs) || ${OSVERSION} < 1000019 RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod .endif Modified: head/Mk/Uses/gettext.mk ============================================================================== --- head/Mk/Uses/gettext.mk Mon Oct 14 19:42:26 2013 (r330345) +++ head/Mk/Uses/gettext.mk Mon Oct 14 19:42:48 2013 (r330346) @@ -23,7 +23,7 @@ BUILD_DEPENDS+= ${_GETTEXT_DEPENDS} .elif ${gettext_ARGS} == "run" RUN_DEPENDS+= ${_GETTEXT_DEPENDS} .elif ${gettext_ARGS} == "lib" -LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext +LIB_DEPENDS+= libintl.so:${PORTSDIR}/devel/gettext .else IGNORE= USES=gettext - invalid args: [${gettext_ARGS}] specifed .endif Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Mon Oct 14 19:42:26 2013 (r330345) +++ head/devel/subversion/Makefile Mon Oct 14 19:42:48 2013 (r330346) @@ -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 Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Mon Oct 14 19:42:26 2013 (r330345) +++ head/devel/subversion/Makefile.common Mon Oct 14 19:42:48 2013 (r330346) @@ -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 no .include .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="@comm .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 Modified: head/devel/subversion16/Makefile.common ============================================================================== --- head/devel/subversion16/Makefile.common Mon Oct 14 19:42:26 2013 (r330345) +++ head/devel/subversion16/Makefile.common Mon Oct 14 19:42:48 2013 (r330346) @@ -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 no # 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="@comm .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 Modified: head/devel/subversion17/Makefile ============================================================================== --- head/devel/subversion17/Makefile Mon Oct 14 19:42:26 2013 (r330345) +++ head/devel/subversion17/Makefile Mon Oct 14 19:42:48 2013 (r330346) @@ -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 Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Mon Oct 14 19:42:26 2013 (r330345) +++ head/devel/subversion17/Makefile.common Mon Oct 14 19:42:48 2013 (r330346) @@ -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 no # 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="@comm .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