From owner-dev-commits-ports-all@freebsd.org Thu May 6 12:23:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B5DB5FF036; Thu, 6 May 2021 12:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FbXmq6vzKz4dDd; Thu, 6 May 2021 12:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E04FE180E9; Thu, 6 May 2021 12:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 146CNdGP067085; Thu, 6 May 2021 12:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 146CNdUO067084; Thu, 6 May 2021 12:23:39 GMT (envelope-from git) Date: Thu, 6 May 2021 12:23:39 GMT Message-Id: <202105061223.146CNdUO067084@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ec55e2f5214a - main - net-mgmt/mbrowse: reduce overlinking and remove pkg dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec55e2f5214a088ac0c052c2102bc85fb80947c5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 12:23:40 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec55e2f5214a088ac0c052c2102bc85fb80947c5 commit ec55e2f5214a088ac0c052c2102bc85fb80947c5 Author: Baptiste Daroussin AuthorDate: 2021-05-06 12:19:49 +0000 Commit: Baptiste Daroussin CommitDate: 2021-05-06 12:23:36 +0000 net-mgmt/mbrowse: reduce overlinking and remove pkg dep First no ports should ever be depending on pkg directly because it prevents building with WITH_PKG=devel, they should depend on ${PKG_ORIGIN}. Second, netsnmp do not expose the pkg API but only consume it, so program linking to netsnmp should not end up being directly linked to libpkg! Patch the configure script to stop asking net-snmp-config for extra libs which will faultly bring in linking against -lpkg and -lelf, and remove entirely libpkg as a dependency on the package --- net-mgmt/mbrowse/Makefile | 8 ++------ net-mgmt/mbrowse/files/patch-configure | 12 ++++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile index b06c8224f5d9..986765ca92c6 100644 --- a/net-mgmt/mbrowse/Makefile +++ b/net-mgmt/mbrowse/Makefile @@ -2,7 +2,7 @@ PORTNAME= mbrowse PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -13,8 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libpkg.so:ports-mgmt/pkg + libfreetype.so:print/freetype2 USES= gnome pkgconfig ssl USE_GNOME= cairo gdkpixbuf2 gtk20 @@ -22,9 +21,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-snmp-prefix=${PREFIX} --with-snmp-type=net -CPPFLAGS+= `net-snmp-config --cflags` -LDFLAGS+= `net-snmp-config --libs` - PLIST_FILES= bin/mbrowse .include diff --git a/net-mgmt/mbrowse/files/patch-configure b/net-mgmt/mbrowse/files/patch-configure new file mode 100644 index 000000000000..4a7bba697d6e --- /dev/null +++ b/net-mgmt/mbrowse/files/patch-configure @@ -0,0 +1,12 @@ +--- configure.orig 2011-01-28 12:10:11 UTC ++++ configure +@@ -5354,8 +5354,7 @@ $as_echo_n "checking for snmp-type... " >&6; } + if test "x$snmp_prefix" != "x" ; then + if test -x "$snmp_prefix/bin/net-snmp-config" ; then + SNMP_NET_LIBS=`$snmp_prefix/bin/net-snmp-config --netsnmp-libs` +- SNMP_EXT_LIBS=`$snmp_prefix/bin/net-snmp-config --external-libs` +- SNMP_LIBS="$SNMP_NET_LIBS $SNMP_EXT_LIBS" ++ SNMP_LIBS="$SNMP_NET_LIBS" + SNMP_CFLAGS="$SNMP_CFLAGS -DHAVE_NETSNMP" + else + guess_type="ucd"