cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PREFIX in configure environment.

Browse Source 
PR:		ports/152532
Submitted by:	Charlie Kester <corky1951@comcast.net> (maintainer)
Approved by:	itetcu (implicit)
This commit is contained in:
Beech Rintoul 2010-11-29 01:54:06 +00:00
parent e9c5ec8867
commit b248495a39
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=265349
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/fbpanel/Makefile
View File

@ -21,7 +21,7 @@ USE_GNOME= gtk20
HAS_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV+= PREFIX=${PREFIX}
CONFIGURE_ARGS+= --prefix=${PREFIX}
MAN1= fbpanel.1
MANCOMPRESSED= no

29
x11/fbpanel/files/patch-configure
View File

@ -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 -E -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 -E -e 's/--(enable|disable)-.+/AA/' <<< $1)" != AA ] && return 1
A=${1:2}
var=${A#*-}
val=${A%%-*}