From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 23:36:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A428ECCF for ; Mon, 21 Oct 2013 23:36:23 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 731D12F2F for ; Mon, 21 Oct 2013 23:36:23 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e14so378967iej.25 for ; Mon, 21 Oct 2013 16:36:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=5iu8qQFtpIWn8LEUXRv7O6jmWXTVq3zoJ8VXCUVWUK8=; b=AooKb6MN9z1TsLbEfI2eicaN6Wvk7HD8WK/pEM0eSJt++Q5MmoxhVzdyeRUJTCmIM1 TmAGt379fup3QaRuPbIHwYMkJNY2ITj3wnNFsL9P/545Y7ZyoUpOGpPdkTtbOa1bnvrJ A3/NXC9qqY5YchwpqkSjbOvC4rCV0O8ZJJARcTOLGf/E58MnkM8NpgymjEirtjx+4msK Ipevw0oB2fRb+uMT9cU1Zw6s8yIPDDR6Hk3sBi2vum/ZBs6CkSqCOFlN8Ddas6GkAgKp /Z9XOy9T6XFWDyevmtzO5vq/4H23mBBMZclPCjlOdVjqVp1b3joGzUO3FZxMGQx3FTN+ vtng== X-Gm-Message-State: ALoCoQlXFT9czdyH93E6NXZ1awwRF3MOebtN8aChS8H9hJTeJxTZQFXy444RyJ17ghlL2cNwiqNp MIME-Version: 1.0 X-Received: by 10.42.12.80 with SMTP id x16mr432915icx.56.1382398582427; Mon, 21 Oct 2013 16:36:22 -0700 (PDT) Received: by 10.50.39.46 with HTTP; Mon, 21 Oct 2013 16:36:22 -0700 (PDT) X-Originating-IP: [199.108.71.41] In-Reply-To: <201310141942.r9EJgmn8014285@svn.freebsd.org> References: <201310141942.r9EJgmn8014285@svn.freebsd.org> Date: Mon, 21 Oct 2013 19:36:22 -0400 Message-ID: Subject: Re: svn commit: r330346 - in head: Mk/Uses devel/subversion devel/subversion16 devel/subversion17 From: "Philip M. Gollucci" To: Olli Hauer Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 23:36:23 -0000 Nice work! On Mon, Oct 14, 2013 at 3:42 PM, Olli Hauer wrote: > 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 > -- --------------------------------------------------------------------------------------------- 4096R/D1EAB94D 2081 E230 3001 6508 8847 1BBF A0A8 DB0F D1EA B94D Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Director IT Operations, RideCharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.