From nobody Sun Mar 10 15:33:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tt3nv3WrWz5D4B9; Sun, 10 Mar 2024 15:33:07 +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 4Tt3nv1WVXz3yf9; Sun, 10 Mar 2024 15:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710084787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QW1LfYffUsD8VYmfWOYSPabqDN1EQP55VktSuq49Aeo=; b=t5Kh2WBCGhtQL0rcP6gN/8w4IFfyiCKydWWcIkZYsvD8eHd/bx0iQZvwnJ4bttwT2sUIwE b/17VxV7ElL5ZOO2MlOFzm4YJCVvQKFf89Rxmg6JuD88fSGUiz9+uD9Sqg5GiAXwO/mrq1 zXg8FUsZHISG2l7TGIJkYpgwDXg4DbLIELW+JUwx+xRoVzIJ6d5/8SJ2RnjJt/vDdpNeVy W+ioPO3r3DGC21E2/xbVZzmJNnU+TMjgmGupOaxhgneybevXgEqO86x4OHUy3m9Q3TxZQz +IvpH5NyJLKyqFIuaRg3XHjVeNh+Lxh+FO3hYpwrCbkcyFnzpTL43v9ZXs2UOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710084787; a=rsa-sha256; cv=none; b=VGHPTEHjYsK5q/CEEa/LcG424a2tqJ5e+6MgjQOWhkaYmcUnPl1ZC3K64EU8vX2qshV3ag j1u7OMLjowS8KQ/IgRdw41gHMavq+A4bGmyra7twViY4HVX6aSjATTlPs4dR86kB3SjQ+L LpOphG1WWYFPj001kMqUTFNOqhjwPzYbERTjawW6rgGKgNI8f0E43YkJOR9lDczzacTzxn A1SV7GwApxIeiY879QtPXCXgspR9S3uyNxXx/odAUShc8akA2BX/sihUVFhHscyJXNjNbV SKfBgHydz4Cr/07HCb6NUnKOg9wSUkZNjGC4q2dMQ1NRca51BXu//HH2HOgPww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710084787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QW1LfYffUsD8VYmfWOYSPabqDN1EQP55VktSuq49Aeo=; b=NZkvhU0OWxsbawfin4ZzbE1t3MK0Y0MbHJ5BrFCruOu2jXDHJ8xNHaYIUpnRYHZPk/tgN8 gZlpLmosyWWRLBzr6n8AP+nTDIbdzAMmcVqaVD6o0X1HzxSZjaAjQu2520ocW9mHBGty5w HrzpIfO9buXMHVFtEiufSwPeYyn4jfVwZFRiJ2E0+oFSoJVlBYWAKvhSgk5dW18RbPgt0m 4h02tmnHZpptrrKpwB9xrViIbOqY/O0lmRAjqome5V7XODnU84Id6SrUTHoS5FCYIlYT6o mkDnK4mLRdz/igg9zoANcYDYTFPR5F9hyavbL1d9OzkkqQxkDKrNHflOTMZlMQ== 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 4Tt3nv16ZWzrq4; Sun, 10 Mar 2024 15:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42AFX7fQ001726; Sun, 10 Mar 2024 15:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42AFX7Kl001723; Sun, 10 Mar 2024 15:33:07 GMT (envelope-from git) Date: Sun, 10 Mar 2024 15:33:07 GMT Message-Id: <202403101533.42AFX7Kl001723@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: fdf1eb985c9c - main - net-mgmt/bsnmp-regex: Fix build time warnings List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdf1eb985c9c78779e0b1074589c3a763dff33c5 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf1eb985c9c78779e0b1074589c3a763dff33c5 commit fdf1eb985c9c78779e0b1074589c3a763dff33c5 Author: Muhammad Moinur Rahman AuthorDate: 2024-03-10 15:17:14 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-03-10 15:32:55 +0000 net-mgmt/bsnmp-regex: Fix build time warnings - Utilize OPTIONSNG - Utilize USES=localbase - Refresh patches --- net-mgmt/bsnmp-regex/Makefile | 29 +++++------- net-mgmt/bsnmp-regex/files/patch-configure.in | 52 ++++++++++++++++++++++ ...ch-bsnmp-regex.c => patch-module_bsnmp-regex.c} | 6 +-- 3 files changed, 66 insertions(+), 21 deletions(-) diff --git a/net-mgmt/bsnmp-regex/Makefile b/net-mgmt/bsnmp-regex/Makefile index 62ef0283315c..a10e74da945b 100644 --- a/net-mgmt/bsnmp-regex/Makefile +++ b/net-mgmt/bsnmp-regex/Makefile @@ -1,6 +1,6 @@ PORTNAME= bsnmp-regex PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/olivier @@ -10,33 +10,26 @@ WWW= http://thewalter.net/stef/software/bsnmp-regex/ LICENSE= BSD3CLAUSE +USES= libtool localbase + GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CPPFLAGS+= "-I${LOCALBASE}/include" -INSTALL_TARGET= install-strip -USES= libtool -OPTIONS_DEFINE= DEBUG PCRE -PCRE_DESC= Use PCRE instead of the default regex library +INSTALL_TARGET= install-strip PLIST_FILES= bin/sockin lib/snmp_regex.so lib/snmp_regex.so.0 \ lib/snmp_regex.so.0.0.0 lib/snmp_regex.a share/man/man1/sockin.1.gz \ share/man/man5/bsnmp-regex.conf.5.gz \ share/man/man8/bsnmp-regex.8.gz -.include +# OPTION PCRE is safe to be removed when devel/pcre is removed +# CONFIGURE_ARGS+= --disable-pcre +OPTIONS_DEFINE= DEBUG PCRE -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.else -CONFIGURE_ARGS+=--disable-debug -.endif +PCRE_DESC= Use PCRE instead of the default regex library -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:devel/pcre -CONFIGURE_ARGS+= --enable-pcre -.else -CONFIGURE_ARGS+= --disable-pcre -.endif +DEBUG_CONFIGURE_ENABLE=debug +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE_CONFIGURE_ENABLE=pcre .include diff --git a/net-mgmt/bsnmp-regex/files/patch-configure.in b/net-mgmt/bsnmp-regex/files/patch-configure.in new file mode 100644 index 000000000000..7eb06d891cca --- /dev/null +++ b/net-mgmt/bsnmp-regex/files/patch-configure.in @@ -0,0 +1,52 @@ +--- configure.in.orig 2024-03-10 15:09:20 UTC ++++ configure.in +@@ -13,14 +13,14 @@ AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_PROG_LIBTOOL + +-AC_CHECK_PROG(GENSNMPTREE, gensnmptree, "gensnmptree") +-if test -z "$GENSNMPTREE"; then +- echo "ERROR: gensnmptree program not found." +- exit 1 ++AC_CHECK_PROG(GENSNMPTREE, gensnmptree, "gensnmptree") ++if test -z "$GENSNMPTREE"; then ++ echo "ERROR: gensnmptree program not found." ++ exit 1 + fi + + # Debug mode +-AC_ARG_ENABLE(debug, ++AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [Compile binaries in debug mode])) + +@@ -36,20 +36,21 @@ AC_ARG_ENABLE(pcre, + AC_ARG_ENABLE(pcre, + AC_HELP_STRING([--with-pcre], + [Use PCRE instead of the default regular expression library])) +- ++ + if test "$enable_pcre" = "yes"; then +- AC_CHECK_LIB(pcre, pcre_compile, , ++ AC_CHECK_LIB(pcre, pcre_compile, , + [echo "Couldn't find the pcre library"; exit 1]) +- AC_CHECK_HEADERS("pcre.h", , ++ AC_CHECK_HEADERS("pcre.h", , + [echo "Couldn't find pcre headers"; exit 1]) + AC_DEFINE_UNQUOTED(WITH_PCRE, 1, [Use PCRE regular expression library]) + fi + +-AC_CHECK_HEADERS([sys/queue.h sys/limits.h sys/stat.h sys/time.h sys/un.h], , +- [echo "ERROR: required header not found."; exit 1]) +-AC_CHECK_HEADERS([bsnmp/snmpmod.h], , +- [echo "ERROR: required bsnmp header not found." exit 1]) +- ++AC_CHECK_HEADERS([sys/queue.h sys/limits.h sys/stat.h sys/time.h sys/un.h], , ++ [echo "ERROR: required header not found."; exit 1]) ++AC_CHECK_HEADERS([bsnmp/snmpmod.h], , ++ [echo "ERROR: required bsnmp header not found." exit 1], ++ [#include ]) ++ + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_TYPE_SIZE_T diff --git a/net-mgmt/bsnmp-regex/files/patch-bsnmp-regex.c b/net-mgmt/bsnmp-regex/files/patch-module_bsnmp-regex.c similarity index 61% rename from net-mgmt/bsnmp-regex/files/patch-bsnmp-regex.c rename to net-mgmt/bsnmp-regex/files/patch-module_bsnmp-regex.c index 3118d723b448..296158bac548 100644 --- a/net-mgmt/bsnmp-regex/files/patch-bsnmp-regex.c +++ b/net-mgmt/bsnmp-regex/files/patch-module_bsnmp-regex.c @@ -1,6 +1,6 @@ ---- module/bsnmp-regex.c.orig 2011-10-21 16:05:37.000000000 +0700 -+++ module/bsnmp-regex.c 2018-06-05 21:16:44.471250000 +0700 -@@ -788,7 +788,7 @@ config_var (char *name, char *value, int +--- module/bsnmp-regex.c.orig 2011-10-21 09:05:37 UTC ++++ module/bsnmp-regex.c +@@ -788,7 +788,7 @@ config_var (char *name, char *value, int line) if (strcmp (name, "expire") == 0 || strcmp (name, "expires") == 0) { i = strtol (value, &t2, 10);