diff options
author | Koichiro Iwao <meta@FreeBSD.org> | 2019-10-25 12:46:19 +0000 |
---|---|---|
committer | Koichiro Iwao <meta@FreeBSD.org> | 2019-10-25 12:46:19 +0000 |
commit | 6b4e300cbdad9265e9ad2dae3eaf65f71b2519c4 (patch) | |
tree | 759d2984d0dad6c4bd5da1b98b89730c2ddca3ac /net/kea | |
parent | 1c3fc50cea9a71a29d724d8de581834d2e699906 (diff) | |
download | ports-6b4e300cbdad9265e9ad2dae3eaf65f71b2519c4.tar.gz ports-6b4e300cbdad9265e9ad2dae3eaf65f71b2519c4.zip |
Notes
Diffstat (limited to 'net/kea')
-rw-r--r-- | net/kea/Makefile | 5 | ||||
-rw-r--r-- | net/kea/files/kea.in | 34 | ||||
-rw-r--r-- | net/kea/files/patch-Makefile.am | 6 | ||||
-rw-r--r-- | net/kea/files/patch-src-bin-keactrl-Makefile.am | 6 | ||||
-rw-r--r-- | net/kea/files/patch-src-lib-dhcpsrv-Makefile.am | 6 | ||||
-rw-r--r-- | net/kea/files/patch-src_bin_keactrl_keactrl.in | 13 | ||||
-rw-r--r-- | net/kea/pkg-plist | 10 |
7 files changed, 43 insertions, 37 deletions
diff --git a/net/kea/Makefile b/net/kea/Makefile index 30d301847fc0..ef0bd627a306 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -2,7 +2,7 @@ PORTNAME= kea PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ISC/kea/${ISCVERSION} DISTNAME= ${PORTNAME}-${ISCVERSION} @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \ libboost_system.so:devel/boost-libs +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 @@ -25,7 +27,6 @@ CPE_VERSION= ${ISCVERSION:C/-.*//} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif -USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes diff --git a/net/kea/files/kea.in b/net/kea/files/kea.in index afdc0f9c4405..a2a0e6ff4eb2 100644 --- a/net/kea/files/kea.in +++ b/net/kea/files/kea.in @@ -3,7 +3,7 @@ # # PROVIDE: kea # REQUIRE: netif routing -# KEYWORD: nojail +# KEYWORD: nojail shutdown # # Add the following to /etc/rc.conf[.local] to enable this service @@ -13,28 +13,20 @@ . /etc/rc.subr -name="kea" -rcvar="${name}_enable" -command="%%PREFIX%%/sbin/keactrl" -required_files="%%PREFIX%%/etc/${name}/keactrl.conf" -extra_commands="reload" -start_precmd="kea_start_precmd" -stop_cmd="kea_cmd stop" -status_cmd="kea_cmd status" -reload_cmd="kea_cmd reload" +name=kea +desc="Kea DHCP Server" +rcvar=kea_enable -kea_start_precmd() -{ - - command_args="start" -} +load_rc_config $name -kea_cmd() -{ +kea_enable=${kea_enable:-"NO"} - $command $1 -} +command="%%PREFIX%%/sbin/keactrl" +required_files="%%PREFIX%%/etc/${name}/keactrl.conf" +extra_commands=reload +start_precmd=command_args=start +stop_cmd="$command stop" +status_cmd="$command status" +reload_cmd="$command reload" -load_rc_config $name -: ${kea_enable="NO"} run_rc_command "$1" diff --git a/net/kea/files/patch-Makefile.am b/net/kea/files/patch-Makefile.am index 07d504fb1a72..77fc64848c9e 100644 --- a/net/kea/files/patch-Makefile.am +++ b/net/kea/files/patch-Makefile.am @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2019-09-07 13:19:16.709194000 -0500 -+++ Makefile.am 2019-09-07 13:20:04.760926000 -0500 -@@ -154,7 +154,6 @@ +--- Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ Makefile.am +@@ -154,7 +154,6 @@ docs: # These steps are necessary during installation install-exec-hook: mkdir -p $(DESTDIR)${localstatedir}/log/ diff --git a/net/kea/files/patch-src-bin-keactrl-Makefile.am b/net/kea/files/patch-src-bin-keactrl-Makefile.am index 4264c065746f..385488664470 100644 --- a/net/kea/files/patch-src-bin-keactrl-Makefile.am +++ b/net/kea/files/patch-src-bin-keactrl-Makefile.am @@ -1,6 +1,6 @@ ---- src/bin/keactrl/Makefile.am.orig 2019-09-07 12:46:25.279164000 -0500 -+++ src/bin/keactrl/Makefile.am 2019-09-07 12:46:32.455324000 -0500 -@@ -62,7 +62,7 @@ +--- 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 \ diff --git a/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am b/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am index 1aa2fdfa84f0..fc2cb111e705 100644 --- a/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am +++ b/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am @@ -1,6 +1,6 @@ ---- src/lib/dhcpsrv/Makefile.am.orig 2019-09-07 13:00:43.923225000 -0500 -+++ src/lib/dhcpsrv/Makefile.am 2019-09-07 13:02:13.215945000 -0500 -@@ -4,7 +4,7 @@ +--- 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). diff --git a/net/kea/files/patch-src_bin_keactrl_keactrl.in b/net/kea/files/patch-src_bin_keactrl_keactrl.in new file mode 100644 index 000000000000..67f77dc7c5f1 --- /dev/null +++ b/net/kea/files/patch-src_bin_keactrl_keactrl.in @@ -0,0 +1,13 @@ +--- src/bin/keactrl/keactrl.in.orig 2019-10-19 21:50:45 UTC ++++ src/bin/keactrl/keactrl.in +@@ -517,8 +517,8 @@ ${args}" 1 + + status) + if [ -t 1 ]; then +- inactive="\e[91minactive\e[0m" +- active="\e[92mactive\e[0m" ++ inactive="\033[91minactive\033[0m" ++ active="\033[92mactive\033[0m" + else + inactive="inactive" + active="active" diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist index d0cdf6f5b48a..2115acbf4b31 100644 --- a/net/kea/pkg-plist +++ b/net/kea/pkg-plist @@ -1,3 +1,8 @@ +@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample +@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample +@sample %%ETCDIR%%/kea-dhcp4.conf.sample +@sample %%ETCDIR%%/kea-dhcp6.conf.sample +@sample %%ETCDIR%%/keactrl.conf.sample include/kea/asiodns/asiodns_messages.h include/kea/asiodns/io_fetch.h include/kea/asiodns/logger.h @@ -517,10 +522,5 @@ sbin/keactrl %%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh %%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh %%DATADIR%%/scripts/pgsql/wipe_data.sh -@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample -@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample -@sample %%ETCDIR%%/kea-dhcp4.conf.sample -@sample %%ETCDIR%%/kea-dhcp6.conf.sample -@sample %%ETCDIR%%/keactrl.conf.sample @dir /var/db/kea @dir /var/run/kea |