Date: Sat, 3 Feb 2018 08:54:22 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460797 - in head/dns/knot2: . dns dns/knot2 dns/knot2/files files Message-ID: <201802030854.w138sMJY061530@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Feb 3 08:54:22 2018 New Revision: 460797 URL: https://svnweb.freebsd.org/changeset/ports/460797 Log: Update to upstream version 2.6.4 PR: 224858 Submitted by: freebsd@dns-lab.com (maintainer) MFH: 2018Q1 Added: head/dns/knot2/dns/ head/dns/knot2/dns/knot2/ head/dns/knot2/dns/knot2/files/ head/dns/knot2/dns/knot2/files/extra-patch-configure.ac (contents, props changed) head/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am (contents, props changed) head/dns/knot2/files/extra-patch-configure.ac (contents, props changed) head/dns/knot2/files/extra-patch-src_Makefile.am (contents, props changed) Modified: head/dns/knot2/Makefile head/dns/knot2/distinfo Modified: head/dns/knot2/Makefile ============================================================================== --- head/dns/knot2/Makefile Sat Feb 3 08:34:24 2018 (r460796) +++ head/dns/knot2/Makefile Sat Feb 3 08:54:22 2018 (r460797) @@ -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: head/dns/knot2/distinfo ============================================================================== --- head/dns/knot2/distinfo Sat Feb 3 08:34:24 2018 (r460796) +++ head/dns/knot2/distinfo Sat Feb 3 08:54:22 2018 (r460797) @@ -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 Added: head/dns/knot2/dns/knot2/files/extra-patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot2/dns/knot2/files/extra-patch-configure.ac Sat Feb 3 08:54:22 2018 (r460797) @@ -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() Added: head/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am Sat Feb 3 08:54:22 2018 (r460797) @@ -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 # Added: head/dns/knot2/files/extra-patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot2/files/extra-patch-configure.ac Sat Feb 3 08:54:22 2018 (r460797) @@ -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() Added: head/dns/knot2/files/extra-patch-src_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot2/files/extra-patch-src_Makefile.am Sat Feb 3 08:54:22 2018 (r460797) @@ -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 #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802030854.w138sMJY061530>