aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-03-24 21:03:55 +0800
committermiwi <miwi@FreeBSD.org>2008-03-24 21:03:55 +0800
commitdd70e028701d877ba20b006edcedc6df5c408d09 (patch)
tree29ee38167b82f550d5b5191edff093320cd794ba
parent4e3961b506ac1065b05288675b0c56c7e1eb7dc3 (diff)
downloadfreebsd-ports-gnome-dd70e028701d877ba20b006edcedc6df5c408d09.tar.gz
freebsd-ports-gnome-dd70e028701d877ba20b006edcedc6df5c408d09.tar.zst
freebsd-ports-gnome-dd70e028701d877ba20b006edcedc6df5c408d09.zip
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Bump PORTREVISION Approved by: portmgr (xorg cleanup)
-rw-r--r--audio/ecamegapedal/Makefile3
-rw-r--r--audio/gai-album/Makefile3
-rw-r--r--audio/gai-visual-audio/Makefile3
-rw-r--r--audio/gdam/Makefile1
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/uade/Makefile2
-rw-r--r--audio/xmms-uade/Makefile2
-rw-r--r--biology/garlic/Makefile4
-rw-r--r--deskutils/gdesklets/Makefile3
-rw-r--r--deskutils/multisync/Makefile1
-rw-r--r--deskutils/splashsetter/Makefile2
-rw-r--r--deskutils/xwrits/Makefile4
-rw-r--r--devel/rapidsvn/Makefile3
-rw-r--r--devel/upp/Makefile4
-rw-r--r--editors/mousepad/Makefile1
-rw-r--r--editors/zoinks/Makefile2
-rw-r--r--emulators/vgb-bin/Makefile3
-rw-r--r--emulators/vgba-bin/Makefile3
-rw-r--r--games/gltron/Makefile3
-rw-r--r--games/hexxagon/Makefile2
-rw-r--r--games/mindguard/Makefile3
-rw-r--r--games/traindirector/Makefile3
-rw-r--r--games/trigger/Makefile3
-rw-r--r--games/xpenguins/Makefile5
-rw-r--r--games/xwelltris/Makefile4
-rw-r--r--graphics/libggi/Makefile2
-rw-r--r--graphics/megapov/Makefile3
-rw-r--r--graphics/povray/Makefile3
-rw-r--r--graphics/povray36/Makefile3
-rw-r--r--graphics/povray37/Makefile3
-rw-r--r--graphics/py-gd/Makefile2
-rw-r--r--japanese/tgif/Makefile4
-rw-r--r--lang/metaocaml/Makefile4
-rw-r--r--mail/sylpheed/Makefile1
-rw-r--r--mail/sylpheed2/Makefile1
-rw-r--r--mail/sylpheed3/Makefile1
-rw-r--r--math/ploticus/Makefile3
-rw-r--r--misc/gkrellm-gamma/Makefile1
-rw-r--r--misc/gkrellm-helium/Makefile1
-rw-r--r--misc/gkrellm-xkb/Makefile1
-rw-r--r--misc/gkrellweather2/Makefile1
-rw-r--r--misc/uf-view/Makefile1
-rw-r--r--misc/wmweather/Makefile3
-rw-r--r--misc/xfce4-appfinder/Makefile1
-rw-r--r--multimedia/audacious/Makefile1
-rw-r--r--multimedia/kino/Makefile1
-rw-r--r--net-im/pidgin-latex/Makefile1
-rw-r--r--net-p2p/dctc-gui/Makefile3
-rw-r--r--net-p2p/gkremldk/Makefile1
-rw-r--r--net/gacxtool/Makefile1
-rw-r--r--net/gkrellmwireless2/Makefile4
-rw-r--r--polish/tleenx2/Makefile1
-rw-r--r--print/xfce4-print/Makefile1
-rw-r--r--science/gchempaint/Makefile1
-rw-r--r--science/gchemutils/Makefile1
-rw-r--r--sysutils/gcombust/Makefile4
-rw-r--r--sysutils/gtk-send-pr/Makefile1
-rw-r--r--sysutils/xfce4-mcs-manager/Makefile1
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile1
-rw-r--r--sysutils/xfce4-utils/Makefile1
-rw-r--r--textproc/scim/Makefile1
-rw-r--r--textproc/xfce4-dict-plugin/Makefile1
-rw-r--r--www/peacock/Makefile1
-rw-r--r--www/ump/Makefile5
-rw-r--r--x11-clocks/asclock-gtk/Makefile3
-rw-r--r--x11-clocks/astime/Makefile5
-rw-r--r--x11-clocks/wmcalclock/Makefile5
-rw-r--r--x11-fm/fsv/Makefile1
-rw-r--r--x11-fm/thunar/Makefile1
-rw-r--r--x11-fonts/bdfresize/Makefile3
-rw-r--r--x11-fonts/cyberbit-ttfonts/Makefile3
-rw-r--r--x11-fonts/gentium-basic/Makefile3
-rw-r--r--x11-fonts/gentium/Makefile3
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile1
-rw-r--r--x11-themes/xfce4-icon-theme/Makefile1
-rw-r--r--x11-toolkits/gtkdatabox2/Makefile1
-rw-r--r--x11-toolkits/gtkunique/Makefile1
-rw-r--r--x11-toolkits/libxfce4gui/Makefile1
-rw-r--r--x11-toolkits/py-wmdockapps/Makefile3
-rw-r--r--x11-wm/evilwm/Makefile3
-rw-r--r--x11-wm/oroborus/Makefile4
-rw-r--r--x11-wm/xfce/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/Makefile1
-rw-r--r--x11-wm/xfce4-panel/Makefile1
-rw-r--r--x11-wm/xfce4-session/Makefile1
-rw-r--r--x11-wm/xfce4-wm/Makefile2
-rw-r--r--x11/Terminal/Makefile1
-rw-r--r--x11/deskmenu/Makefile1
-rw-r--r--x11/gtstarter/Makefile2
-rw-r--r--x11/libexo/Makefile1
-rw-r--r--x11/libxfce4mcs/Makefile1
-rw-r--r--x11/xclick/Makefile5
92 files changed, 65 insertions, 136 deletions
diff --git a/audio/ecamegapedal/Makefile b/audio/ecamegapedal/Makefile
index 88da24e4c020..cddb8f567084 100644
--- a/audio/ecamegapedal/Makefile
+++ b/audio/ecamegapedal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecamegapedal
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://ecasound.seul.org/download/
@@ -18,7 +18,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libecasound.a:${PORTSDIR}/audio/ecasound
JACKDIR= ${LOCALBASE}/include/jack
USE_QT_VER= 3
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/gai-album/Makefile b/audio/gai-album/Makefile
index 33852b503222..c43a527f35b0 100644
--- a/audio/gai-album/Makefile
+++ b/audio/gai-album/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-album
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gai
@@ -19,7 +19,6 @@ LIB_DEPENDS= gai:${PORTSDIR}/x11-toolkits/gai \
xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/audio/gai-visual-audio/Makefile b/audio/gai-visual-audio/Makefile
index 76234133bf6f..e960d00596b3 100644
--- a/audio/gai-visual-audio/Makefile
+++ b/audio/gai-visual-audio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-visual-audio
PORTVERSION= 0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gai
@@ -19,7 +19,6 @@ LIB_DEPENDS= gai:${PORTSDIR}/x11-toolkits/gai \
xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 4094d2d34ff0..5f1cd87995d2 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server.1
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= libglade
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d38bed2e9c6e..580138c0aa92 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqmpeg
PORTVERSION= 0.20.0
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES+= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,6 @@ RUN_DEPENDS+= mpg321:${PORTSDIR}/audio/mpg321
RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
.endif
-USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
USE_AUTOTOOLS= autoconf:213 libtool:15
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index f71c77816aa2..241e058273fb 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmms-uade
PORTVERSION= 2.05
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://zakalwe.fi/uade/uade2/ \
http://critical.ch/distfiles/
@@ -21,7 +22,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
HAS_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index f71c77816aa2..241e058273fb 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmms-uade
PORTVERSION= 2.05
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://zakalwe.fi/uade/uade2/ \
http://critical.ch/distfiles/
@@ -21,7 +22,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
HAS_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index 210279060ebc..497c008bfed8 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= garlic
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= http://garlic.mefos.hr/sources/garlic-${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -19,8 +19,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= maho@FreeBSD.org
COMMENT= Molecular viewer, editor and visualization program
-USE_XLIB= yes
USE_GMAKE= yes
+USE_XORG= x11
ALL_TARGET= # empty
.if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 7b2b3323e45d..fe42b7931f84 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.35.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gdesklets.org/downloads/ \
http://www.pycage.de/download/${PORTNAME}/ \
@@ -25,7 +25,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PYTHON= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack librsvg2 pygnomeextras
OPTIONS= GDBM "install py-gdbm instead py-bsddb for config storage" off
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index a1334ec55cd6..427af39f24fb 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -21,7 +21,6 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
USE_AUTOTOOLS= automake:19:env libtool:15
-USE_X_PREFIX= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
pre-configure:
diff --git a/deskutils/splashsetter/Makefile b/deskutils/splashsetter/Makefile
index 7fbe61967297..48dbd71089f2 100644
--- a/deskutils/splashsetter/Makefile
+++ b/deskutils/splashsetter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= splashsetter
PORTVERSION= 0.6.5.3
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
@@ -14,7 +15,6 @@ MAINTAINER= klammer@webonaut.com
COMMENT= Splash screen changer for GNOME
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GNOME= pygnome2 gnomeprefix
diff --git a/deskutils/xwrits/Makefile b/deskutils/xwrits/Makefile
index 0240abe00e71..6abdc5b15095 100644
--- a/deskutils/xwrits/Makefile
+++ b/deskutils/xwrits/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xwrits
PORTVERSION= 2.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://www.lcdf.org/xwrits/
@@ -16,7 +16,7 @@ COMMENT= Reminds you to take wrist breaks
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xext
MAN1= xwrits.1
PLIST_FILES= bin/xwrits
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index bdb3ffadad31..5a55523f917b 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rapidsvn
PORTVERSION= 0.9.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.rapidsvn.org/download/release/${PORTVERSION}/
@@ -25,7 +25,6 @@ USE_WX= 2.6
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= autoconf:261 libtool:15 automake:19
CONFIGURE_ARGS= --with-apr-config=apr-1-config \
--with-apu-config=apu-1-config \
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 2c45dd9b9645..7e6de37946f7 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= upp
PORTVERSION= 2007.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,8 +22,6 @@ LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft\
gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_XLIB= yes
.if defined(WITH_SDL)
USE_SDL= sdl
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index b0688d17dad3..47353d68ed6b 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -21,6 +21,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index dc0985dfeb35..14c0ea2c437d 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
pre-everything::
diff --git a/emulators/vgb-bin/Makefile b/emulators/vgb-bin/Makefile
index baa358d82240..d2e95a31c77c 100644
--- a/emulators/vgb-bin/Makefile
+++ b/emulators/vgb-bin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vgb
PORTVERSION= 3.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= http://fms.komkon.org/VGB/
@@ -19,7 +19,6 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= Nintendo GameBoy(tm) emulator (closed binary version of vgb)
IA32_BINARY_PORT= yes
-USE_X_PREFIX= yes
NO_BUILD= no
NO_WRKSUBDIR= no
diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile
index 582193a786ae..3d0371110622 100644
--- a/emulators/vgba-bin/Makefile
+++ b/emulators/vgba-bin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vgba
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://fms.komkon.org/VGBA/
PKGNAMESUFFIX= -bin
@@ -18,7 +18,6 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= Virtual GameBoy Advance is an emulator of Nintendo GameBoy Advance(TM)
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
NO_BUILD= no
NO_WRKSUBDIR= no
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index cdc2123a527f..223254204c8c 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gltron
PORTVERSION= 0.70
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= A 3D worm game for two players for X Window System
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_X_PREFIX= yes
USE_GL= yes
USE_SDL= sdl sound
USE_GMAKE= yes
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index caf35c9e1b57..8a0d67ad4664 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hexxagon
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 094bcf0cec51..8e977b785044 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mindguard
PORTVERSION= 0.0.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://zapatopi.net/mindguard/
EXTRACT_SUFX= .tgz
@@ -15,7 +15,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
COMMENT= Helpful utility for detecting and jamming harmful mind-control rays
-USE_X_PREFIX= yes
USE_GNOME= gtk12
ALL_TARGET= # empty
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index 4640eee28421..00e89abfd8f8 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -7,7 +7,7 @@
PORTNAME= traindirector
PORTVERSION= 1.19c
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://xtsl.free.fr/119c/
DISTNAME= traindir-${PORTVERSION}-src
@@ -18,7 +18,6 @@ COMMENT= Train controller simulation
WRKSRC= ${WRKDIR}/traindir-${PORTVERSION}
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_BZIP2= yes
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index e053605d2681..788356b9267f 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trigger
PORTVERSION= 0.5.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF
MASTER_SITE_SUBDIR=${PORTNAME}-rally
@@ -22,7 +22,6 @@ LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \
physfs:${PORTSDIR}/devel/physfs \
alut.1:${PORTSDIR}/audio/freealut
-USE_XLIB= yes
USE_SDL= sdl image
USE_GL= yes
USE_BZIP2= yes
diff --git a/games/xpenguins/Makefile b/games/xpenguins/Makefile
index 15819975c228..e2af402a1cb1 100644
--- a/games/xpenguins/Makefile
+++ b/games/xpenguins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpenguins
PORTVERSION= 2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://xpenguins.seul.org/:xp \
http://www.chrisburkert.de/download/unix/:ch
@@ -18,8 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= lyngbol@wheel.dk
COMMENT= Cute little penguins that walk along the tops of your windows
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
MAN1= xpenguins.1
diff --git a/games/xwelltris/Makefile b/games/xwelltris/Makefile
index ff3ae3c69b4e..541d6688341b 100644
--- a/games/xwelltris/Makefile
+++ b/games/xwelltris/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xwelltris
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.xnc.dubna.su/xwelltris/src/ \
http://freebsd.unixfreunde.de/sources/
@@ -27,6 +27,6 @@ PLIST_FILES= bin/xwelltris \
share/xwelltris/welltris.scores
PLIST_DIRS= share/xwelltris
GNU_CONFIGURE= yes
-USE_XLIB= yes
+USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xi xrandr
.include <bsd.port.mk>
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 3e26a03cbcfa..43f2cc5b5f72 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -125,7 +125,7 @@ CONFIGURE_ARGS+= --enable-kgi --with-extra-includes=/usr/include/dev
.endif
.if !defined(WITHOUT_X11)
-USE_XORG= x11 xxf86dga
+USE_XORG= x11 xxf86dga ice sm xau xsxt xext
PLIST_SUB+= WITH_X=""
.else
CONFIGURE_ARGS+= --disable-x --disable-dga
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index a7128d680646..7f7f28f1d0cb 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -7,7 +7,7 @@
PORTNAME= megapov
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://megapov.inetart.net/packages/unix/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -22,7 +22,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= # empty
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 667c22abee3c..386f59dc79a6 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
PORTVERSION= 3.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 667c22abee3c..386f59dc79a6 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
PORTVERSION= 3.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 667c22abee3c..386f59dc79a6 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
PORTVERSION= 3.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index a911326a6ac5..935af4b294ac 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -18,7 +18,7 @@ COMMENT= Python interface to the GD library
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
.if !defined(WITHOUT_X11)
-USE_XPM= yes
+USE_XORG= xpm
.endif
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 3303c179ff36..db056a984aa0 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tgif-resource
PORTVERSION= 4.1.45
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese graphics
MASTER_SITES= # empty
DISTFILES= # empty
@@ -20,7 +20,7 @@ RUN_DEPENDS= tgif:${PORTSDIR}/graphics/tgif \
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
+USE_XORG= x11
PLIST_SUB= XAPPLRESDIR=${XAPPLRESDIR}
XAPPLRESDIR= lib/X11/ja_JP.eucJP/app-defaults
diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile
index eb91c60647d2..fab567a301f8 100644
--- a/lang/metaocaml/Makefile
+++ b/lang/metaocaml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= metaocaml
PORTVERSION= 3.09.a30
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://www.metaocaml.org/dist/old/
DISTNAME= MetaOCaml_309_alpha_030
@@ -75,7 +75,7 @@ PLISTDIR= ${PREFIX}/lib/metaocaml \
MANPREFIX= ${PREFIX}/share/metaocaml
.if defined(WITH_X11)
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
PLIST_SUB+= X11=""
.else
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index c306401c4bf2..3194812ceb63 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -20,7 +20,6 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
NO_LATEST_LINK= yes
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 5ce6b5e8c079..c2a6e4be311a 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -19,7 +19,6 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 5ce6b5e8c079..c2a6e4be311a 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -19,7 +19,6 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 421b7c163658..df62e01de484 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ploticus
PORTVERSION= 2.33
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF
DISTNAME= pl${PORTVERSION:S/.//}src
@@ -40,7 +41,7 @@ ALL_TARGET= plgd18
MAKE_ARGS+= NOXFLAG=-DNOX11 XLIBS= XOBJ=
PKGNAMESUFFIX= -nox11
.else
-USE_XPM= yes
+USE_XORG= xpm
.endif
.if !defined(NO_INSTALL_MANPAGES)
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 66d61d3d6aad..7b09912f9dea 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/gamma.so
-USE_X_PREFIX= yes
MAKE_ENV= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins
ALL_TARGET= gamma.so
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index 8168e6b411c7..97646415b265 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/helium.so
-USE_X_PREFIX= yes
CFLAGS+= -fPIC -I${LOCALBASE}/include
MAKE_ARGS= CFLAGS="${CFLAGS}"
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index b4296a35cf02..1974f17cdfc6 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/xkb.so
-USE_X_PREFIX= yes
MAKE_ENV= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins
ALL_TARGET= xkb.so
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index dfc62fd5ce07..fb1ac703b6b4 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
USE_GMAKE= yes
-USE_X_PREFIX= yes
ALL_TARGET= gkrellweather.so
MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} CC=${CC}
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 349c0acfdbd8..57f5b3d70611 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.hadess.net/files/software/uf-view/
MAINTAINER= mcgee@wam.umd.edu
COMMENT= A gTK+ viewer for the User Friendly and several other popular comics
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop
GNU_CONFIGURE= yes
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 5476dc62754f..ebfbf2f62532 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmweather.1
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 85d57e53e1dc..aa30c8ecdd77 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -22,6 +22,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 9e76396e1db8..0e31e13016f3 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
USE_LDCONFIG= yes
-USE_XLIB= yes
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
MAN1= audacious.1 audtool.1
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 6c069bcfdc6a..5865e2bbdde3 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -30,7 +30,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2 libxml2
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/libquicktime \
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 6fb2b042cea8..c1606d7b4a47 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin \
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
CFLAGS+= "-fPIC"
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_BZIP2= yes
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 255b969c2814..f48107d4b33d 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.66
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net-p2p gnome
MASTER_SITES= http://unixpages.org/distfiles/
PKGNAMESUFFIX= -gui
@@ -20,7 +20,6 @@ BUILD_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
USE_GETTEXT= yes
-USE_XLIB= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index 1d4772f42254..a483dc62f509 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= \
${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/gacxtool/Makefile b/net/gacxtool/Makefile
index 04a9cfa1e53f..92b9bbcc1711 100644
--- a/net/gacxtool/Makefile
+++ b/net/gacxtool/Makefile
@@ -21,6 +21,5 @@ RUN_DEPENDS= /boot/kernel/if_acx.ko:${PORTSDIR}/net/acx100
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
.include <bsd.port.mk>
diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile
index 6f41c63fc7b0..c981d514ed71 100644
--- a/net/gkrellmwireless2/Makefile
+++ b/net/gkrellmwireless2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmwireless
PORTVERSION= 2.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= http://gkrellm.luon.net/files/
@@ -19,7 +19,7 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
WRKSRC= ${WRKDIR}/gkrellmwireless
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index 96797c679dc8..2fc01d444f74 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -19,7 +19,6 @@ COMMENT= Client for polish IM service called Tlen.pl
LIB_DEPENDS= tlen.1:${PORTSDIR}/polish/libtlen
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/TleenX2-${PORTVERSION}
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 0d3c66c29aef..0c36d0b27e42 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libgui libmcs libutil mcsmanager
-USE_XLIB= yes
OPTIONS= LPR "Use lpr as printing system" on \
CUPS "Use cups as printing system" off \
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index ff5fe8a243bc..358228b6522e 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS= gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
LIB_DEPENDS= gcu.8:${PORTSDIR}/science/gchemutils
USE_BZIP2= yes
-USE_XLIB= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 44113657d9ef..9a467b5035fe 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack intlhack libglade2 libgnomeprintui libgnomeui gnomedocutils
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 703f61d93ba3..0c5e5c7e39ad 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -7,7 +7,8 @@
PORTNAME= gcombust
PORTVERSION= 0.1.55
-PORTREVISION= 3
+PORTREVISION= 4
+
CATEGORIES= sysutils
MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
@@ -17,7 +18,6 @@ COMMENT= A GTK+ frontend for mkisofs and cdrecord
RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GNOME= gtk12 gnomehier
USE_CDRTOOLS= yes
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 0837c21a06c5..0d39b1c24451 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -17,7 +17,6 @@ COMMENT= GTK2 send-pr tool
LIB_DEPENDS= esmtp.6:${PORTSDIR}/mail/libesmtp
USE_GNOME= gtk20
-USE_X_PREFIX= yes
MAN1= gtk-send-pr.1
PLIST_FILES= bin/gtk-send-pr share/pixmaps/ladybird64.xpm
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index d384d7d568f9..6963de90b6bd 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -23,6 +23,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libmcs
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 33d32046aea9..acaaec97ae14 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -22,6 +22,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui mcsmanager
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index a82366a86c01..12c3d69d467d 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -23,7 +23,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libmcs libutil mcsmanager panel
-USE_XLIB= yes
OPTIONS= DBUS "Enable D-BUS support" on
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 3b3b9d7ecb12..d5dbc943af9b 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -18,7 +18,6 @@ COMMENT= Smart Common Input Method platform
USE_GNOME= gnomehack gnomehier gtk20 intlhack
USE_AUTOTOOLS= libtool:15
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index a12bebf86213..72ad35c3ccfb 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -22,6 +22,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/www/peacock/Makefile b/www/peacock/Makefile
index 3aea44850626..771766fb05df 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -18,7 +18,6 @@ COMMENT= A GUI-based HTML Editor for GTK+/GNOME
LIB_DEPENDS= gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml38
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui gtksourceview
GNU_CONFIGURE= yes
diff --git a/www/ump/Makefile b/www/ump/Makefile
index 566a9f960fd5..33b4d63ace2b 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ump
PORTVERSION= 1.10
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \
http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \
@@ -40,8 +40,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ump --with-default-path=${LOCALBASE}/share/timidity
CONFIGURE_ENV= LDFLAGS=-export-dynamic
USE_GMAKE= yes
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm xmu
WANT_GNOME= yes
# CONFIGURE_ARGS+= --enable-motif
EXTRA_PATCHES= ${PORTSDIR}/audio/timidity++/files/*
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index e711b619769e..c1334f9617fb 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asclock-gtk
PORTVERSION= 2.1.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
@@ -19,7 +19,6 @@ COMMENT= New flavor of asclock (GTK version)
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= asclock
-USE_X_PREFIX= yes
USE_GNOME= gtk12
HAS_CONFIGURE= yes
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 551595b7d2a0..9a056f4e47ec 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= astime
PORTVERSION= 2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks afterstep
MASTER_SITES= ftp://ftp.afterstep.org/apps/astime/ \
http://www.tigr.net/afterstep/download/astime/
@@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.afterstep.org/apps/astime/ \
MAINTAINER= kris@FreeBSD.org
COMMENT= Time/Date applet for WindowMaker
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-xpm-library="${X11BASE}/lib" --with-xpm-includes="${X11BASE}/include/X11"
INSTALL_TARGET= install install.man
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index e8306e9bc645..fc43e168dd83 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmCalClock
PORTVERSION= 1.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=kris
@@ -17,8 +17,7 @@ COMMENT= Another Window Maker calendar/clock dockapp
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
ALL_TARGET= clean all
MAN1= wmCalClock.1
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index 648b315ac23c..6dfecb21ce53 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -17,7 +17,6 @@ COMMENT= 3D filesystem visualizer
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GL= yes
USE_GNOME= gtk12
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 1a22212fc546..18322b60ab85 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -28,7 +28,6 @@ USE_GMAKE= yes
USE_GNOME= desktopfileutils glib20 gnomehack gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libexo libutil
-USE_XLIB= yes
OPTIONS= DBUS "Enable D-BUS support" on \
JPEG "Enable JPEG support" on \
diff --git a/x11-fonts/bdfresize/Makefile b/x11-fonts/bdfresize/Makefile
index 21e9f10d4103..f5347a9e3829 100644
--- a/x11-fonts/bdfresize/Makefile
+++ b/x11-fonts/bdfresize/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bdfresize
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/
@@ -15,7 +15,6 @@ MAINTAINER= mistral@imasy.or.jp
COMMENT= A tool for resizing BDF format font
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
MAN1= bdfresize.1
PLIST_FILES= bin/bdfresize
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index 328cb769cd74..71d34229c599 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -6,7 +6,7 @@
PORTNAME= cyberbit-ttfonts
PORTVERSION= 2.0.20050220
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/
DISTFILES= Cyberbit.ZIP
@@ -22,7 +22,6 @@ COMMENT= Bitstream Cyberbit is a TrueType font covers Unicode 2.0
RESTRICTED= "Redistribution not permitted; single user license only."
-USE_X_PREFIX= yes
USE_ZIP= yes
NO_BUILD= yes
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index 7cbe36b74724..6f36916866d0 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -9,7 +9,7 @@
PORTNAME= gentium
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
DISTNAME= ttf-sil-${PORTNAME}_${PORTVERSION}
@@ -20,7 +20,6 @@ COMMENT= Gentium TrueType font collection
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
diff --git a/x11-fonts/gentium/Makefile b/x11-fonts/gentium/Makefile
index 7cbe36b74724..6f36916866d0 100644
--- a/x11-fonts/gentium/Makefile
+++ b/x11-fonts/gentium/Makefile
@@ -9,7 +9,7 @@
PORTNAME= gentium
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
DISTNAME= ttf-sil-${PORTNAME}_${PORTVERSION}
@@ -20,7 +20,6 @@ COMMENT= Gentium TrueType font collection
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index a5c9a589b9a2..e3d73d39206d 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -18,7 +18,6 @@ COMMENT= An XFCE engine for GTK 2.0
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gtk20 pkgconfig
-USE_XLIB= yes
USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined
.include <bsd.port.mk>
diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile
index 384665ba7579..61674c93e2c6 100644
--- a/x11-themes/xfce4-icon-theme/Makefile
+++ b/x11-themes/xfce4-icon-theme/Makefile
@@ -22,7 +22,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget intltool intlhack
USE_XFCE= configenv
-USE_XLIB= yes
WANT_GNOME= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index a9d9a75a0478..0a0428db61f1 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= leoz.2005@gmail.com
COMMENT= A GTK+2 widget to display large amounts of numerical data
-USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index f93ae2d6b6aa..59e77b03b867 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -20,7 +20,6 @@ USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_GNOME= gtk20 ltverhack
USE_LDCONFIG= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index c08839d44aa0..f3d1efcfa605 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= libutil
-USE_XLIB= yes
OPTIONS= GTKDOC "install the library documentation" off
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index ce1141530b19..80e4d48a9931 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmdockapps
PORTVERSION= 1.21
+PORTREVISION= 1
CATEGORIES= x11-toolkits python windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pywmdockapps
@@ -16,10 +17,10 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
COMMENT= Tools for making dockapps in Python
-USE_XLIB= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= pywmdockapps
+USE_XORG= x11 xpm xau xext xfixes xi
post-patch:
${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index bff6f1ec4eeb..37db5edb6185 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -7,13 +7,14 @@
PORTNAME= evilwm
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.6809.org.uk/evilwm/
MAINTAINER= lasg@lasg.dk
COMMENT= Minimalist window manager based on 9wm
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm xext xrender
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= evilwm.1
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index f55a4f8e4618..2bb2e396b210 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oroborus
PORTVERSION= 2.0.18
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.oroborus.org/debian/dists/sid/main/source/x11/ \
http://matt.peterson.org/FreeBSD/ports/
@@ -17,8 +18,7 @@ COMMENT= A small and simple GNOME-compatible window manager
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm
USE_GNOME= gnometarget
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 92351b092260..cffcab261228 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -18,7 +18,7 @@ COMMENT= CDE like desktop with GTK
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
USE_GCC= 4.1
-USE_XPM= yes
+USE_XORG= x11
USE_GETTEXT= yes
USE_GNOME= gdkpixbuf
GNU_CONFIGURE= yes
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 899533b6ff44..97781f6256f4 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
USE_GNOME= glib20 gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libgui libmcs libutil mcsmanager panel
-USE_XLIB= yes
OPTIONS= FAM "Enable FAM support" on \
THUNAR "Enable thunar support" on
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 87220d226447..06095f0458b5 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libgui libmcs libutil mcsmanager
-USE_XLIB= yes
OPTIONS= GTKDOC "install the library documentation" off \
STARTUP "Enable startup notification support" on
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 8544825c10e7..1fe745504309 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libgui libmcs libutil mcsmanager
-USE_XLIB= yes
MAN1= xfce4-session.1 xfce4-session-logout.1
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index a4afb916d742..c9d5bc3a4516 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -26,8 +26,6 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libmcs libutil libgui mcsmanager panel
-USE_XLIB= yes
-
OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \
STARTUP "Enable startup notification support" on \
REVMOUSE "Reverse mouse workspace changing direction" off
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 60f4109b6cc7..ae2c3f323f9d 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -24,7 +24,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig vte
USE_XFCE= configenv libexo
-USE_XLIB= yes
OPTIONS= DBUS "Enable D-BUS support" on \
STARTUP "Enable startup notification support" on
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index 48a5cfa2623e..e11e1fba7b64 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= matt@peterson.org
COMMENT= X11 application launcher
PLIST_FILES= bin/deskmenu
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 264329475700..7c9e3ad058b5 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtstarter
PORTVERSION= 0.4.6.3
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
@@ -14,7 +15,6 @@ MAINTAINER= klammer@webonaut.com
COMMENT= Start gnome-terminal from a list of configured profiles (incl. Applet)
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GNOME= pygnome2 pygnomeextras gnomeprefix
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 97ce7bd761f5..96d69b251ddf 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -30,7 +30,6 @@ USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libutil mcsmanager
-USE_XLIB= yes
OPTIONS= HAL "Enable HAL support" on \
NOTIFY "Enable notification support" on \
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 57a41938c96b..4eee014fa26b 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnometarget pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libutil
-USE_XLIB= yes
OPTIONS= GTKDOC "install the library documentation" off \
STARTUP "Enable startup notification support" on
diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile
index 907cb7ffe59c..b35f863171e6 100644
--- a/x11/xclick/Makefile
+++ b/x11/xclick/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xclick
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://members.shaw.ca/gehrehmee/ \
http://bg.rifetech.com/
@@ -17,8 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= lioux@FreeBSD.org
COMMENT= Generates X11 mouse button click events
-USE_X_PREFIX= yes
-USE_XLIB= yes
+USE_XORG= x11 xtst xext xfixes xi
PLIST_FILES= bin/${PORTNAME}