Index: head/net-mgmt/p5-jmx4perl/Makefile
===================================================================
--- head/net-mgmt/p5-jmx4perl/Makefile	(revision 520468)
+++ head/net-mgmt/p5-jmx4perl/Makefile	(revision 520469)
@@ -1,58 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	jmx4perl
 PORTVERSION=	1.11
 DISTVERSIONSUFFIX=	_2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ROLAND
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	JMX access for Perl
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		p5-Config-General>=0:devel/p5-Config-General \
 		p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP \
 		p5-Crypt-OpenPGP>=0:security/p5-Crypt-OpenPGP \
 		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 		p5-File-SearchPath>=0:devel/p5-File-SearchPath \
 		p5-JSON>=0:converters/p5-JSON \
 		p5-Module-Find>=0:devel/p5-Module-Find \
 		p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
 		p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
 		p5-Term-Clui>=0:devel/p5-Term-Clui \
 		p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
 		p5-Term-ShellUI>=0:shells/p5-Term-ShellUI \
 		p5-Term-Size>=0:devel/p5-Term-Size \
 		p5-URI>=0:net/p5-URI \
 		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 		p5-XML-Twig>=0:textproc/p5-XML-Twig \
 		p5-libwww>=0:www/p5-libwww
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	modbuild
 
 ETC_FILES=	common.cfg \
 		glassfish.cfg \
 		jboss.cfg \
 		jetty.cfg \
 		memory.cfg \
 		metrics.cfg \
 		threads.cfg \
 		tomcat.cfg \
 		weblogic.cfg
-
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	ETC_FILES="${ETC_FILES}"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for f in ${ETC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 
 .include <bsd.port.mk>
Index: head/net-mgmt/p5-jmx4perl/files/pkg-install.in
===================================================================
--- head/net-mgmt/p5-jmx4perl/files/pkg-install.in	(revision 520468)
+++ head/net-mgmt/p5-jmx4perl/files/pkg-install.in	(nonexistent)
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-ETCDIR=%%ETCDIR%%
-ETC_FILES="%%ETC_FILES%%"
-
-case $2 in
-POST-INSTALL)
-	for f in ${ETC_FILES}
-	do
-		if [ ! -f ${ETCDIR}/${f} ]; then
-			/bin/cp ${ETCDIR}/${f}.sample ${ETCDIR}/${f}
-		fi
-	done
-esac

Property changes on: head/net-mgmt/p5-jmx4perl/files/pkg-install.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/p5-jmx4perl/files/pkg-deinstall.in
===================================================================
--- head/net-mgmt/p5-jmx4perl/files/pkg-deinstall.in	(revision 520468)
+++ head/net-mgmt/p5-jmx4perl/files/pkg-deinstall.in	(nonexistent)
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-ETCDIR=%%ETCDIR%%
-ETC_FILES="%%ETC_FILES%%"
-
-case $2 in
-DEINSTALL)
-	for f in ${ETC_FILES}
-	do
-		/usr/bin/cmp -s ${ETCDIR}/${f}.sample \
-			${ETCDIR}/${f} \
-			&& /bin/rm -f ${ETCDIR}/${f}
-	done
-esac

Property changes on: head/net-mgmt/p5-jmx4perl/files/pkg-deinstall.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/p5-jmx4perl/pkg-plist
===================================================================
--- head/net-mgmt/p5-jmx4perl/pkg-plist	(revision 520468)
+++ head/net-mgmt/p5-jmx4perl/pkg-plist	(revision 520469)
@@ -1,118 +1,118 @@
 bin/cacti_jmx4perl
 bin/check_jmx4perl
 bin/j4psh
 bin/jmx4perl
 bin/jolokia
+@sample %%ETCDIR%%/common.cfg.sample
+@sample %%ETCDIR%%/glassfish.cfg.sample
+@sample %%ETCDIR%%/jboss.cfg.sample
+@sample %%ETCDIR%%/jetty.cfg.sample
+@sample %%ETCDIR%%/memory.cfg.sample
+@sample %%ETCDIR%%/metrics.cfg.sample
+@sample %%ETCDIR%%/threads.cfg.sample
+@sample %%ETCDIR%%/tomcat.cfg.sample
+@sample %%ETCDIR%%/weblogic.cfg.sample
 %%PERL5_MAN1%%/cacti_jmx4perl.1.gz
 %%PERL5_MAN1%%/check_jmx4perl.1.gz
 %%PERL5_MAN1%%/j4psh.1.gz
 %%PERL5_MAN1%%/jmx4perl.1.gz
 %%PERL5_MAN1%%/jolokia.1.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::ArtifactHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::DownloadAgent.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Logger.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Meta.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier::ChecksumVerifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier::GnuPGVerifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier::MD5Verifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier::OpenPGPVerifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::Verifier::SHA1Verifier.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::WebXmlHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::UserAgent.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Alias.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Alias::Object.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Config.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::Command.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::Command::Global.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::Command::MBean.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::Command::Server.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::CommandHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::CompletionHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::ServerHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::J4psh::Shell.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Manual.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Nagios::CactiJmx4Perl.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Nagios::CheckJmx4Perl.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Nagios::MessageHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Nagios::SingleCheck.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::ActiveMQ.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::BaseHandler.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Geronimo.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Glassfish.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Hadoop.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::JBoss.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Jetty.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Jonas.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Resin.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::SpringDM.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Terracotta.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Tomcat.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Unknown.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Weblogic.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Product::Websphere.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Request.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Response.3.gz
 %%PERL5_MAN3%%/JMX::Jmx4Perl::Util.3.gz
 %%SITE_PERL%%/JMX/Jmx4Perl.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/ArtifactHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/DownloadAgent.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Logger.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Meta.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/ChecksumVerifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/GnuPGVerifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/MD5Verifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/OpenPGPVerifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/PGPKey.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/Verifier/SHA1Verifier.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/Jolokia/WebXmlHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Agent/UserAgent.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Alias.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Alias/Object.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Config.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Command.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Command/Global.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Command/MBean.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Command/Server.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/CommandHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/CompletionHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/ServerHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/J4psh/Shell.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Manual.pod
 %%SITE_PERL%%/JMX/Jmx4Perl/Nagios/CactiJmx4Perl.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Nagios/CheckJmx4Perl.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Nagios/MessageHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Nagios/SingleCheck.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/ActiveMQ.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/BaseHandler.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Geronimo.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Glassfish.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Hadoop.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/JBoss.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Jetty.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Jonas.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Resin.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/SpringDM.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Terracotta.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Tomcat.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Unknown.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Weblogic.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Product/Websphere.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Request.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Response.pm
 %%SITE_PERL%%/JMX/Jmx4Perl/Util.pm
-%%ETCDIR%%/common.cfg.sample
-%%ETCDIR%%/glassfish.cfg.sample
-%%ETCDIR%%/jboss.cfg.sample
-%%ETCDIR%%/jetty.cfg.sample
-%%ETCDIR%%/memory.cfg.sample
-%%ETCDIR%%/metrics.cfg.sample
-%%ETCDIR%%/threads.cfg.sample
-%%ETCDIR%%/tomcat.cfg.sample
-%%ETCDIR%%/weblogic.cfg.sample