svn commit: r361654 - head/net/ntp-devel

[Cy Schubert]

Author: cy
Date: Sun Jul 13 05:28:16 2014
New Revision: 361654
URL: http://svnweb.freebsd.org/changeset/ports/361654
QAT: https://qat.redports.org/buildarchive/r361654/

Log:
  Remove perl as a hard dependency. Move ntpsnmpd PLIST from Makefile to
  pkg-plist.
  
  PR:		191235

Modified:
  head/net/ntp-devel/Makefile
  head/net/ntp-devel/Makefile.inc
  head/net/ntp-devel/pkg-plist

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Sat Jul 12 23:20:28 2014	(r361653)
+++ head/net/ntp-devel/Makefile	Sun Jul 13 05:28:16 2014	(r361654)
@@ -17,13 +17,15 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake
 AUTOMAKE_ARGS=	--add-missing
 OPTIONS_SUB=	yes
-USES=		pathfix perl5 shebangfix libtool
+USES=		pathfix shebangfix libtool
 LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
 
 NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
 
 .include "Makefile.inc"
 
+PERL_UTILS_USES=	perl5
+
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_OFF=	--without-crypto
 
@@ -31,7 +33,6 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
-NTPSNMPD_PLIST_FILES=	sbin/ntpsnmpd
 NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
@@ -54,13 +55,6 @@ BROKEN=		Fails to compile when MX4200 is
  
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
 
-pre-everything::
-	@${ECHO}
-	@${ECHO} If you wish to build this port with SNMP support, please make
-	@${ECHO} sure that the net-mgmt/net-snmp port is installed before
-	@${ECHO} building and installing this port.
-	@${ECHO}
-
 AUTOTOOLSFILES=	aclocal.m4
 
 post-patch:

Modified: head/net/ntp-devel/Makefile.inc
==============================================================================
--- head/net/ntp-devel/Makefile.inc	Sat Jul 12 23:20:28 2014	(r361653)
+++ head/net/ntp-devel/Makefile.inc	Sun Jul 13 05:28:16 2014	(r361654)
@@ -32,6 +32,7 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		ONCORE \
   		PALISADE \
   		PCF \
+		PERL_UTILS \
   		PST \
   		RIPENCC \
   		SHM \
@@ -56,6 +57,7 @@ OPTIONS_DEFINE=	NTPSNMPD \
 OPTIONS_DEFAULT=	SSL \
 		NTP_SIGND \
   		ATOM \
+		PERL_UTILS \
   		NMEA
 
 NTPSNMPD_DESC=	Build and install ntpsnmpd
@@ -88,6 +90,7 @@ NMEA_DESC=	Enable NMEA GPS receiver
 ONCORE_DESC=	Enable Motorola VP/UT Oncore GPS receiver
 PALISADE_DESC=	Enable Palisade clock
 PCF_DESC=	Enable Conrad parallel port radio clock
+PERL_UTILS_DESC=	Install ntp-wait and ntptrace utilities
 PST_DESC=	Enable PST/Traconex 1020 WWV/WWVH receiver
 RIPENCC_DESC=	Enable RIPENCC specific Trimble driver
 SHM_DESC=	Enable SHM clock attached thru shared memory

Modified: head/net/ntp-devel/pkg-plist
==============================================================================
--- head/net/ntp-devel/pkg-plist	Sat Jul 12 23:20:28 2014	(r361653)
+++ head/net/ntp-devel/pkg-plist	Sun Jul 13 05:28:16 2014	(r361654)
@@ -1,23 +1,24 @@
 man/man5/ntp.conf.5.gz
 man/man5/ntp.keys.5.gz
 man/man8/ntp-keygen.8.gz
-man/man8/ntp-wait.8.gz
+%%PERL%%man/man8/ntp-wait.8.gz
 man/man8/ntpd.8.gz
 man/man8/ntpdc.8.gz
 man/man8/ntpq.8.gz
-man/man8/ntptrace.8.gz
+%%PERL%%man/man8/ntptrace.8.gz
 %%NTPSNMPD%%man/man8/ntpsnmpd.8.gz
 man/man8/sntp.8.gz
 %%SSL%%sbin/ntp-keygen
-sbin/ntp-wait
+%%PERL%%sbin/ntp-wait
 sbin/ntpd
 sbin/ntpdate
 sbin/ntpdc
 sbin/ntpq
+%%NTPSNMPD%%sbin/ntpsnmpd
 sbin/ntptime
-sbin/ntptrace
+%%PERL%%sbin/ntptrace
 sbin/sntp
-share/ntp/lib/NTP/Util.pm
+%%PERL%%share/ntp/lib/NTP/Util.pm
 %%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html