From owner-svn-ports-all@freebsd.org Fri Apr 17 12:01:51 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D2152B69F2; Fri, 17 Apr 2020 12:01:51 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 493ZSv3G6Jz3Jk6; Fri, 17 Apr 2020 12:01:51 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B2152201B; Fri, 17 Apr 2020 12:01:51 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03HC1pGI090117; Fri, 17 Apr 2020 12:01:51 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03HC1oXY090114; Fri, 17 Apr 2020 12:01:50 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202004171201.03HC1oXY090114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 17 Apr 2020 12:01:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531926 - in head/net/knxd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/net/knxd: . files X-SVN-Commit-Revision: 531926 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 12:01:51 -0000 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 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 +