Get rid of X11BASE and replace a few to LOCALBASE. I only touch these ports

that are maintaining by gnome@, ports@ and my team ports.


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

11 files changed, 24 insertions, 26 deletions

diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index b38145c02..0d80cff74 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -24,7 +24,7 @@ WANT_GNOME=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
 		CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin
 USE_LDCONFIG=	yes
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4cf3a068f..12fd718cf 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.62 2007/05/14 05:22:06 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.63 2007/05/19 21:36:27 marcus Exp $
 #
 
 PORTNAME=	gdm
@@ -34,7 +34,7 @@ USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man \
 		--with-console-kit=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
 
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 9762d6e16..494f5bcf8 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.53 2007/05/13 21:06:26 marcus Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.54 2007/05/19 21:36:28 marcus Exp $
 #
 
 PORTNAME=	gnome-menus
@@ -44,8 +44,7 @@ post-patch:
 		${WRKSRC}/layout/settings.menu
 	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
 		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 
 post-install:
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index de35a4839..b134a5817 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -14,7 +14,7 @@
          data_dirs = os.environ["XDG_DATA_DIRS"]
      if not data_dirs:
 -        data_dirs = "/usr/local/share/:/usr/share/"
-+	data_dirs = "%%LOCALBASE%%/share/:%%X11BASE%%/share/"
++	data_dirs = "%%LOCALBASE%%/share/"
  
      for data_dir in data_dirs.split (":"):
          retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 68e6b8fc6..b1ad0ca93 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.150 2007/05/15 22:07:03 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.151 2007/05/19 21:36:28 marcus Exp $
 #
 
 PORTNAME=	gnome-panel
@@ -34,7 +34,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-panel.1
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 07b472301..ef9ee2efa 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.75 2007/05/05 18:54:50 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.76 2007/05/19 21:36:28 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
@@ -29,7 +29,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-screensaver.schemas
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 68af31a52..8df3ef0e3 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.114 2007/05/13 21:25:12 marcus Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.115 2007/05/19 21:36:28 marcus Exp $
 #
 
 PORTNAME=	gnome-session
@@ -35,8 +35,8 @@ GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
 		gnome-session-save.1
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index b01322388..b09dda495 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD: ports/x11/gnome2-lite/Makefile,v 1.43 2007/03/19 05:13:54 marcus Exp $
-#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.56 2007/04/28 19:18:53 marcus Exp $
+#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.57 2007/05/19 21:36:29 marcus Exp $
 #
 
 PORTREVISION=	1
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet
 		evince:${PORTSDIR}/graphics/evince \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
     		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 07aa507d8..88bc3cd24 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.206 2007/05/17 05:12:14 marcus Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.207 2007/05/19 21:36:29 marcus Exp $
 #
 
 PORTNAME=	gnome2
@@ -40,7 +40,7 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		zenity:${PORTSDIR}/x11/zenity \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
 		dasher:${PORTSDIR}/accessibility/dasher \
 		evolution-2.12:${PORTSDIR}/mail/evolution \
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 5a240a06a..efac650ba 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,12 +1,11 @@
---- libgnome/Makefile.in.orig	Mon May 31 16:33:14 2004
-+++ libgnome/Makefile.in	Mon May 31 16:33:45 2004
-@@ -211,6 +211,9 @@
+--- libgnome/Makefile.in.orig	Tue May 29 22:16:13 2007
++++ libgnome/Makefile.in	Tue May 29 22:16:58 2007
+@@ -280,6 +280,8 @@
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
- 
  INCLUDES = \
 +	-DPREFIX=\""$(PREFIX)"\"				\
 +	-DLOCALBASE=\""$(LOCALBASE)"\"				\
-+	-DX11BASE=\""$(X11BASE)"\"				\
  	-I..							\
  	-I$(srcdir)/..						\
  	$(WARN_CFLAGS)						\
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index c0cbbe371..80b49cf51 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/libgnomekbd/Makefile,v 1.7 2007/04/26 17:35:23 ahze Exp $
+#    $MCom: ports/x11/libgnomekbd/Makefile,v 1.8 2007/05/19 21:36:30 marcus Exp $
 #
 
 PORTNAME=	libgnomekbd
@@ -26,8 +26,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas