Date: Tue, 23 Nov 2010 19:10:12 -0800 From: Charlie Kester <corky1951@comcast.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152532: [MAINTAINER] x11/fbpanel: fix patch of configure script Message-ID: <20101124031015.DF972106566B@hub.freebsd.org> Resent-Message-ID: <201011240320.oAO3K91L091774@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101124031015.DF972106566B>