aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabic/ae_fonts_ttf/Makefile3
-rw-r--r--astro/gkrellmoon2/Makefile1
-rw-r--r--audio/bmp-flac/Makefile3
-rw-r--r--audio/gkrellmms/Makefile1
-rw-r--r--audio/gkrellmms2/Makefile1
-rw-r--r--audio/gkrellmvolume/Makefile1
-rw-r--r--audio/gkrellmvolume2/Makefile1
-rw-r--r--audio/liteamp/Makefile1
-rw-r--r--audio/xmms-mp3cue/Makefile1
-rw-r--r--cad/pdnmesh/Makefile3
-rw-r--r--chinese/oxim/Makefile1
-rw-r--r--deskutils/fusenshi/Makefile3
-rw-r--r--devel/ddd/Makefile2
-rw-r--r--editors/gobby/Makefile2
-rw-r--r--editors/ted/Makefile3
-rw-r--r--emulators/pearpc/Makefile4
-rw-r--r--emulators/uae/Makefile1
-rw-r--r--ftp/IglooFTP/Makefile1
-rw-r--r--ftp/gftp/Makefile2
-rw-r--r--games/crossfire-client/Makefile3
-rw-r--r--games/ember/Makefile3
-rw-r--r--games/gnomekiss/Makefile1
-rw-r--r--games/heretic/Makefile2
-rw-r--r--games/holotz-castle/Makefile3
-rw-r--r--games/ishido/Makefile4
-rw-r--r--games/kanatest/Makefile1
-rw-r--r--games/pyching/Makefile4
-rw-r--r--games/xchadance/Makefile4
-rw-r--r--games/xglk/Makefile3
-rw-r--r--games/xsoldier/Makefile4
-rw-r--r--graphics/bmp-rootvis/Makefile3
-rw-r--r--graphics/cegui/Makefile6
-rw-r--r--graphics/ffff/Makefile1
-rw-r--r--graphics/hs-hgl/Makefile4
-rw-r--r--graphics/ogre3d/Makefile3
-rw-r--r--graphics/povray31/Makefile2
-rw-r--r--graphics/py-cgkit/Makefile3
-rw-r--r--graphics/wmgrabimage/Makefile5
-rw-r--r--graphics/xmms-dscope/Makefile1
-rw-r--r--graphics/xmms-dspectral/Makefile1
-rw-r--r--graphics/xzgv/Makefile3
-rw-r--r--irc/gdesklets-irc/Makefile1
-rw-r--r--japanese/monafonts-ttf/Makefile3
-rw-r--r--japanese/motoya-ttfonts/Makefile4
-rw-r--r--japanese/scim-prime/Makefile3
-rw-r--r--japanese/scim-uim/Makefile3
-rw-r--r--korean/aleefonts-ttf/Makefile3
-rw-r--r--korean/nabi/Makefile1
-rw-r--r--korean/unfonts-ttf/Makefile3
-rw-r--r--lang/mit-scheme/Makefile3
-rw-r--r--lang/ptoc/Makefile2
-rw-r--r--mail/gkrellmmailwatch/Makefile1
-rw-r--r--mail/sylpheed2-devel/Makefile1
-rw-r--r--math/asir2000/Makefile4
-rw-r--r--math/mbasecalc/Makefile3
-rw-r--r--math/ump/Makefile1
-rw-r--r--misc/wminfo/Makefile3
-rw-r--r--misc/xosd/Makefile3
-rw-r--r--multimedia/qdvdauthor/Makefile2
-rw-r--r--multimedia/xawtv/Makefile3
-rw-r--r--net/g2ipmsg/Makefile1
-rw-r--r--net/wmnet/Makefile2
-rw-r--r--ports-mgmt/bpm/Makefile1
-rw-r--r--russian/artwiz-ru/Makefile3
-rw-r--r--russian/prawda/Makefile4
-rw-r--r--science/dcl/Makefile3
-rw-r--r--sysutils/asr-utils/Makefile4
-rw-r--r--sysutils/conky-awesome/Makefile4
-rw-r--r--sysutils/conky/Makefile4
-rw-r--r--sysutils/gkrellfire/Makefile2
-rw-r--r--sysutils/gkrellm/Makefile1
-rw-r--r--sysutils/torsmo/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile1
-rw-r--r--x11-clocks/alltraxclock/Makefile4
-rw-r--r--x11-clocks/bmp-alarm/Makefile1
-rw-r--r--x11-clocks/osdclock/Makefile3
-rw-r--r--x11-fm/rox-filer/Makefile1
-rw-r--r--x11-fonts/c64bdf/Makefile2
-rw-r--r--x11-fonts/fonts-te/Makefile3
-rw-r--r--x11-fonts/freefonts/Makefile3
-rw-r--r--x11-fonts/sharefonts/Makefile4
-rw-r--r--x11-fonts/tolkien-ttf/Makefile3
-rw-r--r--x11-fonts/urwfonts-ttf/Makefile3
-rw-r--r--x11-fonts/urwfonts/Makefile5
-rw-r--r--x11-themes/fluxbox-sid-pack/Makefile3
-rw-r--r--x11-themes/fvwm-themes/Makefile3
-rw-r--r--x11-themes/openbox-themes/Makefile3
-rw-r--r--x11-wm/fbcmd/Makefile4
-rw-r--r--x11-wm/fbpager/Makefile4
-rw-r--r--x11-wm/ion/Makefile2
-rw-r--r--x11-wm/obconf/Makefile1
-rw-r--r--x11-wm/openbox/Makefile1
-rw-r--r--x11-wm/ratmenu/Makefile4
-rw-r--r--x11-wm/weewm/Makefile4
-rw-r--r--x11-wm/windowlab/Makefile4
-rw-r--r--x11-wm/windowmaker/Makefile3
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/gdesklets-tasklist/Makefile2
-rw-r--r--x11/gromit/Makefile1
-rw-r--r--x11/keylaunch/Makefile4
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/xcb-util/Makefile1
-rw-r--r--x11/xidle/Makefile4
103 files changed, 100 insertions, 164 deletions
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index 0732928d5983..1e225f2e6284 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ae_fonts1_ttf
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= arabic x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arabeyes
@@ -18,7 +18,6 @@ COMMENT= A collection of truetype Arabic fonts created by Arabeyes.org
BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
-USE_X_PREFIX= yes
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/ae_fonts1-${PORTVERSION}
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index f74bc55baf01..05ab4a7c962c 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -19,7 +19,6 @@ COMMENT= A moon clock plugin for Gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_GNOME= gtk20
ALL_TARGET= gkrellmoon.so
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index 3f1aeff16f9d..cdb57a81c81f 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flac
PORTVERSION= 20040316
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://ccm.sherry.jp/tmp/
PKGNAMEPREFIX= bmp-
@@ -22,7 +22,6 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
PLIST_FILES= lib/bmp/Input/libbmp-flac.so
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index a61336fd650b..be2585689f8b 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= libexec/gkrellm/plugins/gkrellmms.so
-USE_X_PREFIX= yes
USE_GNOME= imlib
.include <bsd.port.mk>
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 78eea93c3306..666acbd30a51 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -27,7 +27,6 @@ PLIST_FILES= libexec/gkrellm2/plugins/gkrellmms.so \
share/locale/nl/LC_MESSAGES/gkrellmms.mo \
share/locale/ru/LC_MESSAGES/gkrellmms.mo
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index 2570d5e73ea5..87cee1fe0784 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
WRKSRC= ${WRKDIR}/volume
PLIST_FILES= libexec/gkrellm/plugins/volume.so
-USE_X_PREFIX= yes
USE_GNOME= imlib
.include <bsd.port.mk>
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index 4c0e013164fe..2307e58daa95 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -30,7 +30,6 @@ PLIST_FILES= libexec/gkrellm2/plugins/volume.so \
share/locale/pl/LC_MESSAGES/gkrellm-volume.mo \
share/locale/ru/LC_MESSAGES/gkrellm-volume.mo
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 3fbab0824ffe..ceeb1991159f 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
mad.2:${PORTSDIR}/audio/mad \
vorbisfile.5:${PORTSDIR}/audio/libvorbis
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui gnomeprefix
.ifndef WITHOUT_NLS
diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile
index cf68532906fe..8cd2e65bd760 100644
--- a/audio/xmms-mp3cue/Makefile
+++ b/audio/xmms-mp3cue/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
PLIST_SUB= PORTDOCS=${DISTNAME}
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index ba687cf1db66..d52e1cfe4615 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pdnmesh
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
${MASTER_SITE_SUNSITE:S/$/:sun/}
@@ -37,7 +37,6 @@ LAPACK= -llapack
USE_FORTRAN= yes
CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" BLAS_LIBS="${BLAS}" LAPACK_LIBS="${LAPACK}"
-USE_XLIB= yes
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index fc752ef106d7..dfa9b8afbe8d 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -27,7 +27,6 @@ OPTIONS= GTK2 "Enable GTK2 input method module" On \
SETUP "Enable GUI Setup Tool" On
USE_ICONV= yes
-USE_XLIB= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 01748eb89192..2165876f5313 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fusenshi
PORTVERSION= 0.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -20,7 +20,6 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
gtksourceview-1.0:${PORTSDIR}/x11-toolkits/gtksourceview
USE_GNOME= libxml2
-USE_XLIB= yes
.ifdef WITHOUT_SSL
MAKE_ARGS+= WITHOUT_SSL=yes
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index cdacb9102e75..f78c0c0c833b 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sergio@softshark.org
COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_MOTIF= yes
GNU_CONFIGURE= yes
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 03be554c342d..f45166b3f00b 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
net6-1.3:${PORTSDIR}/net/net6 \
obby-0.4:${PORTSDIR}/devel/obby
-USE_XLIB= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig gtksourceview
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 4c256c928053..641c00669b18 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
EXTRACT_SUFX= .src.tar.gz
-MAINTAINER= ports@freebsd.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= X11 based RTF editor
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print
WRKSRC= ${WRKDIR}/Ted-${PORTVERSION}
-USE_X_PREFIX= yes
USE_MOTIF= yes
USE_GHOSTSCRIPT_RUN= yes
GNU_CONFIGURE= yes
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index a4c02fe97a0e..3924ab403b40 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pearpc
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= novel@FreeBSD.org
COMMENT= PowerPC emulator
-USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PKGMESSAGE= ${WRKDIR}/pkg-message
+USE_XORG= x11
MAN1= ppc.1
PLIST_FILES= bin/ppc etc/ppccfg.example %%DATADIR%%/video.x
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index fbc5af67c964..ed2160d31d9c 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
CONFIGURE_ARGS= --enable-sound --enable-vidmode --enable-dga
-USE_XLIB= yes
USE_GNOME= gtk20
USE_GCC= 3.4
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 68d7b39f4ee3..15b72dbc8a84 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -19,7 +19,6 @@ COMMENT= Easy to use FTP client for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USE_X_PREFIX= yes
USE_GNOME= gtk12
ALL_TARGET= # empty
MAKE_ARGS= CC=${CC} C_FLAGS="${CFLAGS}" DESTDIR=${PREFIX}
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 88b428064136..deb7f6c9ce6b 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -29,7 +29,7 @@ OPTIONS= X11 "Build with X11 frontend" on \
NLS "Native Language Support via gettext utilities" on
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
.endif
.include <bsd.port.pre.mk>
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index f4958b7556b6..70c262a510a8 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -20,9 +20,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@mark.reidel.info
COMMENT= Multiplayer graphical arcade and adventure game made for X11
-USE_X_PREFIX= yes
USE_PERL5= yes
-USE_XPM= yes
+USE_XORG= xpm
WANT_GNOME= yes
USE_GNOME= gnometarget
USE_GMAKE= yes
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 08955f8f161e..fe8597b46fae 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ember
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://amber.worldforge.org/ember/releases/stable/
@@ -35,7 +35,6 @@ USE_SDL= sdl
GNU_CONFIGURE= YES
USE_LDCONFIG= YES
USE_LUA= 5.0
-USE_XLIB= YES
USE_GNOME= gnomehack
USE_BZIP2= YES
CPPFLAGS= -DBR_NO_MACROS
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index 187b5c0ba0ec..4b49b560fe5d 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -16,7 +16,6 @@ COMMENT= GNOME version of Kisekae Set System
RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index b22d1d4e9247..38b763d33f5c 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -16,7 +16,7 @@ DISTNAME= gl${PORTNAME}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Unix source-port of the famous Heretic game by id Software
-USE_XLIB= yes
+USE_XORG= x11 xi xpm xau
USE_GMAKE= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index 896545da25c1..cc144ce70b6d 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= holotz-castle
PORTVERSION= 1.3.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -19,7 +19,6 @@ MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/ CXX=${
USE_GL= gl
USE_SDL= image mixer sdl ttf
-USE_X_PREFIX= yes
USE_GMAKE= yes
BROKEN= Does not run (No video mode large enough for 676550817x676551540)
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index b4b18245992b..9b961714d0c2 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ishido
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= obrien
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= obrien
MAINTAINER= samorodi@NUXI.com
COMMENT= Tile placement game
-USE_XLIB= yes
+USE_XORG= x11
MAN6= ishido.6
do-install:
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index fccd9a3ca5ab..65255c599115 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://clay.ll.pl/download/
MAINTAINER= shanali@yahoo.com
COMMENT= A simple hiragana/katakana drill tool
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 02a7892ebc2d..eb2600eefef5 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyching
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
NO_WRKSUBDIR= yes
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XORG= x11
PLIST_SUB+= LIB_TARGET=${LIB_TARGET:S,^${PREFIX}/,,g} \
DOC_TARGET=${DOC_TARGET:S,^${PREFIX}/,,g}
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index 390451d0259b..7ba58c93a6ba 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xchadance
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/ \
${MASTER_SITE_LOCAL}
@@ -19,8 +19,8 @@ COMMENT= Display a dancing girl "ChaCha."
EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha
+USE_XORG= x11
MAKEFILE= makefile
-USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
EXTRACT_CMD= lha
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index 1d69e6a38add..a397006a3045 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg png.5:${PORTSDIR}/graphics/png
-USE_XLIB= yes
-USE_X_PREFIX= yes
+USE_XORG= x11
MAKE_ENV+= AR=${AR} RANLIB=${RANLIB} ECHO=${ECHO} RM=${RM}
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 415bfc229444..7b38f1e67913 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -7,18 +7,18 @@
PORTNAME= xsoldier
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.interq.or.jp/libra/oohara/xsoldier/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Space-based shoot-em up game for X11
-USE_XLIB= Yes
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --localstatedir=/var
MAKE_ARGS= CC_OPTIMIZE="${CFLAGS}"
+USE_XORG= x11 ice xpm
MAN6= xsoldier.6
SCOREFILE= /var/games/xsoldier.scores
diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 4e27b633259c..d65644f49063 100644
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-rootvis
PORTVERSION= 0.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= bmp-plugins
@@ -23,7 +23,6 @@ PLIST_FILES= lib/bmp/Visualization/librootvis.so \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index ebc09092e353..3252eb61ec36 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cegui
PORTVERSION= 0.5.0b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= SF
MASTER_SITE_SUBDIR=crayzedsgui
@@ -17,7 +17,8 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library providing windowing and widgets for graphics APIs
LIB_DEPENDS= IL.1:${PORTSDIR}/graphics/devil \
- pcre.0:${PORTSDIR}/devel/pcre
+ pcre.0:${PORTSDIR}/devel/pcre \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${DISTNAME:S/0b/0/}
CONFIGURE_ARGS= --enable-toluacegui --disable-irrlicht-renderer \
@@ -32,7 +33,6 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GL= yes
USE_LUA= 5.0
-USE_XLIB= yes
USE_GNOME= gnomehack
.if !defined(NOPORTDOCS)
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index b0defb3ff997..97169e52c902 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_DOS2UNIX= yes
USE_GCC= 3.2+
USE_GL= yes
-USE_XLIB= yes
USE_ZIP= yes
SOURCE= FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \
diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile
index edc645678a69..f297f8fd32da 100644
--- a/graphics/hs-hgl/Makefile
+++ b/graphics/hs-hgl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hgl
PORTVERSION= 2.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics haskell
MASTER_SITES= http://haskell.org/graphics/downloads/
PKGNAMEPREFIX= hs-
@@ -20,7 +20,7 @@ RUN_DEPENDS= hugs:${PORTSDIR}/lang/hugs
WRKSRC= ${WRKDIR}/graphics-${PORTVERSION}
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11
HGL_LIBS= ${PREFIX}/lib/hugs/x11
HGL_DOCS= ${PREFIX}/share/doc/hs-hgl
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 706dc87e6f0a..21f32bb77f44 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogre3d
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=ogre
@@ -30,7 +30,6 @@ GNU_CONFIGURE= YES
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= YES
USE_BZIP2= YES
-USE_XLIB= YES
#USE_GCC= 3.4
USE_GNOME= gnomehack
USE_GMAKE= YES
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index 75bb9728244e..b1595f605bc6 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -34,7 +34,7 @@ DIST_SUBDIR= povray31
# no UNIX source files for POV-Ray 3.1.
#
-USE_XLIB= yes
+USE_XORG= x11
MAN1= povray.1
POVLIB= ${PREFIX}/lib/povray31
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index 05cd770d5c56..5b8b31439abe 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cgkit
PORTVERSION= 2.0.0a7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,6 @@ COMMENT= Python Computer Graphics Kit
BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-python scons:${PORTSDIR}/devel/scons
USE_GL= yes
-USE_XLIB= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGVERSION= 2.0.0alpha7
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 5dc5ab5a3f3a..ec855f811f80 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmGrabImage
PORTVERSION= 0.72
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics windowmaker
MASTER_SITES= http://dockapps.org/files/12/19/
EXTRACT_SUFX= .tgz
@@ -19,8 +19,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
WRKSRC= ${WRKDIR}/${DISTNAME}/wmGrabImage
-USE_X_PREFIX= YES
-USE_XPM= YES
+USE_XORG= xpm
MAN1= wmGrabImage.1
diff --git a/graphics/xmms-dscope/Makefile b/graphics/xmms-dscope/Makefile
index eb4fc276dc61..e11e38ba507f 100644
--- a/graphics/xmms-dscope/Makefile
+++ b/graphics/xmms-dscope/Makefile
@@ -19,7 +19,6 @@ COMMENT= Dual Scope 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-dspectral/Makefile b/graphics/xmms-dspectral/Makefile
index c6d5f437e04b..f78fbf83c98a 100644
--- a/graphics/xmms-dspectral/Makefile
+++ b/graphics/xmms-dspectral/Makefile
@@ -19,7 +19,6 @@ COMMENT= Dual Spectralizer visualization plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
USE_GNOME= gtk12
post-patch:
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 0139ff71ad47..adbfd0820330 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xzgv
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/viewers/X
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/X
MAINTAINER= nosuzuki@postcard.st
COMMENT= An image viewer with thumbnail-based file selector for X
-USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GMAKE= yes
diff --git a/irc/gdesklets-irc/Makefile b/irc/gdesklets-irc/Makefile
index a5ca098b5a25..b3e89b10c359 100644
--- a/irc/gdesklets-irc/Makefile
+++ b/irc/gdesklets-irc/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted
USE_PYTHON= yes
-USE_XLIB= yes
NAME= irc
DATADIR= ${PREFIX}/share/gdesklets
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
index 57bc544a1f08..67f04cad56f3 100644
--- a/japanese/monafonts-ttf/Makefile
+++ b/japanese/monafonts-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monafonts-ttf
PORTVERSION= 2.90
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= monafont
@@ -16,7 +16,6 @@ DISTNAME= monafont-ttf-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= X11 TrueType kanji fonts
-USE_X_PREFIX= yes
USE_ZIP= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/japanese/motoya-ttfonts/Makefile b/japanese/motoya-ttfonts/Makefile
index 9b1e31b30841..8c420ac8603e 100644
--- a/japanese/motoya-ttfonts/Makefile
+++ b/japanese/motoya-ttfonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= motoya-ttfonts
PORTVERSION= 0.20060201
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= #
# You must accept following MOTOYA freefont LICENSE[1], and regist
@@ -25,7 +25,7 @@ EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha
RESTRICTED= Personal, non-profit, and evaluation purpose only. Redistribution not permitted in any form
-USE_X_PREFIX= yes
+USE_XORG= xpm
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 7fe2dcd8b7ee..ea872c105757 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-prime
PORTVERSION= 0.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/17192
@@ -20,7 +20,6 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 7205b9ceefbc..78d3aa72666f 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-uim
PORTVERSION= 0.1.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://freedesktop.org/~suzhe/sources/
@@ -22,7 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_AUTOTOOLS= libtool:15
USE_GNOME= lthack
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index 304e947593d8..e8cc01dabe7a 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= aleefonts
PORTVERSION= 11.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean x11-fonts
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/t/ttf-alee
@@ -16,7 +16,6 @@ DISTNAME= ttf-alee_${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= A-Lee's Hangul truetype fonts #'
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index f637b87e3dc8..08b8583b0617 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -15,7 +15,6 @@ COMMENT= Hangul X Input Method for Everywhere
LIB_DEPENDS= hangul.1:${PORTSDIR}/korean/libhangul
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/korean/unfonts-ttf/Makefile b/korean/unfonts-ttf/Makefile
index c19fbf180cbe..1b24d9678299 100644
--- a/korean/unfonts-ttf/Makefile
+++ b/korean/unfonts-ttf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= unfonts
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= korean x11-fonts
MASTER_SITES= http://kldp.net/frs/download.php/1425/:core \
@@ -19,7 +19,6 @@ MAINTAINER= perky@FreeBSD.org
COMMENT= GPL'd Korean TrueType Fonts by UN Koaunghi
WRKSRC= ${WRKDIR}/un-fonts
-USE_X_PREFIX= yes
NO_BUILD= yes
FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
FONTLIST= UnBatang UnBatangBold UnBom UnDotum UnDotumBold \
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index f279f5ca2bfe..05860c6727c1 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mit-scheme
PORTVERSION= 7.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang scheme
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= mit-scheme/stable.pkg/${PORTVERSION}
@@ -21,7 +21,6 @@ COMMENT= MIT Scheme: includes runtime, compiler, and edwin binaries
ONLY_FOR_ARCHS= i386
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_XLIB= yes
WRKSRC= ${WRKDIR}/scheme-${PORTVERSION}/src/microcode
ALL_TARGET= default-target
diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index 78651abdbafc..ffcfbed9102a 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -16,7 +16,7 @@ COMMENT= ANSI/Turbo Pascal to C/C++ converter
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_XLIB= yes
+USE_XORG= x11
USE_BISON= build
EXAMPLES= arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index ba37e6ef3fce..c01b779a302d 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
PLIST_FILES= libexec/gkrellm/plugins/mailwatch.so
-USE_X_PREFIX= yes
USE_GNOME= imlib
do-install:
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 6aad9d781ac2..6be7992327a1 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -24,7 +24,6 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 30b0d9b7aae6..6a57f6fc7cb8 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asir
PORTVERSION= 20070806
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= ftp://ftp.jssac.org/pub/distfiles/asir/ \
ftp://ftp.asir.org/pub/asir/src/ \
@@ -20,9 +20,9 @@ COMMENT= The system Risa/Asir is a general computer algebra system
LIB_DEPENDS= pari.2:${PORTSDIR}/math/pari
+USE_XORG= x11 xaw xext xt
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake:15 autoconf:261
-USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari
ASIR_SRC_VERSION= ${PORTVERSION}
ASIR_DOC_VERSION= 20070718
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index fc8c175d7e82..9979c57d4ee4 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mbasecalc
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://www.muquit.com/muquit/software/mbasecalc/
DISTNAME= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= Simple calculator program inspired by basecalc
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-USE_X_PREFIX= yes
MAKE_ARGS= INCLUDES="-I${X11BASE}/include -I." \
LIBS="-L${X11BASE}/lib -lfltk -lX11"
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 704a90f3fcdd..60c147c11f2d 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -21,7 +21,6 @@ LATEST_LINK= math-ump
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_XLIB= yes
USE_GL= yes
USE_X_PREFIX= yes
diff --git a/misc/wminfo/Makefile b/misc/wminfo/Makefile
index 26f87d73b131..86cf25c0a8b1 100644
--- a/misc/wminfo/Makefile
+++ b/misc/wminfo/Makefile
@@ -17,8 +17,7 @@ COMMENT= Dockapp to run shell scripts and display the output
WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
post-patch:
@${REINPLACE_CMD} -e 's|$$(LIBS)$$|& $$(OBJS)|g' \
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 8929597b9fd0..b9c92feab257 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xosd
PORTVERSION= 2.2.12
-PORTREVISION= 2
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.ignavus.net/ \
${MASTER_SITE_LOCAL}
@@ -18,7 +18,6 @@ COMMENT= X On-Screen-Display Library and XMMS plug-in
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile
index f2ac32463915..3713ad5c46a5 100644
--- a/multimedia/qdvdauthor/Makefile
+++ b/multimedia/qdvdauthor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qdvdauthor
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -46,7 +47,6 @@ DESKTOP_ENTRIES="QDVDAuthor" \
"false"
HAS_CONFIGURE= yes
-USE_XLIB= yes
USE_QT_VER= 3
QT_NONSTANDARD= yes
CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 08ecdbd99240..e682367d373e 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -32,8 +32,7 @@ USE_MOTIF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_XPM= yes
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
CFLAGS="-I${WRKSRC}/common"
MAKE_ENV= verbose=yes
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 91a8f3752891..47a519f065d8 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -24,7 +24,6 @@ USE_GNOME= gnomeprefix gnomehack intlhack intltool pkgconfig \
libgnomeui libbonobo desktopfileutils gnomepanel
USE_GSTREAMER= vorbis
USE_ICONV= yes
-USE_XLIB= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index f9cfe3dd0bc6..d50813867135 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= novel
MAINTAINER= novel@FreeBSD.org
COMMENT= A network bandwidth monitor intended for the WindowMaker dock
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmnet.1
PLIST_FILES= bin/wmnet
diff --git a/ports-mgmt/bpm/Makefile b/ports-mgmt/bpm/Makefile
index 241fded8f21e..0c3c9eccf6ca 100644
--- a/ports-mgmt/bpm/Makefile
+++ b/ports-mgmt/bpm/Makefile
@@ -18,7 +18,6 @@ COMMENT= A graphical BSD ports collection manager
RUN_DEPENDS= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \
gdialog:${PORTSDIR}/x11/zenity
-USE_X_PREFIX= yes
USE_GNOME= gtk20 desktopfileutils
MAKE_ENV+= OSTYPE="${OPSYS}"
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 866d46c405da..6cc8a85f750a 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -7,7 +7,7 @@
PORTNAME= artwiz-ru
PORTVERSION= 20041031
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= russian x11-fonts
MASTER_SITES= http://dev.gentoo.org/~sergey/ \
${MASTER_SITE_LOCAL}
@@ -21,7 +21,6 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/fonts
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/russian/prawda/Makefile b/russian/prawda/Makefile
index 450acf0f8ea6..f3e0dc7695fb 100644
--- a/russian/prawda/Makefile
+++ b/russian/prawda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= prawda
PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= russian
MASTER_SITES= http://www.prawda.newmail.ru/
@@ -16,7 +16,7 @@ COMMENT= English-Russian translator
USE_BZIP2= yes
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xaw xmu xt sm
CXXFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib
post-patch:
diff --git a/science/dcl/Makefile b/science/dcl/Makefile
index feff036a08ef..4a1b93cbd8fe 100644
--- a/science/dcl/Makefile
+++ b/science/dcl/Makefile
@@ -7,15 +7,16 @@
PORTNAME= dcl
PORTVERSION= 5.3.3
+PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= http://www.gfd-dennou.org/arch/dcl/
MAINTAINER= murakami@ahs.scitec.kobe-u.ac.jp
COMMENT= Scientific graphic library for geoscience
+USE_XORG= x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --disable-gtk2 --disable-gtk --with-x
-USE_XLIB= yes
WANT_FORTRAN= yes #dummy but future use
BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
diff --git a/sysutils/asr-utils/Makefile b/sysutils/asr-utils/Makefile
index 57dab9435f1a..59d122aa20f4 100644
--- a/sysutils/asr-utils/Makefile
+++ b/sysutils/asr-utils/Makefile
@@ -8,7 +8,7 @@
PORTNAME= asr-utils
PORTVERSION= 3.04
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://download.adaptec.com/raid/u160raid/unix/ \
ftp://ftp.adaptec.com/raid/u160raid/unix/
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386
NO_WRKSUBDIR= yes
BINS= raidutil dpteng dptcom dptsig
.ifndef (WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
BINS+= dptscom dptmgr
.endif
MAN8= raidutil.8
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 3bb1a698aa6a..f8151cf82a79 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.4.9
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +17,9 @@ COMMENT= An advanced, highly configurable system monitor for X
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USE_XORG= x11 xext xdamage
+USE_GNOME= pkgconfig
USE_ICONV= yes
-USE_X_PREFIX= yes
CONFIGURE_ARGS+= --disable-portmon \
--disable-proc-uptime \
--disable-hddtemp
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 3bb1a698aa6a..f8151cf82a79 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,6 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.4.9
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +17,9 @@ COMMENT= An advanced, highly configurable system monitor for X
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USE_XORG= x11 xext xdamage
+USE_GNOME= pkgconfig
USE_ICONV= yes
-USE_X_PREFIX= yes
CONFIGURE_ARGS+= --disable-portmon \
--disable-proc-uptime \
--disable-hddtemp
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index b2d859ffc885..ccf699006226 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gkrellfire
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://people.freenet.de/thomas-steinke/ \
${MASTER_SITE_LOCAL}
@@ -20,7 +21,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/${PORTNAME}.so
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}"
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index d10f83a7c581..4cf29b8fa670 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -21,7 +21,6 @@ CONFLICTS= gkrellm-2.*
NO_LATEST_LINK= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index c94053758abb..346f3953844c 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= torsmo
PORTVERSION= 0.18
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +16,8 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= System monitor that renders text on desktop
GNU_CONFIGURE= yes
+USE_XORG= x11
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
-USE_X_PREFIX= yes
MAN1= torsmo.1
PLIST_FILES= bin/torsmo \
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 02214fb4fb0c..628c656b3e55 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -23,7 +23,6 @@ OPTIONS= GTK2 "Enable GTK2 support" off \
NONROOT "Use xcdroast w/o being root" off \
NLS "Native language support" on
-USE_XLIB= yes
USE_GETTEXT= yes
USE_ICONV= yes
USE_CDRTOOLS= yes
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index d6473cbdb7b2..595044c0c4c5 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltraxclock
PORTVERSION= 2.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-clocks
MASTER_SITES= http://perso.wanadoo.fr/alltrax/ \
${MASTER_SITE_LOCAL}
@@ -20,8 +20,6 @@ COMMENT= An analog clock plugin for gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
-
ALL_TARGET= alltraxclock.so
PLIST_FILES= libexec/gkrellm2/plugins/alltraxclock.so
WRKSRC= ${WRKDIR}/${PORTNAME}2_0.2/
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index e95d4a9002f9..c2edb024351b 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GNOME= gnometarget gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
PLIST_FILES= lib/bmp/General/libalarm.so
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index 78110a5357c6..f7f405517889 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osdclock
PORTVERSION= 0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-clocks
MASTER_SITES= http://leftorium.net/software/ \
${MASTER_SITE_LOCAL}
@@ -20,7 +20,6 @@ COMMENT= Small clock which uses libxosd to render text to the root window
LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd
USE_GCC= 3.4
-USE_X_PREFIX= yes
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${X11BASE}/lib ${PTHREAD_LIBS}" \
PREFIX="${PREFIX}"
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index f6c1818e5ab6..e5e15a9ab43b 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -22,7 +22,6 @@ USE_AUTOTOOLS= autoconf:213
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango libglade2
-USE_XLIB= yes
HAS_CONFIGURE= yes
MAN1= rox.1
diff --git a/x11-fonts/c64bdf/Makefile b/x11-fonts/c64bdf/Makefile
index a5c352cbb0ad..8bd8be7576b4 100644
--- a/x11-fonts/c64bdf/Makefile
+++ b/x11-fonts/c64bdf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= c64bdf
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://beej.us/c64bdf/
DISTNAME= ${PORTNAME}
@@ -16,7 +17,6 @@ MAINTAINER= saper@SYSTEM.PL
COMMENT= Commodore 64 X11 fonts
NO_BUILD= yes
-USE_X_PREFIX= yes
FONTS= c64 c64d
FONTDIR= lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/fonts-te/Makefile b/x11-fonts/fonts-te/Makefile
index d4a0f31b78c1..da809e865133 100644
--- a/x11-fonts/fonts-te/Makefile
+++ b/x11-fonts/fonts-te/Makefile
@@ -6,7 +6,7 @@
PORTNAME= fonts-te
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://itachi.prudhvi.org/te_fonts/ \
http://freebsd.unixfreunde.de/sources/
@@ -20,7 +20,6 @@ USE_BZIP2= yes
NO_BUILD= yes
PORTDOCS= MANUAL.PDF
PKGMESSAGE= ${PKGDIR}/pkg-message
-USE_X_PREFIX= yes
FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
PLIST_SUB= FONTSDIR=${FONTSDIR:S|^${PREFIX}/||}
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 9d09fc325172..4c95282586e7 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freefonts
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -22,7 +22,6 @@ BUILD_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
RESTRICTED= "see accompanying .license files"
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
do-build:
@cd ${WRKSRC}/freefont && ${LOCALBASE}/bin/type1inst -silent -quiet -nolog >/dev/null 2>&1
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 414bad1aaebd..081ebb317676 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sharefonts
PORTVERSION= 0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
@@ -18,8 +18,6 @@ RESTRICTED= "Shareware. Cannot be distributed w/o prior authorization."
NO_BUILD= yes
-USE_X_PREFIX= yes
-
do-install:
${MKDIR} ${PREFIX}/lib/X11/fonts/sharefont
${CP} ${WRKDIR}/sharefont/* ${PREFIX}/lib/X11/fonts/sharefont
diff --git a/x11-fonts/tolkien-ttf/Makefile b/x11-fonts/tolkien-ttf/Makefile
index 8b0e6f9d2014..802b702997e9 100644
--- a/x11-fonts/tolkien-ttf/Makefile
+++ b/x11-fonts/tolkien-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tolkien-ttf
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.northernstorm.org/distfiles/
@@ -19,7 +19,6 @@ RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RESTRICTED= "Shareware. Unlicensed commercial usage/redistribution prohibited."
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile
index 0db830e509d4..95bfce583caa 100644
--- a/x11-fonts/urwfonts-ttf/Makefile
+++ b/x11-fonts/urwfonts-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= urwfonts-ttf
PORTVERSION= 1.0.7b18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gnome.ru/fonts/urw/release/
DISTNAME= urw-fonts-${PORTVERSION:S/b/pre/}-ttf
@@ -20,7 +20,6 @@ NO_WRKSUBDIR= yes
USE_BZIP2= yes
NO_BUILD= yes
-USE_X_PREFIX= yes
do-install:
${MKDIR} ${PREFIX}/lib/X11/fonts/urwfonts-ttf
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index 9602edfdf495..3e6bbc1c0a67 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= urwfonts
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
DISTNAME= urw-fonts
@@ -15,8 +15,9 @@ DISTNAME= urw-fonts
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Another font package for X
+RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
post-extract:
diff --git a/x11-themes/fluxbox-sid-pack/Makefile b/x11-themes/fluxbox-sid-pack/Makefile
index 5fc40f76557c..c28cc1e1a6ce 100644
--- a/x11-themes/fluxbox-sid-pack/Makefile
+++ b/x11-themes/fluxbox-sid-pack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbox-sid-pack
PORTVERSION= 20031226
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://fluxbox.org/download/themes/sid/
DISTNAME= sidpack
@@ -20,7 +20,6 @@ RUN_DEPENDS= fluxbox:${PORTSDIR}/x11-wm/fluxbox
INSTALL_DIR= ${LOCALBASE}/share/fluxbox/
USE_BZIP2= yes
-USE_XLIB= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 101c360253d6..0d24415e7298 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -22,8 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
RUN_DEPENDS= fvwm2:${PORTSDIR}/x11-wm/fvwm2-devel
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index 8f24fdc8f299..73581e8fec85 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openbox-themes
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= novel
@@ -18,7 +18,6 @@ COMMENT= Themes for Openbox
RUN_DEPENDS= openbox:${PORTSDIR}/x11-wm/openbox
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 176eab416cf5..0405e4e8352c 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbcmd
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://darkshed.feuersenger.net/files/c_cpp/fbcmd/
@@ -19,9 +19,9 @@ RUN_DEPENDS= fluxbox:${PORTSDIR}/x11-wm/fluxbox
USE_BZIP2= yes
USE_GMAKE= yes
ALL_TARGET= first
-USE_X_PREFIX= yes
MAKE_ARGS= CXX="${CXX}" CFLAGS="${CFLAGS}"
+USE_XORG= x11 xmu
PLIST_FILES= bin/fbcmd
post-extract:
diff --git a/x11-wm/fbpager/Makefile b/x11-wm/fbpager/Makefile
index 59c584ead4b3..84407490d4f3 100644
--- a/x11-wm/fbpager/Makefile
+++ b/x11-wm/fbpager/Makefile
@@ -7,14 +7,14 @@
PORTNAME= fbpager
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.fluxbox.org/download/
MAINTAINER= novel@FreeBSD.org
COMMENT= Desktop pager for the Fluxbox window manager
-USE_X_PREFIX= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index e1b6e19eea67..8691c6bbbb73 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= ion-2-*
MAN1= ion.1x
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 48a6635735f9..6b9904847e95 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -16,7 +16,6 @@ COMMENT= Preferences manager for the Openbox window manager
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
obparser.16:${PORTSDIR}/x11-wm/openbox
-USE_XLIB= yes
USE_GNOME= gnomehier gnometarget libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 7f761d318c32..85a0425e3293 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20 libxml2 ltverhack
USE_AUTOTOOLS= libtool:15
-USE_XLIB= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index 3a0c64f6bd54..a8e140dbe588 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -7,14 +7,14 @@
PORTNAME= ratmenu
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.mired.org/downloads/
MAINTAINER= mwm@mired.org
COMMENT= A simple menu patterened for use with ratpoison
-USE_X_PREFIX= yes
+USE_XORG= x11
ALL_TARGET= ratmenu
MAN1= ratmenu.1
PLIST_FILES= bin/ratmenu
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index 0dd4ee00bbb3..79a5f3c82069 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= weewm
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://weewm.flashtux.org/download/
@@ -16,7 +16,7 @@ MAINTAINER= ppl@nbnet.nb.ca
COMMENT= Fast and ultra light windowmanager with total keyboard control
PLIST_FILES= bin/weewm
-USE_X_PREFIX= yes
+USE_XORG= x11
post-patch:
@${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${X11BASE},g' \
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 2bcde91cd4d0..c0e21ee1bad5 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= windowlab
PORTVERSION= 1.33
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.nickgravgaard.com/windowlab/
EXTRACT_SUFX= .tar
@@ -17,7 +17,7 @@ COMMENT= A small window manager for X11
MAN1= windowlab.1x
-USE_X_PREFIX= yes
+USE_XORG= x11 xext
USE_GMAKE= yes
MAKE_ARGS= MENURC=${PREFIX}/etc/windowlab/menurc CC="${CC}"
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 8b1b11541300..bcf1d092b72f 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -25,9 +25,8 @@ RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_XPM= yes
+USE_XORG= xpm
USE_PERL5= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 94ab8305b9ef..9a6fceab9aab 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES+= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index e55337a4ae2a..7908e5a4c1d8 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -18,8 +18,6 @@ COMMENT= Displays the GNOME tasklist and floats above the other windows
RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
-USE_XLIB= yes
-
NAME= tasklist
DATADIR= ${PREFIX}/share
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 74c2583ade73..721f1d543c67 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
MAINTAINER= sergei@FreeBSD.org
COMMENT= GRaphics Over Miscellaneous Objects (Gromit)
-USE_X_PREFIX= yes
USE_GNOME= gtk20
DOCS= AUTHORS ChangeLog README
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 6a29f27dfdf5..55cfa13164ac 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= keylaunch
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.mired.org/downloads/
@@ -17,7 +17,7 @@ COMMENT= An X utility for binding commands to a hot key
WRKSRC= ${WRKDIR}/keylaunch
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_X_PREFIX= yes
+USE_XORG= x11
PKGMESSAGE= ${WRKSRC}/pkg-message
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 3bc95222d624..603aaf1f1584 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -17,7 +17,7 @@ COMMENT= Multilingual X11 terminal emulator
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
-USE_X_PREFIX= yes
+USE_XORG= sm
USE_GNOME= gtk20 lthack
USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure kiklib/configure mkf/configure
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index e6a1e195c5ff..271b97adc76e 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -20,7 +20,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_XORG= xau xdmcp
-USE_XLIB= yes
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index b71af8e96957..003967529ca9 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xidle
PORTVERSION= 24102005
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= novel
@@ -16,11 +16,11 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= Run a program on X inactivity
USE_BZIP2= yes
-USE_X_PREFIX= yes
CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -D__dead=static
MAKE_ARGS+= X11LIBDIR="${X11BASE}/lib" \
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_XORG= x11 xscrnsaver
PLIST_FILES= bin/xidle
MAN1= xidle.1