summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile4
-rw-r--r--accessibility/dasher/Makefile4
-rw-r--r--accessibility/gnome-mag/Makefile4
-rw-r--r--accessibility/gnopernicus/Makefile4
-rw-r--r--accessibility/gok/Makefile4
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--audio/rhythmbox-devel/Makefile4
-rw-r--r--audio/rhythmbox/Makefile4
-rw-r--r--audio/sound-juicer/Makefile4
-rw-r--r--databases/evolution-data-server/Makefile4
-rw-r--r--deskutils/deskbar-applet/Makefile4
-rw-r--r--deskutils/evolution-jescs/Makefile4
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--devel/anjuta-devel/Makefile4
-rw-r--r--devel/bug-buddy/Makefile4
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/glade3/Makefile4
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/goffice/Makefile4
-rw-r--r--editors/gedit-plugins/Makefile4
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/evince/Makefile4
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--mail/evolution-exchange/Makefile4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/liferea/Makefile2
-rw-r--r--news/pan-devel/Makefile4
-rw-r--r--sysutils/bonfire/Makefile4
-rw-r--r--sysutils/brasero/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-mount/Makefile4
-rw-r--r--sysutils/gnome-power-manager/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-tools/Makefile4
-rw-r--r--sysutils/gnome-volume-manager/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/pessulus/Makefile4
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/evolution-webcal/Makefile4
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gtkhtml38/Makefile4
-rw-r--r--x11-fm/nautilus/Makefile4
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11/fast-user-switch-applet/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-screensaver/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/yelp/Makefile4
-rw-r--r--x11/zenity/Makefile4
63 files changed, 124 insertions, 124 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 262d83eb9..14fe7af05 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.43 2006/04/13 07:52:28 bland Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.45 2006/07/13 03:03:24 marcus Exp $
#
PORTNAME= at-spi
@@ -25,7 +25,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo \
intlhack
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 28f6340b4..e4a356ad9 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,7 +3,7 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD: ports/accessibility/dasher/Makefile,v 1.30 2006/04/30 00:47:13 marcus Exp $
-# $MCom: ports/accessibility/dasher/Makefile,v 1.38 2006/06/17 17:16:41 marcus Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.39 2006/07/13 03:39:39 marcus Exp $
#
PORTNAME= dasher
@@ -22,7 +22,7 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
libwnck gnomedocutils
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 12d21f782..06b8b306f 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/gnomemag/Makefile,v 1.1 2006/03/13 23:49:23 mezz Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.18 2006/07/13 03:55:45 marcus Exp $
#
PORTNAME= gnome-mag
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen magnifier
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index f6041b09e..3b4f13fad 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.79 2006/06/01 17:10:36 marcus Exp $
+# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.80 2006/07/15 14:46:52 ahze Exp $
#
PORTNAME= gnopernicus
@@ -20,7 +20,7 @@ LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 8757c843a..ee8a3e01d 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.65 2006/04/27 22:59:43 marcus Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.69 2006/07/13 03:32:29 marcus Exp $
PORTNAME= gok
PORTVERSION= 1.1.1
@@ -18,7 +18,7 @@ COMMENT= GNOME On-Screen Keyboard (GOK)
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
gnomespeech
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 74f779f77..8f68f4d56 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,7 +3,7 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/archivers/file-roller/Makefile,v 1.97 2006/07/11 13:26:48 ahze Exp $
#
PORTNAME= file-roller
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
gnomedocutils
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index bad6c7d23..0c474ff98 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.62 2006/06/19 05:49:03 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.63 2006/06/29 05:21:11 marcus Exp $
#
PORTNAME= rhythmbox
@@ -26,7 +26,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index bad6c7d23..0c474ff98 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.62 2006/06/19 05:49:03 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.63 2006/06/29 05:21:11 marcus Exp $
#
PORTNAME= rhythmbox
@@ -26,7 +26,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index ef8143472..915ab9d66 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.55 2006/05/28 02:44:18 mezz Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.56 2006/06/14 13:47:30 ahze Exp $
#
PORTNAME= sound-juicer
@@ -22,7 +22,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index f863abd9e..e788e8286 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.88 2006/06/12 22:30:15 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.89 2006/07/11 01:42:37 marcus Exp $
#
PORTNAME= evolution-data-server
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \
ltverhack
USE_OPENLDAP= yes
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 9b688bc3b..1de8df712 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.30 2006/06/15 17:51:15 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.31 2006/07/11 01:32:30 ahze Exp $
#
PORTNAME= deskbar-applet
@@ -18,7 +18,7 @@ COMMENT= Gnome panel applet similar to Google's (Windows only) Deskbar
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack
USE_PYTHON= yes
USE_GMAKE= yes
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 00297e020..44cc25c7d 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.9 2006/04/13 07:52:31 bland Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.11 2006/07/14 22:22:05 marcus Exp $
#
PORTNAME= jescs
@@ -20,7 +20,7 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution
BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 2a40311c0..62de1de38 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.99 2006/06/14 02:40:57 marcus Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.100 2006/06/24 06:54:35 marcus Exp $
#
PORTNAME= gnome-utils
@@ -22,7 +22,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile
index 552caaafc..e504ee452 100644
--- a/devel/anjuta-devel/Makefile
+++ b/devel/anjuta-devel/Makefile
@@ -3,7 +3,7 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta-devel/Makefile,v 1.10 2006/02/24 18:12:02 marcus Exp $
+# $MCom: ports/devel/anjuta-devel/Makefile,v 1.11 2006/03/02 20:31:33 mezz Exp $
#
PORTNAME= anjuta
@@ -31,7 +31,7 @@ RUN_DEPENDS= ${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoc
CONFLICTS= anjuta-1.2.*
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 762482729..13b42c3cb 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.31 2006/06/13 11:34:10 ahze Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.32 2006/06/17 17:04:54 marcus Exp $
#
PORTNAME= bug-buddy
@@ -22,7 +22,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 3ca6c3389..6cd6b6f34 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.12 2006/07/21 17:40:05 marcus Exp $
#
PORTNAME= gconfmm
@@ -24,7 +24,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
LATEST_LINK= gconfmm26
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack gconf2
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 0e5f71f25..d22f9dcbf 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade3/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.11 2006/04/15 06:53:52 marcus Exp $
#
PORTNAME= glade3
@@ -19,7 +19,7 @@ COMMENT= A user interface builder for GTK+/GNOME
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index cc097c310..8de2eeb76 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/Makefile,v 1.148 2006/07/11 19:35:46 ahze Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.149 2006/07/19 05:13:46 ahze Exp $
#
PORTNAME= gnome-vfs
@@ -28,7 +28,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo ltverhack referencehack
USE_AUTOTOOLS= libtool:15
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 0c04327ec..8a47e09f9 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-experimental/devel/goffice/Makefile,v 1.1 2006/05/05 17:34:14 ahze Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.11 2006/05/08 22:57:51 ahze Exp $
#
PORTNAME= goffice
@@ -17,7 +17,7 @@ COMMENT= GLib/GTK+ set of document centric objects and utilities
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 2d45552bb..39b4ea4df 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit-plugins/Makefile,v 1.14 2006/06/11 19:59:46 marcus Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.15 2006/07/11 06:32:13 marcus Exp $
#
PORTNAME= gedit-plugins
@@ -22,7 +22,7 @@ RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit \
gucharmap:${PORTSDIR}/deskutils/gucharmap
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index a5e1e994e..bb678cec1 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.37 2006/06/13 06:33:09 marcus Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.38 2006/07/11 05:55:18 marcus Exp $
#
PORTNAME= gedit
@@ -20,7 +20,7 @@ LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index c46088b87..0fa10f14b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games/Makefile,v 1.113 2006/06/12 17:58:44 marcus Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.114 2006/07/11 01:01:53 ahze Exp $
#
PORTNAME= gnome-games
@@ -23,7 +23,7 @@ USE_PYTHON= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
librsvg2 desktopfileutils
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 6b5e897da..0ee53787d 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.33 2006/06/10 20:43:37 marcus Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.34 2006/07/13 02:55:28 marcus Exp $
#
PORTNAME= eog
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \
librsvg2 desktopfileutils gnomedesktop
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 79d28fda3..4cc1ebe90 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.50 2006/04/24 00:54:32 ahze Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.52 2006/07/11 00:28:01 ahze Exp $
#
PORTNAME= evince
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GHOSTSCRIPT=yes
INSTALLS_OMF= yes
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 76c7aa110..f995712f6 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.102 2006/07/15 14:34:17 ahze Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.103 2006/07/18 19:19:30 ahze Exp $
#
PORTNAME= librsvg2
@@ -25,7 +25,7 @@ RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_SHLIB= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 6ec56dac2..da739395f 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.62 2006/05/22 20:08:57 marcus Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.63 2006/07/11 05:40:19 marcus Exp $
#
PORTNAME= evolution-exchange
@@ -21,7 +21,7 @@ RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ff54f9808..af5da41f0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD: ports/mail/evolution/Makefile,v 1.123 2006/04/30 00:46:56 marcus Exp $
-# $MCom: ports/mail/evolution/Makefile,v 1.108 2006/07/16 18:50:52 marcus Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.109 2006/07/18 19:22:20 ahze Exp $
#
PORTNAME= evolution
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \
gtkhtml3 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 01321685e..298dced55 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.49 2006/06/10 05:04:35 marcus Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.50 2006/07/10 05:06:41 marcus Exp $
#
PORTNAME= gcalctool
@@ -20,7 +20,7 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows
USE_BZIP2= yes
USE_BISON= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a186d48f8..02f1d0e32 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/math/gnumeric/Makefile,v 1.14 2005/10/11 22:44:47 marcus Exp $
+# $MCom: ports/math/gnumeric/Makefile,v 1.16 2006/05/08 22:58:46 ahze Exp $
#
PORTNAME= gnumeric
@@ -21,7 +21,7 @@ LIB_DEPENDS= goffice-0.3:${PORTSDIR}/devel/goffice \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index dfce5b992..32ee188ff 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
nautiluscdburner ltverhack
GNOME_DESKTOP_VERSION=2
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 5435b0bc5..22f45466f 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD: ports/net/gnomenettool/Makefile,v 1.18 2006/04/30 00:47:18 marcus Exp $
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.27 2006/06/17 17:06:18 marcus Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.28 2006/06/18 03:39:01 marcus Exp $
#
PORTNAME= gnome-nettool
@@ -19,7 +19,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME utility that provides network information statistics
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
USE_GMAKE= yes
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 0f6fd38b8..c176172a1 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= liferea
MAINTAINER= pav@FreeBSD.org
COMMENT= Simple RSS/RDF feed reader
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GECKO= mozilla firefox
USE_GNOME= gnomeprefix gnomehack libgtkhtml
USE_GMAKE= yes
diff --git a/news/pan-devel/Makefile b/news/pan-devel/Makefile
index eca2c33da..58b7fe054 100644
--- a/news/pan-devel/Makefile
+++ b/news/pan-devel/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/news/pan-devel/Makefile,v 1.1 2006/06/20 20:59:19 ahze Exp $
PORTNAME= pan
PORTVERSION= 0.100
@@ -18,7 +18,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 \
gmime-2.0.4:${PORTSDIR}/mail/gmime2
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget libxml2 gtk20
USE_GETTEXT= yes
diff --git a/sysutils/bonfire/Makefile b/sysutils/bonfire/Makefile
index 913e6c507..90bab8c08 100644
--- a/sysutils/bonfire/Makefile
+++ b/sysutils/bonfire/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/bonfire/Makefile,v 1.6 2006/05/17 22:09:38 ahze Exp $
+# $MCom: ports/sysutils/bonfire/Makefile,v 1.7 2006/06/29 05:21:12 marcus Exp $
PORTNAME= bonfire
PORTVERSION= 0.3.1
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix nautiluscdburner
USE_GSTREAMER= gconf core
CONFIGURE_ARGS= --disable-inotify
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 913e6c507..90bab8c08 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/bonfire/Makefile,v 1.6 2006/05/17 22:09:38 ahze Exp $
+# $MCom: ports/sysutils/bonfire/Makefile,v 1.7 2006/06/29 05:21:12 marcus Exp $
PORTNAME= bonfire
PORTVERSION= 0.3.1
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix nautiluscdburner
USE_GSTREAMER= gconf core
CONFIGURE_ARGS= --disable-inotify
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 63383ddc4..337787d8a 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.113 2006/07/13 16:38:39 marcus Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.114 2006/07/16 02:28:24 marcus Exp $
#
PORTNAME= gnome-control-center
@@ -22,7 +22,7 @@ LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 5b233b3e7..71c657dd3 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.1 2006/06/04 17:40:15 marcus Exp $
#
PORTNAME= gnome-mount
@@ -16,7 +16,7 @@ COMMENT= A font-end to mount, umount, and eject using HAL
LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 07011e992..f410608da 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.4 2006/06/11 21:17:42 marcus Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.5 2006/07/10 01:53:16 marcus Exp $
#
PORTNAME= gnome-power-manager
@@ -21,7 +21,7 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 1b590e736..d16550714 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.69 2006/06/30 01:17:35 marcus Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.70 2006/07/10 01:56:45 marcus Exp $
#
PORTNAME= gnome-system-monitor
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index d2b05c0c6..c8880a2a5 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.42 2006/06/07 02:49:05 ahze Exp $
PORTNAME= gnome-system-tools
PORTVERSION= 2.15.0
@@ -21,7 +21,7 @@ LIB_DEPENDS= oobs-1.0:${PORTSDIR}/devel/liboobs
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
USE_AUTOTOOLS= libtool:15
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 253b0a40e..b8a4b8b1d 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -3,7 +3,7 @@
# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.4 2006/06/29 05:21:12 marcus Exp $
+# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.5 2006/07/15 17:55:01 marcus Exp $
#
PORTNAME= gnome-volume-manager
@@ -19,7 +19,7 @@ COMMENT= Automatically mount removable media, and more
LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
notify.2:${PORTSDIR}/devel/libnotify
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
USE_GMAKE= yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 009216713..96b4c5f3b 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.103 2006/07/14 02:52:17 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.104 2006/07/16 02:26:49 marcus Exp $
#
PORTNAME= nautilus-cd-burner
@@ -19,7 +19,7 @@ COMMENT= CD burner view for Nautilus
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index b0c19dbea..d0afdeb39 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,7 +3,7 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/sysutils/pessulus/Makefile,v 1.5 2006/04/30 06:09:06 ahze Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.6 2006/07/11 01:41:13 ahze Exp $
#
PORTNAME= pessulus
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack pygnome2
WANT_GNOME= yes
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index ce12edb2b..eff1c3e54 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.72 2006/04/24 04:49:23 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.74 2006/06/30 01:31:30 marcus Exp $
#
PORTNAME= epiphany
@@ -23,7 +23,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
INSTALLS_OMF= yes
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 025177f6b..a76efe474 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.117 2006/06/11 00:12:10 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.118 2006/07/11 00:07:28 ahze Exp $
#
PORTNAME= epiphany
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
GNOME_DESKTOP_VERSION=2
USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 41fd9f5f8..8c425c8fe 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.37 2006/04/15 06:53:55 marcus Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.39 2006/05/18 01:39:19 ahze Exp $
#
PORTNAME= webcal
@@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Webcal(endar) handler for gnome
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 68004f5d6..0d1d3c0c8 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.81 2006/06/12 19:17:54 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.82 2006/07/10 19:58:25 ahze Exp $
#
PORTNAME= gtkhtml3
@@ -21,7 +21,7 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 68004f5d6..0d1d3c0c8 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.81 2006/06/12 19:17:54 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.82 2006/07/10 19:58:25 ahze Exp $
#
PORTNAME= gtkhtml3
@@ -21,7 +21,7 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 1c5038920..6b64bfe4a 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,7 +3,7 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus/Makefile,v 1.109 2006/06/12 19:10:59 marcus Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.110 2006/07/11 12:46:26 ahze Exp $
#
PORTNAME= nautilus
@@ -21,7 +21,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \
librsvg2 desktopfileutils
GNOME_DESKTOP_VERSION=2
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 5d3a73670..14c750f9f 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.38 2006/06/12 18:43:55 marcus Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.39 2006/07/11 12:31:56 ahze Exp $
#
PORTNAME= eel
@@ -19,7 +19,7 @@ COMMENT= Generally useful classes and extensions to GNOME
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
USE_AUTOTOOLS= libtool:15
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 256064e44..74395db2c 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.45 2006/05/15 22:23:03 mezz Exp $
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.53 2005/09/26 21:14:32 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.55 2006/07/21 17:42:25 marcus Exp $
#
PORTNAME= libgnomeprintui
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index d687e486f..0c3601213 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.85 2006/07/10 23:04:57 ahze Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.86 2006/07/18 19:27:22 ahze Exp $
PORTNAME= libgnomeui
PORTVERSION= 2.15.2
@@ -25,7 +25,7 @@ LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 1efc16985..230559f10 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.53 2006/06/13 00:30:11 ahze Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.54 2006/07/11 12:09:06 ahze Exp $
#
PORTNAME= vte
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_SHLIB= yes
USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 30f2bfc49..8c2b7bc9c 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.12 2006/04/13 07:52:39 bland Exp $
+# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.14 2006/04/30 14:49:58 ahze Exp $
PORTNAME= fast-user-switch-applet
PORTVERSION= 2.15.1
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Fast user switching applet for GNOME
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel
GNU_CONFIGURE= yes
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 03e1ea965..663ec1eb0 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.36 2006/06/13 01:48:08 marcus Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.37 2006/07/10 22:54:13 ahze Exp $
#
PORTNAME= gdm
@@ -21,7 +21,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index d1f26fcfa..072e02e78 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.123 2006/06/29 05:21:12 marcus Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.124 2006/07/18 19:24:08 ahze Exp $
#
PORTNAME= gnome-applets
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
INSTALLS_OMF= yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 9d437a9f3..704272e2a 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.97 2006/06/01 00:49:27 mezz Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.98 2006/07/11 01:12:08 ahze Exp $
#
PORTNAME= gnome-desktop
@@ -28,7 +28,7 @@ GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
USE_AUTOTOOLS= libtool:15
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index f062dc271..b9d68f4ac 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.48 2006/07/11 15:41:07 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.49 2006/07/19 02:36:23 ahze Exp $
#
PORTNAME= gnome-screensaver
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index e6d58659d..9ae7e2202 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.87 2006/07/13 01:08:32 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.88 2006/07/18 19:24:40 ahze Exp $
#
PORTNAME= gnome-session
@@ -28,7 +28,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index ddf410407..d575bf128 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.74 2006/05/28 22:10:28 marcus Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.75 2006/07/11 12:21:48 ahze Exp $
#
PORTNAME= gnome-terminal
@@ -19,7 +19,7 @@ COMMENT= Terminal component for the GNOME 2 Desktop
USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils
GNU_CONFIGURE= yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index b82e12bdf..c11149947 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.78 2006/04/13 07:52:41 bland Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.80 2006/07/10 19:31:54 ahze Exp $
#
PORTNAME= libgnome
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack esound \
gnomevfs2 libxslt ltverhack referencehack
USE_BISON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_SHLIB= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index a0c19aa2e..672c2a017 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.97 2006/06/13 01:35:48 marcus Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.98 2006/07/11 06:40:22 marcus Exp $
#
PORTNAME= yelp
@@ -21,7 +21,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus
USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
libgnomeprintui
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index f7ab5fe76..023163d0d 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,7 +3,7 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.61 2006/04/30 15:01:54 ahze Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.62 2006/05/17 05:25:38 marcus Exp $
#
PORTNAME= zenity
@@ -20,7 +20,7 @@ BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils
USE_BZIP2= yes