pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

dhcpd-snmp has moved to git, the old project page is gone.



Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Wed Jun 1 15:02:20 2016 +0200
Changeset:	922f1dfceb9f812fae189827ef5bc311663c6a1c

Modified Files:
	dhcpd-snmp/Makefile
	dhcpd-snmp/PLIST
	dhcpd-snmp/distinfo
Added Files:
	dhcpd-snmp/patches/patch-dhcpd-snmp.conf.dist

Log Message:
dhcpd-snmp has moved to git, the old project page is gone.

While here, re-sync the package with reality.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=922f1dfceb9f812fae189827ef5bc311663c6a1c

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

diffstat:
 dhcpd-snmp/Makefile                           | 57 +++++++++++++++++----------
 dhcpd-snmp/PLIST                              | 14 +++----
 dhcpd-snmp/distinfo                           |  8 ++--
 dhcpd-snmp/patches/patch-dhcpd-snmp.conf.dist | 18 +++++++++
 4 files changed, 66 insertions(+), 31 deletions(-)

diffs:
diff --git a/dhcpd-snmp/Makefile b/dhcpd-snmp/Makefile
index 4cc5ffb..06619af 100644
--- a/dhcpd-snmp/Makefile
+++ b/dhcpd-snmp/Makefile
@@ -1,36 +1,53 @@
 # $NetBSD: Makefile,v 1.2 2015/06/10 13:43:17 ahp-nils Exp $
 #
 
-DISTNAME=		dhcpd-snmp-0.2
+DISTNAME=		dhcpd-snmp-20160601
 CATEGORIES=		net
-MASTER_SITES=	http://www.net-track.ch/php/d.php?f=/opensource/dhcpd-snmp/
+MASTER_SITES=		-https://github.com/ohitz/dhcpd-snmp/archive/master.zip
+EXTRACT_SUFX=		.zip
 
 MAINTAINER=		nils%NetBSD.org@localhost
-HOMEPAGE=		http://www.net-track.ch/opensource/dhcpd-snmp/
+HOMEPAGE=		https://github.com/ohitz/dhcpd-snmp
 COMMENT=		Extension for the Net-SNMP agent and the ISC DHCP server
 LICENSE=		gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	# none
-USE_TOOLS+=		perl:run
-DOCDIR=			share/doc/dhcpd-snmp
-DATADIR=		share/dhcpd-snmp
-#CONF_FILES=		${PKG_SYSCONFDIR}/dhcpd-snmp.conf
+WRKSRC=			${WRKDIR}/dhcpd-snmp-master
+USE_LANGUAGES=		# none
+NO_BUILD=		yes
 
-AUTO_MKDIRS=	yes
-INSTALLATION_DIRS+=		sbin ${PKGMANDIR}/man8 ${DOCDIR} ${DATADIR} ${DATADIR}/mibs
+USE_TOOLS+=		find pax perl pod2man
+REPLACE_PERL+=		dhcpd-snmp
 
