aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--astro/gpsd/Makefile2
-rw-r--r--astro/wmglobe/Makefile2
-rw-r--r--audio/audacity-devel/Makefile2
-rw-r--r--audio/audacity/Makefile3
-rw-r--r--audio/bmp-musepack/Makefile3
-rw-r--r--audio/praat/Makefile2
-rw-r--r--audio/xmms-cdread/Makefile3
-rw-r--r--audio/xmms-ladspa/Makefile3
-rw-r--r--audio/xmms-mac/Makefile3
-rw-r--r--audio/xmms-mailnotify/Makefile3
-rw-r--r--comms/gpsk31/Makefile1
-rw-r--r--comms/twpsk/Makefile4
-rw-r--r--comms/xnecview/Makefile1
-rw-r--r--deskutils/gxmessage/Makefile3
-rw-r--r--deskutils/xpad/Makefile1
-rw-r--r--devel/regexxer/Makefile1
-rw-r--r--emulators/basiliskII/Makefile1
-rw-r--r--emulators/dtcyber/Makefile4
-rw-r--r--emulators/tme/Makefile2
-rw-r--r--emulators/vba/Makefile3
-rw-r--r--emulators/xhomer/Makefile4
-rw-r--r--ftp/urlgfe/Makefile1
-rw-r--r--games/3dc/Makefile2
-rw-r--r--games/bfm/Makefile3
-rw-r--r--games/evq3/Makefile4
-rw-r--r--games/ezquake/Makefile3
-rw-r--r--games/freedroid/Makefile3
-rw-r--r--games/ioquake3/Makefile4
-rw-r--r--games/joequake/Makefile4
-rw-r--r--games/mangband/Makefile5
-rw-r--r--games/scid/Makefile3
-rw-r--r--games/uqm/Makefile3
-rw-r--r--games/xphotohunter/Makefile3
-rw-r--r--graphics/gnash-devel/Makefile3
-rw-r--r--graphics/gnash/Makefile3
-rw-r--r--graphics/libvisual04-plugins/Makefile3
-rw-r--r--graphics/xmrm/Makefile5
-rw-r--r--misc/wmcalendar/Makefile1
-rw-r--r--multimedia/avidemux2/Makefile1
-rw-r--r--multimedia/avifile/Makefile3
-rw-r--r--multimedia/smilutils/Makefile1
-rw-r--r--net/wmnetmon/Makefile5
-rw-r--r--net/xisp/Makefile5
-rw-r--r--news/klibido/Makefile3
-rw-r--r--print/gv/Makefile4
-rw-r--r--science/g3data/Makefile1
-rw-r--r--sysutils/graveman/Makefile1
-rw-r--r--sysutils/wmcpuload/Makefile5
-rw-r--r--sysutils/wmmemload/Makefile5
-rw-r--r--vietnamese/xvnkb/Makefile3
-rw-r--r--www/plugger/Makefile4
-rw-r--r--x11-clocks/glclock/Makefile1
-rw-r--r--x11-clocks/wmclockmon/Makefile5
-rw-r--r--x11-clocks/wmitime/Makefile5
-rw-r--r--x11-clocks/xdaliclock/Makefile3
-rw-r--r--x11-fm/FSViewer/Makefile3
-rw-r--r--x11-toolkits/fltk2/Makefile2
-rw-r--r--x11-wm/fluxconf/Makefile1
-rw-r--r--x11-wm/gcompmgr/Makefile1
-rw-r--r--x11/lxpanel/Makefile1
-rw-r--r--x11/padkey/Makefile5
-rw-r--r--x11/wdm/Makefile3
62 files changed, 66 insertions, 109 deletions
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 1caf123b6b65..82520cf703ee 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--disable-garmin
.if defined(WITH_XGPS)
CONFIGURE_ARGS+=--with-x
-USE_XLIB=yes
+USE_XORG= x11
PLIST_SUB+= X11=""
.else
CONFIGURE_ARGS+=--without-x
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 76ec9deebf70..ce289a97466d 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -16,8 +16,6 @@ COMMENT= A neat xearth-like WindowMaker dockapp
LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
-USE_X_PREFIX= yes
-
MAN1= wmglobe.1
PLIST_FILES= bin/wmglobe
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index cef053c1ef88..accb5affaf63 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}-beta
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GCC= 4.2+
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 3ec67803650c..bdf9ff6d1651 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -6,7 +6,7 @@
PORTNAME= audacity
PORTVERSION= 1.2.4b
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,6 @@ CONFLICTS= audacity-devel-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_WX= 2.6
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index b76c3ec91732..df4bd6d8e2c6 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= musepack
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://files.musepack.net/linux/plugins/
PKGNAMEPREFIX= bmp-
@@ -19,7 +19,6 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
mpcdec:${PORTSDIR}/audio/libmpcdec \
tag:${PORTSDIR}/audio/taglib
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index 8ceb5b4826b5..d0d8b571c0f9 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -7,6 +7,7 @@
PORTNAME= praat
PORTVERSION= 4.6.39
+PORTREVISION= 1
CATEGORIES= audio science
MASTER_SITES= http://www.neuro.mcw.edu/~bacon/Ports/distfiles/Praat/4639/ \
http://www.fon.hum.uva.nl/praat/
@@ -17,7 +18,6 @@ COMMENT= Phonetics by Computer
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*Makefile
-USE_XLIB= yes
USE_MOTIF= yes
WRKSRC= ${WRKDIR}/sources_4639
MAKEFILE= makefile
diff --git a/audio/xmms-cdread/Makefile b/audio/xmms-cdread/Makefile
index 7219e22805bd..03d7a7471db8 100644
--- a/audio/xmms-cdread/Makefile
+++ b/audio/xmms-cdread/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-cdread
PORTVERSION= 0.14a
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= ftp://ftp.stack.nl/pub/users/willem/
@@ -17,7 +17,6 @@ COMMENT= A XMMS input plugin for read AudioCD via IDE bus
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index 211e52c59310..a098f15c38d5 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xmms-ladspa
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/ \
${MASTER_SITE_LOCAL}
@@ -21,7 +21,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
PLIST_FILES= lib/xmms/Effect/ladspa.so
-USE_X_PREFIX= yes
USE_GNOME= gtk12
do-install:
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 6ec624919dba..8c85d18ae5c7 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mac
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= CENKES
PKGNAMEPREFIX= xmms-
@@ -18,7 +18,6 @@ COMMENT= Monkey's Audio Codec non-win32 port
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
mac.2:${PORTSDIR}/audio/mac
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}"
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 410eab069438..a2ef6a902842 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -16,7 +16,6 @@ COMMENT= XMMS plugin, that plays a sound on incoming mail and opens the MUA
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index 8a7abc96161b..683865344d22 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -15,7 +15,6 @@ COMMENT= A gtk psk31 client
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
post-patch:
@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index 3d7e3b18093e..e3e3aa85dc6e 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -7,14 +7,14 @@
PORTNAME= twpsk
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= comms hamradio
MASTER_SITES= http://www.ibiblio.org/pub/linux/apps/ham/
MAINTAINER= xride@FreeBSD.org
COMMENT= A openmotif X psk31 client
-USE_XPM= yes
+USE_XORG= xpm
USE_MOTIF= yes
MAN1= psk31.1
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index fc9a823fed52..5ad592d4fbb8 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= nec2c:${PORTSDIR}/comms/nec2c
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_X_PREFIX= yes
MAKE_ENV= LDFLAGS="${LDFLAGS}"
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index 6d1843846a3f..14a8d5a82dbb 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gxmessage
PORTVERSION= 2.4.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= http://homepages.ihug.co.nz/~trmusson/stuff/
MAINTAINER= avg@icyb.net.ua
COMMENT= GTK2 substitute for xmessage
-USE_X_PREFIX= yes
USE_GNOME= gtk20 gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index c5fc05ab8796..8830e7077fcc 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -17,7 +17,6 @@ COMMENT= A virtual note-pad system for your X11 desktop
USE_BZIP2= yes
USE_GNOME= pkgconfig gtk20 gnomehier intltool
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 61d7305d2143..a83b7eeb4ccc 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
pcre.0:${PORTSDIR}/devel/pcre
USE_GETTEXT= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intltool intlhack
diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
index 350b9e1279f1..3db4050f02ba 100644
--- a/emulators/basiliskII/Makefile
+++ b/emulators/basiliskII/Makefile
@@ -18,7 +18,6 @@ COMMENT= A free, portable, Open Source 68k Mac emulator
WRKSRC= ${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= esound gtk20
GNU_CONFIGURE= yes
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index ba835fe58995..c265f0969b63 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dtcyber
PORTVERSION= 2.0b1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://members.iinet.net.au/~tom-hunter/ \
${MASTER_SITE_LOCAL}
@@ -18,9 +18,9 @@ MAINTAINER= trasz@FreeBSD.org
COMMENT= Desktop CYBER Emulator
USE_ZIP= yes
+USE_XORG= x11
USE_DOS2UNIX= yes
NO_WRKSUBDIR= yes
-USE_XLIB= yes
INSTALL_TARGET=
MAKEFILE= Makefile.x11
SUB_FILES= pkg-message
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 45e6f9c76735..350092f2ddd7 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tme
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://people.csail.mit.edu/fredette/tme/
@@ -18,7 +19,6 @@ USE_GMAKE= yes
USE_GNOME= gtk12 gnometarget
CONFIGURE_ARGS+= --disable-shared
MAKE_ENV= LANG=C
-USE_XLIB= yes
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/libtme/module.c
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 048680798a2d..ccb3dfd3b6a6 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -6,7 +6,7 @@
PORTNAME= vba
PORTVERSION= 1.7.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Open Source Gameboy Advance emulator
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/emulators/xhomer/Makefile b/emulators/xhomer/Makefile
index c5c252bf0107..75788fd6794d 100644
--- a/emulators/xhomer/Makefile
+++ b/emulators/xhomer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xhomer
DISTVERSION= 9-16-06
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= http://xhomer.isani.org/xhomer/
@@ -17,7 +17,7 @@ MAINTAINER= trasz@FreeBSD.org
COMMENT= Emulator for the DEC Pro 350 computer
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= xt sm ice xext x11
ALL_TARGET= clean xhomer
INSTALL_TARGET=
CFLAGS+= -Wall -ffloat-store
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index dcbc2a4d23ff..fceb34be7c21 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
USE_GNOME= gtk20 lthack
WANT_GNOME= yes
USE_OPENSSL= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 0ff1b6c5a432..0a06ec4a4e68 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -19,7 +19,7 @@ COMMENT= 3-Dimensional Chess for X Window System
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
USE_PERL5_BUILD=yes
-USE_XPM= xpm
+USE_XORG= xpm
WRKSRC= ${WRKDIR}/3Dc/src
post-patch:
diff --git a/games/bfm/Makefile b/games/bfm/Makefile
index eb42c29b73fe..877ab7af1fb9 100644
--- a/games/bfm/Makefile
+++ b/games/bfm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bfm
PORTVERSION= 0.0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/battle4mandicor
EXTRACT_SUFX= -src.tar.gz
@@ -21,7 +21,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_GMAKE= yes
USE_LUA= 5.0
USE_SDL= sdl
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LUA_INCDIR}" LDFLAGS="-L${LUA_LIBDIR}"
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 0f38c54cb164..80ac2e5cbbe1 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= evq3
PORTVERSION= 1.0a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://evolution.quakedev.com/dev/evq3/
DISTNAME= ${PORTNAME}-final-src
@@ -24,7 +24,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_ZIP= yes
USE_DOS2UNIX= yes
USE_GL= yes
-USE_XLIB= yes
+USE_XORG= xxf86dga
USE_SCONS= yes
SCONS_ARGS= warnings=0
NO_WRKSUBDIR= yes
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 08d4521e0c58..fee0e972c10a 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ezquake
PORTVERSION= 1.8.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= SF:ezquake \
@@ -54,7 +55,7 @@ PLIST_SUB+= GLX="@comment "
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= xxf86dga
ALL_TARGET+= x11
PLIST_SUB+= X11=""
.else
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index a6c2d34702cd..423b45503e44 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freedroid
PORTVERSION= 1.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= freedroid
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= freedroid
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Freedroid is a clone of the classic game "Paradroid"
-USE_XLIB= yes
USE_SDL= mixer image sdl
GNU_CONFIGURE= yes
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 5a894a863a8b..db9abc8d8c3b 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ioquake3
DISTVERSION= 1.34-rc3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://ioquake3.org/files/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -78,7 +78,7 @@ USE_SDL= sdl
MAKE_ENV+= USE_SDL_VIDEO=1
. else
USE_GL= yes
-USE_XLIB= yes
+USE_XORG= xxf86dga
. endif
# Vorbis
. if defined(WITH_VORBIS)
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 0e6b2012cbf0..d5594e2ccd02 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= joequake
PORTVERSION= 0.15b1329
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://runecentral.com/joequake/
DISTNAME= ${PORTNAME}-v${PORTVERSION}-source
@@ -81,7 +81,7 @@ MAKE_ENV+= USE_${f}=NO
.endfor
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= xxf86dga
ALL_TARGET+= x11
PLIST_SUB+= X11=""
.else
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index ce578d9b6f1e..9944e0a8284b 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mangband
PORTVERSION= 0.7.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://mangband.org/download/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
@@ -16,8 +16,7 @@ MAINTAINER= adam-ports@blacktabby.org
COMMENT= Multiplayer rogue-like game with color, X11 support
WRKSRC= ${WRKDIR}/${PORTNAME}/src
-
-USE_XLIB= yes
+USE_XORG= x11
ALL_TARGET= install
MALIB= ${PREFIX}/lib/mangband
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 77e3add125bc..87ddd08d5204 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -8,7 +8,7 @@
PORTNAME= scid
PORTVERSION= 3.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 \
tk84:${PORTSDIR}/x11-toolkits/tk84
USE_PYTHON= yes
-USE_XLIB= yes
USE_GMAKE= yes
ALL_TARGET= all strip
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index ce8b66d4b653..63addabbefd2 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,7 +14,7 @@
PORTNAME= uqm
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sc2
@@ -27,7 +27,6 @@ COMMENT= A port of the original Star Control 2 for 3DO consoles
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
mikmod.2:${PORTSDIR}/audio/libmikmod
-USE_XLIB= yes
USE_GMAKE= yes
USE_SDL= image sdl
NO_INSTALL_MANPAGES= yes
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index dc6278765041..b6575e991fd3 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xphotohunter
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://ghs.tongi.org/ \
http://micro.ee.nthu.edu.tw/~tomcat/Xphotohunter/
@@ -16,7 +16,6 @@ MAINTAINER= clive@FreeBSD.org
COMMENT= A game looking for the difference between two pictures
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= imlib
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index 38d02bc8f7a4..d76773901c65 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -26,7 +26,6 @@ WANT_SDL= yes
WANT_GNOME= yes
WANT_GSTREAMER= yes
USE_GNOME= pkgconfig libxml2
-USE_XLIB= yes
USE_AUTOTOOLS= libltdl:15
PLUGIN_DIR= ${PREFIX}/lib/browser_plugins
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 38d02bc8f7a4..d76773901c65 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -26,7 +26,6 @@ WANT_SDL= yes
WANT_GNOME= yes
WANT_GSTREAMER= yes
USE_GNOME= pkgconfig libxml2
-USE_XLIB= yes
USE_AUTOTOOLS= libltdl:15
PLUGIN_DIR= ${PREFIX}/lib/browser_plugins
diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile
index 8fd21bd6cec4..46bc8325d700 100644
--- a/graphics/libvisual04-plugins/Makefile
+++ b/graphics/libvisual04-plugins/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libvisual
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
MASTER_SITE_SUBDIR= libvisual
@@ -20,7 +21,7 @@ LIB_DEPENDS= visual-${MAJORMINOR}:${PORTSDIR}/graphics/libvisual04
USE_GNOME= pkgconfig
USE_GL= yes
-USE_XLIB= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa \
--disable-mplayer \
diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile
index 6593c96b8f78..e98ef4264c01 100644
--- a/graphics/xmrm/Makefile
+++ b/graphics/xmrm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmrm
PORTVERSION= 2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cg.tuwien.ac.at/pub/linux/xmrm/ \
ftp://ftp.uni-passau.de/mount/common.lib.archive.unix/Graphic/xmrm/
@@ -23,8 +23,7 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
tiff.4:${PORTSDIR}/graphics/tiff
USE_GL= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_WRKSUBDIR= yes
.include <bsd.port.pre.mk>
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 3fc4dbd54e13..7421e537d58d 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= ical.27:${PORTSDIR}/devel/libical
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
-USE_XPM= yes
USE_GNOME= gtk20
MAKE_ARGS= CC="${CC}" \
LFLAGS="`pkg-config --libs gtk+-2.0` -L${LOCALBASE}/lib" \
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index ad257d0e70fd..7ccd0f213945 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -26,7 +26,6 @@ LIB_DEPENDS= mp3lame:${PORTSDIR}/audio/lame \
USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15 aclocal:19:env
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
WANT_SDL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 724abc5d5996..215995a2bbf7 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avifile
PORTVERSION= 0.7.43
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,6 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
USE_SUBMAKE= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_ICONV= yes
diff --git a/multimedia/smilutils/Makefile b/multimedia/smilutils/Makefile
index 216907bf3e02..75c909096959 100644
--- a/multimedia/smilutils/Makefile
+++ b/multimedia/smilutils/Makefile
@@ -36,7 +36,6 @@ USE_GNOME= gtk20 libxml2 libglade2
USE_ICONV= yes
USE_SDL= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/libquicktime -L${LOCALBASE}/lib" \
diff --git a/net/wmnetmon/Makefile b/net/wmnetmon/Makefile
index 019a920797bc..d36a49376d51 100644
--- a/net/wmnetmon/Makefile
+++ b/net/wmnetmon/Makefile
@@ -7,15 +7,14 @@
PORTNAME= wmnetmon
PORTVERSION= 0.2p5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net windowmaker
MASTER_SITES= http://www.linuks.mine.nu/dockapps/
MAINTAINER= xride@FreeBSD.org
COMMENT= A host availability monitor intended for the WindowMaker dock
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
BINMODE= 4755
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 3e60ed77a34e..e7cd5b88cd61 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xisp
PORTVERSION= 2.7p4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://xisp.hellug.gr/release/
@@ -18,8 +18,7 @@ COMMENT= A user-friendly X interface to pppd/chat
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm
MAKE_ENV+= CCFLAGS="${CFLAGS}"
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 6561747fea3e..31060d038cda 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klibido
PORTVERSION= 0.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,6 @@ LIB_DEPENDS= uu.3:${PORTSDIR}/converters/uulib \
db-4.4:${PORTSDIR}/databases/db44
USE_KDELIBS_VER= 3
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_ICONS= yes
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 0e54e3764184..18a40d2b4093 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gv
PORTVERSION= 3.6.3
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +18,7 @@ COMMENT= A PostScript and PDF previewer
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GHOSTSCRIPT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/science/g3data/Makefile b/science/g3data/Makefile
index 7b55163f8f5f..eb3c5f1b6d88 100644
--- a/science/g3data/Makefile
+++ b/science/g3data/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade \
${LOCALBASE}/share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl:${PORTSDIR}/textproc/docbook-utils \
${LOCALBASE}/share/sgml/docbook/4.1/docbook.dtd:${PORTSDIR}/textproc/docbook-410
-USE_X_PREFIX= yes
USE_GNOME= gtk20
ALL_TARGET=
MAKE_ENV= PREFIX=${PREFIX}
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index f29b22f57a37..69eb47bd8707 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -21,7 +21,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_CDRTOOLS= yes
USE_GNOME= libglade2 intlhack gnomehack gnomeprefix
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index ec798b744e85..c12a1119aaf0 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmcpuload
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://seiichisato.jp/dockapps/src/
@@ -15,8 +15,7 @@ MAINTAINER= xride@FreeBSD.org
COMMENT= An "lcd" dockapp for windowmaker, which displays the current cpuload
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile
index 3d25e757bd4c..176abb4cfda6 100644
--- a/sysutils/wmmemload/Makefile
+++ b/sysutils/wmmemload/Makefile
@@ -7,16 +7,15 @@
PORTNAME= wmmemload
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://markstaggs.net/wmmemload-download/
MAINTAINER= xride@FreeBSD.org
COMMENT= An dockapp for windowmaker that displays the current mem/swap usage
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_XPM= yes
+USE_XORG= xpm
CONFIGURE_ARGS= --program-prefix=""
MAN1= wmmemload.1
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile
index d6f5537d292c..87b0b4430777 100644
--- a/vietnamese/xvnkb/Makefile
+++ b/vietnamese/xvnkb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xvnkb
PORTVERSION= 0.2.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= vietnamese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= chinhngt@sectorb.msk.ru
COMMENT= A Vietnamese input method for X-Window
-USE_XLIB= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 0f9163c84bf4..13ba603e0dc5 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -7,14 +7,14 @@
PORTNAME= plugger
PORTVERSION= 5.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www audio graphics multimedia
MASTER_SITES= http://fredrik.hubbe.net/plugger/
MAINTAINER= conrads@cox.net
COMMENT= A multimedia front-end plugin for Mozilla or Opera
-USE_XLIB= yes
+USE_XORG= xext xt sm ice xext x11
GNU_CONFIGURE= yes
MAN7= plugger.7
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 9a1afeeaee0b..7a7a4dac7a7d 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -16,7 +16,6 @@ COMMENT= OpenGL spinning pocket watch demo and benchmark utility
LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-USE_X_PREFIX= yes
USE_GL= yes
MAKEFILE= makefile
MAKE_ARGS= CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile
index 5d212a7b8dc9..1d9dfb6a7204 100644
--- a/x11-clocks/wmclockmon/Makefile
+++ b/x11-clocks/wmclockmon/Makefile
@@ -7,15 +7,14 @@
PORTNAME= wmclockmon
PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= xride@FreeBSD.org
COMMENT= A digital clock dockapp with a similar look to wmcpuload
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile
index 5a191cec71f2..3002eb8d5fdf 100644
--- a/x11-clocks/wmitime/Makefile
+++ b/x11-clocks/wmitime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmitime
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://dockapps.org/files/22/29/
@@ -17,7 +17,6 @@ COMMENT= A clock dockapp that shows the date, time, and internet time
WRKSRC= ${WRKDIR}/wmitime/wmitime
PLIST_FILES= bin/wmitime
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
.include <bsd.port.mk>
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index 3a5a6e9f1514..f6e1eaf0c660 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xdaliclock
PORTVERSION= 2.25
+PORTREVISION= 1
CATEGORIES= x11-clocks
MASTER_SITES= http://www.jwz.org/xdaliclock/
MASTER_SITE_SUBDIR= applications
@@ -16,8 +17,8 @@ COMMENT= A rather neat animated clock
WRKSRC= ${WRKDIR}/${DISTNAME}/X11
-USE_XLIB= yes
GNU_CONFIGURE= yes
+USE_XORG= xt sm ice xext x11
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= xdaliclock.1
PLIST_FILES= bin/xdaliclock
diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile
index 3ca486cd7245..d68e54fe63ec 100644
--- a/x11-fm/FSViewer/Makefile
+++ b/x11-fm/FSViewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= FSViewer.app
PORTVERSION= 0.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fm windowmaker
MASTER_SITES= http://www.bayernline.de/~gscholz/linux/fsviewer/
@@ -20,7 +20,6 @@ COMMENT= X11 file manager using WINGS library. Dockable in WindowMaker
LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index cbbec10215c3..80dc71b0a10f 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fltk
PORTVERSION= 2.0.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= fltk/snapshots
@@ -41,7 +42,6 @@ LATEST_LINK= fltk2
USE_BZIP2= yes
USE_GMAKE= yes
USE_GL= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 6f5acb5b3e13..449bdaa20c66 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://devaux.fabien.free.fr/flux/
MAINTAINER= alfredoj69@gmail.com
COMMENT= A configuration program for the fluxbox window manager
-USE_X_PREFIX= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index 4e5b5464e289..65dcd1c5bdb8 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= xcompmgr:${PORTSDIR}/x11-wm/xcompmgr
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= automake:19:env
DESKTOP_ENTRIES="gcompmgr" \
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index f27350eddaed..aa877d51d2ae 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= lxde
MAINTAINER= b89605222@ntu.edu.tw
COMMENT= LXPanel is a lightweight X11 desktop panel
-USE_XLIB= yes
USE_GNOME= gtk20 gnomelibs gnomedesktop
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake:19
diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile
index dc7649f31053..c647ce89b09c 100644
--- a/x11/padkey/Makefile
+++ b/x11/padkey/Makefile
@@ -7,15 +7,14 @@
PORTNAME= padkey
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 games
MASTER_SITES= http://www.liquidx.org/padkey/releases/dist/
MAINTAINER= tlp@liquidx.org
COMMENT= Use an authentic SNES controller to play games
-USE_XLIB= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xtst
PLIST_FILES= bin/padkey
PORTDOCS= CREDITS README
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 0f371c7f5994..f8bfde10d380 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wdm
PORTVERSION= 1.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/:wdm \
http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
@@ -27,7 +27,6 @@ LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
NOT_FOR_ARCHS= sparc64
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \