Pullup ticket #5040 - requested by taca

net/ntp4: package build fixes

Revisions pulled up:
- net/ntp4/Makefile                                             1.93-1.94
- net/ntp4/PLIST                                                1.22
- net/ntp4/options.mk                                           1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bsiegert
   Date:		Fri May 13 15:50:13 UTC 2016

   Modified Files:
   	pkgsrc/net/ntp4: Makefile PLIST

   Log Message:
   Fix package installation for Darwin, which installs tickadj and ntpsnmpd.

   Not sure what the snmp thing is about; is it picking up a dependency from
   the base system? Why does no other OS build it?


   To generate a diff of this commit:
   cvs rdiff -u -r1.92 -r1.93 pkgsrc/net/ntp4/Makefile
   cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/ntp4/PLIST

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bsiegert
   Date:		Sat May 14 08:13:49 UTC 2016

   Modified Files:
   	pkgsrc/net/ntp4: Makefile options.mk

   Log Message:
   Do SNMP support properly, as a package option, default disabled.


   To generate a diff of this commit:
   cvs rdiff -u -r1.93 -r1.94 pkgsrc/net/ntp4/Makefile
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ntp4/options.mk

3 files changed, 20 insertions, 6 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index f072eeeb0b9..6480df7bec6 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.91.2.2 2016/06/06 18:29:05 spz Exp $
+# $NetBSD: Makefile,v 1.91.2.3 2016/06/06 18:34:31 spz Exp $
 #
 
 DISTNAME=	ntp-4.2.8p8
 PKGNAME=	${DISTNAME:S/-dev-/-/}
+#PKGREVISION=	0
 CATEGORIES=	net time
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
 
@@ -41,13 +42,15 @@ post-install:
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-PLIST_VARS+=	ntptime tickadj timetrim
+PLIST_VARS+=	ntpsnmpd ntptime tickadj timetrim
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.ntptime=		yes
 PLIST.tickadj=		yes
 .elif ${OPSYS} == "IRIX"
 PLIST.timetrim=		yes
+.elif ${OPSYS} == "Darwin"
+PLIST.tickadj=		yes
 .endif
 
 # chroot jail support
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index c644ade133b..f41f6cd4b57 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20.4.1 2016/05/13 12:33:51 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.20.4.2 2016/06/06 18:34:31 spz Exp $
 bin/sntp
 man/man1/sntp.1
 man/man5/ntp.conf.5
@@ -9,6 +9,7 @@ man/man8/ntp-wait.8
 man/man8/ntpd.8
 man/man8/ntpdc.8
 man/man8/ntpq.8
+${PLIST.ntpsnmpd}man/man8/ntpsnmpd.8
 man/man8/ntptrace.8
 ${PLIST.tickadj}sbin/calc_tickadj
 sbin/ntp-keygen
@@ -17,6 +18,7 @@ sbin/ntpd
 sbin/ntpdate
 sbin/ntpdc
 sbin/ntpq
+${PLIST.ntpsnmpd}sbin/ntpsnmpd
 ${PLIST.ntptime}sbin/ntptime
 sbin/ntptrace
 ${PLIST.tickadj}sbin/tickadj
diff --git a/net/ntp4/options.mk b/net/ntp4/options.mk
index cb2c1447b52..05cedb17975 100644
--- a/net/ntp4/options.mk
+++ b/net/ntp4/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:00 wiz Exp $
+# $NetBSD: options.mk,v 1.2.32.1 2016/06/06 18:34:31 spz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ntp4
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
+PKG_SUPPORTED_OPTIONS=	inet6 snmp
+PKG_SUGGESTED_OPTIONS=
 
 .if empty(MISSING_FEATURES:Minet6)
 PKG_SUGGESTED_OPTIONS+=	inet6
@@ -15,3 +15,12 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Msnmp)
+CONFIGURE_ARGS+=	--with-ntpsnmpd
+PLIST.ntpsnmpd=		yes
+.  include "../../net/net-snmp/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ntpsnmpd
+CONFIGURE_ARGS+=	--with-net-snmp-config=false
+.endif