Index: beacon/Makefile
===================================================================
--- beacon/Makefile	(revision 366689)
+++ beacon/Makefile	(working copy)
@@ -7,9 +7,12 @@
 CATEGORIES=	net perl5 mbone ipv6
 MASTER_SITES=	SF/multicastbeacon/multicastbeacon/beacon%20v${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Beacon active measurement tool to monitor multicast
 
+LICENSE=	BSD4CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
@@ -17,14 +20,17 @@
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 USES=		perl5
+USE_PERL5+=	fixpacklist
 USE_AUTOTOOLS=	autoconf
 
-OPTIONS_DEFINE=		IPV6
+OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=
 
-IPV6_DESC=		Enable IPv6 PTR lookups
+IPV6_DESC=	Enable IPv6 PTR lookups
 
-NO_STAGE=	yes
+PLIST_DIRSTRY=	${SITE_PERL}/${PERL_ARCH}/auto/Net \
+		${SITE_PERL}/${PERL_ARCH}/Net
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIPV6}
@@ -33,11 +39,14 @@
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
-
 post-install:
+	cd ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Multicast/Beacon/ && ${STRIP_CMD} Beacon.so
+	cd ${WRKSRC}/src/FreeBSD/ && ${CP} beacon ${STAGEDIR}${PREFIX}/etc/rc.d/
+	${FIND} ${STAGEDIR} -name 'perllocal.pod' -delete
+	${FIND} ${STAGEDIR} -name 'perllocal.pod.gz' -delete
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: beacon/pkg-descr
===================================================================
--- beacon/pkg-descr	(revision 366689)
+++ beacon/pkg-descr	(working copy)
@@ -1,7 +1,7 @@
-The NLANR/DAST Multicast Beacon is a program written in Perl which uses the 
-RTP protocol to provide useful statistics and diagnostic information about 
-a given multicast group. 
-The Multicast Beacon can be used as a general-purpose active multicast 
+The NLANR/DAST Multicast Beacon is a program written in Perl which uses the RTP
+protocol to provide useful statistics and diagnostic information about a given
+multicast group.
+The Multicast Beacon can be used as a general-purpose active multicast
 measurement tool.
 
-WWW: http://sourceforge.net/projects/multicastbeacon/
+WWW: http://sourceforge.net/projects/multicastbeacon
Index: beacon/pkg-plist
===================================================================
--- beacon/pkg-plist	(revision 366689)
+++ beacon/pkg-plist	(working copy)
@@ -1,16 +1,12 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon/Beacon.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/Beacon.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
 bin/beacon
-@unexec if cmp -s %D/etc/beacon.conf.sample %D/etc/beacon.conf; then rm -f %D/etc/beacon.conf; fi
 etc/beacon.conf.sample
-@exec if [ ! -f %D/etc/beacon.conf ] ; then cp -p %D/%F %B/beacon.conf; fi
+etc/beacon.conf
+etc/rc.d/beacon
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/rc.d/beacon