aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/xmms-defx/Makefile3
-rw-r--r--audio/xmms-efxmms/Makefile3
-rw-r--r--audio/xmms-eq/Makefile3
-rw-r--r--audio/xmms-fxt/Makefile3
-rw-r--r--audio/xmms-jackasyn/Makefile3
-rw-r--r--audio/xmms-nas/Makefile3
-rw-r--r--deskutils/xneur/Makefile3
-rw-r--r--devel/allegro-devel/Makefile4
-rw-r--r--devel/allegro/Makefile4
-rw-r--r--devel/gpsim/Makefile3
-rw-r--r--devel/ode-devel/Makefile3
-rw-r--r--devel/ode/Makefile3
-rw-r--r--devel/pdcurses-the/Makefile3
-rw-r--r--devel/pdcurses/Makefile3
-rw-r--r--editors/fte/Makefile5
-rw-r--r--emulators/mednafen/Makefile6
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/yabause/Makefile3
-rw-r--r--games/3dc/Makefile5
-rw-r--r--games/aqbubble/Makefile3
-rw-r--r--games/balazar/Makefile3
-rw-r--r--games/ceferino/Makefile3
-rw-r--r--games/chanta/Makefile3
-rw-r--r--games/criticalmass/Makefile4
-rw-r--r--games/el/Makefile3
-rw-r--r--games/galaxymage/Makefile3
-rw-r--r--games/glest/Makefile3
-rw-r--r--games/mangband/Makefile2
-rw-r--r--games/pongix/Makefile3
-rw-r--r--games/primateplunge/Makefile3
-rw-r--r--games/pysycache-lang/Makefile3
-rw-r--r--games/pysycache-themes/Makefile3
-rw-r--r--games/pysycache/Makefile3
-rw-r--r--graphics/amanith/Makefile3
-rw-r--r--graphics/inventor/Makefile5
-rw-r--r--graphics/libgltext/Makefile3
-rw-r--r--graphics/py-soya3d/Makefile3
-rw-r--r--graphics/tgif/Makefile2
-rw-r--r--multimedia/nuppelvideo/Makefile4
-rw-r--r--net-im/gyach/Makefile1
-rw-r--r--net/ohphone/Makefile3
-rw-r--r--net/straw/Makefile3
-rw-r--r--net/twinkle/Makefile3
-rw-r--r--print/asprint/Makefile4
-rw-r--r--russian/xneur/Makefile3
-rw-r--r--science/gromacs/Makefile4
-rw-r--r--security/opensc/Makefile4
-rw-r--r--sysutils/ghasher/Makefile1
-rw-r--r--www/aswedit/Makefile3
-rw-r--r--x11-toolkits/irrlicht/Makefile2
-rw-r--r--x11-toolkits/p5-Tk/Makefile4
-rw-r--r--x11-toolkits/paragui-devel/Makefile3
-rw-r--r--x11-wm/bbkeys/Makefile4
-rw-r--r--x11-wm/blackbox/Makefile4
-rw-r--r--x11-wm/boxtools/Makefile4
-rw-r--r--x11-wm/wmthemeinstall/Makefile3
-rw-r--r--x11/accessx/Makefile4
-rw-r--r--x11/idesk/Makefile3
-rw-r--r--x11/wterm/Makefile5
-rw-r--r--x11/xkbset/Makefile4
60 files changed, 83 insertions, 115 deletions
diff --git a/audio/xmms-defx/Makefile b/audio/xmms-defx/Makefile
index 6cc806c09e64..ee7098af485c 100644
--- a/audio/xmms-defx/Makefile
+++ b/audio/xmms-defx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-defx
PORTVERSION= 0.9.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= defx
@@ -17,7 +17,6 @@ COMMENT= Multi-effects processor plug-in for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-efxmms/Makefile b/audio/xmms-efxmms/Makefile
index 2e705f4f40f8..9e42335398ae 100644
--- a/audio/xmms-efxmms/Makefile
+++ b/audio/xmms-efxmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-efxmms
PORTVERSION= 0.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= efxmms
@@ -20,7 +20,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index cc604a66b03f..60aee354f6e6 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eq
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= equ
@@ -19,7 +19,6 @@ COMMENT= A realtime graphical equalizer plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/audio/xmms-fxt/Makefile b/audio/xmms-fxt/Makefile
index 2d3fb055654c..a234fc9ed17f 100644
--- a/audio/xmms-fxt/Makefile
+++ b/audio/xmms-fxt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-fxt
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= Surround/Echo effect plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-jackasyn/Makefile b/audio/xmms-jackasyn/Makefile
index 01ffed8907bc..b73279119674 100644
--- a/audio/xmms-jackasyn/Makefile
+++ b/audio/xmms-jackasyn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jackasyn
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://gige.xdv.org/libjackasyn/download/
PKGNAMEPREFIX= xmms-
@@ -19,7 +19,6 @@ COMMENT= XMMS plugin for jack using libjackasyn
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
jackasyn.0:${PORTSDIR}/audio/libjackasyn
-USE_X_PREFIX= yes
USE_GNOME= gtk12 gnometarget
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index a0a9e5584925..4aed0aa18b95 100644
--- a/audio/xmms-nas/Makefile
+++ b/audio/xmms-nas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-nas
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ftp://ftp.stack.nl/pub/users/willem/
@@ -17,7 +17,6 @@ COMMENT= A Network Audio System (NAS) output plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
audio.2:${PORTSDIR}/audio/nas
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 13f1d5e893da..814e893d7667 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xneur
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= russian
MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ CENKES
@@ -17,8 +18,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur
-USE_XLIB= yes
USE_BZIP2= yes
+USE_XORG= x11
USE_LDCONFIG= yes
MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 9a86906dd55b..7d1395c9c7b9 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= allegro
DISTVERSION= 4.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= alleg
@@ -18,8 +18,8 @@ COMMENT= A cross-platform library for games and multimedia programming
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG= yes
-USE_XLIB= yes
WANT_GNOME= yes
OPTIONS= AL "Enable OpenAL support" off \
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index f3483f0b84ff..1ca7aa083881 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -7,7 +7,7 @@
PORTNAME= allegro
DISTVERSION= 4.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= alleg
@@ -17,8 +17,8 @@ COMMENT= A cross-platform library for games and multimedia programming
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG= yes
-USE_XLIB= yes
WANT_GNOME= yes
OPTIONS= ARTS "Enable Arts support" off \
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 6166e9ef6ad9..85eb7622bca4 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpsim
PORTVERSION= 0.22.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
USE_AUTOTOOLS= libtool:15
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GCC= 3.4+
USE_LDCONFIG= yes
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index 5f68d81de0a7..b0b07134efc9 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ode
DISTVERSION= ${ODEVER}-060223
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://opende.sourceforge.net/snapshots/
PKGNAMESUFFIX= -devel
@@ -20,7 +20,6 @@ ODEVER= 0.5
CONFLICTS= ode-[0-9].*
-USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index c05cc5b9b2d5..d511034b2f13 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ode
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,6 @@ COMMENT= Articulated rigid body dynamics library
CONFLICTS= ode-devel-[0-9].*
USE_ZIP= yes
-USE_XLIB= yes
USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile
index 00c586287145..f6d7fa784042 100644
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdcurses
PORTVERSION= 3.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= PDCurses-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= alepulver@FreeBSD.org
COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11
USE_LDCONFIG= yes
-USE_XLIB= yes
+USE_XORG= x11 xext sm ice xt xaw8
GNU_CONFIGURE= yes
OPTIONS= DEBUG "Enable debugging support" off \
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 00c586287145..f6d7fa784042 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdcurses
PORTVERSION= 3.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= PDCurses-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= alepulver@FreeBSD.org
COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11
USE_LDCONFIG= yes
-USE_XLIB= yes
+USE_XORG= x11 xext sm ice xt xaw8
GNU_CONFIGURE= yes
OPTIONS= DEBUG "Enable debugging support" off \
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 3c1527727136..8448c7d5bcc3 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fte
PORTVERSION= 20051115
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,8 +20,7 @@ COMMENT= A full-featured text editor for X11
WRKSRC= ${WRKDIR}/fte
-USE_X_PREFIX= yes
-USE_XLIB= yes
+USE_XORG= x11 xpm
USE_ZIP= yes
USE_PERL5_BUILD= yes
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index ba2ec57a6340..f40bbdea06f1 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mednafen
PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators games
MASTER_SITES= SF
@@ -22,8 +22,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_SDL= sdl net
-USE_GL= gl
-USE_XLIB= yes
+USE_XORG= x11
+USE_GL= glut
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index bd2a3ad6bd89..f1f9b6d4ff32 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snes9x
PORTVERSION= 1.51
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://files.ipherswipsite.com/snes9x/ \
http://www.geocities.co.jp/SiliconValley-PaloAlto/2560/release/ \
@@ -18,7 +18,7 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Super Nintendo Entertainment System(SNES) Emulator
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11 sm ice xext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-extensions
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index edf5a24cc7ff..b83053be5a37 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yabause
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= yes
USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:261
-USE_XLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
SUB_FILES= pkg-message
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 25f04ae42d43..0ff1b6c5a432 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3dc
PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
@@ -19,8 +19,7 @@ COMMENT= 3-Dimensional Chess for X Window System
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
USE_PERL5_BUILD=yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XPM= xpm
WRKSRC= ${WRKDIR}/3Dc/src
post-patch:
diff --git a/games/aqbubble/Makefile b/games/aqbubble/Makefile
index 099b19238e46..d634b04c1e87 100644
--- a/games/aqbubble/Makefile
+++ b/games/aqbubble/Makefile
@@ -7,14 +7,13 @@
PORTNAME= aqbubble
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/juegos/aqbubble/descargas/
MAINTAINER= acm@FreeBSD.org
COMMENT= Game similar to snow bros
-USE_X_PREFIX= yes
USE_SDL= sdl mixer image
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 3e4841fddd34..526aa41d824c 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= balazar
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/balazar/
DISTNAME= Balazar-${PORTVERSION}
@@ -25,7 +25,6 @@ RUN_DEPENDS= soya_editor:${PORTSDIR}/graphics/py-soya3d \
${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
${PYTHON_SITELIBDIR}/cerealizer/__init__.py:${PORTSDIR}/security/py-cerealizer
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index 7984240a6b38..0d7decbf0b8c 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -7,14 +7,13 @@
PORTNAME= ceferino
PORTVERSION= 0.97.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/juegos/ceferino/descargas/
MAINTAINER= acm@FreeBSD.org
COMMENT= Game similar to Super Pang
-USE_XLIB= yes
USE_SDL= sdl mixer image
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index 658d57b0f1ad..a81576f61696 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -7,14 +7,13 @@
PORTNAME= chanta
PORTVERSION= 0.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/juegos/chanta/descargas/
MAINTAINER= acm@FreeBSD.org
COMMENT= Free 2D jump and run game
-USE_X_PREFIX= yes
USE_SDL= sdl image mixer
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 885d69b23c99..a00c58a53ee2 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= criticalmass
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -22,7 +22,7 @@ CONFLICTS= shaaft-[0-9]*
USE_BZIP2= yes
USE_SDL= image mixer sdl
USE_GL= yes
-USE_XLIB= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-optimize
diff --git a/games/el/Makefile b/games/el/Makefile
index bc8105153434..c02aeeccb53e 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= el
PORTVERSION= 140
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
@@ -29,7 +29,6 @@ USE_GMAKE= yes
USE_GNOME= libxml2
USE_SDL= sdl net image
USE_GL= yes
-USE_XLIB= yes
ALL_TARGET= el.x86
MAKEFILE= Makefile.bsdg
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index e2bd51f67ca8..fdaeb97d9cea 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galaxymage
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/tactics/
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/_numpy.so:${PORTSDIR}/math/py-numeric
${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
-USE_X_PREFIX= yes
USE_PYTHON= yes
USE_TWISTED= yes
USE_GETTEXT= yes
diff --git a/games/glest/Makefile b/games/glest/Makefile
index f6c3ccc48dcf..f875412bece1 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glest
PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,6 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
RUN_DEPENDS= ${DATADIR}/configuration.xml:${PORTSDIR}/games/glest-data
-USE_XLIB= yes
USE_AUTOTOOLS= automake:15:env autoconf:261:env
USE_ZIP= yes
USE_DOS2UNIX= yes
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index ffa64f38c0f7..ce578d9b6f1e 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mangband
PORTVERSION= 0.7.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://mangband.org/download/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index 5a2a7b005fad..9f95058b003a 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -7,14 +7,13 @@
PORTNAME= pongix
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/juegos/pongix/descargas/
MAINTAINER= acm@FreeBSD.org
COMMENT= Free pong-like game
-USE_X_PREFIX= yes
USE_SDL= sdl image net
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/primateplunge/Makefile b/games/primateplunge/Makefile
index 4e4ea7dcb505..e58811729e8c 100644
--- a/games/primateplunge/Makefile
+++ b/games/primateplunge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= primateplunge
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ecs.soton.ac.uk/~njh/primateplunge/
@@ -16,7 +16,6 @@ COMMENT= Primate Plunge is an arcade game
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_SDL= sdl mixer
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index e208a48ab375..f246b7421a5d 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lang
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/py4childs/pysycache/v${PORTVERSION}/
PKGNAMEPREFIX= pysycache-
@@ -20,7 +20,6 @@ COMMENT= The pysycache lang support
RUN_DEPENDS= pysycache.py:${PORTSDIR}/games/pysycache
USE_ZIP= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
DATADIR= ${PREFIX}/share/${DIST_SUBDIR}
diff --git a/games/pysycache-themes/Makefile b/games/pysycache-themes/Makefile
index 67dc8d523170..813dfa4890e3 100644
--- a/games/pysycache-themes/Makefile
+++ b/games/pysycache-themes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= themes
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games python
MASTER_SITES= http://themes.pysycache.free.fr/
PKGNAMEPREFIX= pysycache-
@@ -20,7 +20,6 @@ COMMENT= The pysycache themes support
RUN_DEPENDS= pysycache.py:${PORTSDIR}/games/pysycache
USE_ZIP= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
DATADIR= ${PREFIX}/share/${DIST_SUBDIR}
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index 706194bfec6c..7393b29adb26 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pysycache
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/py4childs/${PORTNAME}/v${PORTVERSION}/
DIST_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Educational software made in python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
USE_ZIP= yes
-USE_X_PREFIX= yes
USE_PYTHON= yes
NO_BUILD= yes
diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile
index 4766ef7def06..842cf7503772 100644
--- a/graphics/amanith/Makefile
+++ b/graphics/amanith/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanith
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.amanith.org/download/files/ \
http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/
@@ -22,7 +22,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_QT_VER= 3
-USE_XLIB= yes
USE_GL= yes
USE_GMAKE= yes
USE_DOS2UNIX= yes
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index 7888e330e111..23aa65a190b6 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inventor
PORTVERSION= 2.1.5.p10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/}
@@ -20,8 +20,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GLU.1:${PORTSDIR}/graphics/libGLU
-USE_X_PREFIX= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_GL= glw
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index f5984535c6c3..2ebf8d9bb399 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgltext
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gltext
@@ -19,7 +19,6 @@ COMMENT= Portable font rendering library for C++
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 27d0681b1f53..b65bead19c56 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= soya3d
PORTVERSION= 0.13.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://download.gna.org/soya/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -35,7 +35,6 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GL= yes
USE_GMAKE= yes
-USE_XLIB= yes
PYDISTUTILS_PKGNAME= Soya
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 0c4321f19396..730c33a3801c 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tgif
PORTVERSION= 4.1.45
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/ \
http://groups.yahoo.com/group/tgif4-announce/files/ \
diff --git a/multimedia/nuppelvideo/Makefile b/multimedia/nuppelvideo/Makefile
index 274d3f73fc97..f692f21d6f7c 100644
--- a/multimedia/nuppelvideo/Makefile
+++ b/multimedia/nuppelvideo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= NuppelVideo
PORTVERSION= 0.52.a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -21,7 +21,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
DEPRECATED= Unmaintained upstream for years. The nuppelvideo format is now supported by mencoder
EXPIRATION_DATE=2007-10-03
-USE_XLIB= yes
+USE_XORG= x11 sm xext
USE_GMAKE= yes
PORTDOCS= README
diff --git a/net-im/gyach/Makefile b/net-im/gyach/Makefile
index ecd48455e077..2d7c463fff53 100644
--- a/net-im/gyach/Makefile
+++ b/net-im/gyach/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
USE_GNOME= gtk20
-USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 2311fb7ef4fc..2afe2b80f310 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ohphone
PORTVERSION= 1.4.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
@@ -17,7 +17,6 @@ COMMENT= H323 Video Conferencing Program, compatible with NetMeeting
LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323
USE_BISON= build
-USE_XLIB= yes
USE_GMAKE= yes
ALL_TARGET= optshared
MAKE_ENV= PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 8a2f5f03f9fa..8311b1875085 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= straw
PORTVERSION= 0.27
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
USE_GMAKE= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index d2a0bcad08d0..c1c6ee3d3fc8 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= twinkle
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.xs4all.nl/~mfnboer/twinkle/download/
@@ -25,10 +26,10 @@ LIB_DEPENDS= ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp \
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool:15
USE_BISON= build
+USE_XORG= xext
USE_GMAKE= yes
USE_GNOME= libxml2
USE_PERL5= yes
-USE_XLIB= yes
USE_QT_VER= 3
CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE}
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index ea5beb7f35c7..6bd7cbb23711 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asprint
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
MASTER_SITE_SUBDIR= apps/asprint
@@ -17,7 +17,7 @@ MAINTAINER= brett@peloton.runet.edu
COMMENT= A simple browser to allow a user to print
PLIST_FILES= bin/asprint
-USE_X_PREFIX= yes
+USE_XORG= x11
ALL_TARGET= asprint
MAKEFILE= makefile
diff --git a/russian/xneur/Makefile b/russian/xneur/Makefile
index 13f1d5e893da..814e893d7667 100644
--- a/russian/xneur/Makefile
+++ b/russian/xneur/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xneur
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= russian
MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ CENKES
@@ -17,8 +18,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur
-USE_XLIB= yes
USE_BZIP2= yes
+USE_XORG= x11
USE_LDCONFIG= yes
MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 4019c4511a4f..d82139c702e8 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gromacs
PORTVERSION= 3.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --without-x
.else
PLIST_SUB+= WITHOUT_X=
CONFIGURE_ARGS+= --with-x
-USE_XLIB= yes
+USE_XORG= x11
.endif
.ifndef WITH_FLOAT
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 794d12689673..bdc55f61dd9a 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opensc
DISTVERSION= 0.11.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security devel
MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \
http://www.opensc-project.org/files/${PORTNAME}/testing/
@@ -83,7 +83,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
PINENTRY?= ${LOCALBASE}/bin/pinentry
PINENTRY_PORT?= security/pinentry
RUN_DEPENDS+= pinentry:${PORTSDIR}/${PINENTRY_PORT}
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS+=--with-libassuan-prefix=${LOCALBASE} \
--with-plugin-dir=${LOCALBASE}/lib/browser_plugins \
--with-pin-entry=${PINENTRY}
diff --git a/sysutils/ghasher/Makefile b/sysutils/ghasher/Makefile
index fb58fdc8fa94..69ce7be05a8f 100644
--- a/sysutils/ghasher/Makefile
+++ b/sysutils/ghasher/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://asgaard.homelinux.org/code/ghasher/
MAINTAINER= MrL0Lz@gmail.com
COMMENT= GUI frontend to MD5 sum
-USE_X_PREFIX= yes
USE_GNOME= gtk20 libglade2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 5276b8eeb871..9f518ec52b99 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asWedit
PORTVERSION= 4.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www editors linux
MASTER_SITES= ftp://sunsite.icm.edu.pl/pub/www/asWedit/
DISTNAME= asWedit-4.0-i386.linux
@@ -19,7 +19,6 @@ RESTRICTED= Commercial software
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/asWedit-4.0.1
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 34cdfb50b271..380c32f42028 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -7,6 +7,7 @@
PORTNAME= irrlicht
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +22,6 @@ USE_ZIP= yes
USE_DOS2UNIX= Makefile *.cpp *.h *.txt
USE_GMAKE= yes
USE_GL= yes
-USE_XLIB= yes
USE_LDCONFIG= yes
MAKE_ENV+= CXX="${CXX}"
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 364de2e32268..5d7faa4d8af1 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk
PORTVERSION= 804.027
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits tk84 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tk
@@ -16,8 +16,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= yinjieh@csie.nctu.edu.tw
COMMENT= A re-port of a perl5 interface to Tk8.4
-USE_XLIB= yes
PERL_CONFIGURE= 5.8.0+
+USE_XORG= x11
CONFIGURE_ARGS= X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 6ced88762b68..9ca35c32c473 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paragui
PORTVERSION= 1.1.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,7 +23,6 @@ LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs \
CONFLICTS= paragui-[0-9]*
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image ttf
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 2321e53964fa..6bfa1784fbb1 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbkeys
PORTVERSION= 0.9.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +17,8 @@ COMMENT= A keygrabber for the Blackbox window manager
BUILD_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox
-USE_X_PREFIX= yes
USE_PERL5= yes
+USE_XORG= x11 xext
USE_GCC= 3.3+
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags xft`" \
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index a4c2cce14de7..0544855ab6a6 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blackbox
PORTVERSION= 0.70.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= blackboxwm
@@ -22,8 +22,8 @@ CONFLICTS= boxtools-*
PORTDOCS= AUTHORS COMPLIANCE ChangeLog LICENSE README RELNOTES TODO
MAN1= blackbox.1
-USE_X_PREFIX= yes
USE_GNOME= gnomehack pkgconfig
+USE_XORG= x11
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GCC= 3.3+
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index 7bc9577c8f8e..6cf1fe2155c0 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= boxtools
PORTVERSION= 0.70.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= blackboxwm
@@ -22,7 +22,7 @@ MAN1= bsetbg.1 bsetroot.1
PORTDOCS= README.bbtools README.bsetbg
PLIST_FILES= bin/bsetbg bin/bsetroot
-USE_X_PREFIX= yes
+USE_XORG= x11 xext
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GCC= 3.3+
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index d88f52f230dc..77d4ae331362 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmthemeinstall
PORTVERSION= 0.62
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://www.jeremias.net/wmthemeinstall/download/
@@ -16,7 +16,6 @@ COMMENT= A neat theme manager for WindowMaker
RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile
index 65be61b6afc3..e1fa1647fd84 100644
--- a/x11/accessx/Makefile
+++ b/x11/accessx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= accessx
PORTVERSION= 0.951
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 accessibility
MASTER_SITES= http://cmos-eng.rehab.uiuc.edu/accessx/software/
DISTNAME= accessx${PORTVERSION:S/.//g}
@@ -17,8 +17,8 @@ COMMENT= Customise accessibility features for X
USE_TK= yes
+USE_XORG= xext
WRKSRC= ${WRKDIR}/accessx
-USE_X_PREFIX= yes
PLIST_FILES= bin/ax bin/accessx
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 044717f8dd92..2ae8959dd539 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= idesk
PORTVERSION= 0.7.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}/
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/
MAINTAINER= acm@FreeBSD.org
COMMENT= Place launch icons and background directly on your desktop
-USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_EFL= imlib2
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 22f52306da9e..0b36db0bd8d7 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wterm
PORTVERSION= 6.2.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +17,7 @@ COMMENT= A color vt102 terminal emulator with transparency support
BUILD_DEPENDS= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \
--disable-delete-key --disable-backspace-key \
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 847b7a69b438..b270df25ef5b 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkbset
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.math.missouri.edu/~stephen/software/xkbset/
@@ -15,7 +15,7 @@ MAINTAINER= stephen@math.missouri.edu
COMMENT= Manage various XKB features of X Window
MAN1= xkbset.1
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_PERL5_BUILD= yes
MAKE_ARGS= X11BASE="${X11BASE}" X11PREFIX="${PREFIX}" \