From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 24 03:20:09 2010 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 BAF5F106566C for ; Wed, 24 Nov 2010 03:20:09 +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 948898FC16 for ; Wed, 24 Nov 2010 03:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAO3K9BZ091775 for ; Wed, 24 Nov 2010 03:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAO3K91L091774; Wed, 24 Nov 2010 03:20:09 GMT (envelope-from gnats) Resent-Date: Wed, 24 Nov 2010 03:20:09 GMT Resent-Message-Id: <201011240320.oAO3K91L091774@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, Charlie Kester Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF972106566B for ; Wed, 24 Nov 2010 03:10:15 +0000 (UTC) (envelope-from corky1951@comcast.net) Received: from qmta13.emeryville.ca.mail.comcast.net (qmta13.emeryville.ca.mail.comcast.net [76.96.27.243]) by mx1.freebsd.org (Postfix) with ESMTP id BB1508FC1E for ; Wed, 24 Nov 2010 03:10:15 +0000 (UTC) Received: from omta12.emeryville.ca.mail.comcast.net ([76.96.30.44]) by qmta13.emeryville.ca.mail.comcast.net with comcast id aqSQ1f0040x6nqcADrAFfy; Wed, 24 Nov 2010 03:10:15 +0000 Received: from comcast.net ([98.203.142.76]) by omta12.emeryville.ca.mail.comcast.net with comcast id arAD1f00A1f6R9u8YrADjH; Wed, 24 Nov 2010 03:10:14 +0000 Received: by comcast.net (sSMTP sendmail emulation); Tue, 23 Nov 2010 19:10:12 -0800 Message-Id: <20101124031015.DF972106566B@hub.freebsd.org> Date: Tue, 23 Nov 2010 19:10:12 -0800 From: Charlie Kester To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/152532: [MAINTAINER] x11/fbpanel: fix patch of configure script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Charlie Kester List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2010 03:20:09 -0000 >Number: 152532 >Category: ports >Synopsis: [MAINTAINER] x11/fbpanel: fix patch of configure script >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 24 03:20:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Charlie Kester >Release: FreeBSD 8.1-STABLE i386 >Organization: >Environment: System: FreeBSD atom.local 8.1-STABLE FreeBSD 8.1-STABLE #0: Tue Nov 16 17:15:14 PST 2010 root@atom.local:/usr/obj/usr/src/sys/ATOM i386 >Description: Existing port sets PREFIX in configure environment, in order to force installation into proper directories. This was a quick and dirty workaround. Wolfgang Jenkner did root cause analysis and suggested the attached changes to fix the real problem. My testing confirms his fix. No need to bump PORTREVISION since this doesn't affect the resulting package. >How-To-Repeat: >Fix: --- fbpanel-6.1_1.diff begins here --- diff -ruN /usr/ports/x11/fbpanel/Makefile ./fbpanel/Makefile --- /usr/ports/x11/fbpanel/Makefile 2010-11-22 14:58:13.000000000 -0800 +++ ./fbpanel/Makefile 2010-11-23 18:54:04.000000000 -0800 @@ -21,7 +21,7 @@ HAS_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV+= PREFIX=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX} MAN1= fbpanel.1 MANCOMPRESSED= no diff -ruN /usr/ports/x11/fbpanel/files/patch-configure ./fbpanel/files/patch-configure --- /usr/ports/x11/fbpanel/files/patch-configure 2010-11-22 03:35:55.000000000 -0800 +++ ./fbpanel/files/patch-configure 2010-11-23 17:48:11.000000000 -0800 @@ -1,11 +1,20 @@ ---- ./configure.orig 2010-04-04 02:02:40.000000000 -0700 -+++ ./configure 2010-11-17 11:11:33.000000000 -0800 -@@ -324,7 +324,7 @@ - add_var target "stab: configure for arch" "" +--- ./configure.orig 2010-04-04 11:02:40.000000000 +0200 ++++ ./configure 2010-11-22 19:41:52.000000000 +0100 +@@ -92,7 +92,7 @@ + { + local var val A - # N.B. order is important --add_var prefix "install architecture-independent files" /usr -+add_var prefix "install architecture-independent files" '${PREFIX}' - add_var eprefix "install architecture-dependent files" '$prefix' - add_var bindir "user executables" '$eprefix/bin' - add_var sbindir "system executables" '$eprefix/sbin' +- [ "$(sed -e 's/--[^=]\+=[^=]*/AA/' <<< $1)" != AA ] && return 1 ++ [ "$(sed -r -e 's/--[^=]+=[^=]*/AA/' <<< $1)" != AA ] && return 1 + + A=${1:2} + var=${A%%=*} +@@ -167,7 +167,7 @@ + + function check_feature () + { +- [ "$(sed -e 's/--\(enable\|disable\)-.\+/AA/' <<< $1)" != AA ] && return 1 ++ [ "$(sed -r -e 's/--(enable|disable)-.+/AA/' <<< $1)" != AA ] && return 1 + A=${1:2} + var=${A#*-} + val=${A%%-*} --- fbpanel-6.1_1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: