15 files changed, 11 insertions, 22 deletions

diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile
index 23ab829ac9e1..a5120aed174d 100644
--- a/net/gkrellmwireless/Makefile
+++ b/net/gkrellmwireless/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwireless
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
@@ -19,7 +19,6 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 NO_LATEST_LINK=	yes
 
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 
 PLIST_FILES=	libexec/gkrellm/plugins/wireless.so
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index afad5e060acd..1c869452a851 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -18,7 +18,6 @@ USE_RUBY=	yes
 USE_RUBY_FEATURES=	ruby18
 
 USE_GNOME=	gnomeprefix gtksourceview libglade2 libgnomeui vte
-USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 01c7a9d30126..ff4cf794700e 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based MUD client with triggers, aliases, colors, etc
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget gnomeprefix intlhack libgnomeui \
 		pygtk2 vte
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 56713a176264..a917a156669b 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometelnet
 PORTVERSION=	2.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cyest.org/downloads/
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
@@ -19,7 +19,6 @@ BROKEN=		Size mismatch
 
 USE_AUTOTOOLS=	automake:15:env libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index 409046996fb7..aaf26a420683 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Samba configuration tool for X Window System
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 PLIST_FILES=	bin/gnosamba
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 5e827a013e8e..d39a5b645970 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -18,7 +18,7 @@ COMMENT=	JAGS - Just Another GTK+ Samba Client
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gtk12
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index fba80a929f6a..56ed415d9ef0 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtr
 PORTVERSION=	0.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/mtr/ \
@@ -31,7 +31,7 @@ PKGNAMESUFFIX=	-gtk1
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=--enable-gtk2
 .endif
-USE_XLIB=	yes
+USE_XORG=	x11
 CONFIGURE_ARGS+=--with-gtk-prefix=${X11BASE}
 .else
 PKGNAMESUFFIX=	-nox11
diff --git a/net/py-mp-random/Makefile b/net/py-mp-random/Makefile
index cdfeb20cab31..53e04bc3045e 100644
--- a/net/py-mp-random/Makefile
+++ b/net/py-mp-random/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=mp-random
+PORTNAME=	mp-random
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	net python
@@ -17,7 +17,6 @@ MAINTAINER=	randomimage-widget@mirrorproject.com
 COMMENT=	Display random Mirror Project images on your desktop
 
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 USE_WX=		2.4
 WX_COMPS=	python
 NO_BUILD=	yes
diff --git a/net/sambasentinel/Makefile b/net/sambasentinel/Makefile
index 9472fdd03156..93d976afb296 100644
--- a/net/sambasentinel/Makefile
+++ b/net/sambasentinel/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	jags:${PORTSDIR}/net/jags
 PLIST_FILES=	bin/SambaSentinel
 WRKSRC=		${WRKDIR}/SambaSentinel
 USE_GMAKE=	yes
-USE_XPM=	yes
 USE_GNOME=	gtk12
 ALL_TARGET=	SambaSentinel
 
diff --git a/net/tvark/Makefile b/net/tvark/Makefile
index bd7cab3e01ab..f485f6b9d052 100644
--- a/net/tvark/Makefile
+++ b/net/tvark/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES=	http://voodoo.bawue.com/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI network monitoring tool, tied to a MySQL database
 
-USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
 USE_MYSQL=	yes
diff --git a/net/warppipe/Makefile b/net/warppipe/Makefile
index 1c1fd74a9174..87714a6b619f 100644
--- a/net/warppipe/Makefile
+++ b/net/warppipe/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Online multi-player gaming for the Nintendo GameCube
 LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	YES
 WRKSRC=		${WRKDIR}/WarpPipe-0.3.5-bsd
 NO_BUILD=	YES
 
diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile
index a7fae00b5c0c..c5360ae08454 100644
--- a/net/wmnetload/Makefile
+++ b/net/wmnetload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnetload
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net windowmaker afterstep
 MASTER_SITES=	ftp://truffula.com/pub/ \
 				http://dl.fkb.wormulon.net/wmnetload/ \
@@ -19,7 +19,7 @@ COMMENT=	Network load monitor dockapp
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 USE_BZIP2=	yes
-USE_XPM=	yes
+USE_XORG=	xpm x11
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index 978a0c2ce84d..315bb3e76a3d 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	serg@cad.kiev.ua
 COMMENT=	Windowmaker dock app to display network hosts status
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 1592b5b58917..558300076b7b 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtraceroute
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index 0ad1b369c760..5b9658c0febf 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://c64.org/~nr/xwhois/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK-based frontend to the whois service (RFC954)
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes