aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-poke/Makefile1
-rw-r--r--audio/bmp-htmlplaylist/Makefile3
-rw-r--r--audio/bmp-wma/Makefile3
-rw-r--r--audio/easytag-devel/Makefile1
-rw-r--r--audio/easytag/Makefile1
-rw-r--r--audio/scrobbler/Makefile3
-rw-r--r--audio/wmix/Makefile5
-rw-r--r--audio/xmms-bonk/Makefile3
-rw-r--r--audio/xmms-flac/Makefile3
-rw-r--r--audio/xmms-shn/Makefile3
-rw-r--r--audio/xmms-sndstretch/Makefile1
-rw-r--r--audio/xmms-xf86audio/Makefile3
-rw-r--r--deskutils/adesklets/Makefile3
-rw-r--r--deskutils/bmp-docklet/Makefile3
-rw-r--r--deskutils/gkrellm-gtodo/Makefile1
-rw-r--r--deskutils/gkrellm-reminder2/Makefile1
-rw-r--r--deskutils/gkrellm-timers/Makefile1
-rw-r--r--deskutils/gnochm/Makefile1
-rw-r--r--deskutils/hot-babe/Makefile1
-rw-r--r--deskutils/logjam/Makefile1
-rw-r--r--devel/py-game/Makefile3
-rw-r--r--editors/gphpedit/Makefile1
-rw-r--r--editors/hte/Makefile3
-rw-r--r--editors/leafpad/Makefile1
-rw-r--r--editors/morla/Makefile2
-rw-r--r--editors/winefish/Makefile1
-rw-r--r--games/0verkill/Makefile2
-rw-r--r--games/zangband/Makefile3
-rw-r--r--graphics/fyre/Makefile1
-rw-r--r--graphics/gle-graphics/Makefile4
-rw-r--r--graphics/gle/Makefile1
-rw-r--r--graphics/py-visual/Makefile3
-rw-r--r--graphics/xmms-gdancer/Makefile3
-rw-r--r--irc/xchat-gnome/Makefile1
-rw-r--r--japanese/jmode/Makefile3
-rw-r--r--japanese/zangband/Makefile4
-rw-r--r--lang/squeak-dev/Makefile4
-rw-r--r--lang/squeak/Makefile4
-rw-r--r--mail/xfmail/Makefile5
-rw-r--r--math/gnuplot+/Makefile3
-rw-r--r--misc/gkx86info2/Makefile1
-rw-r--r--misc/lingoteach/Makefile1
-rw-r--r--multimedia/gxmms/Makefile1
-rw-r--r--multimedia/xmms-weasel/Makefile3
-rw-r--r--net-im/pidgin-guifications/Makefile1
-rw-r--r--net-im/pidgin-libnotify/Makefile1
-rw-r--r--net-mgmt/etherape/Makefile1
-rw-r--r--net-p2p/gkrellm-gift/Makefile1
-rw-r--r--net/ekiga/Makefile1
-rw-r--r--net/gkrellmmultiping2/Makefile1
-rw-r--r--net/wmwlmon/Makefile5
-rw-r--r--palm/jpilot/Makefile1
-rw-r--r--print/lyx-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--science/cdcl/Makefile1
-rw-r--r--security/gpass/Makefile3
-rw-r--r--sysutils/gkrellm-trayicons/Makefile1
-rw-r--r--sysutils/gkrellmwho2/Makefile5
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile1
-rw-r--r--x11-fm/emelfm2/Makefile1
-rw-r--r--x11-fonts/fonts-indic/Makefile2
-rw-r--r--x11-toolkits/mowitz/Makefile5
-rw-r--r--x11/aterm/Makefile4
-rw-r--r--x11/libsynaptics/Makefile4
-rw-r--r--x11/wbar/Makefile4
67 files changed, 50 insertions, 101 deletions
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index 9f49131e2e07..c1706e8e1b41 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= mva@sysfault.org
COMMENT= Accessibility testing and poking tool
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix libglade2 libgailgnome
GNU_CONFIGURE= yes
diff --git a/audio/bmp-htmlplaylist/Makefile b/audio/bmp-htmlplaylist/Makefile
index 0c6d836bcd73..da2bd97c35be 100644
--- a/audio/bmp-htmlplaylist/Makefile
+++ b/audio/bmp-htmlplaylist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-htmlplaylist
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.berlios.de/bmp-plugins/ \
${MASTER_SITE_LOCAL}
@@ -23,7 +23,6 @@ MAKE_ARGS= CC=${CC} LD=${CC}
USE_GNOME= pkgconfig
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
-USE_X_PREFIX= yes
PLIST_FILES= bin/bmp-htmlplaylist
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index 049a9e0f82dd..dedbaffb084b 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-wma
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.nixp.ru/pub/files/
@@ -21,7 +21,6 @@ PLIST_FILES= lib/bmp/Input/libwma.so \
lib/bmp/Input/libwma.a
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 5d7b51be0a0e..6a242133ce73 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -24,7 +24,6 @@ MAN1= easytag.1
CONFLICTS= easytag-[0-9]*
USE_BZIP2= yes
-USE_XLIB= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index b4377f93d445..f7a40017bce9 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -24,7 +24,6 @@ MAN1= easytag.1
CONFLICTS= easytag-devel-[0-9]*
USE_BZIP2= yes
-USE_XLIB= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index f6eff43faac5..06231b6c620e 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= scrobbler
PORTVERSION= 0.3.8.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://static.audioscrobbler.com/plugins/ \
http://www.pipian.com/stuffforchat/
@@ -22,7 +22,6 @@ CONFLICTS= bmp-scrobbler-[0-9]* \
xmms-scrobbler-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/wmix/Makefile b/audio/wmix/Makefile
index 214b21f7f93e..17daabbfce59 100644
--- a/audio/wmix/Makefile
+++ b/audio/wmix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmix
PORTVERSION= 3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/
@@ -16,8 +16,7 @@ COMMENT= An audio mixer for the WindowMaker dock with TV-like OSD
PLIST_FILES= bin/wmix
ALL_TARGET= ${PORTNAME}
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index cc724c2fd3b5..ef3381c04066 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xmms-bonk
PORTVERSION= 0.12
-PORTREVISION= 3
+PORTREVISION=
CATEGORIES= audio
MASTER_SITES= http://www.proustmedia.de/bonk-xmms/
DISTNAME= bonk-xmms-${PORTVERSION}
@@ -16,7 +16,6 @@ COMMENT= XMMS input plugin to play bonk files
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
ALL_TARGET=
do-install:
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index e8643e5c269a..1c5145c9828d 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-flac
PORTVERSION= 1.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -22,7 +22,6 @@ COMMENT= XMMS input plugin for playing FLAC files
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
FLAC.7:${PORTSDIR}/audio/flac
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 5905758f5d89..93ff3d3e70ef 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-shn
PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.etree.org/shnutils/xmms-shn/dist/src/
@@ -17,7 +17,6 @@ COMMENT= XMMS plugin to allow playing shorten-compressed audio
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index 13e692fd9133..86c957559a78 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -22,7 +22,6 @@ WRKSRC= ${WRKDIR}/sndstretch_xmms
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_X_PREFIX= yes
MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS}
post-extract:
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index f7ae296423cd..6427b8534fa8 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-xf86audio
PORTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.devin.com/xmms-xf86audio/download/
@@ -16,7 +16,6 @@ COMMENT= XF86Audio multimedia-key support for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
MAKE_ARGS= CC="${CC}" OPT="${CFLAGS}" DEBUG=""
do-install:
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index 8255c1931f27..7cc17a0a2eff 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adesklets
PORTVERSION= 0.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_EFL= imlib2
USE_ICONV= yes
WANT_PERL= yes
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 1ec7373afbc9..73fd6f17814e 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-docklet
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils audio
MASTER_SITES= http://mark.xnull.de/bmp-docklet/ \
${MASTER_SITE_LOCAL}
@@ -21,7 +21,6 @@ RUN_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack
diff --git a/deskutils/gkrellm-gtodo/Makefile b/deskutils/gkrellm-gtodo/Makefile
index 1c1c0168a6ec..9a54796788ef 100644
--- a/deskutils/gkrellm-gtodo/Makefile
+++ b/deskutils/gkrellm-gtodo/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk20
PLIST_FILES= libexec/gkrellm2/plugins/gkrellm-gtodo.so
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index 08e6546eec31..eaffaa46a6ba 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -20,7 +20,6 @@ COMMENT= GKrellM2 plugin that reminds you of important events
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_GNOME= gtk20
PLIST_FILES= libexec/gkrellm2/plugins/reminder.so
diff --git a/deskutils/gkrellm-timers/Makefile b/deskutils/gkrellm-timers/Makefile
index 53271f1a9017..c30f4f1a153e 100644
--- a/deskutils/gkrellm-timers/Makefile
+++ b/deskutils/gkrellm-timers/Makefile
@@ -20,7 +20,6 @@ COMMENT= GKrellM2 plugin that allows the setting of countdowns
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_GNOME= gtk20
PLIST_FILES= libexec/gkrellm2/plugins/gkrellm_timers.so
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 6e9b3bdbdf2f..0d1d6de845dd 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygtk2 pygnomeextras
GNU_CONFIGURE= yes
USE_PYTHON= 2.2+
-USE_X_PREFIX= yes
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index 81058bbe421f..64215af68f11 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= Small utility which displays the system activity in a very special way
USE_BZIP2= yes
-USE_X_PREFIX= yes
MAKE_ARGS+= PREFIX="${PREFIX}" CC="${CC}"
USE_GNOME= gtk20
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 26d29efa58d6..40eafa2fc2d0 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -21,7 +21,6 @@ MAN1= logjam.1
USE_BZIP2= yes
USE_GMAKE= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gtk20 libxml2 intlhack
CONFIGURE_ARGS= --program-transform-name="s/$$//"
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 0ca1cbef3fad..ba3099c8d0da 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -7,7 +7,7 @@
PORTNAME= game
PORTVERSION= 1.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MASTER_SITES= http://pygame.seul.org/ftp/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -23,7 +23,6 @@ RUN_DEPENDS= ${PYNUMERIC}
USE_SDL= ttf image mixer sdl
USE_PYTHON= yes
USE_PYDISTUTILS=yes
-USE_XLIB= yes
PYDISTUTILS_PKGNAME= pygame
PYDISTUTILS_PKGVERSION= 1.7.1release
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index 0685b6af907b..b91b01448ea2 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -19,7 +19,6 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
USE_GCC= 3.4+
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 42de5ee8308d..7c8b2a1814af 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -8,6 +8,7 @@
PORTNAME= hte
PORTVERSION= 2.0.12
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF
DISTNAME= ht-${PORTVERSION}
@@ -31,7 +32,7 @@ BROKEN= Does not build on ia64
PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS=--disable-x11-textmode
.else
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
.endif
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 145742936f1b..4325a624db7b 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -18,7 +18,6 @@ COMMENT= GTK+ based simple text editor
USE_GNOME= gtk20 desktopfileutils intlhack
USE_GCC= 3.4
USE_GETTEXT= YES
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index c38b8fcdd54b..27d36c78ead7 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= morla
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= editors textproc
MASTER_SITES= http://www.morlardf.net/src/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -20,7 +21,6 @@ LIB_DEPENDS= nxml.18:${PORTSDIR}/textproc/libnxml \
BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GETTEXT= yes
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 0792079f9777..70c19a1c21c4 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -32,7 +32,6 @@ GNU_CONFIGURE= yes
USE_GCC= 3.3+
USE_GMAKE= yes
USE_GNOME= libgnomeui desktopfileutils gnomehier
-USE_XLIB= yes
OPTIONS= CONTEXT "Enable ConTexT support (Experimental)" off \
VNTEX "Vietnamese TeX user" off \
diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index 06676bffceb1..9c3917496b0e 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
.if defined(WITHOUT_X11)
PLIST_SUB= X11="@comment "
.else
-USE_XPM= yes
+USE_XORG= xpm
CONFIGURE_ARGS+= --with-x
PLIST_SUB= X11=""
.endif
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 0813b7394314..726675d46d93 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zangband
PORTVERSION= 2.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES+= games
MASTER_SITES= ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
@@ -16,7 +16,6 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= makoto@pinpott.spnet.ne.jp
COMMENT= Zangband (Zelazny Angband) with color, X11 support
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= automake:14 autoconf:261
USE_PERL5_BUILD=yes
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 11ffca50782c..1f4a6639c004 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
gnet-2.0:${PORTSDIR}/net/gnet2
USE_BZIP2= yes
-USE_XLIB= yes
USE_GNOME= libglade2 desktopfileutils
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 3722410742fd..b4b453e8a3b8 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gle-graphics
PORTVERSION= 4.0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= glx
@@ -56,7 +56,7 @@ RUN_DEPENDS+= latex:${PORTSDIR}/print/teTeX
.if !defined(WITHOUT_X_WINDOWS)
CONFIGURE_ARGS+= --with-x
-USE_XLIB= yes
+USE_XORG= x11
.endif
.include <bsd.port.post.mk>
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 91b1bb4be5af..f8baa0c65039 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -21,7 +21,6 @@ COMMENT= A GL Tubing and Extrusion Library
LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= "LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}"
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 561d3844a810..f634ecb1f696 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -7,7 +7,7 @@
PORTNAME= visual
PORTVERSION= 4.b14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= visualpython
@@ -28,7 +28,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_PYTHON= 2.3+
-USE_XLIB= yes
OPTIONS= EXAMPLES "install example files" on
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/graphics/xmms-gdancer/Makefile b/graphics/xmms-gdancer/Makefile
index 8c9db67d4f1f..48815a5f33c9 100644
--- a/graphics/xmms-gdancer/Makefile
+++ b/graphics/xmms-gdancer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-gdancer
PORTVERSION= 0.4.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.figz.com/gdancer/files/
DISTNAME= gdancer-$(PORTVERSION)
@@ -18,7 +18,6 @@ COMMENT= XMMS Visualization plugin, displays dancing figures
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
PLIST_FILES= lib/xmms/Visualization/gdancer.so
-USE_X_PREFIX= yes
USE_GNOME= gtk12 gdkpixbuf
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index c76c54ff6eae..143edbbd900f 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -18,7 +18,6 @@ COMMENT= An IRC client for GNOME 2 (development version)
LIB_DEPENDS= sexy:${PORTSDIR}/x11-toolkits/libsexy \
notify:${PORTSDIR}/devel/libnotify
-USE_XLIB= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index 5007988c00ce..6787107920c8 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jmode
PORTVERSION= 0.6.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese
MASTER_SITES= http://downloads.sourceforge.jp/anthy/5467/
@@ -16,7 +16,6 @@ COMMENT?= XIM server for Anthy input method
LIB_DEPENDS?= anthy.1:${PORTSDIR}/japanese/anthy
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/japanese/zangband/Makefile b/japanese/zangband/Makefile
index f36407251376..171914e1ec56 100644
--- a/japanese/zangband/Makefile
+++ b/japanese/zangband/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zangband
PORTVERSION= 2.4.0${JA_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese games
MASTER_SITES= ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
@@ -21,7 +21,7 @@ COMMENT= Zangband (Zelazny Angband) with japanese, color, X11 support
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -qa
-USE_XLIB= yes
+USE_XORG= x11
NO_CDROM= Possible copyright infringement
diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile
index 450410817731..21693c893085 100644
--- a/lang/squeak-dev/Makefile
+++ b/lang/squeak-dev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squeak
PORTVERSION= 3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
##################################################
MASTER_SITES= http://www.squeakvm.org/unix/release/ \
@@ -111,7 +111,7 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
CONFIGURE_ARGS+= --without-x
PLIST_X= "@comment feature not wanted - "
.else
-USE_XLIB= yes
+USE_XORG= x11
USE_GL= yes
CONFIGURE_ARGS+= --with-x
PLIST_X=
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 450410817731..21693c893085 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squeak
PORTVERSION= 3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
##################################################
MASTER_SITES= http://www.squeakvm.org/unix/release/ \
@@ -111,7 +111,7 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
CONFIGURE_ARGS+= --without-x
PLIST_X= "@comment feature not wanted - "
.else
-USE_XLIB= yes
+USE_XORG= x11
USE_GL= yes
CONFIGURE_ARGS+= --with-x
PLIST_X=
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 41d6e84d9e29..8c0f3c069ff9 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfmail
PORTVERSION= 1.5.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/ \
ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/ \
@@ -25,8 +25,7 @@ USE_BZIP2= yes
USE_GNOME= glib12
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index ae8d46d40cb4..2b6c3680eb3c 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuplot371+
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math japanese graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.yama-ga.com/gnuplot/:patch \
@@ -24,7 +24,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
VFlib2.24:${PORTSDIR}/japanese/vflib
USE_FREETYPE= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index 315fbcbfa074..b026063e8f42 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
USE_GNOME= gtk20
WRKSRC= ${WRKDIR}/gkx86info${PORTVERSION}
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 59f2359fae69..f06ec2896868 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -26,7 +26,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-ui-${PORTVERSION}
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 886fff30a5a9..fafa2e15690f 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -23,7 +23,6 @@ BROKEN= Does not compile
USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index 16d945293740..5acb8fd554cd 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-weasel
PORTVERSION= 0.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,6 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
PLIST_FILES= lib/xmms/General/libweasel.la \
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index aa28a87d5b89..f58229386439 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -17,7 +17,6 @@ COMMENT= Plugin to add msn style "toaster" popups to Pidgin
BUILD_DEPENDS= ${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin
-USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 9b1c4035df1c..bad0d998eee6 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -22,7 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
purple.4:${PORTSDIR}/net-im/libpurple
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig gtk20
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 0cbd5c5fe414..09335920252d 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -18,7 +18,6 @@ COMMENT= A graphical network traffic visualization tool for gnome
USE_GETTEXT= yes
USE_GNOME= libglade2 libgnomeui gnomehack gnomeprefix
USE_GMAKE= yes
-USE_XLIB= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 3632ab32c6b6..9d7f3981b171 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -23,7 +23,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
PLIST_FILES= libexec/gkrellm2/plugins/gift.la \
libexec/gkrellm2/plugins/gift.so
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 9c1167947461..36ae2863ee57 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -21,7 +21,6 @@ OPTIONS= AVAHI "Support Avahi for service discovery on LAN" on \
LIB_DEPENDS= opal_r:${PORTSDIR}/net/opal
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_SDL= sdl
INSTALLS_OMF= yes
diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile
index a88da9fd55f5..6f2afa4ab54d 100644
--- a/net/gkrellmmultiping2/Makefile
+++ b/net/gkrellmmultiping2/Makefile
@@ -19,7 +19,6 @@ COMMENT= GKrellM2 multiping plugin
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_GMAKE= yes
PLIST_FILES= libexec/gkrellm2/plugins/multiping.so libexec/gkrellm2/plugins/pinger
diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile
index a39b60599f7c..8f666055e60c 100644
--- a/net/wmwlmon/Makefile
+++ b/net/wmwlmon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmwlmon
PORTVERSION= 0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net windowmaker
MASTER_SITES= http://www.nazgul.ch/dev/ \
http://dougbarton.us/Downloads/
@@ -16,8 +16,7 @@ DISTNAME= wmwlmon-${PORTVERSION}
MAINTAINER= marcus@nazgul.ch
COMMENT= DockApp showing the state of a wireless network device
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
MAN1= wmwlmon.1
PLIST_FILES= bin/wmwlmon
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 2958d11cb4e8..256644bb82a3 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -18,7 +18,6 @@ COMMENT= Desktop Organizer Software for the Palm Pilot
LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link
-USE_X_PREFIX= yes
USE_GNOME= gnomehier
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index e59cd3f5188e..9738300c555a 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -90,7 +90,7 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-font
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
-USE_XPM= yes
+USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index e59cd3f5188e..9738300c555a 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -90,7 +90,7 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-font
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
-USE_XPM= yes
+USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index e59cd3f5188e..9738300c555a 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -90,7 +90,7 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-font
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
-USE_XPM= yes
+USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index e59cd3f5188e..9738300c555a 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -90,7 +90,7 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-font
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
-USE_XPM= yes
+USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
diff --git a/science/cdcl/Makefile b/science/cdcl/Makefile
index 44624cd4d249..06662e63c5e1 100644
--- a/science/cdcl/Makefile
+++ b/science/cdcl/Makefile
@@ -19,7 +19,6 @@ COMMENT= Scientific graphic library for geoscience
USE_GNOME= gtk20
.endif
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} --with-x
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 205ff66a8be7..890da8b69a8f 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpass
PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security gnome
MASTER_SITES= http://projects.netlab.jp/gpass/release/
@@ -17,7 +17,6 @@ COMMENT= A password manager for GNOME2
LIB_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
mhash:${PORTSDIR}/security/mhash
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
USE_GMAKE= yes
diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile
index 320a1c8335d7..1250d373ad42 100644
--- a/sysutils/gkrellm-trayicons/Makefile
+++ b/sysutils/gkrellm-trayicons/Makefile
@@ -20,7 +20,6 @@ COMMENT= GKrellM2 plugin to display definable icons as notifiers or launchers
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
PLIST_FILES= libexec/gkrellm2/plugins/trayicons.so
ALL_TARGET= trayicons.so
diff --git a/sysutils/gkrellmwho2/Makefile b/sysutils/gkrellmwho2/Makefile
index 4af912cd641a..5e3fe276bbb4 100644
--- a/sysutils/gkrellmwho2/Makefile
+++ b/sysutils/gkrellmwho2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmwho2
PORTVERSION= 0.2.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://shisha.spb.ru/ \
http://users.podolsk.ru/c104598/
@@ -16,10 +16,9 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= mangoost@inetcomm.ru
COMMENT= Displays logged in users
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 30c8b243fe4b..696ed0fce48b 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -21,6 +21,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv panel
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 17f81b9bf07c..4aac783540c3 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= mva@sysfault.org
COMMENT= The gtk2 port of emelfm, a fast graphical filemanager
USE_GNOME= gtk20
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install
diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile
index 221013af0805..9a5c909736af 100644
--- a/x11-fonts/fonts-indic/Makefile
+++ b/x11-fonts/fonts-indic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fonts-indic
PORTVERSION= 2.1.5
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://gentoo.osuosl.org/distfiles/
@@ -16,7 +17,6 @@ COMMENT= The Lohit family of Indic fonts
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
USE_GZIP= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 83bbb80129b5..6e29125ba5bb 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -6,7 +6,7 @@
PORTNAME= Mowitz
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://siag.nu/pub/mowitz/
@@ -16,8 +16,7 @@ COMMENT= This is the Mowitz ("More widgets") library
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xawm=Xaw3d
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 80dcf774ced4..744be93ca492 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aterm
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES+= x11 # `+=' is for slave ports
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mich@FreeBSD.org
COMMENT= A color vt102 terminal emulator with transparency support
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
# `+=' is for slave ports
CONFIGURE_ARGS+= --enable-transparency \
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index dde3974de581..4f3b35267702 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libsynaptics
PORTVERSION= 0.14.6b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://qsynaptics.sourceforge.net/ \
http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
@@ -16,8 +16,8 @@ MAINTAINER= markus@FreeBSD.org
COMMENT= Library to access the Xorg/XFree86 Synaptics TouchPad Driver
USE_BZIP2= yes
-USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index c232097de0ab..c75c972734b7 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wbar
PORTVERSION= 1.3.3
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.tecapli.com.ar/rodolfo/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -22,7 +22,7 @@ SUB_FILES= pkg-message
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11
post-patch:
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile