Bug 191119 - [maintainer] Port update: net-mgmt/snmptt
Summary: [maintainer] Port update: net-mgmt/snmptt
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Kurt Jaeger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-17 11:37 UTC by nistor
Modified: 2014-07-20 21:33 UTC (History)
1 user (show)

See Also:


Attachments
patch as attachment (4.93 KB, patch)
2014-07-20 21:30 UTC, Kurt Jaeger
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nistor 2014-06-17 11:37:04 UTC

Fix:
diff -ruN snmptt.old/Makefile snmptt/Makefile
--- snmptt.old/Makefile	2013-09-20 18:24:43.000000000 -0400
+++ snmptt/Makefile	2014-06-14 18:12:57.000000000 -0400
@@ -1,60 +1,56 @@
-# Created by: Bruce M Simpson <bms@FreeBSD.org>
-# $FreeBSD: head/net-mgmt/snmptt/Makefile 327757 2013-09-20 22:24:43Z bapt $
+#
+# $FreeBSD$
 
 PORTNAME=		snmptt
-PORTVERSION=		1.3
+PORTVERSION=	1.4
 CATEGORIES=		net-mgmt
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
 DISTNAME=		${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	nistor@snickers.org
-COMMENT=	SNMP trap handler/translator/swiss-army-knife
+MAINTAINER=		nistor@snickers.org
+COMMENT=		SNMP trap handler/translator/swiss-army-knife
 
-RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
+USES=			perl5 shebangfix
+USE_RC_SUBR=	snmptt
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
+RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
+				p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
+				p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
+				p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
+				p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
 
-USES=		perl5
+DOCS=			faqs.html index.html layout1.css snmptt.html \
+				snmpttconvert.html snmpttconvertmib.html
 
-USE_RC_SUBR=	snmptt
+SCRIPTS=		snmptt snmptt-net-snmp-test snmpttconvert \
+				snmpttconvertmib snmptthandler
 
-SCRIPTS=	snmptt snmptt-net-snmp-test snmpttconvert \
-		snmpttconvertmib snmptthandler
-DOCS=		faqs.html index.html layout1.css snmptt.html \
-		snmpttconvert.html snmpttconvertmib.html
+SHEBANG_FILES=	${SCRIPTS}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-build:
-
-post-build:
-	@${ECHO_CMD} ${WRKSRC}/snmptt ${WRKSRC}/snmptthandler ${WRKSRC}/snmptt.ini | ${XARGS} \
-	 ${REINPLACE_CMD} -e \
-	 "s|/etc/snmptt.ini|${PREFIX}/etc/snmptt.ini|g ; \
-	  s|/etc/snmp/snmptt.ini|${PREFIX}/etc/snmp/snmptt.ini|g ; \
-	  s|/etc/snmp/snmptt.conf|${PREFIX}/etc/snmp/snmptt.conf.generic|g"
+	@echo Skipping building ${PORTNAME}
 
 do-install:
+	@echo Installing ${PORTNAME} ${PORTVERSION}
+
 .for _SCRIPT in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${_SCRIPT} ${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKSRC}/${_SCRIPT} ${STAGEDIR}${PREFIX}/sbin
 .endfor
-	${MKDIR} ${PREFIX}/etc/snmp
-	${INSTALL_DATA} ${WRKSRC}/snmptt.ini ${PREFIX}/etc/snmp/snmptt.ini-dist
-.if !exists(${PREFIX}/etc/snmp/snmptt.ini)
-	${INSTALL_DATA} ${WRKSRC}/snmptt.ini ${PREFIX}/etc/snmp
-.endif
-	${INSTALL_DATA} ${WRKSRC}/examples/snmptt.conf.generic ${PREFIX}/etc/snmp/snmptt.conf.generic-dist
-.if !exists(${PREFIX}/etc/snmp/snmptt.conf)
-	${INSTALL_DATA} ${WRKSRC}/examples/snmptt.conf.generic ${PREFIX}/etc/snmp/snmptt.conf.generic
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmptt.ini ${STAGEDIR}${PREFIX}/etc/snmp/snmptt.ini-dist
+	${INSTALL_DATA} ${WRKSRC}/examples/snmptt.conf.generic ${STAGEDIR}${PREFIX}/etc/snmp/snmptt.conf.generic-dist
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for _DOC in ${DOCS}
-	${INSTALL_MAN} ${WRKSRC}/docs/${_DOC} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/${_DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
+
 .include <bsd.port.post.mk>
+
diff -ruN snmptt.old/distinfo snmptt/distinfo
--- snmptt.old/distinfo	2014-01-22 10:30:13.000000000 -0500
+++ snmptt/distinfo	2014-06-14 16:58:07.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (snmptt_1.3.tgz) = 2f09d489a2073f5b1f4bdc207533b7dcf99d5b57d1c9659cfaa3c2af44ce6567
-SIZE (snmptt_1.3.tgz) = 146314
+SHA256 (snmptt_1.4.tgz) = 512c33ecdf06da8b3c75082c1506e4b4091ddb714d0d9564771aa12ddc98ef99
+SIZE (snmptt_1.4.tgz) = 148504
diff -ruN snmptt.old/pkg-descr snmptt/pkg-descr
--- snmptt.old/pkg-descr	2014-01-22 10:44:51.000000000 -0500
+++ snmptt/pkg-descr	2014-06-14 16:58:07.000000000 -0400
@@ -1,4 +1,4 @@
 SNMPTT (SNMP Trap Translator) is an SNMP trap handler written in Perl
-for use with the Net-SNMP / UCD-SNMP snmptrapd program (www.net-snmp.org).
+for use with the Net-SNMP.  Easy to setup and use.
 
 WWW: http://www.snmptt.org/
diff -ruN snmptt.old/pkg-plist snmptt/pkg-plist
--- snmptt.old/pkg-plist	2013-06-13 19:46:45.000000000 -0400
+++ snmptt/pkg-plist	2014-06-14 18:13:46.000000000 -0400
@@ -1,19 +1,16 @@
+etc/rc.d/snmptt
+etc/snmp/snmptt.conf.generic-dist
+etc/snmp/snmptt.ini-dist
 sbin/snmptt
 sbin/snmptt-net-snmp-test
 sbin/snmpttconvert
 sbin/snmpttconvertmib
 sbin/snmptthandler
-@unexec if cmp -s %D/etc/snmp/snmptt.ini %D/etc/snmp/snmptt.ini-dist; then rm -f %D/etc/snmp/snmptt.ini; fi
-etc/snmp/snmptt.ini-dist
-@exec [ ! -f %B/snmptt.ini ] && cp %B/%f %B/snmptt.ini
-@unexec if cmp -s %D/etc/snmp/snmptt.conf.generic %D/etc/snmp/snmptt.conf.generic-dist; then rm -f %D/etc/snmp/snmptt.conf.generic; fi
-etc/snmp/snmptt.conf.generic-dist
-@exec [ ! -f %B/snmptt.conf.generic ] && cp %B/%f %B/snmptt.conf.generic
 %%PORTDOCS%%%%DOCSDIR%%/faqs.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/layout1.css
 %%PORTDOCS%%%%DOCSDIR%%/snmptt.html
 %%PORTDOCS%%%%DOCSDIR%%/snmpttconvert.html
 %%PORTDOCS%%%%DOCSDIR%%/snmpttconvertmib.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/snmp
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry etc/snmp
Comment 1 John Marino freebsd_committer freebsd_triage 2014-07-20 16:00:35 UTC
This patch needs to be resubmitted as an attachment.  It's showing as a comment.
Comment 2 Kurt Jaeger freebsd_committer freebsd_triage 2014-07-20 21:27:23 UTC
I'll take it.
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2014-07-20 21:30:53 UTC
Created attachment 144825 [details]
patch as attachment

patch as attachment, with a bit of reformatting, small fixes.
Comment 4 commit-hook freebsd_committer freebsd_triage 2014-07-20 21:33:12 UTC
A commit references this bug:

Author: pi
Date: Sun Jul 20 21:32:24 UTC 2014
New revision: 362378
URL: http://svnweb.freebsd.org/changeset/ports/362378

Log:
  net-mgmt/snmptt: 1.3 -> 1.4

  PR:		191119
  Submitted by:	nistor@snickers.org (maintainer)

Changes:
  head/net-mgmt/snmptt/Makefile
  head/net-mgmt/snmptt/distinfo
  head/net-mgmt/snmptt/pkg-descr
  head/net-mgmt/snmptt/pkg-plist
Comment 5 Kurt Jaeger freebsd_committer freebsd_triage 2014-07-20 21:33:50 UTC
Committed, thanks for the patch.