CVS commit: pkgsrc/net/gkrellm-snmp

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Aug 19 14:13:17 UTC 2025

Modified Files:
        pkgsrc/net/gkrellm-snmp: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/gkrellm-snmp/files: Makefile
Removed Files:
        pkgsrc/net/gkrellm-snmp/patches: patch-aa patch-ab

Log Message:
net/gkrellm-snmp: Update to 1.1

pkgsrc changes:
 - Removed patch-aa (Makefile)
 - Added a replacement Makefile for libtoolisation
 - Removed patch-ab (gkrellm_snmp.c): The patch heavily modified the source
   but had no explanation at all. Not a single hunk in it applied
   cleanly. It also had some modifications to {load,save}_plugin_config()
   but I couldn't comprehend the intention. Old config lines are most
   likely incompatible with this version, and will be skipped. Sorry about
   that, but packages should never have been modified like this.

upstream changes:
1.1 (2009-01-03)
 - License clarification (thanks to Debian maintainers)
 - Removed unnecessary linking to libssl

1.0 (2006-05-01)
 - Makefile changes for OS-X (thanks to Mark Duling)
 - Added grid config to charts

0.22 (2003-09-21)
 - net-snmp is the default now, use make ucdsnmp if necessary
 - tcp/udp transport (patch from Quentin Garnier)
 - added chart config save/load functions


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/net/gkrellm-snmp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/gkrellm-snmp/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/gkrellm-snmp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/gkrellm-snmp/files/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/net/gkrellm-snmp/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/net/gkrellm-snmp/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/gkrellm-snmp/Makefile
diff -u pkgsrc/net/gkrellm-snmp/Makefile:1.84 pkgsrc/net/gkrellm-snmp/Makefile:1.85
--- pkgsrc/net/gkrellm-snmp/Makefile:1.84       Thu Apr 24 14:15:23 2025
+++ pkgsrc/net/gkrellm-snmp/Makefile    Tue Aug 19 14:13:16 2025
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.84 2025/04/24 14:15:23 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2025/08/19 14:13:16 pho Exp $
 #
 
-DISTNAME=      gkrellm_snmp-0.21
+DISTNAME=      gkrellm_snmp-1.1
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   64
 CATEGORIES=    net
-MASTER_SITES=  http://triq.net/gkrellm/
+MASTER_SITES=  http://triq.net/files/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://triq.net/gkrellm_snmp.html
 COMMENT=       GKrellM plugin to display values collected from a SNMP agent
+LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=            pkg-config
+USE_TOOLS+=    pkg-config
+USE_LIBTOOL=   yes
 
-INSTALLATION_DIRS=     lib/gkrellm2/plugins
+MAKE_FILE=     ${FILESDIR}/Makefile
+MAKE_FLAGS+=   INSTALL_LIB_DIR=${INSTALL_LIB_DIR:Q}
+MAKE_FLAGS+=   INSTALL_LIB=${INSTALL_LIB:Q}
+MAKE_FLAGS+=   PLUGIN_DIR=${PREFIX:Q}/lib/gkrellm2/plugins
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/gkrellm-snmp/PLIST
diff -u pkgsrc/net/gkrellm-snmp/PLIST:1.2 pkgsrc/net/gkrellm-snmp/PLIST:1.3
--- pkgsrc/net/gkrellm-snmp/PLIST:1.2   Tue Feb 24 23:34:11 2004
+++ pkgsrc/net/gkrellm-snmp/PLIST       Tue Aug 19 14:13:16 2025
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/24 23:34:11 cube Exp $
-lib/gkrellm2/plugins/gkrellm_snmp.so
+@comment $NetBSD: PLIST,v 1.3 2025/08/19 14:13:16 pho Exp $
+lib/gkrellm2/plugins/gkrellm_snmp.la

Index: pkgsrc/net/gkrellm-snmp/distinfo
diff -u pkgsrc/net/gkrellm-snmp/distinfo:1.7 pkgsrc/net/gkrellm-snmp/distinfo:1.8
--- pkgsrc/net/gkrellm-snmp/distinfo:1.7        Tue Oct 26 11:05:39 2021
+++ pkgsrc/net/gkrellm-snmp/distinfo    Tue Aug 19 14:13:16 2025
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:05:39 nia Exp $
+$NetBSD: distinfo,v 1.8 2025/08/19 14:13:16 pho Exp $
 
-BLAKE2s (gkrellm_snmp-0.21.tar.gz) = 605345b674b141318f4a09093571fece8c67730813a256d47c6c466d0d844779
-SHA512 (gkrellm_snmp-0.21.tar.gz) = 6f7da375db083befd9ee3aebb30aba2ae248aa0796eb35a1ea2f58d21dbfae2f8e16ed997ac1c4e913afe4dab53cdaf9d7c1af72ac7a7701861c5d9ef6d2b18c
-Size (gkrellm_snmp-0.21.tar.gz) = 17034 bytes
-SHA1 (patch-aa) = b83ec8b6b419b1e075db3750c1d165eba2ca1973
-SHA1 (patch-ab) = d136139689fd2971f5b596db2184e46b20f6bb76
+BLAKE2s (gkrellm_snmp-1.1.tar.gz) = 216941298463306df8149cb34da3878b5198dc6f76ef075f6ef28c05a2da144e
+SHA512 (gkrellm_snmp-1.1.tar.gz) = b66b45aa718cd850f763a86ecda45e22946643fef93a697f122be6932ee43ac4e4617cb5520637529eeb4195af414c68ce64a4fd5c7238fb7fc3fce94090c3e8
+Size (gkrellm_snmp-1.1.tar.gz) = 17684 bytes

Added files:

Index: pkgsrc/net/gkrellm-snmp/files/Makefile
diff -u /dev/null pkgsrc/net/gkrellm-snmp/files/Makefile:1.1
--- /dev/null   Tue Aug 19 14:13:17 2025
+++ pkgsrc/net/gkrellm-snmp/files/Makefile      Tue Aug 19 14:13:16 2025
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2025/08/19 14:13:16 pho Exp $
+#
+# Replacement Makefile for gkrellm-snmp for portability
+#
+
+OBJS=  gkrellm_snmp.lo
+
+PKG_CONFIG_DEPS=       gtk+-2.0 netsnmp
+EXTRA_CFLAGS!=         pkg-config ${PKG_CONFIG_DEPS} --cflags
+EXTRA_LIBS!=           pkg-config ${PKG_CONFIG_DEPS} --libs
+
+.PHONY: all
+all: gkrellm_snmp.la
+
+gkrellm_snmp.la: ${OBJS}
+       ${LIBTOOL} --tag=CC --mode=link \
+               ${CC} ${LDFLAGS} ${EXTRA_LIBS} ${.ALLSRC} -o ${.TARGET} \
+               -module -shared -avoid-version -rpath ${PLUGIN_DIR:Q}
+
+.SUFFIXES: .c .lo
+.c.lo:
+       ${LIBTOOL} --tag=CC --mode=compile \
+               ${CC} -c ${CFLAGS} ${EXTRA_CFLAGS} ${.IMPSRC} -shared
+
+.PHONY: install
+install: gkrellm_snmp.la
+       ${INSTALL_LIB_DIR} ${DESTDIR}${PLUGIN_DIR}
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} ${.ALLSRC} ${DESTDIR}${PLUGIN_DIR}