Attachment 111296 Details for Bug 152532 – fbpanel-6.1_1.diff

[patch] fbpanel-6.1_1.diff

fbpanel-6.1_1.diff (text/plain), 1.70 KB, created by Charlie Kester on 2010-11-24 03:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Kester

Created: 2010-11-24 03:20:09 UTC

Size: 1.70 KB

patch

obsolete

>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%%-*}

Actions: View | Diff

Attachments on bug 152532: 111296