Index: Makefile =================================================================== --- Makefile (revision 517997) +++ Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= kea PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ISC/kea/${ISCVERSION} DISTNAME= ${PORTNAME}-${ISCVERSION} @@ -19,7 +18,7 @@ USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe # ISC releases things like 1.4.0-P1, which our versioning doesn't like -ISCVERSION= 1.6.0 +ISCVERSION= 1.6.1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Index: distinfo =================================================================== --- distinfo (revision 517997) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567876702 -SHA256 (kea-1.6.0.tar.gz) = 44ed48c729e4618fffcf0086529b469f7232990983187b2f71fce89f1ac6e270 -SIZE (kea-1.6.0.tar.gz) = 7154301 +TIMESTAMP = 1574306342 +SHA256 (kea-1.6.1.tar.gz) = dede0f4a953113f01075132aab251d5f359ebf32aa5b32d2ee3212d875bf284e +SIZE (kea-1.6.1.tar.gz) = 7155604 Index: files/patch-src-bin-keactrl-Makefile.am =================================================================== --- files/patch-src-bin-keactrl-Makefile.am (revision 517997) +++ files/patch-src-bin-keactrl-Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- src/bin/keactrl/Makefile.am.orig 2019-10-25 12:41:08 UTC -+++ src/bin/keactrl/Makefile.am -@@ -62,7 +62,7 @@ install-data-local: - $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \ - fi; \ - if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \ -- ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \ -+ ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$${f}.sample; \ - fi; \ - done - Property changes on: files/patch-src-bin-keactrl-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src-lib-dhcpsrv-Makefile.am =================================================================== --- files/patch-src-lib-dhcpsrv-Makefile.am (revision 517997) +++ files/patch-src-lib-dhcpsrv-Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- src/lib/dhcpsrv/Makefile.am.orig 2019-10-25 12:41:08 UTC -+++ src/lib/dhcpsrv/Makefile.am -@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks - - # DATA_DIR is the directory where to put default CSV files and the DHCPv6 - # server ID file (i.e. the file where the server finds its DUID at startup). --dhcp_data_dir = @localstatedir@/lib/@PACKAGE@ -+dhcp_data_dir = @localstatedir@/db/@PACKAGE@ - kea_lfc_location = @prefix@/sbin/kea-lfc - - AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\"" Property changes on: files/patch-src-lib-dhcpsrv-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_bin_keactrl_Makefile.am =================================================================== --- files/patch-src_bin_keactrl_Makefile.am (nonexistent) +++ files/patch-src_bin_keactrl_Makefile.am (working copy) @@ -0,0 +1,11 @@ +--- src/bin/keactrl/Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ src/bin/keactrl/Makefile.am +@@ -62,7 +62,7 @@ install-data-local: + $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \ + fi; \ + if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \ +- ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \ ++ ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$${f}.sample; \ + fi; \ + done + Property changes on: files/patch-src_bin_keactrl_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_lib_dhcpsrv_Makefile.am =================================================================== --- files/patch-src_lib_dhcpsrv_Makefile.am (nonexistent) +++ files/patch-src_lib_dhcpsrv_Makefile.am (working copy) @@ -0,0 +1,11 @@ +--- src/lib/dhcpsrv/Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ src/lib/dhcpsrv/Makefile.am +@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks + + # DATA_DIR is the directory where to put default CSV files and the DHCPv6 + # server ID file (i.e. the file where the server finds its DUID at startup). +-dhcp_data_dir = @localstatedir@/lib/@PACKAGE@ ++dhcp_data_dir = @localstatedir@/db/@PACKAGE@ + kea_lfc_location = @prefix@/sbin/kea-lfc + + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\"" Property changes on: files/patch-src_lib_dhcpsrv_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 517997) +++ pkg-plist (working copy) @@ -421,7 +421,7 @@ lib/libkea-dhcp++.a lib/libkea-dhcp++.so lib/libkea-dhcp++.so.13 -lib/libkea-dhcp++.so.13.0.1 +lib/libkea-dhcp++.so.13.0.2 lib/libkea-dhcp_ddns.a lib/libkea-dhcp_ddns.so lib/libkea-dhcp_ddns.so.1 @@ -449,7 +449,7 @@ lib/libkea-http.a lib/libkea-http.so lib/libkea-http.so.6 -lib/libkea-http.so.6.0.1 +lib/libkea-http.so.6.0.2 lib/libkea-log.a lib/libkea-log.so lib/libkea-log.so.4