svn commit: r324112 - in head/net/openntpd: . files

[Christian Weisgerber]

Author: naddy
Date: Thu Aug  1 15:40:49 2013
New Revision: 324112
URL: http://svnweb.freebsd.org/changeset/ports/324112

Log:
  Simplify by dropping support for FreeBSD prior to 8.0-RELEASE.

Deleted:
  head/net/openntpd/files/arc4random.c
Modified:
  head/net/openntpd/Makefile
  head/net/openntpd/files/compat.h
  head/net/openntpd/files/patch-Makefile

Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile	Thu Aug  1 15:35:53 2013	(r324111)
+++ head/net/openntpd/Makefile	Thu Aug  1 15:40:49 2013	(r324112)
@@ -18,20 +18,12 @@ GROUPS=		_ntp
 USE_RC_SUBR=	openntpd
 
 WRKSRC=		${WRKDIR}/ntpd
-MAKE_JOBS_SAFE=	yes
 
 MAN5=		ntpd.conf.5
 MAN8=		ntpd.8
 
-.include <bsd.port.pre.mk>
-
-# requires adjtime(NULL, &olddelta) by unprivileged user
-.if ${OSVERSION} < 700000
-IGNORE=		is unsupported prior to FreeBSD 7.0
-.endif
-
 post-extract:
-.for i in compat.h adjfreq.c arc4random.c
+.for i in compat.h adjfreq.c
 	@${CP} ${FILESDIR}/$i ${WRKSRC}
 .endfor
 
@@ -46,7 +38,7 @@ do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/ntpd.conf ${EXAMPLESDIR}
 	@if [ ! -f ${PREFIX}/etc/ntpd.conf ]; then \
-		${CP} ${EXAMPLESDIR}/ntpd.conf ${PREFIX}/etc; \
+	    ${CP} ${EXAMPLESDIR}/ntpd.conf ${PREFIX}/etc; \
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/openntpd/files/compat.h
==============================================================================
--- head/net/openntpd/files/compat.h	Thu Aug  1 15:35:53 2013	(r324111)
+++ head/net/openntpd/files/compat.h	Thu Aug  1 15:40:49 2013	(r324112)
@@ -20,6 +20,3 @@
 
 /* adjfreq.c */
 int			adjfreq(const int64_t *, int64_t *);
-
-/* arc4random.c */
-u_int32_t		arc4random_uniform(u_int32_t);

Modified: head/net/openntpd/files/patch-Makefile
==============================================================================
--- head/net/openntpd/files/patch-Makefile	Thu Aug  1 15:35:53 2013	(r324111)
+++ head/net/openntpd/files/patch-Makefile	Thu Aug  1 15:40:49 2013	(r324112)
@@ -1,12 +1,12 @@
 $FreeBSD$
---- Makefile.orig	2009-11-23 20:27:18.000000000 +0100
-+++ Makefile	2009-11-23 20:29:05.000000000 +0100
+--- Makefile.orig	2009-06-25 16:14:54.000000000 +0200
++++ Makefile	2013-08-01 17:33:37.000000000 +0200
 @@ -2,7 +2,7 @@
  
  PROG=	ntpd
  SRCS=	ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c parse.y config.c \
 -	server.c client.c sensors.c util.c ntp_dns.c
-+	server.c client.c util.c ntp_dns.c adjfreq.c arc4random.c
++	server.c client.c util.c ntp_dns.c adjfreq.c
  CFLAGS+= -Wall -I${.CURDIR}
  CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS+= -Wmissing-declarations