aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-03-23 23:03:18 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-03-23 23:03:18 +0000
commit06aa815303d09728523a1521f001bd7d8ac0ff16 (patch)
tree8ef0d81d9016d3c0cd3c36f31cc02904d60bab57
parent7dad8e86731f6a02bb83a5de682e3bfbcc7232ba (diff)
downloadports-06aa815303d09728523a1521f001bd7d8ac0ff16.tar.gz
ports-06aa815303d09728523a1521f001bd7d8ac0ff16.zip
Notes
-rw-r--r--astro/stellarium/Makefile3
-rw-r--r--astro/wmmoonclock/Makefile5
-rw-r--r--astro/xglobe/Makefile3
-rw-r--r--audio/hydrogen/Makefile3
-rw-r--r--audio/mixxx/Makefile3
-rw-r--r--audio/soundtracker/Makefile3
-rw-r--r--audio/streamtuner/Makefile1
-rw-r--r--biology/xdrawchem/Makefile3
-rw-r--r--cad/alliance/Makefile2
-rw-r--r--chinese/aterm/Makefile4
-rw-r--r--deskutils/autocutsel/Makefile3
-rw-r--r--deskutils/drivel/Makefile3
-rw-r--r--deskutils/gruler/Makefile1
-rw-r--r--deskutils/recoll/Makefile2
-rw-r--r--deskutils/timer-applet/Makefile3
-rw-r--r--devel/preps-gui/Makefile3
-rw-r--r--devel/simgear/Makefile3
-rw-r--r--devel/wininfo/Makefile1
-rw-r--r--editors/xvile/Makefile3
-rw-r--r--editors/yudit/Makefile4
-rw-r--r--emulators/adamem/Makefile5
-rw-r--r--emulators/gnuboy/Makefile4
-rw-r--r--emulators/gxemul/Makefile3
-rw-r--r--emulators/mtools/Makefile4
-rw-r--r--emulators/pcemu/Makefile4
-rw-r--r--finance/opentaxsolver/Makefile2
-rw-r--r--games/bubbros/Makefile3
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/falconseye/Makefile5
-rw-r--r--games/fgsd/Makefile1
-rw-r--r--games/flightgear-atlas/Makefile1
-rw-r--r--games/flightgear/Makefile1
-rw-r--r--games/golddig/Makefile4
-rw-r--r--games/gtklife/Makefile3
-rw-r--r--games/magiccube4d/Makefile5
-rw-r--r--games/nadar/Makefile5
-rw-r--r--games/openarena/Makefile4
-rw-r--r--games/seahaven/Makefile4
-rw-r--r--games/tetrons/Makefile3
-rw-r--r--games/xmahjongg/Makefile4
-rw-r--r--games/xtet42/Makefile4
-rw-r--r--graphics/gpicview/Makefile1
-rw-r--r--graphics/grads/Makefile3
-rw-r--r--graphics/show/Makefile4
-rw-r--r--graphics/xaos/Makefile1
-rw-r--r--japanese/epson-ttfonts/Makefile3
-rw-r--r--japanese/font-sazanami/Makefile5
-rw-r--r--japanese/sazanami-ttf/Makefile5
-rw-r--r--japanese/xdvik/Makefile3
-rw-r--r--lang/caml-light/Makefile4
-rw-r--r--lang/drscheme/Makefile2
-rw-r--r--lang/mpd/Makefile4
-rw-r--r--lang/yorick/Makefile3
-rw-r--r--mail/mail-notification/Makefile1
-rw-r--r--mail/metamail/Makefile4
-rw-r--r--math/abs/Makefile5
-rw-r--r--math/kseg/Makefile3
-rw-r--r--multimedia/recordmydesktop/Makefile3
-rw-r--r--net-p2p/giftoxic/Makefile1
-rw-r--r--net-p2p/giftui/Makefile1
-rw-r--r--net-p2p/gtk-gnutella/Makefile4
-rw-r--r--net/cnet/Makefile4
-rw-r--r--net/link-monitor-applet/Makefile1
-rw-r--r--net/vnc2swf/Makefile4
-rw-r--r--print/xdvik/Makefile3
-rw-r--r--sysutils/bubblemon-dockapp/Makefile3
-rw-r--r--sysutils/lineak-defaultplugin/Makefile4
-rw-r--r--sysutils/lineak-xosdplugin/Makefile4
-rw-r--r--sysutils/lineakd/Makefile4
-rw-r--r--sysutils/sensors-applet/Makefile1
-rw-r--r--sysutils/synergy/Makefile4
-rw-r--r--sysutils/xacpim/Makefile4
-rw-r--r--sysutils/xmbmon/Makefile4
-rw-r--r--textproc/dixit/Makefile3
-rw-r--r--x11-fonts/artwiz-aleczapka-de/Makefile3
-rw-r--r--x11-fonts/webfonts/Makefile4
-rw-r--r--x11-themes/flux-art/Makefile3
-rw-r--r--x11-toolkits/flu/Makefile3
-rw-r--r--x11-toolkits/plib/Makefile3
-rw-r--r--x11-wm/devilspie/Makefile3
-rw-r--r--x11-wm/flwm/Makefile3
-rw-r--r--x11-wm/nickleby/Makefile3
-rw-r--r--x11/bbdock/Makefile4
-rw-r--r--x11/hs-X11/Makefile5
-rw-r--r--x11/hs-x11-ghc/Makefile5
-rw-r--r--x11/numlockx/Makefile4
-rw-r--r--x11/wmmenu/Makefile3
-rw-r--r--x11/xcalib/Makefile5
-rw-r--r--x11/xnodecor/Makefile4
-rw-r--r--x11/xscreensaver.app/Makefile3
90 files changed, 125 insertions, 163 deletions
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 137233168a44..0b5047e7589f 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stellarium
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -27,7 +27,6 @@ QT_COMPONENTS= qmake moc gui rcc uic opengl
USE_GETTEXT= yes
USE_GL= yes
USE_SDL= sdl mixer
-USE_XLIB= yes
USE_GMAKE= yes
CMAKE_ENV= QMAKESPEC=${QMAKESPEC}
CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index f2a28a1b69cf..64595ca6dcd1 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmMoonClock
PORTVERSION= 1.27
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= astro windowmaker
MASTER_SITES= http://dockapps.org/files/14/21/
@@ -19,8 +19,7 @@ EXTRACT_CMD= ${CAT}
EXTRACT_BEFORE_ARGS=
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
MAN1= wmmoonclock.1
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index 9e903d9f239b..70e9b9601315 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xglobe
PORTVERSION= 0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=kris
@@ -16,7 +16,6 @@ MAINTAINER= kris@FreeBSD.org
COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map
USE_QT_VER= 3
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index a35d4c8993d7..c3c232d14566 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hydrogen
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= An advanced drum machine
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_QT_VER= 3
CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index e87f03bcd4d6..ec84de7a746f 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mixxx
PORTVERSION= 1.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,6 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \
vorbis:${PORTSDIR}/audio/libvorbis \
sndfile:${PORTSDIR}/audio/libsndfile
-USE_X_PREFIX= yes
USE_QT_VER= 3
HAS_CONFIGURE= yes
USE_GL= yes
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 6fb3e4be88f5..b977c9c687d4 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= soundtracker
PORTVERSION= 0.6.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
MASTER_SITE_SUBDIR= v${PORTVERSION:R}
@@ -17,7 +17,6 @@ COMMENT= Mod player/tracking tool which supports XM and MOD formats
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile
-USE_X_PREFIX= yes
USE_GNOME= esound gdkpixbuf gnomehack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index d44fb1811c98..51f6dfd55ae9 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-USE_XLIB= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
USE_GMAKE= yes
INSTALLS_OMF= yes
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index f0e42a1b7270..cff472c0e830 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdrawchem
PORTVERSION= 1.9.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xdrawchem
@@ -20,7 +20,6 @@ LIB_DEPENDS= openbabel.3:${PORTSDIR}/science/openbabel
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_QT_VER= 3
-USE_X_PREFIX= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index 81c90b5c5293..a35bebc1547c 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -6,6 +6,7 @@
PORTNAME= alliance
PORTVERSION= 5.0.20070718
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www-asim.lip6.fr/pub/alliance/distribution/5.0/ \
${MASTER_SITE_LOCAL}
@@ -23,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-5.0
USE_BISON= build
USE_GMAKE= yes
USE_MOTIF= yes
-USE_XLIB= yes
HAS_CONFIGURE= yes
CONFIGURE_ENV+= ALLIANCE_TOP=${ALLIANCE_TOP}
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index 23ebd28559cd..2f8ce0ccd598 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -6,7 +6,7 @@
PORTNAME= aterm
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gugod@gugod.org
COMMENT= A color vt102 terminal emulator with transparency support
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
PATCH_WRKSRC= ${WRKSRC}/..
CONFIGURE_ARGS= --enable-fading --enable-xim --enable-big5
diff --git a/deskutils/autocutsel/Makefile b/deskutils/autocutsel/Makefile
index 58508c2e310e..8917968af14e 100644
--- a/deskutils/autocutsel/Makefile
+++ b/deskutils/autocutsel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= autocutsel
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= autocutsel
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= autocutsel
MAINTAINER= john@jnielsen.net
COMMENT= Synchronizes the two copy/paste buffers used by X applications
-USE_X_PREFIX= yes
+USE_XORG= x11 xaw xext
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index a413c67fa423..254ffd5ff0dd 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drivel
PORTVERSION= 2.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Blog editor for GNOME
LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
INSTALLS_ICONS= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui intlhack gtksourceview
USE_BZIP2= yes
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index afe4274aa250..5c3cac7448d7 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://linuxadvocate.org/projects/gruler/downloads/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A customizable screen ruler for GNOME
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libglade2
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 43ab08c84ca9..66164ad96756 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -7,6 +7,7 @@
PORTNAME= recoll
PORTVERSION= 1.10.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://www.lesbonscomptes.com/recoll/
@@ -24,7 +25,6 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
INSTALLS_ICONS= yes
MAN1= recoll.1 recollindex.1
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 1ddb4d4371d9..7b791f7d0d72 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= timer-applet
PORTVERSION= 1.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= timerapplet
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-USE_XLIB= yes
USE_GMAKE= yes
GCONF_SCHEMAS= timer-applet.schemas
INSTALLS_OMF= yes
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index db32e9159007..9f02842eb01f 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= preps
PORTVERSION= 2.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/
PKGNAMESUFFIX= -gui
@@ -19,7 +19,6 @@ COMMENT= Problem reporting system
RUN_DEPENDS= prepsdb_tool:${PORTSDIR}/devel/prepstools
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk20 gconf2 libgnomeui
USE_PGSQL= yes
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 5b812e8c0ba9..8d93a962ed7e 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SimGear
PORTVERSION= 0.3.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel games
MASTER_SITES= ftp://ftp.simgear.org/pub/simgear/Source/ \
ftp://ftp.de.flightgear.org/pub/simgear/Source/
@@ -21,7 +21,6 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
jpeg.9:${PORTSDIR}/graphics/jpeg \
alut.1:${PORTSDIR}/audio/freealut
-USE_X_PREFIX= yes
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index 7f0049053b29..d99880f2316b 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.freedesktop.org/software/wininfo/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A window information utility
-USE_X_PREFIX= yes
USE_GNOME= gtk20 gnomeprefix
GNU_CONFIGURE= yes
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 15753e0b9d73..057f6915d2fc 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xvile
PORTVERSION= 9.6e
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://invisible-island.net/vile/ \
ftp://dickey.his.com/vile/ \
@@ -24,9 +25,9 @@ PATCHFILES= vile-9.6a.patch.gz \
MAINTAINER= gj@FreeBSD.org
COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
-USE_XLIB= yes
MAKEFILE= makefile
GNU_CONFIGURE= yes
+USE_XORG= x11 xpm xext
USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index d2969c21d795..f6ac90edb96f 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yudit
PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors converters print
MASTER_SITES= http://yudit.org/download/ \
${MASTER_SITE_SUNSITE}
@@ -17,8 +17,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
COMMENT= Multi-lingual unicode text editor with TTF support
-USE_XLIB= YES
USE_GETTEXT= yes
+USE_XORG= x11
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib" \
LC_ALL=
diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 71733620ba62..676ce8e32b4a 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adamem
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://www.komkon.org/~dekogel/files/coleco/
DISTNAME= ${PORTNAME}
@@ -16,8 +16,7 @@ MAINTAINER= karlj000@unbc.ca
COMMENT= ADAMEm is a portable Coleco ADAM and ColecoVision emulator
NO_WRKSUBDIR= yes
-USE_XLIB= yes
-USE_X_PREFIX= yes
+USE_XORG= sm x11 xau xext xfixes xi xrandr
ALL_TARGET= x
PROGDIR= ${PREFIX}/${PORTNAME}
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index ea564a05647a..b4d461dd1e85 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnuboy
PORTVERSION= 1.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators games
MASTER_SITES= http://gnuboy.unix-fu.org/src/ \
http://brightrain.aerifal.cx/~laguna/src/
@@ -19,7 +19,7 @@ COMMENT= Nintendo GameBoy emulator
LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
USE_SDL= sdl
-USE_XLIB= yes
+USE_XORG= x11
USE_AUTOTOOLS= autoconf:261
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index e849d844836a..04336cded0f4 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxemul
PORTVERSION= 0.4.6.2
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://gavare.se/gxemul/src/ \
${MASTER_SITE_LOCAL}
@@ -32,7 +33,7 @@ OPTIONS= X11 "X11 support" on
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--disable-x
.else
-USE_XLIB= yes
+USE_XORG= x11
.endif
post-patch:
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index d526a3e0ee17..6cce9dfc1d3b 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mtools
PORTVERSION= 3.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.tux.org/pub/knaff/mtools/ \
http://mtools.linux.lu/
@@ -21,7 +21,7 @@ COMMENT= A collection of tools for manipulating MSDOS files
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS= --enable-xdf --enable-floppyd
PLIST_SUB= WITH_X11=""
.else
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 398943ac0bb8..6d63dfd2e6d8 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pcemu
PORTVERSION= 1.01b
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
#
# This could in theory become a chicken-and-egg problem. Anyway,
@@ -30,7 +30,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-USE_XLIB= yes
+USE_XORG= x11 xext
MAKE_ENV= FILESDIR=${FILESDIR}
.include <bsd.port.mk>
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 0d01c633d4a9..1caf126d5d15 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ${UPPORTNAME:L}
PORTVERSION= 5.05
+PORTREVISION= 1
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= opentaxsolver
@@ -16,7 +17,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= jhein@timing.com
COMMENT= US tax prep software
-USE_XLIB= yes
USE_GL= yes
UPPORTNAME= OpenTaxSolver
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 4de5a2e6ddee..fe89fcbd804b 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bubbros
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bub-n-bros
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
USE_PYTHON= yes
USE_BZIP2= yes
-USE_XLIB= yes
post-patch:
@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
diff --git a/games/doom/Makefile b/games/doom/Makefile
index 39ad082d4cb9..ac5bdd274773 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= doom
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
MASTER_SITE_SUBDIR= source
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 4eca9143b590..18fee9d8c430 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -7,7 +7,7 @@
PORTNAME= falconseye
PORTVERSION= 1.9.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= falconseye
@@ -23,9 +23,8 @@ MAKE_ENV= NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
NETHACKCONFIG= ${FILESDIR}/x-config
USE_SDL= sdl
USE_PERL5_BUILD=yes
-USE_X_PREFIX= Yes
USE_ZIP= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" X11BASE="${X11BASE}"
WRKSRC= ${WRKDIR}
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index fe7641129ab5..2073e04c7c81 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -28,7 +28,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \
png:${PORTSDIR}/graphics/png \
glut:${PORTSDIR}/graphics/libglut
-USE_X_PREFIX= yes
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 41c15d140dbc..f073c3400e20 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GL= yes
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 629fd676528f..600d7372a1ad 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
FGVERSION= 0.9.10
-USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 478083cbc9f3..804378a6c972 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= golddig
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ftp://qiclab.scn.rain.com/pub/games/
DISTNAME= golddig2
@@ -16,8 +16,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
COMMENT= Getting the Gold and Avoiding Death
-USE_XLIB= yes
MAN6= golddig.6
+USE_XORG= x11
pre-patch:
@(cd ${WRKSRC}; for i in 245 244 246 247; do \
diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile
index c66e5e384551..ca58b168a14d 100644
--- a/games/gtklife/Makefile
+++ b/games/gtklife/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gtklife
PORTVERSION= 5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://ironphoenix.org/tril/gtklife/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A GTK+ implementation of Conway's Game of Life
-USE_XLIB= yes
WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile
index 9360b786b410..686c2b60e7d8 100644
--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= magiccube4d
PORTVERSION= 2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.superliminal.com/cube/
DISTNAME= mc4d-src-${PORTVERSION:S/./_/}
@@ -16,8 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= karlj000@unbc.ca
COMMENT= MagicCube4D is a four-dimensional analog of Rubik's cube
-USE_X_PREFIX= yes
-
+USE_XORG= x11 xext xt sm ice xaw
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION:S/./_/}
DOCS= ChangeLog Intro.txt MagicCube4D-unix.txt \
diff --git a/games/nadar/Makefile b/games/nadar/Makefile
index 934635a39dda..4662e7242a5c 100644
--- a/games/nadar/Makefile
+++ b/games/nadar/Makefile
@@ -7,15 +7,14 @@
PORTNAME= nadar
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.vector.co.jp/pack/unix/game/action/
MAINTAINER= hsakai@m8.ffn.ne.jp
COMMENT= A network tank battle game
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= nadars.1 nadar.1
MANCOMPRESSED= yes
diff --git a/games/openarena/Makefile b/games/openarena/Makefile
index 68202b83a205..d6541593cf98 100644
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openarena
PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://openarena.ws/rel/070/:src \
http://download.tuxfamily.net/cooker/openarena/rel070/:data \
@@ -82,7 +82,7 @@ USE_SDL= sdl
MAKE_ENV+= USE_SDL_VIDEO=1
. else
USE_GL= yes
-USE_XLIB= yes
+USE_XORG= x11 xxf86dga
. endif
.endif
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 63389443bd18..3e837b2e11e2 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -7,7 +7,7 @@
PORTNAME= seahaven
PORTVERSION= 1.44
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://seahaven.sourceforge.net/ \
${MASTER_SITE_SOURCEFORGE}
@@ -17,8 +17,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= imp@FreeBSD.org
COMMENT= The classic, lightweight version of Seahaven Towers
-USE_XLIB= yes
GNU_CONFIGURE= yes
+USE_XORG= x11 xext
MAN6?= seahaven.6
PLIST_FILES= bin/seahaven
diff --git a/games/tetrons/Makefile b/games/tetrons/Makefile
index a877cfec692e..07c760b33e41 100644
--- a/games/tetrons/Makefile
+++ b/games/tetrons/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tetrons
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.mammothcheese.ca/
@@ -14,8 +15,8 @@ MAINTAINER= jimmy@mammothcheese.ca
COMMENT= Tetris(TM) clone for X11
MAKE_ARGS+= -DRANDOM
-USE_XLIB= yes
+USE_XORG= x11 xext xi
PLIST_FILES= bin/tetrons
.include <bsd.port.mk>
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index d4fb5f497710..98f79e9b78a7 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xmahjongg
PORTVERSION= 3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.lcdf.org/xmahjongg/
MAINTAINER= joerg@freebsd.org
COMMENT= The Chinese game of Mahjongg for X11
-USE_X_PREFIX= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/xtet42/Makefile b/games/xtet42/Makefile
index 225882b1d700..d6df5c63d4ef 100644
--- a/games/xtet42/Makefile
+++ b/games/xtet42/Makefile
@@ -7,16 +7,16 @@
PORTNAME= xtet42
PORTVERSION= 2.21
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://utenti.gufi.org/~gmarco/files/distfiles/
MAINTAINER= gmarco@gufi.org
COMMENT= A one or two player t*tris game
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-setgid=games
+USE_XORG= x11
MAN6= xtet42.6
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index e4eed609ac1d..a9a5054ad0b0 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= lxde
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= A Simple and Fast Image Viewer for X
-USE_XLIB= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 25e44262631c..986a3beb8fb8 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grads
PORTVERSION= 1.9b3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics science math
MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \
ftp://grads.iges.org/grads/:other
@@ -25,7 +25,6 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= SUPPLIBS="${LOCALBASE}"
CONFIGURE_ARGS+= --enable-dyn-supplibs \
diff --git a/graphics/show/Makefile b/graphics/show/Makefile
index ddcbf56d7e58..7e365b4a8fd4 100644
--- a/graphics/show/Makefile
+++ b/graphics/show/Makefile
@@ -7,7 +7,7 @@
PORTNAME= show
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.ibiblio.org/propaganda/ \
http://www.freebsdbrasil.com.br/~jmelo/
@@ -21,8 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ungif.5:${PORTSDIR}/graphics/libungif \
Imlib.5:${PORTSDIR}/graphics/imlib
-USE_X_PREFIX= yes
-
PLIST_FILES= bin/show
post-extract:
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 4a912896d2bd..9ed29fa3bcaa 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xaos
PORTVERSION= 3.2.3
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xaos
diff --git a/japanese/epson-ttfonts/Makefile b/japanese/epson-ttfonts/Makefile
index 2d752671f86e..e2c7ac3319ee 100644
--- a/japanese/epson-ttfonts/Makefile
+++ b/japanese/epson-ttfonts/Makefile
@@ -6,7 +6,7 @@
PORTNAME= epson-ttfonts
PORTVERSION= 3.0.20050220
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= # empty
DISTNAME= ${EPSONFONTS}
@@ -19,7 +19,6 @@ COMMENT= EPSON TrueTypeFontVer.3.0
RESTRICTED= "Redistribution not permitted; only usable with EPSON printer."
EPSONFONTS= ttf30
-USE_X_PREFIX= yes
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index daa8fcf6c1be..988c0e1ae20e 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sazanami-ttf
PORTVERSION= 20040629
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= efont/10087
@@ -16,7 +16,8 @@ DISTNAME= ${PORTNAME:S/-ttf$//}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Free Japanese TrueType fonts named 'Sazanami'
-USE_X_PREFIX= yes
+RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile
index daa8fcf6c1be..988c0e1ae20e 100644
--- a/japanese/sazanami-ttf/Makefile
+++ b/japanese/sazanami-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sazanami-ttf
PORTVERSION= 20040629
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= efont/10087
@@ -16,7 +16,8 @@ DISTNAME= ${PORTNAME:S/-ttf$//}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Free Japanese TrueType fonts named 'Sazanami'
-USE_X_PREFIX= yes
+RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 331192009899..dd87b76de51f 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdvik
PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xdvi
@@ -36,7 +36,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
t1.5:${PORTSDIR}/devel/t1lib
DIST_SUBDIR= xdvik
-USE_XLIB= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --datadir=${PREFIX}/${TEXMFDIR:S,texmf$,,} \
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 93ee10217a4a..424847a4c56c 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -7,7 +7,7 @@
PORTNAME= caml
PORTVERSION= 0.75
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang elisp
MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/ \
ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \
@@ -19,7 +19,7 @@ DISTNAME= cl75unix
MAINTAINER= jkoshy@freebsd.org
COMMENT= A strongly typed functional language belonging to the ML family
-USE_XLIB= yes
+USE_XORG= x11
WRKSRC= ${WRKDIR}/cl75
ALL_TARGET= configure world bootstrap
MAN1= camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 \
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index cfed6bd0bb30..51b8c0089b70 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= drscheme
PORTVERSION= 370
+PORTREVISION= 1
CATEGORIES= lang scheme
MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \
http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \
@@ -44,7 +45,6 @@ WRKSRC= ${WRKDIR}/plt-${PORTVERSION}/src
USE_ICONV= yes
USE_GL= yes
USE_LDCONFIG= yes
-USE_XLIB= yes
USE_AUTOTOOLS= libtool:15:env
MAN1= drscheme.1 help-desk.1 mred.1 mzscheme.1 tex2page.1
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index ff60b8ba1cb2..0bd00122708c 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpd
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://www.cs.arizona.edu/mpd/download/ \
http://crypto.riken.go.jp/pub/NetBSD/packages/distfiles/mpd-language/
@@ -38,7 +38,7 @@ MAN5= mpdmap.5 mpdtrace.5
PLIST_SUB+= X11="@comment "
.else
PLIST_SUB+= X11=""
-USE_XLIB= yes
+USE_XORG= x11
.endif
post-patch:
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index afd6508c0e6b..02ef9e708903 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yorick
PORTVERSION= 2.1.05
+PORTREVISION= 1
CATEGORIES= lang math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT= Interpreted language and scientific graphics
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-USE_XLIB= yes
+USE_XORG= x11
MAKE_ARGS= Y_HOME=relocatable Y_DOCDIR=/dev/null
MAN1= yorick.1 gist.1
INFO= yorick
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index d0979c3743cc..8b054abcf594 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -17,7 +17,6 @@ COMMENT= A mail notification for freedesktop.org-compliant system trays
LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify
USE_BZIP2= yes
-USE_XLIB= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack eel2
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 07c5f4ee3a59..294b929cfd05 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= metamail
PORTVERSION= 2.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail
MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \
ftp://ftp.research.telcordia.com/pub/nsb/
@@ -35,7 +35,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-USE_XLIB= yes
+USE_XORG= x11
PLIST_SUB+= X11=""
.else
PLIST_SUB+= X11="@comment "
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 154a3f738b24..88b0e4f29fda 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abs
PORTVERSION= 0908
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://utenti.gufi.org/~gmarco/files/distfiles/ \
http://fresh.t-systems-sfr.com/unix/src/privat2/
@@ -17,8 +17,7 @@ MAINTAINER= gmarco@gufi.org
COMMENT= A free spreadsheet with graphical user interface
PLIST_FILES= bin/abs
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= x11 xpm xaw
WRKSRC= ${WRKDIR}/abs-src-0.908
post-patch:
diff --git a/math/kseg/Makefile b/math/kseg/Makefile
index 2440b1416274..0d1bf94c3747 100644
--- a/math/kseg/Makefile
+++ b/math/kseg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kseg
PORTVERSION= 0.403
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= math graphics
MASTER_SITES= http://www.mit.edu/~ibaran/
@@ -19,7 +19,6 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_QT_VER= 3
-USE_X_PREFIX= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
pre-patch:
diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile
index f6941494f685..edddbe46a317 100644
--- a/multimedia/recordmydesktop/Makefile
+++ b/multimedia/recordmydesktop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= recordmydesktop
DISTVERSION= 0.3.7.3
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -16,13 +17,13 @@ COMMENT= Record desktop sessions to an Ogg-Theora-Vorbis file
LIB_DEPENDS= theora.0:${PORTSDIR}/multimedia/libtheora \
jack.0:${PORTSDIR}/audio/jack
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-oss=yes \
--enable-jack=yes
MAN1= recordmydesktop.1
+USE_XORG= ice sm x11 xext xfixes xdamage
PLIST_FILES= bin/recordmydesktop
post-patch:
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index a80441997b34..5ca3eb309fa0 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -17,7 +17,6 @@ COMMENT= GTK2 client for giFT
LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
-USE_X_PREFIX= yes
USE_GNOME= gtk20 gnomeprefix gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index d9f7d57211a5..09cd3f12c498 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -19,7 +19,6 @@ COMMENT= GTK2 client for giFT daemon
LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
-USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gconf2 gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 3238066dd843..b6454534d5e1 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -44,7 +44,7 @@
PORTNAME= gtk-gnutella
PORTVERSION= 0.96.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+= -D official=true
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= -D gtkversion=2
USE_GNOME+= gtk20
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index bef583008209..c02f80608935 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -9,7 +9,7 @@
PORTNAME= cnet
PORTVERSION= 2.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net tcl84 tk84
MASTER_SITES= http://www.csse.uwa.edu.au/cnet/ \
ftp://ftp.giga.net.tw/OS/FreeBSD/distfiles/ \
@@ -21,7 +21,7 @@ COMMENT= A networking simulator
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
ALL_TARGET= # empty
MAN1= cnet.1
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index 107279bb2d28..d85dcc7329a6 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -17,7 +17,6 @@ COMMENT= A GNOME applet displaying the round-trip time to one or more hosts
LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnomepanel eel2 librsvg2
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/vnc2swf/Makefile b/net/vnc2swf/Makefile
index b3402b8865bc..9268cfcbd4c0 100644
--- a/net/vnc2swf/Makefile
+++ b/net/vnc2swf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vnc2swf
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.unixuser.org/~euske/${PORTNAME}/ \
ftp://ftp.rewt.org.uk/pub/distfiles/
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.unixuser.org/~euske/${PORTNAME}/ \
MAINTAINER= joe@joeholden.co.uk
COMMENT= VNC Session Recorder to SWF Flash (Movie) format
-USE_X_PREFIX= yes
+USE_XORG= xmu x11 xi xaw
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 68c620bb8e22..d88ab0174031 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdvik
PORTVERSION= 22.84.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xdvi
@@ -24,7 +24,6 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
mktexlsr:${PORTSDIR}/print/teTeX-base
LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib
-USE_XLIB= yes
USE_GMAKE= yes
USE_MOTIF= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/bubblemon-dockapp/Makefile b/sysutils/bubblemon-dockapp/Makefile
index 8ea603ed69d2..9a9769396c0e 100644
--- a/sysutils/bubblemon-dockapp/Makefile
+++ b/sysutils/bubblemon-dockapp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bubblemon-dockapp
PORTVERSION= 1.46
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
http://critical.ch/distfiles/ \
@@ -17,7 +17,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/0$//}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= X eye candy for displaying CPU and memory load in a dock
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
MAKE_ARGS+= PREFIX="${PREFIX}"
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index ba1aabc97f41..3e9481dc8a75 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lineak-defaultplugin
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lineak
@@ -20,8 +20,8 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
+USE_XORG= x11 xext xt xtst xfixes
USE_GMAKE= yes
-USE_XLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --program-prefix=''
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index d02f392257a3..0c094dd3e249 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lineak-xosdplugin
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=lineak
@@ -20,7 +20,7 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd \
xosd.4:${PORTSDIR}/misc/xosd
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11 xext xt
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-prefix=''
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 0424e4792e97..795c914a04f3 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lineakd
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=lineak
@@ -17,7 +17,7 @@ MAINTAINER= kay_lehmann@web.de
COMMENT= Lineakd is a daemon which enables special keys on internet keyboards
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11 xext xt
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 16a5532f6e60..33d235201747 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -18,7 +18,6 @@ COMMENT= A GNOME applet displaying hardware sensor values
RUN_DEPENDS= mbmon:${PORTSDIR}/sysutils/mbmon \
smartctl:${PORTSDIR}/sysutils/smartmontools
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix intlhack gnomepanel
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 20e485d30789..e98c1d16415b 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= synergy
PORTVERSION= 1.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}2
@@ -16,7 +16,7 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= Mouse and keyboard sharing utility
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XORG= ice xtst x11 sm
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xacpim/Makefile b/sysutils/xacpim/Makefile
index aaa75a7601e7..93b623222061 100644
--- a/sysutils/xacpim/Makefile
+++ b/sysutils/xacpim/Makefile
@@ -6,14 +6,14 @@
PORTNAME= xacpim
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://shapeshifter.se/pub/xacpim/
MAINTAINER= henriknj@0xmilk.org
COMMENT= Utility to display battery status and temperature on the root-display
-USE_X_PREFIX= yes
+USE_XORG= x11
PLIST_FILES= bin/xacpim
do-install:
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 2371d4dddbe4..a9ccae58d4a4 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= xmbmon
-PORTREVISION= 8
+PORTREVISION= 9
COMMENT= A X motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240
MASTERDIR= ${.CURDIR}/../mbmon
-USE_X_PREFIX= yes
+USE_XORG= x11 xt
EXTRA_PATCHES= ${.CURDIR}/files/patch-*
PLIST_FILES= lib/X11/app-defaults/XMBmon
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index fb7f409b7588..855db6b5ccbc 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dixit
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc # this should/will be romanian ;)
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= dixit
@@ -37,7 +37,6 @@ _DB_F= ${PORTNAME}.qdb
_DB= ${DB_DIR}/${_DB_F}
USE_QT_VER= 3
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 9d88c0142187..6ba14bff2dbe 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -6,7 +6,7 @@
PORTNAME= artwiz-aleczapka-de
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= artwizaleczapka
@@ -16,7 +16,6 @@ COMMENT= A set of (improved) artwiz fonts
NO_BUILD= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
FONTS= anorexia.de aqui.de cure.de drift.de edges.de fkp.de gelly.de \
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 4379f4dffad9..3b474cefbee0 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webfonts
PORTVERSION= 0.30
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \
${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \
@@ -36,8 +36,6 @@ EXTRACT_DEPENDS=cabextract:${PORTSDIR}/archivers/cabextract
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_X_PREFIX= yes
-
NO_BUILD= yes
RESTRICTED= "Restrictive license - cannot sell for profit or distribute in modified form"
diff --git a/x11-themes/flux-art/Makefile b/x11-themes/flux-art/Makefile
index f70038b25737..531218cfd2ce 100644
--- a/x11-themes/flux-art/Makefile
+++ b/x11-themes/flux-art/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flux-art
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://www.iluxa.kremenchug.net/files/
@@ -19,7 +19,6 @@ RUN_DEPENDS= fluxbox:${PORTSDIR}/x11-wm/fluxbox
CONFLICTS= fluxbox-fluxmod-*
USE_BZIP2= yes
-USE_XLIB= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
INSTALL_DIR= ${PREFIX}/share/fluxbox/styles
diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index b32e329b4b39..3f633b77cf07 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flu
PORTVERSION= 2.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.osc.edu/~jbryan/FLU/
DISTNAME= FLU_${PORTVERSION}
@@ -17,7 +17,6 @@ COMMENT= A library containing extra widgets for FLTK
LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk
-USE_X_PREFIX= yes
USE_GL= yes
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index e3c49496f594..cd3ae23ed2a5 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -7,14 +7,13 @@
PORTNAME= plib
PORTVERSION= 1.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://plib.sourceforge.net/dist/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math
-USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 19fa599394ae..11a38e993f1c 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -7,14 +7,13 @@
PORTNAME= devilspie
PORTVERSION= 0.20.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.burtonini.com/computing/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A window manipulation tool
-USE_XLIB= yes
USE_GNOME= libwnck
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 66e10bf8c113..3ee04a392787 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flwm
PORTVERSION= 1.00
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= gj
@@ -20,7 +20,6 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
MAN1= flwm.1
PLIST_FILES= bin/flwm
diff --git a/x11-wm/nickleby/Makefile b/x11-wm/nickleby/Makefile
index 09f772ff3fad..8118c57311fb 100644
--- a/x11-wm/nickleby/Makefile
+++ b/x11-wm/nickleby/Makefile
@@ -7,15 +7,16 @@
PORTNAME= nickleby
PORTVERSION= 1.51
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.mammothcheese.ca/
MAINTAINER= jimmy@mammothcheese.ca
COMMENT= Simple window manager
-USE_XLIB= yes
MAN1= nickleby.1
MANCOMPRESSED= yes
+USE_XORG= x11
PLIST_FILES= bin/nickleby
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index c9fed00f405e..7c944dd94c1e 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbdock
PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://bbdock.nethence.com/download/
@@ -20,7 +20,7 @@ PORTDOCS= README
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xi
USE_GCC= 3.3+
PLIST_FILES= bin/bbdock
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index f3d6c3978b3e..cb2024083261 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -6,6 +6,7 @@
PORTNAME= x11
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -15,8 +16,6 @@ DISTNAME= X11-${PORTVERSION}
MAINTAINER= haskell@FreeBSD.org
COMMENT= X11 bindings for Haskell programs
-USE_XLIB= yes
-
# include the version verbatim. This will require a revision bump
# on updates, but the correct quoting of `ghc --numeric-version` in the various
# places is a real nightmare.
@@ -32,6 +31,8 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+USE_XORG= x11 xext sm
+
# 'owned' by lang/ghc:
CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs
diff --git a/x11/hs-x11-ghc/Makefile b/x11/hs-x11-ghc/Makefile
index f3d6c3978b3e..cb2024083261 100644
--- a/x11/hs-x11-ghc/Makefile
+++ b/x11/hs-x11-ghc/Makefile
@@ -6,6 +6,7 @@
PORTNAME= x11
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -15,8 +16,6 @@ DISTNAME= X11-${PORTVERSION}
MAINTAINER= haskell@FreeBSD.org
COMMENT= X11 bindings for Haskell programs
-USE_XLIB= yes
-
# include the version verbatim. This will require a revision bump
# on updates, but the correct quoting of `ghc --numeric-version` in the various
# places is a real nightmare.
@@ -32,6 +31,8 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+USE_XORG= x11 xext sm
+
# 'owned' by lang/ghc:
CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 3fa142366f7b..e4213ee0714a 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= numlockx
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://ktown.kde.org/~seli/numlockx/ \
http://caraldi.com/jbq/numlockx/
@@ -17,8 +17,8 @@ MAINTAINER= jb.quenot@caraldi.com
COMMENT= This little thingy allows you to start X with NumLock turned on
GNU_CONFIGURE= yes
+USE_XORG= x11 xext
PLIST_FILES= bin/numlockx
-USE_X_PREFIX= yes
# Needed for the "configure" program to find XTest and XKB header files
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 2952984ef003..16acb20afaed 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmenu
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
@@ -17,7 +17,6 @@ COMMENT= A popup menu of icons that launch programs for the WindowMaker dock
LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
USE_GNOME= libcapplet gdkpixbuf
USE_GMAKE= yes
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index ab4b631d1a01..c5f17ae167a8 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcalib
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 graphics
MASTER_SITES= http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
@@ -15,10 +15,9 @@ DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= hopet@ics.muni.cz
COMMENT= A program for display calibration of X11-Servers with ICC profiles
-USE_X_PREFIX= yes
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
PORTDOCS= README README.profilers
+USE_XORG= x11 xext sm xxf86vm
DEFINES= -DXCALIB_VERSION=\"${PORTVERSION}\" -DUNIX
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lX11 -lXxf86vm -lXext
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 2c66402de325..63ce080b1576 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xnodecor
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.42.org/pub/wmx/contrib/
DISTFILES= xnodecor.c
@@ -16,8 +16,8 @@ MAINTAINER= katsura@cc.osaka-kyoiku.ac.jp
COMMENT= Utility to set override_redirect in XWindowAttributes to True
NO_WRKSUBDIR= yes
+USE_XORG= x11
PLIST_FILES= bin/xnodecor
-USE_X_PREFIX= yes
do-extract:
@${MKDIR} ${WRKDIR}
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 2ec699a05b14..f851a842fc70 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XScreenSaver.App
PORTVERSION= 2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xscreensaverapp
@@ -18,7 +18,6 @@ COMMENT= WindowMaker dockapp to control XScreenSaver
LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp
PLIST_FILES= bin/XScreenSaver.App
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib" \
CPPFLAGS="-I${X11BASE}/include"