o Add WITHOUT_PERL knob (and unbreak at unusual variable situation).

o Fix pkg-message message.

PR:		ports/56716, ports/58109
Submitted by:	Vivek Khera <khera@kcilink.com>,
		Matt Peterson <matt@peterson.org>

3 files changed, 58 insertions, 46 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index a5943c74fba1..e2f62c844727 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	net-snmp
 PORTVERSION=	5.0.9
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= net-snmp
@@ -14,7 +15,6 @@ MASTER_SITE_SUBDIR= net-snmp
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
-USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
 USE_LIBTOOL=	yes
@@ -22,6 +22,9 @@ USE_RC_SUBR=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 NO_LATEST_LINK=	yes
+.if !defined(WITHOUT_PERL)
+USE_PERL5=	yes
+.endif
 
 CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \
 		 --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \
@@ -29,10 +32,15 @@ CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host ucd-snmp/diskio" \
 		 --with-sys-location="${NET_SNMP_SYS_LOCATION}" \
 		 --with-logfile="${NET_SNMP_LOGFILE}" \
 		 --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
-		 --with-perl-modules \
 		 --with-gnu-ld --with-libwrap --with-libs="-lkvm -ldevstat"
+.if defined(WITHOUT_PERL)
+PLIST_SUB+=	WITHPERL="@comment "
+.else
+CONFIGURE_ARGS+=	--with-perl-modules
+PLIST_SUB+=	WITHPERL=""
+.endif
 .if defined(BATCH)
-CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
+CONFIGURE_ARGS+= --with-defaults
 .else
 IS_INTERACTIVE= yes
 .endif
@@ -75,12 +83,14 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
 		snmp_timeout.3 snmp_trap_api.3
+.if !defined(WITHOUT_PERL)
 MAN3PERL=	NetSNMP::default_store.3 NetSNMP::ASN.3 NetSNMP::OID.3 \
 		NetSNMP::agent::default_store.3 \
 		NetSNMP::netsnmp_request_infoPtr.3 \
 		NetSNMP::agent.3 SNMP.3
 MAN3PERLPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 _MANPAGES+=     ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
+.endif
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmpd.8 snmptrapd.8
@@ -107,9 +117,11 @@ post-patch:
 		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
+.if !defined(WITHOUT_PERL)
 post-build:
 	@${FIND} ${CONFIGURE_WRKSRC}/perl -name Makefile | \
 	 ${XARGS} ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//'
+.endif
 
 pre-install:
 	-@[ -f ${STARTUP_FILE} ] && \
diff --git a/net-mgmt/net-snmp/pkg-message b/net-mgmt/net-snmp/pkg-message
index c33cc3a65658..492dcecabfe0 100644
--- a/net-mgmt/net-snmp/pkg-message
+++ b/net-mgmt/net-snmp/pkg-message
@@ -3,8 +3,8 @@
      If you want to invoke snmpd from startup, put these lines into
      /etc/rc.conf.
 
-	net_snmpd_enable="YES"
-	net_snmpd_flags=""
+	snmpd_enable="YES"
+	snmpd_flags=""
 
 **** You can specify make variables as:
 
@@ -20,4 +20,4 @@
 
 	BATCH="yes"
 
-     to make to avoid interactive configuration.
\ No newline at end of file
+     to make to avoid interactive configuration.
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 96b16bc5d9ab..7cce181fa8c9 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -244,49 +244,49 @@ share/snmp/snmpconf-data/snmpd-data/trapsinks
 share/snmp/snmpconf-data/snmptrapd-data/formatting
 share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
 share/snmp/snmpconf-data/snmptrapd-data/traphandle
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm
+%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
 @dirrm share/snmp/snmpconf-data/snmp-data
 @dirrm share/snmp/snmpconf-data/snmpd-data
 @dirrm share/snmp/snmpconf-data/snmptrapd-data
 @dirrm share/snmp/snmpconf-data
 @dirrm share/snmp/mibs
 @unexec rmdir %D/share/snmp 2>/dev/null || true
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
+%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
+%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true