- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

30 files changed, 23 insertions, 46 deletions

diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index 485fa644a91a..70e5f12ca08a 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	9libs
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits plan9
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plan9 compatibility libraries
 
-USE_XLIB=	yes
+USE_XORG=	x11 xt ice
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/9libs
 
diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile
index 329b105efcb8..cf0d983bf74b 100644
--- a/x11-toolkits/XawPlus/Makefile
+++ b/x11-toolkits/XawPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XawPlus
 PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://people.freenet.de/kra/XawPlus/
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -16,9 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A replacement for Xaw with a nicer 3-D look and some extensions
 
+USE_XORG=	x11 xaw
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \
 		INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib"
 ALL_TARGET=	lib
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index 333d53314643..4650b90a2de7 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fl_editor
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://robertk.com/source/fl_editor/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,6 @@ COMMENT=	Text Editor Widgets for the Fast Light ToolKit
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index cacc84d9b762..bfd84de4c20d 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,6 @@ COMMENT=	Virtual Widgets for the Fast Light ToolKit
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/1.0
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	DIRS=src
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 24a8c3b21a20..020f72e2f850 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Display large amounts of numerical data fast and easy
 
 CONFLICTS=	gtkdatabox2-*
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 254a679b178c..562fe857b9ac 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 4e87d7ff4f96..f3f0bb66f60e 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -16,7 +16,6 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+ 2.0
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk20 gnomehack
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index de7e242f5fa4..651efb638bc9 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -18,7 +18,6 @@ COMMENT=	An OpenGL widget for the GTK+ GUI toolkit
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index ccafbacc6c77..7dc78b97f11c 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OpenGL extension to GTK
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 7c8025e8d8cc..d8b91c1b67e0 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GCC=	3.4+
 USE_GMAKE=	yes
diff --git a/x11-toolkits/inti-gconf/Makefile b/x11-toolkits/inti-gconf/Makefile
index a585ff824dad..6f5cb2b97844 100644
--- a/x11-toolkits/inti-gconf/Makefile
+++ b/x11-toolkits/inti-gconf/Makefile
@@ -19,7 +19,6 @@ COMMENT=	An Inti binding for GConf, the GNOME Configuration System
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
 USE_GNOME=	gconf2 gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/inti-gl/Makefile b/x11-toolkits/inti-gl/Makefile
index 859701530eb9..e7b065320808 100644
--- a/x11-toolkits/inti-gl/Makefile
+++ b/x11-toolkits/inti-gl/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti \
 		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/inti-sourceview/Makefile b/x11-toolkits/inti-sourceview/Makefile
index 4abf476bb162..520e99a74aad 100644
--- a/x11-toolkits/inti-sourceview/Makefile
+++ b/x11-toolkits/inti-sourceview/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtksourceview gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index 02167a06e8af..ca1072eecc17 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of C++ classes for developing GNOME and GTK+ applications
 
 USE_GNOME=	glib20 gtk20 atk pango gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 712a1e18d7e6..5137c3759f19 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -19,7 +19,6 @@ COMMENT=	A source code editor widget for GTK+
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_AUTOTOOLS=	automake:15:env autoconf:261:env libtool:15
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 3e46538e3025..b970ecffedd6 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack lthack gtk20 libxml2
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index 99bbb1731a56..564a48ee2b41 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -22,6 +22,5 @@ USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 33971a7202cd..bc8975dc99bf 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	pangopdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implements Pango library with a PDF backend for PDF output
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pango
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index f10ab435bd99..ce0d341cc569 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.0.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -22,7 +22,6 @@ LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \
 
 CONFLICTS=	paragui-devel-[0-9]*
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index f0ce19dd62e7..f1a39441c775 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 
 PYDISTUTILS_PKGNAME=	pyFltk
 PYDISTUTILS_PKGVERSION=	1.1.2
diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile
index 2c9760bde679..9469499ca404 100644
--- a/x11-toolkits/py-fox/Makefile
+++ b/x11-toolkits/py-fox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fxpy
@@ -21,7 +21,6 @@ LIB_DEPENDS=	FOX-1.0:${PORTSDIR}/x11-toolkits/fox10
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_XLIB=	yes
 USE_GL=		yes
 
 PYDISTUTILS_PKGNAME=	FXPy
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 74714f8c824c..2d5379288006 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Ruby binding for GTK+
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GNOME=	gtk12
 
 RUBY_GNOME_VERSION=		0.34
diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile
index a2e6c7fd297d..b15847397981 100644
--- a/x11-toolkits/scx/Makefile
+++ b/x11-toolkits/scx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scx
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	ftp://ftp.scsh.net/pub/scsh/packages/scx/
 
@@ -16,8 +16,8 @@ COMMENT=	A GUI library for scsh and Scheme 48
 
 RUN_DEPENDS=	${LOCALBASE}/lib/scsh/scsh-install-pkg:${PORTSDIR}/devel/scsh-install-lib
 
+USE_XORG=	x11 xmu
 NO_BUILD=	yes
-USE_XLIB=	yes
 USE_LDCONFIG=	${PREFIX}/lib/scsh/0.6/scx-0.2/lib/${MACHINE_ARCH}-portbld-freebsd${OSREL}/
 
 DEPRECATED=		Version branch long since retired
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 77c46f16bbcf..254d1a9cd889 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	v
 PORTVERSION=	1.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vgui
@@ -19,7 +19,7 @@ COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows
 
 WRKSRC=		${WRKDIR}/home/vgui
 
-USE_X_PREFIX=	YES
+USE_XORG=	x11 xt xmu xaw
 USE_GMAKE=	YES
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 USE_DOS2UNIX=	yes
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 4a704933a226..9448d7702f09 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdk
 PORTVERSION=	2.4.1
-PORTREVISION=	4
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vdklib
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile
index e33d3344714c..09c448a1e9fd 100644
--- a/x11-toolkits/wmapp/Makefile
+++ b/x11-toolkits/wmapp/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	wmapp
 PORTVERSION=	0.0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits windowmaker
 MASTER_SITES=	http://www.princeton.edu/~kmccarty/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DockApp Graphics Library
 
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 CFLAGS+=	-I${X11BASE}/include
 ALL_TARGET=	# empty
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 411b29edd2e3..aa2132931772 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	Xbae
 PORTVERSION=	4.50.97
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xbae
@@ -21,7 +21,6 @@ COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 USE_MOTIF=	yes
-USE_X_PREFIX=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=--enable-production
 
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 4c563e2019e6..32a248f96452 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xclasses
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xcmail
@@ -25,8 +25,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 WRKSRC=		${WRKDIR}/xclasses
 
 pre-configure:
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index 5bcd5f1aac52..3b863875d67b 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xg
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://messners.com/code/ \
 		http://www.messners.com/code/
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows(tm) controls - like widget set for Motif(tm)
 
 WRKSRC=		${WRKDIR}/Xg-${PORTVERSION}
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_MOTIF=	yes
 MAKEFILE=	makefile
 
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index d1c52f6106a5..6fa2219b3c95 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits www
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
@@ -19,7 +19,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 USE_AUTOTOOLS=	libtool:15:env
 USE_MOTIF=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${LIBTOOL} ${CC}"
 USE_LDCONFIG=	yes