Index: net-mgmt/snmptt/Makefile
===================================================================
--- net-mgmt/snmptt/Makefile
+++ net-mgmt/snmptt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		snmptt
 PORTVERSION=		1.3
+PORTREVISION=		1
 CATEGORIES=		net-mgmt
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
 DISTNAME=		${PORTNAME}_${PORTVERSION}
@@ -11,21 +12,24 @@
 MAINTAINER=	nistor@snickers.org
 COMMENT=	SNMP trap handler/translator/swiss-army-knife
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-USES=		perl5
-
+USES=		perl5 shebangfix
 USE_RC_SUBR=	snmptt
+SHEBANG_FILES=	${SCRIPTS}
+
+OPTIONS_DEFINE=	DOCS
 
 SCRIPTS=	snmptt snmptt-net-snmp-test snmpttconvert \
 		snmpttconvertmib snmptthandler
 DOCS=		faqs.html index.html layout1.css snmptt.html \
 		snmpttconvert.html snmpttconvertmib.html
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-build:
@@ -39,22 +43,14 @@
 
 do-install:
 .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.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/snmptt.conf.generic ${STAGEDIR}${PREFIX}/etc/snmp/snmptt.conf.generic.sample
+	${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>
Index: net-mgmt/snmptt/pkg-plist
===================================================================
--- net-mgmt/snmptt/pkg-plist
+++ net-mgmt/snmptt/pkg-plist
@@ -1,19 +1,15 @@
+@sample etc/snmp/snmptt.ini.sample
+@sample etc/snmp/snmptt.conf.generic.sample
 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%%
+%%DOCSDIR%%/faqs.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/layout1.css
+%%DOCSDIR%%/snmptt.html
+%%DOCSDIR%%/snmpttconvert.html
+%%DOCSDIR%%/snmpttconvertmib.html
 @dirrm etc/snmp
+@dirrm %%DOCSDIR%%