Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.

Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

22 files changed, 37 insertions, 42 deletions

diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index bf5fbabfd9d..6cd1805ca1f 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=		RealPlayer10GOLD
@@ -29,7 +29,6 @@ DEPENDS+=		suse_freetype2>=9.1:../../emulators/suse91_freetype2
 DEPENDS+=		suse_x11>=9.1:../../emulators/suse91_x11
 DEPENDS+=		suse_gtk2>=9.1:../../emulators/suse91_gtk2
 .else
-USE_X11=		yes
 .endif
 
 REALPLAYER_SUBDIR=	lib
@@ -43,6 +42,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-build:
 	${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g'		\
 		${FILESDIR}/realplay.sh > ${WRKDIR}/realplayergold
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index d462dd12da8..7b0c05cc45b 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=	alevt-1.6.0
 PKGREVISION=	2
@@ -23,4 +23,5 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index c5f57dc324d..ec49bb38620 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/02 23:02:06 reed Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=	divx-player-installer
 PKGNAME=	divxplayer-0.2.0
@@ -36,5 +36,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/frontend.sh \
 		${PREFIX}/bin/${BINARY:S/.bin$//}
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 41ab8af0de1..906ef56befc 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=	ffmpeg-0.4.8
 PKGREVISION=	3
@@ -17,7 +17,7 @@ USE_PKGINSTALL=	YES
 CONF_FILES=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
 		${PKG_SYSCONFDIR}/ffserver.conf
 
-MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q} \
+MAKE_ENV+=	EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \
 		FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \
 		LOCALBASE=${LOCALBASE:Q}
 
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index ad812ec2bbf..59b1c2ec8c5 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -20,7 +20,6 @@ USE_DIRS+=       	gnome2-1.5
 USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 EGDIR=			${PREFIX}/share/examples/gmencoder
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index ac129c532fd..36e325f0052 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=		gnome-media-2.10.2
 CATEGORIES=		multimedia gnome
@@ -18,7 +18,6 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 USE_TOOLS+=		gmake
 USE_PERL5=		build
 
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 71448b37675..87980346425 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/03/22 16:16:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:06 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -6,7 +6,6 @@
 COMMENT+=		base plugins
 
 USE_PERL5=		run
-USE_X11=		yes
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-gconf.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-interfaces.pc.in
@@ -28,4 +27,5 @@ REPLACE_PERL+=		tools/gst-launch-ext-m.m
 REPLACE_PERL+=		tools/gst-visualise-m.m
 
 .include "../../devel/GConf2/schemas.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index fb76e188cfa..8d88d1510d8 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.8.10
@@ -16,7 +16,6 @@ GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 USE_TOOLS+=		gmake
 USE_PERL5=		build
 
@@ -51,4 +50,5 @@ _GSTREAMER_NO_DEPEND=		# defined
 .include "../../multimedia/gstreamer/plugins.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index e527b7ed601..dc2a0286611 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/27 12:09:27 salo Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=		gxine-0.4.5
@@ -12,7 +12,6 @@ COMMENT=		Gtk-based media player
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 
 PTHREAD_OPTS+=		require
diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common
index 452dd24304b..30fa9ea65eb 100644
--- a/multimedia/libflash/Makefile.common
+++ b/multimedia/libflash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/03/31 11:16:25 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=	flash-0.4.10
@@ -9,12 +9,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gplflash.sourceforge.net/
 
-USE_X11=	yes
 USE_LANGUAGES=	c c++
 
 DISTINFO_FILE=	${.CURDIR}/../libflash/distinfo
 PATCHDIR=	${.CURDIR}/../libflash/patches
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-extract: remove-subpackages
 
 remove-subpackages:
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 7ff63b8ea0f..deea67b70e8 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:06 jlam Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -13,7 +13,6 @@ DEPENDS+=	${DISTNAME}:../../multimedia/mkvtoolnix
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
-USE_X11=	yes
 
 BUILD_TARGET=	src/mmg/mmg
 
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
index 6fc75263bf2..e91665ffff5 100644
--- a/multimedia/moz-flash/Makefile
+++ b/multimedia/moz-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:06 jlam Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -12,7 +12,6 @@ COMMENT=	Mozilla open source Flash(tm) plugin
 
 DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
 
-USE_X11=	YES
 USE_LIBTOOL=	YES
 
 BUILD_DIRS=	${WRKSRC}/Plugin
@@ -28,5 +27,6 @@ do-install:
 		${INSTALL_PROGRAM} .libs/npflash.so ${MOZ_PLUGDIR}
 
 .include "../../multimedia/libflash/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index f44af88baf4..5907d007acc 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -17,7 +17,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES+=		c++
 USE_PKGINSTALL=		yes
-USE_X11=		yes
 
 FILESDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/files
 PATCHDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/patches
@@ -68,3 +67,4 @@ do-install:
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
index 1ad9b8ba0d4..938de5c0a05 100644
--- a/multimedia/mplayer-share/Makefile.depends
+++ b/multimedia/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.12 2004/08/18 13:35:06 wiz Exp $
+# $NetBSD: Makefile.depends,v 1.13 2005/06/01 18:03:06 jlam Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -21,7 +21,6 @@ DEPENDS+=	win32-codecs>=011227:../../multimedia/win32-codecs
 DEPENDS+=	realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
 .endif
 
-USE_X11=	YES
 
 .for drv pkg val in ${MPLAYER_DRIVERS}
 .  if empty(MPLAYER_DISABLE_DRIVERS:M${drv})
@@ -46,3 +45,5 @@ USE_X11=	YES
 .if defined(USE_OSS)
 .  include "../../mk/ossaudio.buildlink3.mk"
 .endif
+
+.include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 3ad1678bbaa..a72f376763d 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	2
@@ -21,7 +21,6 @@ ONLY_FOR_PLATFORM+=	SunOS-*-*
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_X11=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
@@ -39,4 +38,5 @@ MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 61cb3f8293a..af373c535ad 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:06 jlam Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	4
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	GUI for the Ogle DVD player
 
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index bb873351564..b4d55863dbb 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:07 jlam Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_X11=	yes
 USE_LIBTOOL=	yes
 
 .include "../../mk/compiler.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 520ca1602be..7ae12403c8e 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:07 jlam Exp $
 #
 
 DISTNAME=	totem-1.0.2
@@ -18,7 +18,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 
 PKGCONFIG_OVERRIDE=	totem-plparser.pc.in
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 502215ec539..f91b6a29b75 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:07 jlam Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -13,7 +13,6 @@ COMMENT=		VideoLAN Client
 
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 19a0ae78856..4ab8f2ebe3c 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:07 jlam Exp $
 #
 
 DISTNAME=	xawtv_3.90
@@ -14,7 +14,6 @@ COMMENT=	TV application for Brooktree 848 compatible cards
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
-USE_X11=		YES
 USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--disable-aalib
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 6252eb8328c..900579071b5 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:07 jlam Exp $
 #
 
 DISTNAME=		xine-ui-0.99.2
@@ -16,7 +16,6 @@ BUILDLINK_DEPENDS.curl=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
 USE_DIRS+=		xdg-1.1
-USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	yes
@@ -29,4 +28,5 @@ USE_GNU_READLINE=	yes
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 31666abfded..bfe88c5e072 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:07 jlam Exp $
 
 DISTNAME=	xvid4conf-1.12
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://zebra.fh-weingarten.de/~transcode/
 COMMENT=	XviD Configuration Panel
                                                                                 
 GNU_CONFIGURE=	YES
-USE_X11=	YES
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"