aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astro/xmoontool/Makefile3
-rw-r--r--audio/asunder/Makefile1
-rw-r--r--audio/gtkhirad/Makefile1
-rw-r--r--audio/trommler/Makefile3
-rw-r--r--audio/xanalyser/Makefile4
-rw-r--r--audio/xmms-arts_output/Makefile3
-rw-r--r--audio/xmms-audiofile/Makefile3
-rw-r--r--audio/xmms-sexyspc/Makefile2
-rw-r--r--audio/yamt/Makefile3
-rw-r--r--biology/embassy/Makefile3
-rw-r--r--biology/emboss/Makefile3
-rw-r--r--biology/seaview/Makefile3
-rw-r--r--chinese/fcitx/Makefile3
-rw-r--r--chinese/pcmanx/Makefile1
-rw-r--r--chinese/xpdf/Makefile3
-rw-r--r--comms/kb/Makefile1
-rw-r--r--comms/lirc/Makefile4
-rw-r--r--databases/flamerobin/Makefile3
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile1
-rw-r--r--editors/nedit/Makefile5
-rw-r--r--editors/texmacs/Makefile3
-rw-r--r--editors/vigor/Makefile4
-rw-r--r--emulators/doscmd/Makefile2
-rw-r--r--emulators/fmsx/Makefile4
-rw-r--r--emulators/m2000/Makefile4
-rw-r--r--games/bomberclone/Makefile3
-rw-r--r--games/circuslinux/Makefile3
-rw-r--r--games/dodgindiamond2/Makefile3
-rw-r--r--games/fgkicker/Makefile1
-rw-r--r--games/oneko/Makefile2
-rw-r--r--games/sol/Makefile4
-rw-r--r--games/tank/Makefile3
-rw-r--r--games/xrally/Makefile4
-rw-r--r--games/xroads/Makefile4
-rw-r--r--german/steak/Makefile4
-rw-r--r--graphics/dataplot/Makefile4
-rw-r--r--graphics/epdfview/Makefile1
-rw-r--r--graphics/glexcess/Makefile3
-rw-r--r--graphics/gsculpt/Makefile3
-rw-r--r--graphics/xsane/Makefile2
-rw-r--r--japanese/ruby-rdic/Makefile5
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile1
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile3
-rw-r--r--japanese/scim-honoka/Makefile3
-rw-r--r--korean/baekmukfonts-ttf/Makefile3
-rw-r--r--korean/gtkcomm/Makefile3
-rw-r--r--korean/imhangul/Makefile1
-rw-r--r--lang/ecl/Makefile4
-rw-r--r--lang/schemetoc/Makefile4
-rw-r--r--mail/gkrellmmailwatch2/Makefile3
-rw-r--r--math/R/Makefile3
-rw-r--r--math/xplot/Makefile4
-rw-r--r--mbone/wb/Makefile3
-rw-r--r--misc/gkrellmlaunch2/Makefile1
-rw-r--r--misc/gkrellshoot/Makefile1
-rw-r--r--misc/wmweather+/Makefile5
-rw-r--r--multimedia/exportvideo/Makefile3
-rw-r--r--multimedia/kmplayer-kde4/Makefile1
-rw-r--r--multimedia/kmplayer/Makefile1
-rw-r--r--net/clusterit/Makefile4
-rw-r--r--net/gkrellm_snmp/Makefile3
-rw-r--r--net/wb/Makefile3
-rw-r--r--net/wmwave/Makefile4
-rw-r--r--print/flpsed/Makefile2
-rw-r--r--print/fontforge/Makefile3
-rw-r--r--science/gramps/Makefile1
-rw-r--r--science/gsmc/Makefile1
-rw-r--r--science/x11iraf/Makefile3
-rw-r--r--security/bsp_upektfmess/Makefile4
-rw-r--r--security/qca-tls/Makefile3
-rw-r--r--sysutils/ascpu/Makefile5
-rw-r--r--sysutils/gai-leds/Makefile3
-rw-r--r--sysutils/gdmap/Makefile1
-rw-r--r--sysutils/gnomebaker/Makefile1
-rw-r--r--sysutils/ipsc/Makefile3
-rw-r--r--sysutils/wmbluecpu/Makefile5
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile1
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile1
-rw-r--r--sysutils/xwlans/Makefile3
-rw-r--r--textproc/stardict2/Makefile3
-rw-r--r--textproc/stardict3/Makefile3
-rw-r--r--www/dummyflash/Makefile4
-rw-r--r--www/links/Makefile2
-rw-r--r--x11-clocks/cairo-clock/Makefile1
-rw-r--r--x11-clocks/wmfuzzy/Makefile5
-rw-r--r--x11-fm/evidence/Makefile3
-rw-r--r--x11-fm/x-files/Makefile2
-rw-r--r--x11-fonts/artwiz-aleczapka-se/Makefile3
-rw-r--r--x11-fonts/junicode/Makefile3
-rw-r--r--x11-fonts/manu-gothica/Makefile3
-rw-r--r--x11-fonts/ppantsfonts/Makefile3
-rw-r--r--x11-themes/cursor-crystal-theme/Makefile2
-rw-r--r--x11-themes/cursor-polar-theme/Makefile3
-rw-r--r--x11-toolkits/fltk/Makefile3
-rw-r--r--x11-toolkits/qscintilla/Makefile3
-rw-r--r--x11-toolkits/scintilla/Makefile2
-rw-r--r--x11-wm/fvwm2-devel/Makefile3
-rw-r--r--x11-wm/fvwm2/Makefile4
-rw-r--r--x11-wm/fvwm24/Makefile4
-rw-r--r--x11-wm/hackedbox/Makefile4
-rw-r--r--x11-wm/obmenu/Makefile1
-rw-r--r--x11-wm/wmakerconf/Makefile1
-rw-r--r--x11/chameleon/Makefile3
-rw-r--r--x11/grabc/Makefile4
-rw-r--r--x11/swarp/Makefile4
-rw-r--r--x11/xbindkeys/Makefile4
-rw-r--r--x11/xdialog/Makefile3
-rw-r--r--x11/xrsi/Makefile4
108 files changed, 120 insertions, 187 deletions
diff --git a/astro/xmoontool/Makefile b/astro/xmoontool/Makefile
index 66116fc8c289..210d33416d1e 100644
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmoontool
PORTVERSION= 3.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro
MASTER_SITES= http://www.senax.net/xmoontool/
@@ -15,7 +15,6 @@ MAINTAINER= frank@dynamical-systems.org
COMMENT= A version of John Walker's classical moontool for X11/Motif
USE_MOTIF= yes
-USE_X_PREFIX= yes
MAN1= xmoontool.1
PORTDOCS= NOTES
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index d70f9a810910..0a959b54e554 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -21,7 +21,6 @@ OPTIONS= LAME "lame support" on \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_GNOME= gtk20
DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
diff --git a/audio/gtkhirad/Makefile b/audio/gtkhirad/Makefile
index 46f72baba1f6..3f8cd53c724f 100644
--- a/audio/gtkhirad/Makefile
+++ b/audio/gtkhirad/Makefile
@@ -20,7 +20,6 @@ USE_BZIP2= yes
USE_GNOME= gtk20 intlhack
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_LDCONFIG= yes
MAKE_ARGS= prefix=${PREFIX}
diff --git a/audio/trommler/Makefile b/audio/trommler/Makefile
index 42df0b96616f..066b8a5c6e1b 100644
--- a/audio/trommler/Makefile
+++ b/audio/trommler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trommler
PORTVERSION= 3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://muth.org/Robert/Trommler/
DISTNAME= trommler.3.4
@@ -17,7 +17,6 @@ COMMENT= A GTK based drum machine
WRKSRC= ${WRKDIR}/Trommler
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index fd7bc70c4d8b..2e2d4a19a761 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xanalyser
PORTVERSION= 1.30
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio hamradio
MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \
${MASTER_SITE_LOCAL}
@@ -17,8 +17,6 @@ MAINTAINER= db@FreeBSD.org
COMMENT= Spectrum analyser
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XLIB= yes
USE_MOTIF= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 5a74b4b664b0..37ad94799533 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -8,7 +8,7 @@
PKGNAMEPREFIX= xmms-
PORTNAME= arts_output
PORTVERSION= 0.7.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://havardk.xmms.org/plugins/arts_output/
@@ -18,7 +18,6 @@ COMMENT= aRts output plugin for XMMS.
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
artsc.0:${PORTSDIR}/audio/arts
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
diff --git a/audio/xmms-audiofile/Makefile b/audio/xmms-audiofile/Makefile
index 347d482ee560..f3815389d58d 100644
--- a/audio/xmms-audiofile/Makefile
+++ b/audio/xmms-audiofile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-audiofile
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.68k.org/~michael/xmms/
@@ -19,7 +19,6 @@ BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
PLIST_FILES= lib/xmms/Input/libaf.so
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/audio/xmms-sexyspc/Makefile b/audio/xmms-sexyspc/Makefile
index 75be19d4ca1d..9b8bc99db36d 100644
--- a/audio/xmms-sexyspc/Makefile
+++ b/audio/xmms-sexyspc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sexyspc
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
@@ -23,7 +24,6 @@ PLIST_FILES= lib/xmms/Input/libsexyspc.a \
lib/xmms/Input/libsexyspc.so
ONLY_FOR_ARCHS= i386 # contains x86 assembler code
-USE_XLIB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index bed1ea1480a8..61ae0c64ed7d 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yamt
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
@@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= Yet Another Mp3 Tool which helps you to organize your mp3s
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs gnomehack gnomeprefix
GNU_CONFIGURE= yes
diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile
index 93d67cee5f74..cacec45675aa 100644
--- a/biology/embassy/Makefile
+++ b/biology/embassy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= embassy
PORTVERSION= 3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/ \
ftp://ftp.uk.embnet.org/pub/EMBOSS/ \
@@ -27,7 +27,6 @@ USE_SUBMAKE= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_MOTIF= yes
OPTIONS= DOMAINATRIX "Protein domain apps" on \
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index bc9016cc0d67..71eafc2d8e19 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emboss
PORTVERSION= 3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/ \
ftp://ftp.uk.embnet.org/pub/EMBOSS/ \
@@ -34,7 +34,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
-USE_XLIB= yes
USE_MOTIF= yes
SUB_FILES= pkg-message
SUB_LIST= PREFIX=${PREFIX} DATADIR=${DATADIR}
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 6cbc32c036b4..38523c3f3f78 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= seaview
PORTVERSION= 2006.02.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= biology
MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@@ -20,7 +20,6 @@ COMMENT= Multiple DNA/protein sequence alignment editor
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
pdf.8:${PORTSDIR}/print/pdflib
-USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CAT}
EXTRACT_BEFORE_ARGS= #
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 5d6d85e325dd..aa697d3af147 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx
PORTVERSION= 3.5
+PORTREVISION= 1
CATEGORIES= chinese x11
MASTER_SITES= http://www.fcitx.org/download/ \
ftp://mirrors.redv.com/pub/fcitx/ \
@@ -21,7 +22,7 @@ COMMENT= A simple and fast GBK Chinese XIM server
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= xpm x11
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index ad71114442e3..64d75f4bb974 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -21,7 +21,6 @@ USE_GCC= 3.3+
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index b3ad27d27ab0..07f43a7f5ade 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpdf
PORTVERSION= 20040727
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_TEX_CTAN} \
@@ -24,7 +24,6 @@ RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf\
${LOCALBASE}/share/arphicttf/logo.gif:${PORTSDIR}/chinese/arphicttf
NO_BUILD= yes
-USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
SUB_FILES= dot.xpdfrc
SUB_LIST= ADOBECMAPDIR=${ADOBECMAPDIR}
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index ec21091d948f..961431af4519 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -16,7 +16,6 @@ DISTFILES= kb_src-${PORTVERSION}.tar.gz kb_inst-${PORTVERSION}.tar.gz
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio contest logger
-USE_XLIB= yes
USE_GNOME= libgnome gtk20 libbonobo
NO_WRKSUBDIR= yes
PKGMESSAGE= ${FILESDIR}/pkg_message
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 1c5678b8bef8..5c8edb8f5951 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lirc
PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lirc
@@ -17,8 +17,8 @@ COMMENT= Linux Infared Remote Control
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 9d5c5b025d30..6a6f3baca8ef 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flamerobin
PORTVERSION= 0.7.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= dindin@FreeBSD.org.ua
COMMENT= The GUI administration tool for firebird database
-USE_XLIB= yes
USE_WX= 2.6+
WX_COMPS= wx contrib
WX_CONF_ARGS= absolute
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index f234545cf81f..f505ea9f9b24 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -21,6 +21,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv panel
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 5cd14bc9a97a..4d9b26e1e4de 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nedit
PORTVERSION= 5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nedit.org/pub/NEdit/v5_5/ \
ftp://ftp.nedit.org/pub/NEdit/contrib/misc/ \
@@ -21,8 +21,7 @@ COMMENT= An X11/Motif GUI text editor for programs and plain text files
USE_BZIP2= yes
USE_MOTIF= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= nclient.1 nedit.1
ALL_TARGET= freebsd
MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 56dae0762a63..13c7c4b672cc 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texmacs
PORTVERSION= 1.0.6.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors print
MASTER_SITES= http://www.texmacs.org/Download/ftp/%SUBDIR%/ \
ftp://ftp.texmacs.org/pub/TeXmacs/%SUBDIR%/ \
@@ -24,7 +24,6 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= tex:${PORTSDIR}/print/teTeX-base
-USE_XLIB= yes
USE_PYTHON= yes
USE_ICONV= yes
REINPLACE_ARGS= -i ""
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 951aea7aff6b..454fc019b457 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vigor
PORTVERSION= 0.016
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors tk84 tcl84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,7 @@ USE_TCL= yes
USE_TCL_BUILD= yes
USE_TK= yes
USE_TK_BUILD= yes
-USE_XLIB= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index a7f2700670a6..acc8d1def073 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386
MAKE_ARGS+= -DNO_X
PLIST_SUB+= X11="@comment "
.else
-USE_XLIB= yes
+USE_XORG= x11
PLIST_SUB+= X11=""
.endif
MAKE_ARGS+= MANDIR="${PREFIX}/man/man"
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index cb70f945dac5..a1dff66d2834 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fmsx
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://www.mavetju.org/download/adopted/:code \
http://fms.komkon.org/fMSX/:code \
@@ -24,7 +24,7 @@ COMMENT= The Portable MSX/MSX2/MSX2+ Emulator
REINPLACE_ARGS= -i ""
-USE_XLIB= yes
+USE_XORG= xi x11
RESTRICTED= Legal status of distributed ROM images unclear
WRKSRC= ${WRKDIR}/MSX
diff --git a/emulators/m2000/Makefile b/emulators/m2000/Makefile
index 1003a8ae58f3..0c8196fcadd9 100644
--- a/emulators/m2000/Makefile
+++ b/emulators/m2000/Makefile
@@ -8,7 +8,7 @@
PORTNAME= m2000
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= \
http://www.komkon.org/~dekogel/files/p2000/:code \
@@ -46,7 +46,7 @@ M2000TAPES= 3DDoolhof2.cas \
WRKSRC= ${WRKDIR}/P2000
ALL_TARGET= x
-USE_XLIB= yes
+USE_XORG= x11 xi
SUB_FILES= m2000.sh
PORTDOCS= M2000.txt
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 4eae14a91afa..4d68298b6081 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bomberclone
PORTVERSION= 0.11.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Reimplementation of Atomic Bomber Man
USE_SDL= image mixer sdl
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=""
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index a666d4f71a5f..dec22233392e 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= circuslinux
PORTVERSION= 1.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/circus-linux/src/
@@ -16,7 +16,6 @@ COMMENT= "Circus Linux!" is a clone of the Atari 2600 game "Circus Atari"
USE_SDL= image mixer sdl
GNU_CONFIGURE= yes
-USE_XLIB= yes
CONFIGURE_ARGS= --target=""
.include <bsd.port.mk>
diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index f0305d1baafa..fa7f9476c312 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dodgindiamond2
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/
DISTNAME= dd2-${PORTVERSION}
@@ -15,7 +15,6 @@ DISTNAME= dd2-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= An old school shoot'em up game
-USE_XLIB= yes
USE_SDL= sdl image mixer
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var/games
diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile
index b351cf8d4088..a21c917a202f 100644
--- a/games/fgkicker/Makefile
+++ b/games/fgkicker/Makefile
@@ -17,7 +17,6 @@ COMMENT= A launcher frontend for FlightGear
RUN_DEPENDS= fgfs:${PORTSDIR}/games/flightgear
-USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_GMAKE= yes
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 3be3aed8d332..3f7e717fdb71 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -25,7 +25,7 @@ COMMENT= A cat chasing a mouse all over the screen
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
GNU_CONFIGURE= yes
-USE_XORG= x11 xpm
+USE_XORG= x11 xpm xmu
MAN6= oneko.6
MANLANG= "" ja
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 00c1dede9806..10b35b678be5 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sol
PORTVERSION= 1.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://shh.thathost.com/pub-unix/files/
@@ -22,7 +22,7 @@ LIB_DEPENDS= shhopt.1:${PORTSDIR}/devel/libshhopt \
CONFLICTS= gnome-games-*
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN6= sol.6
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 9498213cc67c..1ec3d66ccca7 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tank
PORTVERSION= 0.4a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://step.polymtl.ca/~coyote/tank/
EXTRACT_SUFX= -src.tar.gz
@@ -17,7 +17,6 @@ COMMENT= A 3-D network tank game that uses OpenGL/Mesa
BUILD_DEPENDS= ${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
-USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
ALL_TARGET= linux-mesa-elf
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index f8bfaeca2c15..090d198453f0 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xrally
PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xrally
@@ -21,9 +21,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GCC= 2.95
PTHREAD_LIBS= -lc_r
HAS_CONFIGURE= yes
+USE_XORG= x11 xi xpm
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index c370cc66c1d8..68a1572767c4 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xroads
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://math.missouristate.edu/~erik/files/fbsd/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= erik@smluc.org
COMMENT= Commodore 64 "Crossroads"-like video game for X Window System
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm xext
.include <bsd.port.pre.mk>
diff --git a/german/steak/Makefile b/german/steak/Makefile
index fc431a7896f1..ab68b402610e 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= steak
PORTVERSION= 1.7.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= german
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
@@ -20,7 +20,7 @@ COMMENT= An english <-> german dictionary under the GPL
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
.if defined(WITHOUT_XSTEAK)
-USE_XLIB= yes
+USE_XORG= x11
.else
USE_GNOME= gtk12
MAKE_ARGS= -D xsteak
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index 1c7b335d0c45..30a51e86de83 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dataplot
PORTVERSION= 20061219
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \
http://www.alaskaparadise.com/freebsd/:source \
@@ -28,7 +28,7 @@ LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \
USE_FORTRAN= yes
FFLAGS+= -fno-range-check
MAKE_ENV+= FFLAGS="${FFLAGS}"
-USE_XLIB= yes
+USE_XORG= x11 xi
NO_WRKSUBDIR= yes
MAXOBV?= 20000 # Make bigger if you need more observations/variable
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 60cacdcd3122..06ee9f804128 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -22,7 +22,6 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20 intlhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile
index c72a68234e2a..aea3233713cf 100644
--- a/graphics/glexcess/Makefile
+++ b/graphics/glexcess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glexcess
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.glexcess.com/files/
DISTNAME= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= An impressive OpenGL Demo
LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut
-USE_X_PREFIX= yes
USE_GL= yes
MAKE_ARGS= 'CXXFLAGS=${CXXFLAGS} -I${X11BASE}/include -pipe -s -O2' \
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 74f42affb51b..4563258efddd 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gsculpt
PORTVERSION= 0.99.46.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= gSculpt-${PORTVERSION}-alpha-src
@@ -23,7 +24,7 @@ WRKSRC= ${WRKDIR}/gSculpt-${PORTVERSION}-alpha
USE_SCONS= yes
SCONS_BUILDENV= ${SCONS_ENV}
USE_PYTHON= 2.4+
-USE_XLIB= yes
+USE_XORG= x11
USE_GL= yes
USE_GNOME= pygtk2
USE_LDCONFIG= ${PREFIX}/lib/gSculpt
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 288ddc959959..37c6d584cf2d 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xsane
PORTVERSION= 0.995
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -21,7 +22,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
sane.1:${PORTSDIR}/graphics/sane-backends
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/japanese/ruby-rdic/Makefile b/japanese/ruby-rdic/Makefile
index c891f806e6f1..4188cdbb150f 100644
--- a/japanese/ruby-rdic/Makefile
+++ b/japanese/ruby-rdic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rdic
PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese ruby
MASTER_SITES= http://www.yasgursfarm.us/download/
DIST_SUBDIR= ruby
@@ -28,8 +28,7 @@ RUBY_SHEBANG_FILES= rdic \
RUBY_RD_FILES= xselection.rd \
xselection.rd.jp
-USE_XLIB= yes
-
+USE_XORG= x11
INSTALL_TARGET= site-install
MAKE_ARGS+= CFLAGS='-I ${X11BASE}/include'
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index c5acf078a0e2..ccbbf49f420f 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index 00ed6be6febf..969dcbfa2035 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-honoka-plugin-wnn
PORTVERSION= 0.9.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-plugin-wnn-${PORTVERSION}
@@ -24,7 +24,6 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim \
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 21ad8c44ffbe..5befc1ae26bb 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-honoka
PORTVERSION= 0.9.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-${PORTVERSION}
@@ -21,7 +21,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_LDCONFIG= yes
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index 21be1f7cdf64..9280fbe45656 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= baekmukfonts
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= ftp://ftp.mizi.com/pub/baekmuk/obsoletes/
PKGNAMESUFFIX= -ttf
@@ -16,7 +16,6 @@ DISTNAME= baekmuk${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
COMMENT= Baekmuk family Korean TrueType Fonts
-USE_X_PREFIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index a523d44a7f58..c00c7ee155a1 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkcomm
PORTVERSION= 0.6.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= korean comms
MASTER_SITES= http://download.kldp.net/gtkcomm/
@@ -16,7 +16,6 @@ COMMENT= Serial controlling software, with gtk+ widget
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
-USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GNOME= imlib
GNU_CONFIGURE= yes
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index 437b89dd075e..940d44e9d1a1 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -16,7 +16,6 @@ COMMENT= GTK+-2.0 hangul input module
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index ba81ff44309e..d68dfa6cd779 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecl
PORTVERSION= 0.9g
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang lisp
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ecls
@@ -60,7 +60,7 @@ PLIST_SUB+= CLOS_STREAMS="@comment "
.endif
.if defined(WITH_CLX)
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS+=--with-clx=yes
INFO+= clx
PLIST_SUB+= CLX=""
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index 0d4a8990b07f..909cc2b015f1 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= schemetoc
PORTVERSION= 93.3.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang scheme
MASTER_SITES= http://www.cs.indiana.edu/pub/scheme-repository/imp/Scheme-to-C/
DISTNAME= 15mar93
@@ -16,8 +16,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= erik@smluc.org
COMMENT= Scheme-to-C, a compiler and interpreter for compiling scheme into C
-USE_XLIB= yes
USE_GCC= 2.95
+USE_XORG= x11 xi
INSTALLS_SHLIB= yes
NO_WRKSUBDIR= yes
MAN1= scc.1 sci.1
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index 0d2632494430..b9bb98056baf 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gkrellmmailwatch
PORTVERSION= 2.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= gkrellm-mailwatch-${PORTVERSION}
@@ -24,7 +24,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
WRKSRC= ${WRKDIR}/gkrellm-mailwatch
USE_GMAKE= yes
-USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins CC="${CC}"
diff --git a/math/R/Makefile b/math/R/Makefile
index b4afefac7968..5c89d06e1ab1 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -8,6 +8,7 @@
PORTNAME= R
PORTVERSION= 2.6.1
+PORTREVISION= 1
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@@ -112,7 +113,7 @@ CONFIGURE_ARGS+=--without-x
PLIST_SUB+= X11="@comment "
.else
CONFIGURE_ARGS+=--with-x
-USE_XLIB= yes
+USE_XORG= x11
PLIST_SUB+= X11=""
.endif
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index a6e59c956c79..366ba00766b1 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -7,18 +7,18 @@
PORTNAME= xplot
PORTVERSION= 0.90.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics net
MASTER_SITES= http://www.xplot.org/xplot/
MAINTAINER= fenner@FreeBSD.org
COMMENT= X11 plotting package
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
#XPLOT_DEMOS= demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7
+USE_XORG= x11
MAN1= tcpdump2xplot.1 xplot.1
post-install:
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 46cbb8617058..6db8a0491869 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wb
PORTVERSION= 1.59
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
@@ -17,7 +17,6 @@ COMMENT= A shared drawing (whiteboard) tool using multicast
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_X_PREFIX= yes
STRIP=
# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index ecc899556cde..162352ad018d 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/gkrellmlaunch.so
-USE_X_PREFIX= yes
ALL_TARGET= ${PORTNAME}.so
do-install:
diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile
index 5e78e85a954b..cbc980d79e06 100644
--- a/misc/gkrellshoot/Makefile
+++ b/misc/gkrellshoot/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \
PLIST_FILES= libexec/gkrellm/plugins/gkrellshoot.so
WRKSRC= ${WRKDIR}/gkrellShoot-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= imlib
.include <bsd.port.mk>
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 94f67e03b9de..9be5e172ffad 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -6,7 +6,7 @@
PORTNAME= wmweather+
PORTVERSION= 2.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc windowmaker geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wmweatherplus
@@ -25,8 +25,7 @@ LIB_DEPENDS= xmlparse:${PORTSDIR}/www/libwww \
GNU_CONFIGURE= yes
USE_ICONV= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
CONFIGURE_ARGS+= --with-libwraster=${X11BASE}
diff --git a/multimedia/exportvideo/Makefile b/multimedia/exportvideo/Makefile
index c0182d934f6a..afe6faf2437c 100644
--- a/multimedia/exportvideo/Makefile
+++ b/multimedia/exportvideo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= exportvideo
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/
DISTNAME= ${PORTNAME}.7e-pre9
@@ -22,7 +22,6 @@ DEPRECATED= Add-on for soon to be removed nuppelvideo port
EXPIRATION_DATE=2008-04-07
USE_GNOME= gtk12
-USE_XLIB= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --no-avi --prefix=${PREFIX}
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 598852ddcafe..bd1a1611c39a 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -28,7 +28,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
USE_BZIP2= yes
USE_KDEBASE_VER=3
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 598852ddcafe..bd1a1611c39a 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -28,7 +28,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
USE_BZIP2= yes
USE_KDEBASE_VER=3
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index d5192b00ead0..24abed7e86f9 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clusterit
PORTVERSION= 2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net devel parallel
MASTER_SITES= http://www.garbled.net/download/ \
ftp://ftp.chg.ru/pub/prog/parallel/clusterit/
@@ -23,7 +23,7 @@ PLIST_SUB+= X11='@comment '
.else
PLIST_SUB+= X11=''
MAN1+= rvt.1 dvt.1
-USE_XLIB= yes
+USE_XORG= x11
.endif
USE_PERL5_BUILD=yes
diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile
index 5aae9645eda7..240b3ded0531 100644
--- a/net/gkrellm_snmp/Makefile
+++ b/net/gkrellm_snmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm_snmp
PORTVERSION= 0.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://triq.net/gkrellm/
@@ -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/gkrellm_snmp.so
-USE_X_PREFIX= yes
USE_GNOME= imlib
MAKE_ENV= GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \
PLUGIN_DIR="${X11BASE}/libexec/gkrellm/plugins/"
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 46cbb8617058..6db8a0491869 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wb
PORTVERSION= 1.59
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
@@ -17,7 +17,6 @@ COMMENT= A shared drawing (whiteboard) tool using multicast
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_X_PREFIX= yes
STRIP=
# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index b42461882eb4..2e741794cc7a 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmwave
PORTVERSION= 0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= benjsc@FreeBSD.org
COMMENT= Display 802.11 status in the WindowMaker Dock
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmwave.1
PLIST_FILES= bin/wmwave
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index b45e8f013983..f7be3765b3be 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flpsed
PORTVERSION= 0.3.9
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.ecademix.com/JohannesHofmann/
@@ -16,7 +17,6 @@ COMMENT= WYSIWYG pseudo Postscript editor
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_GHOSTSCRIPT=yes
USE_GMAKE= yes
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 9d7747c71840..8e52ea94a14c 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fontforge
PORTVERSION= 20080309
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
DISTFILES= ${EXTRACT_ONLY} ${DOCFILES}
@@ -39,9 +40,9 @@ DOCFILES= ${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
USE_BZIP2= yes
USE_GETTEXT= yes
+USE_XORG= x11
USE_GMAKE= yes
USE_ICONV= yes
-USE_XLIB= yes
PATCH_STRIP= -l
.if !defined(FONTFORGE_NO_MULTILAYER)
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 4221772bf002..8641f7cce6dd 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
${PYTHON_LIBDIR}/site-packages/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
USE_BDB= 42+
-USE_XLIB= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index 71c733dbb4e8..22268428640b 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.qsl.net/ik5nax/
MAINTAINER= db@FreeBSD.org
COMMENT= Smith chart program for impedance matching
-USE_X_PREFIX= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/science/x11iraf/Makefile b/science/x11iraf/Makefile
index 5ffdd466eedf..d107bd1b2825 100644
--- a/science/x11iraf/Makefile
+++ b/science/x11iraf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= x11iraf
PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science astro
MASTER_SITES= ftp://iraf.noao.edu/iraf/x11iraf/
DISTNAME= x11iraf-v${PORTVERSION}-bin.freebsd
@@ -17,7 +17,6 @@ COMMENT= Provides graphical tools to work with IRAF
LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x
NO_BUILD= yes
-USE_XLIB= yes
# this may work on other archs, but I'm making no bets
ONLY_FOR_ARCHS= i386
diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile
index 37b0c1cc2e45..a1aea58b659a 100644
--- a/security/bsp_upektfmess/Makefile
+++ b/security/bsp_upektfmess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bsp_upektfmess
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.upek.com/support/download/ \
http://shapeshifter.se/pub/bsp_upektfmess/
@@ -27,7 +27,7 @@ USE_GETTEXT= yes
USE_ICONV= yes
# Maintainer note
# Both the gui and the non-gui object are linked to libX11
-USE_XLIB= yes
+USE_XORG= x11
RESTRICTED= license prohibits redistribution
NO_BUILD= yes
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index d3f32fbefd06..f983f3aa83f8 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qca-tls
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/ \
http://psi.affinix.com/beta/
@@ -18,7 +18,6 @@ COMMENT= SSL/TLS plugin for Qt
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
HAS_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_OPENSSL= yes
USE_QT_VER= 3
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 6a2ec027f334..915ee9fdbe30 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ascpu
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils afterstep
MASTER_SITES= http://www.tigr.net/afterstep/download/ascpu/
@@ -16,8 +16,7 @@ COMMENT= CPU statistics monitor utility for XFree86
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include --with-xpm-library=${X11BASE}/lib
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gai-leds/Makefile b/sysutils/gai-leds/Makefile
index bb0c840f7d78..7010e1de5266 100644
--- a/sysutils/gai-leds/Makefile
+++ b/sysutils/gai-leds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-leds
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gai
@@ -18,7 +18,6 @@ COMMENT= A GAI applet that displays the keyboard status leds
LIB_DEPENDS= gai:${PORTSDIR}/x11-toolkits/gai
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index 6a979c052194..5f9d803b1049 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -17,7 +17,6 @@ COMMENT= Graphical disk map Utility
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 3fdef2f660db..572b78404138 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -19,7 +19,6 @@ COMMENT= A CD/DVD recording GUI for Gnome
OPTIONS= DVD "Enable DVD support" off \
CJK "Use cdrtools-cjk instead of cdrtools" off
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils
USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index ef96a37097a7..1777b7ef1e58 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipsc
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.alaskaparadise.com/freebsd/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -25,7 +25,6 @@ PLIST_FILES= bin/ipsc
MAN8= ipsc.8
.if defined(HAVE_GNOME)
-USE_X_PREFIX= yes
USE_GNOME= yes
ALL_TARGET= all
PLIST_FILES+= bin/gipsc
diff --git a/sysutils/wmbluecpu/Makefile b/sysutils/wmbluecpu/Makefile
index 386634bdb03d..29785eed033d 100644
--- a/sysutils/wmbluecpu/Makefile
+++ b/sysutils/wmbluecpu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmbluecpu
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/xutils
@@ -16,8 +16,7 @@ MAINTAINER= benjsc@FreeBSD.org
COMMENT= A CPU monitoring dockapp
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmbluecpu.1
PLIST_FILES= bin/wmbluecpu
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 565b77741574..7609deddcede 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -21,6 +21,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv panel
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 9bdee44ed92d..b71641964bb8 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -21,6 +21,5 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv panel
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/sysutils/xwlans/Makefile b/sysutils/xwlans/Makefile
index 249ea268c871..56bfed9557d8 100644
--- a/sysutils/xwlans/Makefile
+++ b/sysutils/xwlans/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xwlans
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://shapeshifter.se/code/xwlans/release/ \
http://mirror.shapeshifter.se/code/xwlans/release/
@@ -15,7 +15,6 @@ MASTER_SITES= http://shapeshifter.se/code/xwlans/release/ \
MAINTAINER= fli@shapeshifter.se
COMMENT= Utilty to display your wavelan signal strength on the X11 root-display
-USE_X_PREFIX= yes
PLIST_FILES= bin/xwlans
.include <bsd.port.pre.mk>
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index f8bf86f7ce7c..42522c517151 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
USE_GETTEXT= yes
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index f8bf86f7ce7c..42522c517151 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
USE_GETTEXT= yes
diff --git a/www/dummyflash/Makefile b/www/dummyflash/Makefile
index d255ff30bc5e..dd6254be7688 100644
--- a/www/dummyflash/Makefile
+++ b/www/dummyflash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dummyflash
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= ftp://ftp.netscape.com/pub/sdk/plugin/unix/
DISTNAME= unix-sdk-3.0b5
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= darius@dons.net.au
COMMENT= Silently consume flash MIME types
-USE_XLIB= yes
+USE_XORG= x11
BUILD_WRKSRC= ${WRKSRC}/PluginSDK30b5/examples/UnixTemplate/Unix
NO_WRKSUBDIR= yes
MAKEFILE= makefile.freebsd
diff --git a/www/links/Makefile b/www/links/Makefile
index 1ef8f162a182..ddc843e098f5 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -46,7 +46,7 @@ OPTIONS_MESG= "non-X11 graphics support disabled, "
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS+= --enable-graphics --with-x
OPTIONS_MESG+= "X11 graphics support enabled."
.else
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index d835db2fb064..2daab7c46ea5 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -20,7 +20,6 @@ USE_GCC= 3.3+
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_XLIB= yes
USE_LDCONFIG= yes
GZIP_CMD?= /usr/bin/gzip
MAN1= cairo-clock.1
diff --git a/x11-clocks/wmfuzzy/Makefile b/x11-clocks/wmfuzzy/Makefile
index efe0ab4ddd5a..670f0ab62637 100644
--- a/x11-clocks/wmfuzzy/Makefile
+++ b/x11-clocks/wmfuzzy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmfuzzy
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://www.manicai.net/comp/wmfuzzy/
EXTRACT_SUFX= .tgz
@@ -17,8 +17,7 @@ COMMENT= A fuzzy clock WindowMaker dockapp
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
PORTDOCS= README
PLIST_FILES= bin/wmfuzzy
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index ecf4f2461d6e..e32c65c48e3c 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= evidence
PORTVERSION= 0.9.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,6 @@ BROKEN= Does not compile
USE_FAM= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_GETTEXT= yes
USE_EFL= imlib2 evas edje ecore embryo eet
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 29dc375210c2..db1712e7b631 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -7,7 +7,7 @@
PORTNAME= x-files
PORTVERSION= 2.00b1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm tk83
MASTER_SITES= http://users.tkk.fi/~mkivinie/X-Files/data/
DISTNAME= X-Files-${PORTVERSION}
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 5379d1b99a09..442a4d545f3b 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -6,7 +6,7 @@
PORTNAME= artwiz-aleczapka-se
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= artwizaleczapka
@@ -16,7 +16,6 @@ COMMENT= A set of (improved) artwiz fonts
NO_BUILD= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
FONTS= anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index a6c568bbd691..67e78e07a320 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= junicode
DISTVERSION= 0-6-12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= Unicode font for medievalists (Latin, IPA and Runic)
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
USE_ZIP= yes
NO_BUILD= yes
diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile
index 8eb1dd657d8e..d07a543e4c1f 100644
--- a/x11-fonts/manu-gothica/Makefile
+++ b/x11-fonts/manu-gothica/Makefile
@@ -7,7 +7,7 @@
PORTNAME= manu-gothica
DISTVERSION= 0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.bryld.info/downloads/
DISTNAME= manugot19
@@ -24,7 +24,6 @@ RESTRICTED= The font is free for personal use
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= ${WRKSRC}
-USE_X_PREFIX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-fonts/ppantsfonts/Makefile b/x11-fonts/ppantsfonts/Makefile
index ac16c36e7e15..0ca6223bdedc 100644
--- a/x11-fonts/ppantsfonts/Makefile
+++ b/x11-fonts/ppantsfonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ppantsfonts
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://cus.org.uk/~dom/distfiles/ppants-fonts/
DISTNAME= ${PORTNAME}-default-${PORTVERSION}
@@ -16,7 +16,6 @@ MAINTAINER= dominic.marks@btinternet.com
COMMENT= A set of small angular fonts
NO_BUILD= yes
-USE_X_PREFIX= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
FONTS= moosefont terminalpants
diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile
index 164fe08cf148..1b1c5e50f20e 100644
--- a/x11-themes/cursor-crystal-theme/Makefile
+++ b/x11-themes/cursor-crystal-theme/Makefile
@@ -10,6 +10,7 @@
PORTNAME= cursor-crystal-theme
DISTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://www.notmart.org/files/ \
http://pinguin.stttelkom.ac.id/gentoo/distfiles/
@@ -23,7 +24,6 @@ BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
post-patch:
@${REINPLACE_CMD} -e 's|function ||' \
diff --git a/x11-themes/cursor-polar-theme/Makefile b/x11-themes/cursor-polar-theme/Makefile
index 0353bf626116..76b52a558e80 100644
--- a/x11-themes/cursor-polar-theme/Makefile
+++ b/x11-themes/cursor-polar-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= polar-theme
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= cursor-
@@ -18,7 +18,6 @@ COMMENT= Polar is a smooth and simple cursor set
NO_BUILD= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 856f44e0cd11..0c6b5ccfcba5 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fltk
PORTVERSION= ${VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= fltk/${VERSION}
@@ -42,7 +42,6 @@ CONFIGURE_ARGS+=--enable-shared --enable-xft
CONFIGURE_ENV+= CC="${CXX}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
-USE_X_PREFIX= yes
USE_GL= yes
MAN1= fluid.1 fltk-config.1
diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index 20a69b57ecde..5b4f8dea4d5d 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qscintilla
PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.riverbankcomputing.com/Downloads/QScintilla1/ \
http://freebsd.ricin.com/ports/distfiles/
@@ -17,7 +17,6 @@ COMMENT= QT port of the Scintilla C++ editor class
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-USE_X_PREFIX= yes
USE_QT_VER= 3
MAKE_ENV= QTDIR="${QT_PREFIX}"
USE_LDCONFIG= yes
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 64bb96509c9b..9a9c36b4a1a7 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scintilla
PORTVERSION= 1.76
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF \
http://www.scintilla.org/
@@ -19,7 +20,6 @@ COMMENT= A full-featured free source code editing component for GTK+
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
-USE_XLIB= yes
USE_GMAKE= yes
USE_ICONV= yes
MAKEFILE= makefile
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index d477e636cd69..08042b527e25 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.5.24
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -26,7 +27,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include
CONFIGURE_ARGS= --with-png-library=${LOCALBASE}/lib
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_BZIP2= yes
WANT_GNOME= yes
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index ed0949133cc2..cc2dd81e5ba3 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.4.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -34,7 +34,7 @@ LATEST_LINK= ${PORTNAME}2
PKGNAMESUFFIX= -imlib
.endif
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_BZIP2= yes
WANT_GNOME= yes
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index ed0949133cc2..cc2dd81e5ba3 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.4.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -34,7 +34,7 @@ LATEST_LINK= ${PORTNAME}2
PKGNAMESUFFIX= -imlib
.endif
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_BZIP2= yes
WANT_GNOME= yes
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 3dfc2f907491..4a547d09d79e 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hackedbox
PORTVERSION= 0.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://scrudgeware.org/downloads/hackedbox/
@@ -24,7 +24,7 @@ STYLES= artwiz bluebox cthulhain deep flux frobozz frobust nyz \
steelblue2 the_orange trisb twice
PLIST= ${WRKDIR}/pkg-plist
#USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xext xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-bg-utils
diff --git a/x11-wm/obmenu/Makefile b/x11-wm/obmenu/Makefile
index d34ad035339d..8358c8fc0f55 100644
--- a/x11-wm/obmenu/Makefile
+++ b/x11-wm/obmenu/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= SF
MAINTAINER= dougb@FreeBSD.org
COMMENT= Menu manager for Openbox supporting both static and pipe menus
-USE_XLIB= yes
USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 568f956610d2..58383397bb6c 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XLIB= yes
USE_GNOME= gnometarget gtk20
USE_PERL5= yes
USE_GETTEXT= yes
diff --git a/x11/chameleon/Makefile b/x11/chameleon/Makefile
index 9ed309c971dd..5e135f1a1536 100644
--- a/x11/chameleon/Makefile
+++ b/x11/chameleon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chameleon
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://ftp.us.debian.org/debian/pool/main/c/chameleon/ \
ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/pool/main/c/chameleon/ \
@@ -22,7 +22,6 @@ COMMENT= Application for putting pictures or colors onto the root window
LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
USE_GNOME= gtk12
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
PIXMAPSDIR= ${PREFIX}/share/pixmaps/
diff --git a/x11/grabc/Makefile b/x11/grabc/Makefile
index db5e94ad402f..877b79c45c64 100644
--- a/x11/grabc/Makefile
+++ b/x11/grabc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= grabc
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://muquit.com/muquit/software/grabc/ \
http://www.carpetsmoker.net/distfiles/ \
@@ -19,7 +19,7 @@ MAINTAINER= carpetsmoker@xs4all.nl
COMMENT= Grab a color from screen
PLIST_FILES= bin/grabc
-USE_XLIB= yes
+USE_XORG= x11
CFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lX11
diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile
index c622a5e2d3b1..565157fc0b22 100644
--- a/x11/swarp/Makefile
+++ b/x11/swarp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= swarp
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.suckless.org/download/ \
http://mirror.roe.ch/dist/${PORTNAME}/
@@ -14,13 +15,12 @@ MASTER_SITES= http://www.suckless.org/download/ \
MAINTAINER= daniel@roe.ch
COMMENT= X11 generic pointer warping utility
-USE_XLIB= yes
-
MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lX11" \
CFLAGS="${CFLAGS} -I${X11BASE}/include \
-DVERSION=\\\"${PORTVERSION}\\\"" \
LD=${CC}
+USE_XORG= x11
PLIST_FILES= bin/swarp
PORTDOCS= README
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 956b6ab1b5b2..f9962823b795 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xbindkeys
PORTVERSION= 1.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://hocwp.free.fr/xbindkeys/
@@ -18,7 +18,7 @@ COMMENT= Allows you to launch shell commands under X with your keyboard
OPTIONS= GUILE "Guile support" off \
TCLTK "Tcl/Tk support" off
-USE_XLIB= yes
+USE_XORG= x11 xi
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 4232c66e2423..eddbd24e4408 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xdialog
PORTVERSION= 2.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://thgodef.nerim.net/xdialog/ \
LOCAL/chinsan
@@ -18,7 +18,6 @@ MAINTAINER= chinsan@FreeBSD.org
COMMENT= A drop in replacement for the "dialog" or "cdialog" programs
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index 53a6f4307515..ac5d043c4b3e 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xrsi
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xrsi
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= xrsi
MAINTAINER= carpetsmoker@xs4all.nl
COMMENT= A minimalist break enforcer for linux/unix for the prevention of RSI
-USE_XLIB= yes
+USE_XORG= x11
PLIST_FILES= bin/xrsi
PORTDOCS= Readme Licence