- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 11 insertions, 12 deletions

diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 9a86906dd55b..7d1395c9c7b9 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -18,8 +18,8 @@ COMMENT=	A cross-platform library for games and multimedia programming
 
 USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
+USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 WANT_GNOME=	yes
 
 OPTIONS=	AL "Enable OpenAL support" off \
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index f3483f0b84ff..1ca7aa083881 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -17,8 +17,8 @@ COMMENT=	A cross-platform library for games and multimedia programming
 
 USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
+USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 WANT_GNOME=	yes
 
 OPTIONS=	ARTS "Enable Arts support" off \
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 6166e9ef6ad9..85eb7622bca4 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpsim
 PORTVERSION=	0.22.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
 
 USE_AUTOTOOLS=	libtool:15
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4+
 USE_LDCONFIG=	yes
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index 5f68d81de0a7..b0b07134efc9 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ode
 DISTVERSION=	${ODEVER}-060223
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://opende.sourceforge.net/snapshots/
 PKGNAMESUFFIX=	-devel
@@ -20,7 +20,6 @@ ODEVER=		0.5
 
 CONFLICTS=	ode-[0-9].*
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index c05cc5b9b2d5..d511034b2f13 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ode
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,6 @@ COMMENT=	Articulated rigid body dynamics library
 CONFLICTS=	ode-devel-[0-9].*
 
 USE_ZIP=	yes
-USE_XLIB=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile
index 00c586287145..f6d7fa784042 100644
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdcurses
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11
 
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xext sm ice xt xaw8
 GNU_CONFIGURE=	yes
 
 OPTIONS=	DEBUG "Enable debugging support" off \
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 00c586287145..f6d7fa784042 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdcurses
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11
 
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xext sm ice xt xaw8
 GNU_CONFIGURE=	yes
 
 OPTIONS=	DEBUG "Enable debugging support" off \