-INSTALL_UNSTRIPPED=		yes
+DEPENDS+=		net-snmp-[0-9]*:../../net/net-snmp
+
+.include "../../mk/bsd.prefs.mk"
+
+NET_SNMP_MIBDIR=	share/snmp/mibs
+EGDIR=			share/examples/dhcpd-snmp
+
+BUILD_DEFS+=            VARBASE NET_SNMP_MIBDIR
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths+=	dhcpd-snmp.conf.dist
+SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE:Q}|g'
+SUBST_STAGE.paths=	post-configure
+
+CONF_FILES=		${PREFIX}/${EGDIR}/dhcpd-snmp.conf \
+			${PKG_SYSCONFDIR}/dhcpd-snmp.conf
+
+INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man8 ${NET_SNMP_MIBDIR} ${EGDIR}
+
+post-configure:
+	cd ${WRKSRC} ; pod2man README.pod dhcpd-snmp.8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dhcpd-snmp ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/dhcpd-snmp ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/dhcpd-snmp.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/mibs/nettrack-dhcpd-snmp.mib ${DESTDIR}${PREFIX}/${DATADIR}/mibs
-	${INSTALL_DATA} ${WRKSRC}/mibs/nettrack.mib ${DESTDIR}${PREFIX}/${DATADIR}/mibs
+	${INSTALL_DATA} ${WRKSRC}/mibs/nettrack-dhcpd-snmp.mib \
+		${DESTDIR}${PREFIX}/${NET_SNMP_MIBDIR}/nettrack-dhcpd-mib.txt
+	${INSTALL_DATA} ${WRKSRC}/dhcpd-snmp.conf.dist \
+		${DESTDIR}${PREFIX}/${EGDIR}/dhcpd-snmp.conf
+	find ${WRKSRC}/cacti -type f -exec chmod ugo-x \{\} \;
+	cd ${WRKSRC} ; ${PAX} -rw cacti ${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/dhcpd-snmp/PLIST b/dhcpd-snmp/PLIST
index d0eb0fc..4a4a770 100644
--- a/dhcpd-snmp/PLIST
+++ b/dhcpd-snmp/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/18 08:22:56 ahp-nils Exp $
+@comment $NetBSD$
 man/man8/dhcpd-snmp.8
 sbin/dhcpd-snmp
-share/dhcpd-snmp/mibs/nettrack-dhcpd-snmp.mib
-share/dhcpd-snmp/mibs/nettrack.mib
-share/doc/dhcpd-snmp/AUTHORS
-share/doc/dhcpd-snmp/COPYING
-share/doc/dhcpd-snmp/ChangeLog
-share/doc/dhcpd-snmp/NEWS
-share/doc/dhcpd-snmp/README
+share/examples/dhcpd-snmp/cacti/README.txt
+share/examples/dhcpd-snmp/cacti/snmp_queries/dhcp_snmp_leases.xml
+share/examples/dhcpd-snmp/cacti/templates/cacti_graph_template_dhcp_lease_stats.xml
+share/examples/dhcpd-snmp/dhcpd-snmp.conf
+share/snmp/mibs/nettrack-dhcpd-mib.txt
diff --git a/dhcpd-snmp/distinfo b/dhcpd-snmp/distinfo
index 18d8b47..70b9ca3 100644
--- a/dhcpd-snmp/distinfo
+++ b/dhcpd-snmp/distinfo
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.1 2013/02/18 08:22:57 ahp-nils Exp $
 
-SHA1 (dhcpd-snmp-0.2.tar.gz) = d441bec381d67a963ff33ff39fc41f705c4a55ea
-RMD160 (dhcpd-snmp-0.2.tar.gz) = b4cdc93ad68bf9c8675be0cce85be0be4b20867a
-Size (dhcpd-snmp-0.2.tar.gz) = 76717 bytes
+SHA1 (dhcpd-snmp-20160601.zip) = 0bfb23b105af0053f1febdd4dc543fb606007e2b
+RMD160 (dhcpd-snmp-20160601.zip) = d06814464ddb018a97fc15773b63d1af35b57509
+SHA512 (dhcpd-snmp-20160601.zip) = 978ecaa7e27476da0d0f31332ecc12d98547718c7d12fccb8e19a4ad0ff26f49e6f287a6b1bbebd3637478cd5aa463e79543fc51e32df3cf498cd6634563a981
+Size (dhcpd-snmp-20160601.zip) = 12895 bytes
+SHA1 (patch-dhcpd-snmp.conf.dist) = a96b586f9db7c6805cbcd9536980979a65287d99
diff --git a/dhcpd-snmp/patches/patch-dhcpd-snmp.conf.dist b/dhcpd-snmp/patches/patch-dhcpd-snmp.conf.dist
new file mode 100644
index 0000000..cc7959c
--- /dev/null
+++ b/dhcpd-snmp/patches/patch-dhcpd-snmp.conf.dist
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Substitute the dhcpd leases path
+
+--- dhcpd-snmp.conf.dist.orig	2016-05-18 13:37:42.000000000 +0000
++++ dhcpd-snmp.conf.dist
+@@ -2,9 +2,9 @@
+ 
+ # Path to the dhcpd.leases file.
+ #
+-# leases: /var/lib/dhcp3/dhcpd.leases
++# leases: @VARBASE@/db/dhcpd.leases
+ 
+-leases: /var/lib/dhcp3/dhcpd.leases
++leases: @VARBASE@/db/dhcpd.leases
+ 
+ # Definition of the pools
+ #


Home | Main Index | Thread Index | Old Index