aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/gnowavcut/Makefile3
-rw-r--r--audio/x11amp/Makefile3
-rw-r--r--audio/xmp/Makefile3
-rw-r--r--cad/opencascade/Makefile3
-rw-r--r--chinese/pyDict/Makefile4
-rw-r--r--comms/gmfsk/Makefile1
-rw-r--r--comms/hamfax/Makefile3
-rw-r--r--comms/syncterm/Makefile4
-rw-r--r--deskutils/pinot/Makefile2
-rw-r--r--deskutils/wmpinboard/Makefile4
-rw-r--r--devel/esvn/Makefile2
-rw-r--r--devel/libgii/Makefile4
-rw-r--r--editors/aee/Makefile3
-rw-r--r--editors/mlview/Makefile3
-rw-r--r--editors/xemacs-devel-mule/Makefile5
-rw-r--r--editors/xemacs21-mule/Makefile5
-rw-r--r--emulators/e-uae/Makefile1
-rw-r--r--ftp/axyftp/Makefile3
-rw-r--r--ftp/junglemonkey/Makefile1
-rw-r--r--ftp/xrmftp/Makefile3
-rw-r--r--games/enigma/Makefile3
-rw-r--r--games/oneko/Makefile4
-rw-r--r--games/pinball/Makefile3
-rw-r--r--games/pioneers/Makefile1
-rw-r--r--games/q15/Makefile3
-rw-r--r--games/xminehunter/Makefile5
-rw-r--r--graphics/agave/Makefile3
-rw-r--r--graphics/danpei/Makefile3
-rw-r--r--graphics/eterm-bg/Makefile3
-rw-r--r--graphics/gcolor2/Makefile1
-rw-r--r--graphics/gifsicle/Makefile4
-rw-r--r--graphics/gliv/Makefile1
-rw-r--r--graphics/ida/Makefile3
-rw-r--r--graphics/libggi/Makefile4
-rw-r--r--graphics/libggiwmh/Makefile4
-rw-r--r--graphics/libx3dtk/Makefile3
-rw-r--r--graphics/swfdec/Makefile3
-rw-r--r--graphics/xmms-dancingparticles/Makefile3
-rw-r--r--graphics/xmms-dflowers/Makefile3
-rw-r--r--graphics/xmms-dspectogram/Makefile3
-rw-r--r--graphics/xmms-plazma/Makefile3
-rw-r--r--graphics/xmms-scivi/Makefile3
-rw-r--r--graphics/xmms-vumeter/Makefile3
-rw-r--r--graphics/xmms-waterfall/Makefile3
-rw-r--r--graphics/xpdf/Makefile3
-rw-r--r--japanese/aterm/Makefile5
-rw-r--r--japanese/jyuroku/Makefile3
-rw-r--r--lang/clisp/Makefile4
-rw-r--r--multimedia/nxtvepg/Makefile3
-rw-r--r--net-im/kf/Makefile1
-rw-r--r--net-im/pidgin-rhythmbox/Makefile1
-rw-r--r--net/mpich2/Makefile5
-rw-r--r--net/wmpiki/Makefile3
-rw-r--r--polish/gnugadu2/Makefile1
-rw-r--r--print/asprint/Makefile2
-rw-r--r--print/gl2ps/Makefile3
-rw-r--r--print/libotf/Makefile2
-rw-r--r--print/mup/Makefile5
-rw-r--r--science/gnudatalanguage/Makefile2
-rw-r--r--security/kovpn/Makefile4
-rw-r--r--sysutils/gksu/Makefile1
-rw-r--r--sysutils/libgksuui/Makefile1
-rw-r--r--sysutils/spassgen/Makefile3
-rw-r--r--x11-clocks/sanduhr/Makefile1
-rw-r--r--x11-clocks/wmfishtime/Makefile3
-rw-r--r--x11-fm/jaffm/Makefile3
-rw-r--r--x11-fm/tdfsb/Makefile3
-rw-r--r--x11-fm/worker/Makefile3
-rw-r--r--x11-fm/xdiskusage/Makefile3
-rw-r--r--x11-fonts/mathfonts/Makefile3
-rw-r--r--x11-fonts/texcm-ttf/Makefile3
-rw-r--r--x11-themes/cursor-jimmac-theme/Makefile3
-rw-r--r--x11-themes/xmms-eq-skins/Makefile3
-rw-r--r--x11-themes/xmms-vumeter-skins/Makefile3
-rw-r--r--x11-toolkits/ruby-fox10/Makefile4
-rw-r--r--x11-toolkits/ruby-fox12/Makefile5
-rw-r--r--x11-wm/bbpager/Makefile2
-rw-r--r--x11-wm/icewm/Makefile3
-rw-r--r--x11-wm/ratmen/Makefile3
-rw-r--r--x11-wm/selectwm/Makefile1
-rw-r--r--x11/fireflies/Makefile3
-rw-r--r--x11/rxvt-unicode/Makefile4
-rw-r--r--x11/wmmsg/Makefile5
-rw-r--r--x11/yalias/Makefile1
84 files changed, 95 insertions, 151 deletions
diff --git a/audio/gnowavcut/Makefile b/audio/gnowavcut/Makefile
index f45ff8e41163..d3f70266c828 100644
--- a/audio/gnowavcut/Makefile
+++ b/audio/gnowavcut/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gnowavcut
PORTVERSION= 0.0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio gnome
MASTER_SITES= http://gnowavcut.good-day.net/src/
MAINTAINER= spcoltri@omcl.org
COMMENT= A GNOME/GTK+ based RIFF PCM Wave file splitter
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnomelibs
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index e0d7834d5826..e8f2d51a2bf6 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= x11amp
PORTVERSION= 0.9.b1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/misc/x11amp/0.9/ \
ftp://ftp.x11amp.bz.nu/x11amp/0.9/ \
@@ -17,7 +17,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/}
MAINTAINER= beech@FreeBSD.org
COMMENT= X11-based MP3 player with nice graphical interface
-USE_XLIB= yes
USE_GNOME= gtk12 esound
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 299c77b5efc8..fef0d83093cc 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmp
PORTVERSION= 2.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER= anders@FreeBSD.org
COMMENT= A player for many different Amiga and PC module formats
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= esound
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:213
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index e1081723478f..b4130e0672f0 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opencascade
PORTVERSION= 6.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= cad science
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= thierry
@@ -29,7 +29,6 @@ BROKEN= Does not compile
USE_BZIP2= yes
USE_BISON= build
-USE_XLIB= yes
USE_TK= yes
USE_TCL_BUILD= 84
USE_TCL_RUN= 84
diff --git a/chinese/pyDict/Makefile b/chinese/pyDict/Makefile
index 952cd6dea227..19b400eeec7b 100644
--- a/chinese/pyDict/Makefile
+++ b/chinese/pyDict/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyDict
PORTVERSION= 0.2.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= chinese
MASTER_SITES= LOCAL/chinsan/pyDict/ \
http://www.525183.com/freebsd/pyDict/ \
@@ -20,8 +20,6 @@ COMMENT= A Chinese <-> English dictionary, under both console and X11
RUN_DEPENDS= ${LOCALBASE}/include/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk \
${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-USE_XLIB= yes
-
WRKSRC= ${WRKDIR}/dict
NO_BUILD= yes
SHAREMODE= 644
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 4abdbd7b8555..61523b360485 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
USE_GMAKE= yes
USE_GNOME= libgnomeui gnomehack gnomeprefix
-USE_XLIB= yes
INSTALLS_OMF= yes
GCONF_SCHEMAS= gmfsk.schemas
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 9b1f07a56ffc..c63d01ac9a4b 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -6,7 +6,7 @@
PORTNAME= hamfax
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms audio hamradio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hamfax
@@ -18,7 +18,6 @@ COMMENT= QT application for sending and receiving facsimiles over radio
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
USE_QT_VER= 3
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-Qt-dir=${X11BASE} CXX="${CXX} ${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index ec43cf239bd1..749a63bc9a5e 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= syncterm
PORTVERSION= 0.9.${PORTVER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -36,7 +36,7 @@ MAKE_ARGS+= -C syncterm
MAKE_ARGS+= PREFIX="${PREFIX}"
MAKE_ARGS+= INSTALL_EXE="${INSTALL_PROGRAM}"
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
.else
MAKE_ARGS+= NO_X=1
.endif
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 848d5a9e7fa6..fa890027dba5 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pinot
PORTVERSION= 0.83
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_BERLIOS}
#MASTER_SITES= http://www.chez.com/colinf/pinot/ \
@@ -44,7 +45,6 @@ CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MKDIR_P="${MKDIR}"
USE_GETTEXT= yes
-USE_XLIB= yes
#USE_SQLITE= 3 # Replaced by sqlite3-threads
USE_PYTHON= yes
USE_OPENSSL= yes
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 2cea7a3e2115..f77e77eb005c 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmpinboard
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils afterstep windowmaker
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -17,7 +17,7 @@ COMMENT= Post-it notes for the WindowMaker dock or AfterStep Wharf
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index afb46a8035f3..ceb5b913eb1f 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= esvn
PORTVERSION= 0.6.12
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -27,7 +28,6 @@ WRKSRC= ${WRKDIR}/${ESVN_DIST}
HAS_CONFIGURE= yes
USE_QT_VER= 3
USE_GMAKE= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
CONFIGURE_ARGS= --qtdir=${QT_PREFIX}
MAKE_ARGS+= QTDIR=${QT_PREFIX} \
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index e9dfb92112d1..68d3daaa3e81 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgii
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
${MASTER_SITE_SOURCEFORGE}
@@ -192,7 +192,7 @@ PLIST_SUB+= KII="@comment "
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
PLIST_SUB+= WITH_X=""
.else
CONFIGURE_ARGS+= --disable-x --without-x
diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index 54c9bfdcc7d2..fb4cd6671965 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aee
PORTVERSION= 2.2.15b
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://mahon.cwx.net/sources/
@@ -21,7 +22,7 @@ OPTIONS= XAE "Build X11 version 'xae'" off
ALL_TARGET= main
PLIST_SUB= XAE="@comment "
.else
-USE_XLIB= yes
+USE_XORG= x11
ALL_TARGET= both
PLIST_SUB= XAE=""
.endif
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 18a3f2aa80c8..eee8e9f1549c 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mlview
PORTVERSION= 0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -17,7 +17,6 @@ MAINTAINER= barner@FreeBSD.org
COMMENT= A tree oriented XML editor for Gnome
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= autoconf:261 libtool:15
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview
USE_GMAKE= yes
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 728e11760ee6..40f57ac0f011 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -43,8 +43,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm
CONFIGURE_ARGS= --with-xpm
.endif
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 4a64e53c0c1a..f6bb1bd8c554 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-mule
PORTVERSION= ${XEMACS_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -48,8 +48,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm
STRIP=
USE_AUTOTOOLS= autoconf:213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index 4f5750bb883e..55c6f4d23a09 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -19,7 +19,6 @@ CONFLICTS= uae-[0-9]*
USE_GMAKE= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_GNOME= gtk20
USE_SDL= sdl
CONFIGURE_ARGS= --with-sdl --with-sdl-gfx
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index 26b4ef14b247..139095880c9e 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= axyftp
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.bitchx.com/pub/shareware/ \
ftp://ftp.netsw.org/net/ip/filetrans/ftp/axyftp/ \
@@ -17,7 +17,6 @@ MASTER_SITES= ftp://ftp.bitchx.com/pub/shareware/ \
MAINTAINER= beech@FreeBSD.org
COMMENT= X Window System FTP client, with WSftp-like UI
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 1065b7adb8fb..aa5005a3486b 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -17,7 +17,6 @@ COMMENT= A distributed file sharing program for GNOME
LIB_DEPENDS= gnet.7:${PORTSDIR}/net/gnet
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libglade
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index 720285522078..305d10309bbf 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xrmftp
PORTVERSION= 1.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp
MASTER_SITES= http://www-users.mat.uni.torun.pl/~rafmet/xrmftp/
EXTRACT_SUFX= .src.tgz
@@ -19,7 +19,6 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.src
-USE_X_PREFIX= yes
ALL_TARGET= xrmftp
CFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/X11
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 5e7501cde0e7..3ef387520c9e 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enigma
PORTVERSION= 0.92
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= enigma
@@ -24,7 +24,6 @@ USE_GETTEXT= yes
USE_LUA= 4.0
LUA_COMPS= lua tolua
USE_SDL= gfx image mixer sdl ttf
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --target="" \
--with-libintl-prefix="${LOCALBASE}"
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index b65af4cbbbd4..3be3aed8d332 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oneko
PORTVERSION= 2.0b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.3bit.co.jp/~sasaki/oneko/ \
http://www.net24.ne.jp/~ryo2/archives/:ryo2 \
@@ -25,7 +25,7 @@ COMMENT= A cat chasing a mouse all over the screen
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm
MAN6= oneko.6
MANLANG= "" ja
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 0b1d9056db51..e13b1b7e04d9 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinball
PORTVERSION= 0.3.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,6 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
.endif
USE_SDL= image mixer sdl
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GL= yes
USE_AUTOTOOLS= libtool:15
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 090521e84651..85725ee961c8 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -17,7 +17,6 @@ COMMENT= An Internet playable version of the Settlers of Catan for GNOME/GTK+
RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 libgnome
diff --git a/games/q15/Makefile b/games/q15/Makefile
index 43e033a3bf9a..242038d70536 100644
--- a/games/q15/Makefile
+++ b/games/q15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q15
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://silversoft.net/src/
@@ -16,7 +16,6 @@ COMMENT= A Qt-based game fifteen
USE_BZIP2= yes
USE_QT_VER= 3
-USE_X_PREFIX= yes
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
QT_PREFIX="${QT_PREFIX}"
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 582a892a8d79..14c1b91e2ca8 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xminehunter
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= games
MAINTAINER= tg@FreeBSD.org
COMMENT= A Motif minesweeper game
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
WRKSRC= ${WRKDIR}/xminehunter
USE_MOTIF= yes
ALL_TARGET= xminehunter
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 0677d4450f2f..4e0af31ffd55 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= agave
PORTVERSION= 0.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= http://download.gna.org/colorscheme/releases/
@@ -23,7 +23,6 @@ LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomedocutils intlhack
GCONF_SCHEMAS= agave.schemas
INSTALLS_ICONS= yes
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index a6fef501eeb1..f3d04a875f6e 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -7,7 +7,7 @@
PORTNAME= danpei
PORTVERSION= 2.9.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= danpei
@@ -21,7 +21,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GNOME= gtk12 gdkpixbuf
GNU_CONFIGURE= yes
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index 19a321fb214c..ba575515792d 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eterm-bg
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.eterm.org/download/
DISTNAME= Eterm-bg-${PORTVERSION}
@@ -17,7 +17,6 @@ COMMENT= Image files for background of Eterm
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_X_PREFIX= yes
do-install:
${MKDIR} ${PREFIX}/share/Eterm
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index ea865c490dcc..ffaab05962ac 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= smyru@heron.pl
COMMENT= A simple GTK+ 2.0 color selector
-USE_X_PREFIX= yes
USE_GNOME= gtk20 gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index a6030c89164b..9eb8c096fde7 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gifsicle
PORTVERSION= 1.48
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.lcdf.org/gifsicle/
@@ -28,7 +28,7 @@ PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+= --without-x --disable-gifview
PLIST_SUB= X11='@comment '
.else
-USE_XLIB= yes
+USE_XORG= x11
MAN1+= gifview.1
PLIST_SUB= X11=''
.endif
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 8253f380f58d..4178615be50c 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -17,7 +17,6 @@ COMMENT= An image viewer that uses Gdk-Pixbuf and OpenGL
LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20
USE_GL= yes
USE_GETTEXT= yes
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index b43b57bd9827..5aad30475cb8 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ida
PORTVERSION= 0.21
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://dl.bytesex.org/releases/fbida/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -22,7 +22,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
exif.12:${PORTSDIR}/graphics/libexif
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_MOTIF= yes
USE_PERL5_BUILD=yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index e7708450fd6a..3e26a03cbcfa 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libggi
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
@@ -125,7 +125,7 @@ CONFIGURE_ARGS+= --enable-kgi --with-extra-includes=/usr/include/dev
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11 xxf86dga
PLIST_SUB+= WITH_X=""
.else
CONFIGURE_ARGS+= --disable-x --disable-dga
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index 032c3ef65031..fe8338622d5f 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libggiwmh
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
${MASTER_SITE_SOURCEFORGE}
@@ -41,7 +41,7 @@ MLINKS= ggiWmhIconify.3 ggiWmhMoveIcon.3 \
- ggiWmhMaximize.3 - ggiWmhResize.3
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
PLIST_SUB+= XWMH=""
.else
CONFIGURE_ARGS+=--disable-x
diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile
index cb5e33842ecb..a8f4171a755a 100644
--- a/graphics/libx3dtk/Makefile
+++ b/graphics/libx3dtk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libx3dtk
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/
DISTNAME= X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E}
@@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/X3DToolKit-1.0
USE_GMAKE= yes
USE_GNOME= libxml2
-USE_XLIB= yes
USE_QT_VER= 3
MAKE_ENV= QTDIR="${QT_PREFIX}"
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 36826f8d3ca4..727b46ad7eb3 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.5/
MAINTAINER= alexbl@FreeBSD.org
COMMENT= Flash Rendering Library
-LIB_DEPENDS= oil-0.3.1:${PORTSDIR}/devel/liboil \
+LIB_DEPENDS= oil-0.3.1:${PORTSDIR}/devel/liboil \
soup-2.2.8:${PORTSDIR}/devel/libsoup
-USE_XLIB= yes
USE_GNOME= gnomehack gtk20
USE_AUTOTOOLS= libtool:15:env automake:19:env autoconf:261
GNU_CONFIGURE= yes
diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile
index 4d10a022b56c..e538d7ddd0dc 100644
--- a/graphics/xmms-dancingparticles/Makefile
+++ b/graphics/xmms-dancingparticles/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dancingparticles
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://tardyp.free.fr/dancingparticles/
PKGNAMEPREFIX= xmms-
@@ -21,7 +21,6 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \
glut.4:${PORTSDIR}/graphics/libglut \
xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GL= yes
USE_GNOME= gtk12
USE_SDL= sdl
diff --git a/graphics/xmms-dflowers/Makefile b/graphics/xmms-dflowers/Makefile
index 7c3a2eee1641..ccffd46a53fb 100644
--- a/graphics/xmms-dflowers/Makefile
+++ b/graphics/xmms-dflowers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dflowers
PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alepulver
@@ -19,7 +19,6 @@ COMMENT= Dual Flowers visualization plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
post-patch:
diff --git a/graphics/xmms-dspectogram/Makefile b/graphics/xmms-dspectogram/Makefile
index c89d018f2172..257c4fc490d8 100644
--- a/graphics/xmms-dspectogram/Makefile
+++ b/graphics/xmms-dspectogram/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dspectogram
PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alepulver
@@ -19,7 +19,6 @@ COMMENT= Dual Spectogram visualization plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
post-patch:
diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile
index fb06ce6abd7c..3a1b7f4d43a3 100644
--- a/graphics/xmms-plazma/Makefile
+++ b/graphics/xmms-plazma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-plazma
DISTVERSION= 0.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://membres.lycos.fr/diablolight/
@@ -16,7 +16,6 @@ COMMENT= Plazma is an XMMS visualization plugin
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GL= yes
USE_GNOME= gtk12
USE_SDL= sdl
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index d31a70e466b3..8cd2d9f62335 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scivi
DISTVERSION= 0.2.0-rc3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Scivi is a visualization plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GL= yes
USE_GNOME= gtk12
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index 03afa39e2a0e..19c515b79d91 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vumeter
PORTVERSION= 0.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}plugin
@@ -18,7 +18,6 @@ COMMENT= Analog VUmeter plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
GNU_CONFIGURE= yes
diff --git a/graphics/xmms-waterfall/Makefile b/graphics/xmms-waterfall/Makefile
index 78388806ef49..03cac8b66f45 100644
--- a/graphics/xmms-waterfall/Makefile
+++ b/graphics/xmms-waterfall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waterfall
PORTVERSION= 0.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.sethoscope.net/waterfall/
PKGNAMEPREFIX= xmms-
@@ -17,7 +17,6 @@ COMMENT= Yet another XMMS spectrum analyzer
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 42ff6b8b5931..30e3d05a796d 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpdf
PORTVERSION= 3.02
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_TEX_CTAN}
@@ -64,7 +64,6 @@ CONFIGURE_ARGS+= --without-x
PLIST_SUB+= X11="@comment "
.else
CONFIGURE_ARGS+= --with-x
-USE_X_PREFIX= yes
USE_MOTIF= yes
MAN1+= xpdf.1
PLIST_SUB+= X11=""
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 3ce5d61770bf..90fcc4989021 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aterm
PORTVERSION= 0.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES+= japanese x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -26,8 +26,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
USE_AUTOTOOLS= autoconf:261:env
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm xmu
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= \
--enable-transparency --enable-background-image \
diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile
index f534890dce70..b45afaf25bf7 100644
--- a/japanese/jyuroku/Makefile
+++ b/japanese/jyuroku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jyuroku
PORTVERSION= 1.32
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= http://homepage3.nifty.com/seto-yoneji/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -17,7 +17,6 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Japanese address book
ALL_TARGET=
-USE_X_PREFIX= yes
USE_GNOME= gtk12
post-patch:
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index d27fe7fd8423..de651809dd15 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clisp
PORTVERSION= 2.44
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang lisp
MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION} \
ftp://sunsite.unc.edu/pub/Linux/devel/lang/lisp/
@@ -87,7 +87,7 @@ LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER}
IGNORE= selected different implementations of the same X11 module
.endif
.if defined(WITH_CLX_MIT) || defined(WITH_CLX_NEW)
-USE_XLIB= yes
+USE_XORG= x11
.endif
.if defined(WITH_CLX_MIT)
CONFIGURE_ARGS+=--with-module=clx/mit-clx
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index ff0ff8b3f526..d695e856082e 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nxtvepg
PORTVERSION= 2.7.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
NOT_FOR_ARCHS= sparc64
USE_GMAKE= yes
USE_XLIB= yes
-USE_X_PREFIX= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC}
MAN1= nxtvepg.1
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index 346a9f6ddcf9..35c7e7d7c9e5 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -18,7 +18,6 @@ COMMENT= A simple Jabber client using the GTK+ 2.0 toolkit
LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
-USE_X_PREFIX= yes
USE_GNOME= libglade2
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
GNU_CONFIGURE= yes
diff --git a/net-im/pidgin-rhythmbox/Makefile b/net-im/pidgin-rhythmbox/Makefile
index 0114e3aabc51..ca881659c578 100644
--- a/net-im/pidgin-rhythmbox/Makefile
+++ b/net-im/pidgin-rhythmbox/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin \
rhythmbox:${PORTSDIR}/audio/rhythmbox
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 2a6707c14066..5d093c9feb31 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -7,7 +7,8 @@
PORTNAME= mpich2
DISTVERSION= 1.0.6p1
-PORTEPOCH= 3
+PORTREVISION= 1
+PORTEPOCH= 2
CATEGORIES= net parallel
MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ \
http://www-unix.mcs.anl.gov/mpi/mpich/downloads/
@@ -54,7 +55,7 @@ CONFIGURE_ARGS+= --disable-graphics
WITHOUT_JAVA= yes
PLIST_SUB+= X11="@comment "
.else
-USE_XLIB= yes
+USE_X11= x11
PLIST_SUB+= X11=""
.endif
.if defined(WITHOUT_JAVA)
diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile
index a8b69c49dd59..2f5524f2555a 100644
--- a/net/wmpiki/Makefile
+++ b/net/wmpiki/Makefile
@@ -17,8 +17,7 @@ COMMENT= A multiping host checker dockapp
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
post-patch:
@${REINPLACE_CMD} -e 's|/usr/X11R6|$$(X11BASE)|g' \
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 26e4754a5f32..1a9c9d6b041e 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \
audiofile.0:${PORTSDIR}/audio/libaudiofile
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_PERL5= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index 6bd7cbb23711..984daeeec700 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= brett@peloton.runet.edu
COMMENT= A simple browser to allow a user to print
PLIST_FILES= bin/asprint
-USE_XORG= x11
+USE_XORG= xmu xpm xt xaw x11
ALL_TARGET= asprint
MAKEFILE= makefile
diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile
index 46613b92e42f..cd6e130a92f3 100644
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gl2ps
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print graphics
MASTER_SITES= http://www.geuz.org/gl2ps/src/
EXTRACT_SUFX= .tgz
@@ -16,7 +16,6 @@ MAINTAINER= araujo@FreeBSD.org
COMMENT= A C library providing vector output for OpenGL application
USE_GL= yes
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
pre-build:
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index fe1bbee32f00..3cdeb7c28ca7 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libotf
PORTVERSION= 0.9.7
+PORTREVISION= 1
CATEGORIES= print devel
MASTER_SITES= http://www.m17n.org/libotf/
@@ -16,7 +17,6 @@ COMMENT= Library for handling OpenType fonts
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_GNOME= pkgconfig
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_LDCONFIG= yes
diff --git a/print/mup/Makefile b/print/mup/Makefile
index cc2fa5fccd0e..fdc4d79042e8 100644
--- a/print/mup/Makefile
+++ b/print/mup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mup
PORTVERSION= 5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print audio
MASTER_SITES= ftp://ftp.arkkra.com/pub/unix/
DISTFILES= mup${PORTVERSION:S/.//}src.tar.gz
@@ -15,10 +15,9 @@ DISTFILES= mup${PORTVERSION:S/.//}src.tar.gz
MAINTAINER= araujo@FreeBSD.org
COMMENT= A shareware program for typesetting music
-USE_XLIB= yes
-
MAN1= mup.1 mkmupfnt.1 mupdisp.1 mupprnt.1
PLIST_FILES= bin/mkmupfnt bin/mup bin/mupdisp bin/mupprnt
+USE_XORG= x11
MOREDOCS= docs/README0 docs/overview.txt docs/register.txt\
docs/mupfeat.txt docs/faq.txt docs/license.txt docs/uguide.ps
PORTDOCS= *
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index c8c4672b1d98..d394ec13c927 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnudatalanguage
DISTVERSION= 0.9pre6
+PORTREVISION= 1
CATEGORIES= science lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -34,7 +35,6 @@ LIB_DEPENDS+= plplotd.11:${PORTSDIR}/math/plplot \
gsl.10:${PORTSDIR}/math/gsl \
readline.5:${PORTSDIR}/devel/readline
-USE_XLIB= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index 6dbb57f3d071..bebdc89abe90 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kovpn
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security kde
MASTER_SITES= http://home.bawue.de/~lighter/www.enlighter.de/files/
DISTNAME= ${PORTNAME}-${PORTVERSION}_pre6
@@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX}
USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_AUTOTOOLS= libtool:15
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index c843999e2311..10e64553da1d 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/libgksuui/Makefile b/sysutils/libgksuui/Makefile
index c2b9fbe50ff4..a4795d702a1b 100644
--- a/sysutils/libgksuui/Makefile
+++ b/sysutils/libgksuui/Makefile
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}1.0-${PORTVERSION}
MAINTAINER= bsam@FreeBSD.org
COMMENT= A graphical fronted to su library
-USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/spassgen/Makefile b/sysutils/spassgen/Makefile
index cb28915d42d9..5f6751a88e27 100644
--- a/sysutils/spassgen/Makefile
+++ b/sysutils/spassgen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spassgen
PORTVERSION= 1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= spassgen
@@ -20,7 +20,6 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
USE_QT_VER= 3
USE_GMAKE= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
QMAKE_LOCATION= ${LOCALBASE}/bin
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index c4935b9d4799..ce93dd605e5c 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://seehuhn.de/media/programs/
MAINTAINER= araujo@FreeBSD.org
COMMENT= An alarm clock for GNOME desktop designed as a sand-glass
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnometarget gnomeprefix libgnomeui oaf
USE_GMAKE= yes
INSTALLS_OMF= yes
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index bd21a2156cef..f87a6acb79c8 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmfishtime
PORTVERSION= 1.24
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
http://atreides.freenix.no/~anders/
@@ -16,7 +16,6 @@ MAINTAINER= anders@FreeBSD.org
COMMENT= A time/date applet for WindowMaker with fishes swimming around
USE_GNOME= gtk12
-USE_X_PREFIX= yes
GTK_LIBS?= `${GTK_CONFIG} --libs`
GTK_CFLAGS?= `${GTK_CONFIG} --cflags`
diff --git a/x11-fm/jaffm/Makefile b/x11-fm/jaffm/Makefile
index 8e34ead06c62..a3ad5dffe75e 100644
--- a/x11-fm/jaffm/Makefile
+++ b/x11-fm/jaffm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jaffm
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-fm
MASTER_SITES= http://binary.is/download/ \
http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -17,7 +17,6 @@ COMMENT= A lightweight file manager inspired by MacOS Finder
USE_BZIP2= yes
USE_WX= 2.4-2.6
-USE_X_PREFIX= yes
ALL_TARGET= ${PORTNAME}
PLIST_FILES= bin/${PORTNAME}
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 6a5f906b539e..e14466e6ef8a 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdfsb
PORTVERSION= 0.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm
MASTER_SITES= http://www.determinate.net/webdata/data/
@@ -19,7 +19,6 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \
USE_GL= yes
USE_SDL= image sdl
-USE_X_PREFIX= yes
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= README
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 501888498fa6..4d0402343512 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -7,6 +7,7 @@
PORTNAME= worker
PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= http://www.boomerangsworld.de/worker/downloads/
@@ -16,7 +17,7 @@ COMMENT= X11 File Manager based on Directory Opus
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
GNU_CONFIGURE= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_BZIP2= yes
MANLANG= "" fr it
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 1264fd8041ec..8127dea227f9 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdiskusage
PORTVERSION= 1.48
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm
MASTER_SITES= http://xdiskusage.sourceforge.net/
EXTRACT_SUFX= .tgz
@@ -19,7 +19,6 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
MAN1= xdiskusage.1
USE_GMAKE= yes
-USE_X_PREFIX= yes
OPTIONS= THREADS "Threads support, necessary with threaded fltk" off
.include <bsd.port.pre.mk>
diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile
index 8586008943f4..3f19ba08957d 100644
--- a/x11-fonts/mathfonts/Makefile
+++ b/x11-fonts/mathfonts/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mathfonts
PORTVERSION= 4.1 # Don't upgrade this port if not supported by MathML-enabled Mozilla
# # Please check http://www.mozilla.org/projects/mathml/fonts/
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://support.wolfram.com/mathematica/systems/windows/general/files/
DISTNAME= MathFonts_TrueType_${PORTVERSION:S/.//}
@@ -25,7 +25,6 @@ RUN_DEPENDS= ${FONTSBASE}/texcm-ttf/cmr10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
RESTRICTED= no distribution of the fonts allowed
NO_CDROM= ${RESTRICTED}
-USE_X_PREFIX= yes
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile
index 6ebe665db82c..c7e3fa68b088 100644
--- a/x11-fonts/texcm-ttf/Makefile
+++ b/x11-fonts/texcm-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texcm-ttf
PORTVERSION= 20010117
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://www.mozilla.org/projects/mathml/fonts/bakoma/
DISTFILES= ${PORTNAME}${EXTRACT_SUFX} license.txt
@@ -22,7 +22,6 @@ BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
NO_CDROM= cannot be sold or distributed with any commercial product
-USE_X_PREFIX= yes
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11-themes/cursor-jimmac-theme/Makefile b/x11-themes/cursor-jimmac-theme/Makefile
index ce7469108ebd..629f544624b2 100644
--- a/x11-themes/cursor-jimmac-theme/Makefile
+++ b/x11-themes/cursor-jimmac-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cursor-jimmac-theme
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://www.gnome-look.org/CONTENT/content-files/
DISTNAME= 6550-Jimmac
@@ -16,7 +16,6 @@ MAINTAINER= smyru@heron.pl
COMMENT= The beatiful Jimmac X cursor themes
NO_BUILD= yes
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/Jimmac
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index d50891689b28..1f89d7c4e74e 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-eq-skins
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= equ
@@ -19,7 +19,6 @@ COMMENT= Additional skins for the XMMS EQ plugin
RUN_DEPENDS= ${X11BASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq
USE_BZIP2= yes
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/EQskins
NO_BUILD= yes
diff --git a/x11-themes/xmms-vumeter-skins/Makefile b/x11-themes/xmms-vumeter-skins/Makefile
index ec6c43757e20..e0b0c803d858 100644
--- a/x11-themes/xmms-vumeter-skins/Makefile
+++ b/x11-themes/xmms-vumeter-skins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-vumeter-skins
PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://vumeterplugin.sourceforge.net/skins/
DISTFILES= X-skin.tar.bz2 \
@@ -22,7 +22,6 @@ COMMENT= Additional skins for the XMMS Analog VUmeter plugin
RUN_DEPENDS= ${SKINSDIR}/default/skin.cfg:${PORTSDIR}/graphics/xmms-vumeter
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile
index 824101b93e11..1ca0a8bffdae 100644
--- a/x11-toolkits/ruby-fox10/Makefile
+++ b/x11-toolkits/ruby-fox10/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fox
PORTVERSION= 1.0.29
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fxruby
@@ -31,7 +31,7 @@ USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
-USE_XLIB= yes
+USE_XORG= x11 xcursor
DOCS_EN= ANNOUNCE ChangeLog README \
index.html doc
diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile
index a6cc38fb2117..c5b213efe460 100644
--- a/x11-toolkits/ruby-fox12/Makefile
+++ b/x11-toolkits/ruby-fox12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fox
PORTVERSION= 1.2.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= fxruby
@@ -30,8 +30,7 @@ USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
NOHARM_ARGS= --no-harm
-
-USE_XLIB= yes
+USE_XORG= xcursor x11
USE_GL= yes
install-noharm:
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 2ab8ec35c901..95f0d4e31249 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbpager
DISTVERSION= 0.4.7
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= SF
MASTER_SITE_SUBDIR= bbtools
@@ -17,6 +18,7 @@ COMMENT= A pager for the Blackbox window manager
BUILD_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox
USE_GNOME= gnomehack pkgconfig
+USE_XORG= xext sm x11 xau xcursor xi
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags xft`" \
LDFLAGS="`pkg-config --libs xft`"
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 912c7c95af0f..7404c0a1147a 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icewm
PORTVERSION= 1.2.34
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= SF
@@ -53,7 +54,7 @@ PLIST_SUB+= GNOMEDESKTOP="@comment "
USE_GNOME+= imlib
CONFIGURE_ARGS+=--with-imlib
.else
-USE_XPM= yes
+USE_XORG= xpm
CONFIGURE_ARGS+=--without-imlib
.endif
diff --git a/x11-wm/ratmen/Makefile b/x11-wm/ratmen/Makefile
index d5da770b2aeb..ccbb093a28bf 100644
--- a/x11-wm/ratmen/Makefile
+++ b/x11-wm/ratmen/Makefile
@@ -7,13 +7,14 @@
PORTNAME= ratmen
PORTVERSION= 2.2.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.update.uu.se/~zrajm/programs/ratmen/
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Simple program for displaying a menu in a window
-USE_XLIB= yes
+USE_XORG= x11
USE_PERL5_BUILD=yes
MAN1= ratmen.1
PLIST_FILES= bin/ratmen
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index c9a8aa8e9d19..e46f9627ad93 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -18,7 +18,6 @@ MAN1= selectwm.1
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
PLIST_FILES= bin/selectwm share/locale/fr/LC_MESSAGES/selectwm.mo
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index f463be5d531e..0245b8b79ace 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -7,14 +7,13 @@
PORTNAME= fireflies
PORTVERSION= 2.07
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://somewhere.fscked.org/fireflies/
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= Fireflies is a extention of xscreensaver
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GL= yes
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index a8cd5847f552..6f21e23bdab7 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rxvt-unicode
PORTVERSION= 9.02
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
MASTER_SITE_SUBDIR= . Attic
@@ -21,8 +22,7 @@ PATCH_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt \
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index 3c22e69dcbe1..b4dccba3c68d 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmsg
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 windowmaker
MASTER_SITES= http://mirror.israel.net/pub/FreeBSD/distfiles/
@@ -18,8 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk12
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_EFL= imlib2
GNU_CONFIGURE= yes
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index e7af4017482e..7d577e431af4 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= tdb@FreeBSD.org
COMMENT= An enhanced execution box with regex pattern matching
USE_GNOME= gtk20
-USE_XLIB= yes
ALL_TARGET= yalias
MAKE_ARGS= prefix=${PREFIX} YALIASDIR=${DATADIR}