diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-07-10 06:23:31 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-07-10 06:23:31 +0800 |
commit | fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113 (patch) | |
tree | 630bff06517ca11c2ef5cf516c4e89dfebfa0040 /x11/gnome-applets/files | |
parent | 9f12282101a966bae3306f6a191d28bde80b0623 (diff) | |
download | marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar.gz marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar.bz2 marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar.lz marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar.xz marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.tar.zst marcuscom-ports-fd20845d4aece8c3d5facf7a1c2fa2b8f8c21113.zip |
Fix a slew of == bashisms as well as a neat little variable expansion bug that
pops up now that we no longer specify an explicit datadir.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9166 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-applets/files')
-rw-r--r-- | x11/gnome-applets/files/patch-aa | 61 |
1 files changed, 36 insertions, 25 deletions
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index a7599220d..7d1f86084 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Wed Jul 26 16:38:04 2006 -+++ configure Wed Jul 26 16:38:04 2006 -@@ -27066,8 +27065,8 @@ +--- configure.orig 2007-07-09 18:13:48.000000000 -0400 ++++ configure 2007-07-09 18:14:19.000000000 -0400 +@@ -25117,7 +25117,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${datadir}/locale"` ++ ac_define_dir=`eval echo "${datadir}/locale"` + ac_define_dir=`eval echo $ac_define_dir` + GNOMELOCALEDIR="$ac_define_dir" + +@@ -27157,8 +27157,8 @@ fi ;; # list of supported OS cores that do not use libapm @@ -11,7 +20,16 @@ ACPIINC="-I${OS_SYS}" else ACPIINC="-I/usr/src/sys" -@@ -28145,6 +28144,9 @@ +@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; } + fi + + +- stb="system-tools-backends" ++ stb="system-tools-backends-2.0" + + if test x$PKG_CONFIG != xno ; then + if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then +@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then *linux*) build_cpufreq_applet=yes ;; @@ -21,73 +39,66 @@ *) { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5 echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;} -@@ -28764,8 +28766,7 @@ +@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade" test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${iconsdir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${iconsdir}"` + ac_define_dir=`eval echo $ac_define_dir` GNOME_ICONDIR="$ac_define_dir" - -@@ -28777,8 +28778,7 @@ +@@ -28697,7 +28700,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${pixmapsdir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${pixmapsdir}"` + ac_define_dir=`eval echo $ac_define_dir` GNOME_PIXMAPSDIR="$ac_define_dir" - -@@ -28790,8 +28790,7 @@ +@@ -28710,7 +28713,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${gladedir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${gladedir}"` + ac_define_dir=`eval echo $ac_define_dir` GNOME_GLADEDIR="$ac_define_dir" - -@@ -28803,8 +28802,7 @@ +@@ -28723,7 +28726,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${datadir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${datadir}"` + ac_define_dir=`eval echo $ac_define_dir` DATADIR="$ac_define_dir" - -@@ -28816,8 +28814,7 @@ +@@ -28736,7 +28739,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${sysconfdir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${sysconfdir}"` + ac_define_dir=`eval echo $ac_define_dir` SYSCONFDIR="$ac_define_dir" - -@@ -28829,8 +28826,7 @@ +@@ -28749,7 +28752,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${libdir}"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "${libdir}"` + ac_define_dir=`eval echo $ac_define_dir` LIBDIR="$ac_define_dir" - -@@ -28842,8 +28838,7 @@ +@@ -28762,7 +28765,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"$prefix"` -- ac_define_dir=`eval echo $ac_define_dir` + ac_define_dir=`eval echo "$prefix"` + ac_define_dir=`eval echo $ac_define_dir` PREFIX="$ac_define_dir" - |