Allow applets to find their GTK+ builder UI files. This fixes quite a few

applet problems.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11829 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 22 insertions, 12 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 91864a614..6a91320d8 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.191 2008/10/21 15:37:33 mezz Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.192 2008/11/25 18:07:05 mezz Exp $
 #
 
 PORTNAME=	gnome-applets
 PORTVERSION=	2.24.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 9559282b5..8a9822d48 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	2008-04-28 13:26:14.000000000 -0400
-+++ configure	2008-04-28 13:26:14.000000000 -0400
-@@ -25946,7 +25946,7 @@ _ACEOF
+--- configure.orig	2008-12-20 14:46:11.000000000 -0500
++++ configure	2008-12-20 14:54:57.000000000 -0500
+@@ -17150,7 +17150,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -9,7 +9,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOMELOCALEDIR="$ac_define_dir"
  
-@@ -27893,8 +27893,8 @@ fi
+@@ -19097,8 +19097,8 @@ fi
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -20,7 +20,7 @@
  	       ACPIINC="-I${OS_SYS}"
  	   else
  	       ACPIINC="-I/usr/src/sys"
-@@ -28815,6 +28815,9 @@ if test x$disable_cpufreq = xno; then
+@@ -20023,6 +20023,9 @@ if test x$disable_cpufreq = xno; then
        *linux*)
           build_cpufreq_applet=yes
  	 ;;
@@ -30,7 +30,7 @@
        *)
           { 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;}
-@@ -29383,7 +29386,7 @@ builderdir="${pkgdatadir}/builder"
+@@ -20591,7 +20594,7 @@ builderdir="${pkgdatadir}/builder"
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -39,7 +39,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOME_ICONDIR="$ac_define_dir"
  
-@@ -29396,7 +29399,7 @@ _ACEOF
+@@ -20604,7 +20607,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -48,7 +48,16 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
-@@ -29422,7 +29425,7 @@ _ACEOF
+@@ -20617,7 +20620,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${builderdir}"`
++  ac_define_dir=`eval echo "${builderdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GTK_BUILDERDIR="$ac_define_dir"
+ 
+@@ -20630,7 +20633,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57,7 +66,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    DATADIR="$ac_define_dir"
  
-@@ -29435,7 +29438,7 @@ _ACEOF
+@@ -20643,7 +20646,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +75,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    SYSCONFDIR="$ac_define_dir"
  
-@@ -29448,7 +29451,7 @@ _ACEOF
+@@ -20656,7 +20659,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -75,7 +84,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    LIBDIR="$ac_define_dir"
  
-@@ -29461,7 +29464,7 @@ _ACEOF
+@@ -20669,7 +20672,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'