Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Apr 2020 12:01:50 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r531926 - in head/net/knxd: . files
Message-ID:  <202004171201.03HC1oXY090114@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Fri Apr 17 12:01:50 2020
New Revision: 531926
URL: https://svnweb.freebsd.org/changeset/ports/531926

Log:
  Fixed error while starting knxd with service knxd start:
  Starting knxd.
  knxd: invalid option -- d
  
  It uses now a config file in /usr/local/etc/knxd.conf.

Modified:
  head/net/knxd/Makefile
  head/net/knxd/files/knxd.in
  head/net/knxd/pkg-plist

Modified: head/net/knxd/Makefile
==============================================================================
--- head/net/knxd/Makefile	Fri Apr 17 11:02:45 2020	(r531925)
+++ head/net/knxd/Makefile	Fri Apr 17 12:01:50 2020	(r531926)
@@ -3,7 +3,7 @@
 
 PORTNAME=	knxd
 PORTVERSION=	0.14.35
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -29,5 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-systemd --disable-usb \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-I${LOCALBASE}/include -L/${LOCALBASE}/lib"
+
+post-install:
+	(cd ${WRKSRC} && src/server/knxd_args -d -e 15.15.1 -E 15.15.2:8 -D -T -S -b ipt:192.168.0.117 -u /var/run/knxd > ${STAGEDIR}${PREFIX}/etc/knxd.conf.sample)
 
 .include <bsd.port.mk>

Modified: head/net/knxd/files/knxd.in
==============================================================================
--- head/net/knxd/files/knxd.in	Fri Apr 17 11:02:45 2020	(r531925)
+++ head/net/knxd/files/knxd.in	Fri Apr 17 12:01:50 2020	(r531926)
@@ -10,13 +10,8 @@
 #
 # sysrc knxd_enable="YES":	Set to "YES" to enable knxd
 #
-# sysrc knxd_local_address="15.15.1"	Set the bus address of knxd to 0.0.1, make sure this address is free on your KNX bus
+# sysrc knxd_config="%%PREFIX%%/etc/knxd.conf"	The config file to use
 #
-# sysrc knxd_child_address="15.15.2:8"	Give client connecting to knxd this address
-#
-# sysrc knxd_address="ipt:192.168.0.117"	The address of the commercial IP interface knxd should connect to
-#
-# sysrc knxd_
 
 . /etc/rc.subr
 
@@ -26,10 +21,8 @@ rcvar=knxd_enable
 load_rc_config $name
 
 : ${knxd_enable:="NO"}
-: ${knxd_local_address:="15.15.1"}
-: ${knxd_child_address:="15.15.2:8"}
-: ${knxd_address:="ipt:192.168.0.117"}
-: ${knxd_flags="-d -e ${knxd_local_address} -E ${knxd_child_address} -D -T -S -b ${knxd_address} -u /var/run/knxd"}
+: ${knxd_config:="%%PREFIX%%/etc/knxd.conf"}
+: ${knxd_flags="${knxd_config}"}
 
 command="%%PREFIX%%/bin/knxd"
 #command_args=""

Modified: head/net/knxd/pkg-plist
==============================================================================
--- head/net/knxd/pkg-plist	Fri Apr 17 11:02:45 2020	(r531925)
+++ head/net/knxd/pkg-plist	Fri Apr 17 12:01:50 2020	(r531926)
@@ -70,3 +70,5 @@ libexec/knxd_args
 %%DATADIR%%/EIBConnection.rb
 %%DATADIR%%/EIBD.pas
 %%DATADIR%%/eibclient.php
+@sample etc/knxd.conf.sample
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004171201.03HC1oXY090114>