- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 7 insertions, 13 deletions

diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index edfae236aadb..92bf0d329912 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	artwiz-fonts
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.xs4all.nl/~hanb/software/fluxbox/ \
 		http://www.cus.org.uk/~dom/distfiles/artwiz-fonts/
@@ -18,7 +18,6 @@ COMMENT=	A set of free fonts for X11 desktops
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/fluxbox-${PORTNAME}
 
diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile
index a8a30663d4d3..c94d55dc938c 100644
--- a/x11-fonts/avifonts/Makefile
+++ b/x11-fonts/avifonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avifonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://graphis.hellug.gr/packages/
 DISTNAME=	avifonts
@@ -19,7 +19,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
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index 3beccf01459a..b3212986c026 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		freefont-ttf
 PORTVERSION=		20060126
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	freefont
@@ -16,7 +16,6 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Free UCS Outline Fonts
 
 NO_BUILD=		yes
-USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/freefont-${PORTVERSION}
 SUB_FILES=		pkg-message
 SUB_LIST=		INSTALLDIR=${INSTALLDIR}
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index 14e46cbd464e..335de36c6106 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -18,6 +18,6 @@ COMMENT=	GTK+-based .bdf font editor for X
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/gfe
 USE_GNOME=	gtk12
-USE_XPM=	yes
+USE_XORG=	xpm
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index 5a537bc3b692..b1b517affbf2 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mgopen
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.ellak.gr/fonts/mgopen/files/
 DISTNAME=	MgOpen
@@ -18,7 +18,6 @@ COMMENT=	MgOpen greek fonts collection
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 676aafb3af7e..28e0da00f148 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	terminus-font
 PORTVERSION=	4.20
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.is-vn.bg/hamster/
 
@@ -20,7 +20,6 @@ BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USE_PERL5=	yes
-USE_X_PREFIX=	yes
 ALL_TARGET=	pcf
 SHAREMODE=	644
 FONTDIR=	lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 1cdb7b689e78..8e72d6c37e4d 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmbdfed
 PORTVERSION=	4.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -21,7 +21,6 @@ COMMENT=	A Motif tool for editing X11 bitmap fonts
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 
 MAN1=		xmbdfed.1