Tue Nov 24 18:25:39 2015 UTC ()
Pullup ticket #4861 - requested by taca
net/ntp4: build fix

Revisions pulled up:
- net/ntp4/Makefile                                             1.89
- net/ntp4/distinfo                                             1.24
- net/ntp4/patches/patch-aa                                     deleted
- net/ntp4/patches/patch-include-ntp__syscall.h                 1.1
- net/ntp4/patches/patch-ntpd-ntpd.c                            1.1

---
   Module Name:	pkgsrc
   Committed By:	christos
   Date:		Thu Oct 29 11:23:47 UTC 2015

   Added Files:
   	pkgsrc/net/ntp4/patches: patch-include-ntp__syscall.h patch-ntpd-ntpd.c
   Removed Files:
   	pkgsrc/net/ntp4/patches: patch-aa

   Log Message:
   - rename patch-aa to follow not so new anymore convention
   - apply the "warmup" patch only on linux. should fix the build on netbsd-6

---
   Module Name:	pkgsrc
   Committed By:	christos
   Date:		Thu Oct 29 11:28:44 UTC 2015

   Modified Files:
   	pkgsrc/net/ntp4: Makefile distinfo

   Log Message:
   update checksum and bump revision


(bsiegert)
diff -r1.87.2.1 -r1.87.2.2 pkgsrc/net/ntp4/Makefile
diff -r1.22.2.1 -r1.22.2.2 pkgsrc/net/ntp4/distinfo
diff -r1.11 -r0 pkgsrc/net/ntp4/patches/patch-aa
diff -r0 -r1.1.2.2 pkgsrc/net/ntp4/patches/patch-include-ntp__syscall.h
diff -r0 -r1.1.2.2 pkgsrc/net/ntp4/patches/patch-ntpd-ntpd.c
cvs diff -r1.87.2.1 -r1.87.2.2 pkgsrc/net/ntp4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ntp4/Makefile 2015/10/27 19:07:02 1.87.2.1
+++ pkgsrc/net/ntp4/Makefile 2015/11/24 18:25:38 1.87.2.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.87.2.1 2015/10/27 19:07:02 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.87.2.2 2015/11/24 18:25:38 bsiegert Exp $
2# 2#
3 3
4DISTNAME= ntp-4.2.8p4 4DISTNAME= ntp-4.2.8p4
 5PKGREVISION= 1
5PKGNAME= ${DISTNAME:S/-dev-/-/} 6PKGNAME= ${DISTNAME:S/-dev-/-/}
6CATEGORIES= net time 7CATEGORIES= net time
7MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ 8MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ntp.org/ 11HOMEPAGE= http://www.ntp.org/
11COMMENT= Network Time Protocol Version 4 12COMMENT= Network Time Protocol Version 4
12 13
13CONFLICTS+= openntpd-[0-9]* 14CONFLICTS+= openntpd-[0-9]*
14 15
15GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
16USE_LIBTOOL= YES 17USE_LIBTOOL= YES
17USE_TOOLS+= pax perl:run 18USE_TOOLS+= pax perl:run
cvs diff -r1.22.2.1 -r1.22.2.2 pkgsrc/net/ntp4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ntp4/distinfo 2015/10/27 19:07:02 1.22.2.1
+++ pkgsrc/net/ntp4/distinfo 2015/11/24 18:25:38 1.22.2.2
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.22.2.1 2015/10/27 19:07:02 bsiegert Exp $ 1$NetBSD: distinfo,v 1.22.2.2 2015/11/24 18:25:38 bsiegert Exp $
2 2
3SHA1 (ntp-4.2.8p4.tar.gz) = a30f61f87b219ab3613def9e27f5c8e91ce38b0a 3SHA1 (ntp-4.2.8p4.tar.gz) = a30f61f87b219ab3613def9e27f5c8e91ce38b0a
4RMD160 (ntp-4.2.8p4.tar.gz) = 94ab0e190f37c55700978a1555473a308e7175e6 4RMD160 (ntp-4.2.8p4.tar.gz) = 94ab0e190f37c55700978a1555473a308e7175e6
5SHA512 (ntp-4.2.8p4.tar.gz) = e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23 5SHA512 (ntp-4.2.8p4.tar.gz) = e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23
6Size (ntp-4.2.8p4.tar.gz) = 7104852 bytes 6Size (ntp-4.2.8p4.tar.gz) = 7104852 bytes
7SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92 7SHA1 (patch-include-ntp__syscall.h) = b247569339d09a88f2e143e355033ce7635ffe92
8SHA1 (patch-configure) = 21466ffa5d0334957a1a93b2a99087e7edaaa4d5 8SHA1 (patch-ntpd-ntpd.c) = 5a5bf9c8939752e1b3f5d04cea3daabdc34081cf
9SHA1 (patch-sntp_configure) = 38357046af0f0c1aeb8b57bb9c653e330d3feadd 
10SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 9SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575
File Deleted: pkgsrc/net/ntp4/patches/Attic/patch-aa
File Added: pkgsrc/net/ntp4/patches/patch-include-ntp__syscall.h
$NetBSD: patch-include-ntp__syscall.h,v 1.1.2.2 2015/11/24 18:25:38 bsiegert Exp $

--- include/ntp_syscall.h.orig	2011-03-31 10:03:53.000000000 +0000
+++ include/ntp_syscall.h
@@ -10,6 +10,14 @@
 # include <sys/timex.h>
 #endif
 
+#if defined(ADJ_NANO) && !defined(MOD_NANO)
+#define MOD_NANO ADJ_NANO
+#endif
+
+#if defined(ADJ_TAI) && !defined(MOD_TAI)
+#define MOD_TAI ADJ_TAI
+#endif
+
 #ifndef NTP_SYSCALLS_LIBC
 # ifdef NTP_SYSCALLS_STD
 #  define ntp_adjtime(t)	syscall(SYS_ntp_adjtime, (t))
File Added: pkgsrc/net/ntp4/patches/Attic/patch-ntpd-ntpd.c
$NetBSD: patch-ntpd-ntpd.c,v 1.1.2.2 2015/11/24 18:25:38 bsiegert Exp $

Apply the stupid glibc "warmup" only on linux

--- ntpd/ntpd.c.orig	2015-10-21 12:14:24.000000000 -0400
+++ ntpd/ntpd.c	2015-10-29 07:20:41.000000000 -0400
@@ -32,7 +32,9 @@
 # ifdef HAVE_PTHREAD_H
 #  include <pthread.h>
 # endif
-# define NEED_PTHREAD_WARMUP
+# ifdef __linux__
+#  define NEED_PTHREAD_WARMUP
+# endif
 #endif
 
 #ifdef HAVE_UNISTD_H