From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 25 12:40:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 704291065692 for ; Wed, 25 Nov 2009 12:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4B5508FC1B for ; Wed, 25 Nov 2009 12:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPCe1VH058948 for ; Wed, 25 Nov 2009 12:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAPCe1Og058947; Wed, 25 Nov 2009 12:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 25 Nov 2009 12:40:01 GMT Resent-Message-Id: <200911251240.nAPCe1Og058947@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tor Halvard Furulund Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 056BD106566B for ; Wed, 25 Nov 2009 12:34:02 +0000 (UTC) (envelope-from Squat@hipper.squat.no) Received: from hipper.squat.no (unknown [IPv6:2001:700:300:1701:213:d3ff:fef3:25a2]) by mx1.freebsd.org (Postfix) with ESMTP id 8F9608FC29 for ; Wed, 25 Nov 2009 12:34:01 +0000 (UTC) Received: from hipper.squat.no (Squat@localhost [127.0.0.1]) by hipper.squat.no (8.14.3/8.14.3) with ESMTP id nAPCXxDO058324 for ; Wed, 25 Nov 2009 13:33:59 +0100 (CET) (envelope-from Squat@hipper.squat.no) Received: (from Squat@localhost) by hipper.squat.no (8.14.3/8.14.3/Submit) id nAPCXxLA058323; Wed, 25 Nov 2009 13:33:59 +0100 (CET) (envelope-from Squat) Message-Id: <200911251233.nAPCXxLA058323@hipper.squat.no> Date: Wed, 25 Nov 2009 13:33:59 +0100 (CET) From: Tor Halvard Furulund To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/140861: [MAINTAINER] net/miniupnpd: make it build in tinderbox X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Tor Halvard Furulund List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 12:40:01 -0000 >Number: 140861 >Category: ports >Synopsis: [MAINTAINER] net/miniupnpd: make it build in tinderbox >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 25 12:40:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Tor Halvard Furulund >Release: FreeBSD 8.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hipper.squat.no 8.0-RELEASE FreeBSD 8.0-RELEASE #5: Mon Nov 16 14:46:55 CET 2009 Squat@hipper.squat.no:/usr/obj/usr/src/sys/hipper amd64 >Description: In ports/140319 my genconfig.sh-patch was just removed, so the port cannot build in setups without /etc/rc.conf (like tinderbox). Made a new genconfig.sh-patch to make the port build without rc.conf and rc.subr. I didn't bump the portrevision-number, I can submit a new patch with PORTREVISION=1 if requested. >How-To-Repeat: http://pointyhat.FreeBSD.org/errorlogs/amd64-errorlogs/a.8.20091122192541/miniupnpd-1.4.log >Fix: diff -ruN /usr/ports/net/miniupnpd/files/patch-genconfig.sh miniupnpd/files/patch-genconfig.sh --- /usr/ports/net/miniupnpd/files/patch-genconfig.sh 1970-01-01 01:00:00.000000000 +0100 +++ miniupnpd/files/patch-genconfig.sh 2009-11-25 12:58:20.461270015 +0100 @@ -0,0 +1,40 @@ +--- genconfig.sh.orig 2009-09-04 18:21:24.000000000 +0200 ++++ genconfig.sh 2009-11-25 12:31:04.344410750 +0100 +@@ -66,18 +66,25 @@ + fi + # new way to see which one to use PF or IPF. + # see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957 +- # source file with handy subroutines like checkyesno +- . /etc/rc.subr +- # source config file so we can probe vars +- . /etc/rc.conf +- if checkyesno ipfilter_enable; then +- echo "Using ipf" +- FW=ipf +- echo "#define USE_IPF 1" >> ${CONFIGFILE} +- elif checkyesno pf_enable; then +- echo "Using pf" +- FW=pf +- echo "#define USE_PF 1" >> ${CONFIGFILE} ++ # source file wource config file so we can probe vars ++ if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then ++ # source file with handy subroutines like checkyesno ++ . /etc/rc.subr ++ # source config file so we can probe vars ++ . /etc/rc.conf ++ if checkyesno ipfilter_enable; then ++ echo "Using ipf" ++ FW=ipf ++ echo "#define USE_IPF 1" >> ${CONFIGFILE} ++ elif checkyesno pf_enable; then ++ echo "Using pf" ++ FW=pf ++ echo "#define USE_PF 1" >> ${CONFIGFILE} ++ else ++ echo "Could not detect usage of ipf or pf. Compiling for pf by default" ++ FW=pf ++ echo "#define USE_PF 1" >> ${CONFIGFILE} ++ fi + # TODO : Add support for IPFW + # echo "#define USE_IPFW 1" >> ${CONFIGFILE} + # FW=ipfw >Release-Note: >Audit-Trail: >Unformatted: