Fri May 13 15:50:13 2016 UTC ()
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?


(bsiegert)
diff -r1.92 -r1.93 pkgsrc/net/ntp4/Makefile
diff -r1.21 -r1.22 pkgsrc/net/ntp4/PLIST
cvs diff -r1.92 -r1.93 pkgsrc/net/ntp4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ntp4/Makefile 2016/04/27 15:59:19 1.92
+++ pkgsrc/net/ntp4/Makefile 2016/05/13 15:50:13 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2016/04/27 15:59:19 wen Exp $ 1# $NetBSD: Makefile,v 1.93 2016/05/13 15:50:13 bsiegert Exp $
2# 2#
3 3
4DISTNAME= ntp-4.2.8p7 4DISTNAME= ntp-4.2.8p7
5PKGNAME= ${DISTNAME:S/-dev-/-/} 5PKGNAME= ${DISTNAME:S/-dev-/-/}
6CATEGORIES= net time 6CATEGORIES= net time
7MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ 7MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ntp.org/ 10HOMEPAGE= http://www.ntp.org/
11COMMENT= Network Time Protocol Version 4 11COMMENT= Network Time Protocol Version 4
12 12
13CONFLICTS+= openntpd-[0-9]* 13CONFLICTS+= openntpd-[0-9]*
14 14
@@ -31,33 +31,36 @@ INSTALLATION_DIRS= ${DOCDIR} ${EXAMPLESD @@ -31,33 +31,36 @@ INSTALLATION_DIRS= ${DOCDIR} ${EXAMPLESD
31 31
32RCD_SCRIPTS= ntpd ntpdate 32RCD_SCRIPTS= ntpd ntpdate
33 33
34post-install: 34post-install:
35 cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DESTDIR}${PREFIX}/${DOCDIR} 35 cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DESTDIR}${PREFIX}/${DOCDIR}
36 cd ${WRKSRC}/conf && pax -rw -pm . ${DESTDIR}${PREFIX}/${EXAMPLESDIR} 36 cd ${WRKSRC}/conf && pax -rw -pm . ${DESTDIR}${PREFIX}/${EXAMPLESDIR}
37 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS} 37 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS}
38 ${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 38 ${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
39 ${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 39 ${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42.include "options.mk" 42.include "options.mk"
43 43
44PLIST_VARS+= ntptime tickadj timetrim 44PLIST_VARS+= ntpsnmpd ntptime tickadj timetrim
45 45
46.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 46.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
47PLIST.ntptime= yes 47PLIST.ntptime= yes
48PLIST.tickadj= yes 48PLIST.tickadj= yes
49.elif ${OPSYS} == "IRIX" 49.elif ${OPSYS} == "IRIX"
50PLIST.timetrim= yes 50PLIST.timetrim= yes
 51.elif ${OPSYS} == "Darwin"
 52PLIST.ntpsnmpd= yes
 53PLIST.tickadj= yes
51.endif 54.endif
52 55
53# chroot jail support 56# chroot jail support
54.if ${OPSYS} == "NetBSD" 57.if ${OPSYS} == "NetBSD"
55CONFIGURE_ARGS+= --enable-clockctl 58CONFIGURE_ARGS+= --enable-clockctl
56.elif ${OPSYS} == "Linux" && exists(/usr/include/sys/capability.h) 59.elif ${OPSYS} == "Linux" && exists(/usr/include/sys/capability.h)
57CONFIGURE_ARGS+= --enable-linuxcaps 60CONFIGURE_ARGS+= --enable-linuxcaps
58.else 61.else
59# no chroot/privilege drop supported 62# no chroot/privilege drop supported
60.endif 63.endif
61 64
62CPPFLAGS.Linux+= -D_GNU_SOURCE # for struct in6_pktinfo 65CPPFLAGS.Linux+= -D_GNU_SOURCE # for struct in6_pktinfo
63 66
cvs diff -r1.21 -r1.22 pkgsrc/net/ntp4/PLIST (expand / switch to unified diff)

--- pkgsrc/net/ntp4/PLIST 2016/04/27 15:59:19 1.21
+++ pkgsrc/net/ntp4/PLIST 2016/05/13 15:50:13 1.22
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1@comment $NetBSD: PLIST,v 1.21 2016/04/27 15:59:19 wen Exp $ 1@comment $NetBSD: PLIST,v 1.22 2016/05/13 15:50:13 bsiegert Exp $
2bin/sntp 2bin/sntp
3man/man1/sntp.1 3man/man1/sntp.1
4man/man5/ntp.conf.5 4man/man5/ntp.conf.5
5man/man5/ntp.keys.5 5man/man5/ntp.keys.5
6${PLIST.tickadj}man/man8/calc_tickadj.8 6${PLIST.tickadj}man/man8/calc_tickadj.8
7man/man8/ntp-keygen.8 7man/man8/ntp-keygen.8
8man/man8/ntp-wait.8 8man/man8/ntp-wait.8
9man/man8/ntpd.8 9man/man8/ntpd.8
10man/man8/ntpdc.8 10man/man8/ntpdc.8
11man/man8/ntpq.8 11man/man8/ntpq.8
 12${PLIST.ntpsnmpd}man/man8/ntpsnmpd.8
12man/man8/ntptrace.8 13man/man8/ntptrace.8
13${PLIST.tickadj}sbin/calc_tickadj 14${PLIST.tickadj}sbin/calc_tickadj
14sbin/ntp-keygen 15sbin/ntp-keygen
15sbin/ntp-wait 16sbin/ntp-wait
16sbin/ntpd 17sbin/ntpd
17sbin/ntpdate 18sbin/ntpdate
18sbin/ntpdc 19sbin/ntpdc
19sbin/ntpq 20sbin/ntpq
 21${PLIST.ntpsnmpd}sbin/ntpsnmpd
20${PLIST.ntptime}sbin/ntptime 22${PLIST.ntptime}sbin/ntptime
21sbin/ntptrace 23sbin/ntptrace
22${PLIST.tickadj}sbin/tickadj 24${PLIST.tickadj}sbin/tickadj
23${PLIST.timetrim}sbin/timetrim 25${PLIST.timetrim}sbin/timetrim
24share/doc/ntp/COPYRIGHT 26share/doc/ntp/COPYRIGHT
25share/doc/ntp/ChangeLog 27share/doc/ntp/ChangeLog
26share/doc/ntp/NEWS 28share/doc/ntp/NEWS
27share/doc/ntp/README 29share/doc/ntp/README
28share/doc/ntp/README.bk 30share/doc/ntp/README.bk
29share/doc/ntp/README.hackers 31share/doc/ntp/README.hackers
30share/doc/ntp/README.leapsmear 32share/doc/ntp/README.leapsmear
31share/doc/ntp/README.patches 33share/doc/ntp/README.patches
32share/doc/ntp/README.pullrequests 34share/doc/ntp/README.pullrequests