svn commit: r460931 - in branches/2018Q1/dns/knot2: . dns files

[Thomas Zander]

Author: riggs
Date: Sun Feb  4 13:58:47 2018
New Revision: 460931
URL: https://svnweb.freebsd.org/changeset/ports/460931

Log:
  MFH: r460797
  
  Update to upstream version 2.6.4
  
  PR:		224858
  Submitted by:	freebsd at dns-lab.com (maintainer)
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2018Q1/dns/knot2/dns/
     - copied from r460797, head/dns/knot2/dns/
  branches/2018Q1/dns/knot2/files/extra-patch-configure.ac
     - copied unchanged from r460797, head/dns/knot2/files/extra-patch-configure.ac
  branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am
     - copied unchanged from r460797, head/dns/knot2/files/extra-patch-src_Makefile.am
Modified:
  branches/2018Q1/dns/knot2/Makefile
  branches/2018Q1/dns/knot2/distinfo
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/dns/knot2/Makefile
==============================================================================
--- branches/2018Q1/dns/knot2/Makefile	Sun Feb  4 13:32:07 2018	(r460930)
+++ branches/2018Q1/dns/knot2/Makefile	Sun Feb  4 13:58:47 2018	(r460931)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
@@ -60,15 +60,12 @@ FASTPARSER_CONFIGURE_ENABLE=	fastparser
 IDN_CONFIGURE_WITH=		libidn
 IDN_LIB_DEPENDS=		libidn.so:dns/libidn
 
+# starting at 2.6.5 this block will already be absolete
 .include <bsd.port.pre.mk>
-
 .if ${ARCH} == "i386"
-CPUTYPE=	i686
-CFLAGS+=	-march=i686
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000
-USE_GCC=	yes
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-configure.ac
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_Makefile.am
 .endif
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
@@ -83,4 +80,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
+#.include <bsd.port.mk>
 .include <bsd.port.post.mk>

Modified: branches/2018Q1/dns/knot2/distinfo
==============================================================================
--- branches/2018Q1/dns/knot2/distinfo	Sun Feb  4 13:32:07 2018	(r460930)
+++ branches/2018Q1/dns/knot2/distinfo	Sun Feb  4 13:58:47 2018	(r460931)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509693720
-SHA256 (knot-2.6.1.tar.xz) = 3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3
-SIZE (knot-2.6.1.tar.xz) = 1112956
+TIMESTAMP = 1517244504
+SHA256 (knot-2.6.4.tar.xz) = 1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a
+SIZE (knot-2.6.4.tar.xz) = 1116928

Copied: branches/2018Q1/dns/knot2/files/extra-patch-configure.ac (from r460797, head/dns/knot2/files/extra-patch-configure.ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/dns/knot2/files/extra-patch-configure.ac	Sun Feb  4 13:58:47 2018	(r460931, copy of r460797, head/dns/knot2/files/extra-patch-configure.ac)
@@ -0,0 +1,24 @@
+--- configure.ac.orig	2018-01-29 16:11:32 UTC
++++ configure.ac
+@@ -501,19 +501,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#inclu
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]], [[cpuset_t* set = cpuset_create(); cpuset_destroy(set);]])],
+ [AC_DEFINE(HAVE_CPUSET_NETBSD, 1, [Define if cpuset_t and cpuset(3) exists.])])
+ 
+-AC_COMPILE_IFELSE(
++AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM([[#include <stdint.h>]],
+                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
+-  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])
+-    AC_LINK_IFELSE(
+-     [AC_LANG_PROGRAM([[#include <stdint.h>]],
+-                      [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
+-     [atomic_LIBS=""],
+-     [atomic_LIBS="-latomic"]
+-  )],
+-  [atomic_LIBS=""]
++  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
+ )
+-AC_SUBST([atomic_LIBS])
+ 
+ # Prepare CFLAG_VISIBILITY to be used where needed
+ gl_VISIBILITY()

Copied: branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am (from r460797, head/dns/knot2/files/extra-patch-src_Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am	Sun Feb  4 13:58:47 2018	(r460931, copy of r460797, head/dns/knot2/files/extra-patch-src_Makefile.am)
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2018-01-29 16:11:17 UTC
++++ src/Makefile.am
+@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(
+                        $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC
+ libknotd_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
+ libknotd_la_LIBADD   = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \
+-                       $(liburcu_LIBS) $(atomic_LIBS)
++                       $(liburcu_LIBS)
+ 
+ ###################
+ # Knot DNS Daemon #