summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-01 18:02:37 +0000
committerjlam <jlam@pkgsrc.org>2005-06-01 18:02:37 +0000
commit95fd1f6ec9ce583a46e4351179d93b744a17d1ad (patch)
tree614ebca62dbe176d9c75cab1cfeef7c554a336c9 /audio
parent6469e231c2dabc4fdb3edae536776b2c90cf5616 (diff)
downloadpkgsrc-95fd1f6ec9ce583a46e4351179d93b744a17d1ad.tar.gz
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.
Diffstat (limited to 'audio')
-rw-r--r--audio/SDL_mixer/Makefile3
-rw-r--r--audio/SDL_sound/Makefile3
-rw-r--r--audio/audacity/Makefile3
-rw-r--r--audio/bmp/Makefile.common3
-rw-r--r--audio/cdplayer/Makefile3
-rw-r--r--audio/csound4/Makefile3
-rw-r--r--audio/dap/Makefile3
-rw-r--r--audio/easytag/Makefile3
-rw-r--r--audio/festival/Makefile4
-rw-r--r--audio/freezetag/Makefile3
-rw-r--r--audio/gdcd/Makefile3
-rw-r--r--audio/gmp3info/Makefile4
-rw-r--r--audio/gnome-audio/Makefile5
-rw-r--r--audio/gnome-speech/Makefile4
-rw-r--r--audio/gqmpeg-devel/Makefile3
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/kmp/Makefile3
-rw-r--r--audio/libao-arts/Makefile4
-rw-r--r--audio/libvisual-plugins/Makefile4
-rw-r--r--audio/libvisual/Makefile4
-rw-r--r--audio/madman/Makefile4
-rw-r--r--audio/mixer.app/Makefile3
-rw-r--r--audio/mpg123-nas/Makefile5
-rw-r--r--audio/muse/Makefile3
-rw-r--r--audio/musicbox/Makefile3
-rw-r--r--audio/rhythmbox/Makefile3
-rw-r--r--audio/rosegarden/Makefile5
-rw-r--r--audio/rsynth/Makefile4
-rw-r--r--audio/snd/Makefile3
-rw-r--r--audio/spiralloops/Makefile3
-rw-r--r--audio/spiralsynth/Makefile3
-rw-r--r--audio/streamtuner/Makefile3
-rw-r--r--audio/sweep/Makefile3
-rw-r--r--audio/tcl-snack/Makefile3
-rw-r--r--audio/terminatorx/Makefile3
-rw-r--r--audio/wmmp3/Makefile3
-rw-r--r--audio/wmusic/Makefile3
-rw-r--r--audio/xamp/Makefile3
-rw-r--r--audio/xanalyser/Makefile3
-rw-r--r--audio/xhippo/Makefile3
-rw-r--r--audio/xmms-alarm/Makefile3
-rw-r--r--audio/xmms-bezier/Makefile3
-rw-r--r--audio/xmms-blursk/Makefile3
-rw-r--r--audio/xmms-crossfade/Makefile3
-rw-r--r--audio/xmms-dflowers/Makefile3
-rw-r--r--audio/xmms-dscope/Makefile3
-rw-r--r--audio/xmms-dspectogram/Makefile3
-rw-r--r--audio/xmms-dspectral/Makefile3
-rw-r--r--audio/xmms-fmradio/Makefile3
-rw-r--r--audio/xmms-funtimedancer/Makefile4
-rw-r--r--audio/xmms-gdancer/Makefile3
-rw-r--r--audio/xmms-modplug/Makefile3
-rw-r--r--audio/xmms-neato/Makefile3
-rw-r--r--audio/xmms-paranormal/Makefile3
-rw-r--r--audio/xmms-synaesthesia/Makefile3
-rw-r--r--audio/xmms-vismsa/Makefile3
-rw-r--r--audio/xmms/Makefile.common3
-rw-r--r--audio/xmp/Makefile5
-rw-r--r--audio/yamt/Makefile3
59 files changed, 72 insertions, 122 deletions
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index 80d5fdd6c20..7eaebb7ac73 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 14:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:37 jlam Exp $
DISTNAME= SDL_mixer-1.2.6
PKGREVISION= 2
@@ -14,7 +14,6 @@ CONFLICTS= SDL-mixer-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= YES
-USE_X11= YES
GNU_CONFIGURE= YES
CPPFLAGS= -Dunix=1
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index d19898513b8..25b8db95122 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= SDL_sound-1.0.1
@@ -12,7 +12,6 @@ COMMENT= SDL library to handle the decoding of different file formats
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_X11= YES
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 89c8e791f06..0b4b2c92c38 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:37 jlam Exp $
DISTNAME= audacity-src-1.2.3
PKGNAME= audacity-1.2.3
@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/audacity-src-1.2.3
USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xaudio
CONFIGURE_ARGS+= --with-id3=system
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 7931c4671dc..3893192b26c 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/04/28 22:16:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= bmp-0.9.7
@@ -17,7 +17,6 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_X11= yes
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-esd
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index c5c4e902dac..bfbd669a47b 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= cdplayer-0.4.2
@@ -10,7 +10,6 @@ HOMEPAGE= http://gsburn.sourceforge.net/
COMMENT= GNUstep CD player with CDDB support
WRKSRC= ${WRKDIR}/${PKGBASE}
-USE_X11= YES
USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import"
diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
index 5fa398c6a60..67a92464677 100644
--- a/audio/csound4/Makefile
+++ b/audio/csound4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/23 20:40:47 ben Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= csound-4.23f13gbs.0
@@ -16,7 +16,6 @@ CONFLICTS+= csound-dev-4*
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_MAKEINFO= yes
-USE_X11= yes
TEXINFO_REQD= 4.2
CONFIGURE_ARGS+= --enable-debug
CFLAGS+= -g
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index f011d69e770..5a9683f902d 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:37 jlam Exp $
DISTNAME= dap-2.1.2
PKGREVISION= 5
@@ -14,7 +14,6 @@ MAKEFILE= Makefile.netbsd
MAKE_ENV+= X11PREFIX=${X11PREFIX}
-USE_X11= yes
USE_LANGUAGES= c c++
do-install:
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index f2a69608abd..a951925a500 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= easytag-1.1
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes # xgettext, really
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake
-USE_X11= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 16e88280773..44479698a7a 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:37 jlam Exp $
DISTNAME= festival-1.95-beta
PKGNAME= festival-1.95beta
@@ -14,7 +14,6 @@ COMMENT= Advanced multi-lingual speech synthesis system
WRKSRC= ${WRKDIR}
USE_TOOLS+= gmake
-USE_X11= yes
SPEECHTOOLS= ${WRKSRC}/speech_tools
FESTIVAL= ${WRKSRC}/festival
@@ -94,4 +93,5 @@ do-install:
${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
.include "../../audio/nas/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile
index 27d136ff282..6c96a2d94f4 100644
--- a/audio/freezetag/Makefile
+++ b/audio/freezetag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:37 jlam Exp $
#
DISTNAME= freezetag-0.9.2
@@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://katz.linuxpower.org/freezetag/
COMMENT= Id3 tag editor for GTK+-1.2.0 and higher
-USE_X11= YES
GNU_CONFIGURE= YES
.include "../../x11/gtk/buildlink3.mk"
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 03f0100810e..0152361ecc7 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= gdcd-0.2.1
@@ -11,7 +11,6 @@ HOMEPAGE= http://gdcd.undergrid.net/
COMMENT= CD player for the X Window System using the GIMP Tool Kit (GTK)
USE_DIRS+= xdg-1.1
-USE_X11= YES
GNU_CONFIGURE= YES
.include "../../audio/libcdaudio/buildlink3.mk"
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 17e7ee5aa31..db22add7afa 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:38 jlam Exp $
DISTNAME= mp3info-0.8.4
PKGNAME= g${DISTNAME}
@@ -14,8 +14,6 @@ COMMENT= Utility to read and modify the ID3 tags of MP3 files
CONFLICTS= mp3info-[0-9]*
-USE_X11= YES
-
# wgetnstr()
INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 5ee9aaabfa8..87f61bd7bba 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/24 13:53:13 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= gnome-audio-2.0.0
@@ -14,7 +14,8 @@ COMMENT= Set of audio files for GNOME
NO_CONFIGURE= YES
NO_BUILD= YES
USE_DIRS+= xdg-1.1
-USE_X11= YES
+
+.include "../../mk/x11.buildlink3.mk"
do-install:
cd ${WRKSRC}/sounds && for f in *.wav */*.wav; do \
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index c859c3c04bb..b13685cb291 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= gnome-speech-0.3.6
@@ -17,7 +17,6 @@ BUILD_USES_MSGFMT= yes
USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-gtk-doc
@@ -31,4 +30,5 @@ PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 208f817c51c..a5fe1bf804e 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/31 15:13:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:38 jlam Exp $
DISTNAME= gqmpeg-0.91.1
PKGREVISION= 2
@@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
-USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-included-gettext
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index aa861188cef..c4012296d8d 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2005/05/31 12:20:11 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2005/06/01 18:02:38 jlam Exp $
DISTNAME= gqmpeg-0.20.0
PKGREVISION= 8
@@ -18,7 +18,6 @@ USE_DIRS+= gnome1-1.5
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
-USE_X11= YES
GNU_CONFIGURE= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index a8750b694d9..6fb89d8c922 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:38 jlam Exp $
DISTNAME= kmp-0.01
PKGREVISION= 1
@@ -12,7 +12,6 @@ COMMENT= Qt client for the Music Player Daemon
USE_LANGUAGES= c++
USE_LIBTOOL= yes
-USE_X11= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= ${PREFIX}
diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile
index 0b488dbe6c5..3468d296cfb 100644
--- a/audio/libao-arts/Makefile
+++ b/audio/libao-arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/11/16 14:49:41 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:38 jlam Exp $
.include "../libao/Makefile.common"
@@ -9,9 +9,9 @@ COMMENT+= (arts plugin)
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/disable-arts/enable-arts/g}
BUILD_DIRS= ${WRKSRC}/src/plugins/arts
INSTALL_DIRS= ${WRKSRC}/src/plugins/arts
-USE_X11= YES
.include "../../audio/arts/buildlink3.mk"
.include "../../audio/libao/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index e7fdc315823..7160ab4ac8d 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= libvisual-plugins-0.2.0
@@ -13,7 +13,6 @@ CONFLICTS= libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_X11= yes
GNU_CONFIGURE= yes
# sigsegfaults in 0.2.0 because of:
@@ -27,4 +26,5 @@ CONFIGURE_ARGS+= --disable-dancingparticles
.include "../../graphics/MesaLib/buildlink3.mk"
# currently not useful, since libgdkpixbuf plugin is not configurable
#.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index f0718bd82cf..ed00390441a 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/19 15:38:21 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= libvisual-0.2.0
@@ -10,9 +10,9 @@ HOMEPAGE= http://libvisual.sourceforge.net/
COMMENT= Abstraction library between applications and audio visualisation plugins
USE_LIBTOOL= yes
-USE_X11= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in
GNU_CONFIGURE= yes
.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 0c5acaf0aa4..caea8ac9adb 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/31 22:00:06 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:38 jlam Exp $
DISTNAME= madman-0.93
PKGREVISION= 2
@@ -11,8 +11,6 @@ COMMENT= Powerful audio manager for large collections
BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-USE_X11= yes
-
GCC_REQD= 3.0
post-extract:
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index b3fa1e35d37..0f7ca731db2 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= Mixer.app-1.8.0
@@ -14,7 +14,6 @@ COMMENT= Another mixer intended for the windowmaker dockapp
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c++
-USE_X11= YES
INSTALLATION_DIRS= bin
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index 3a7d726aa5a..7f907689955 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/01/12 14:17:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:38 jlam Exp $
PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
PKGREVISION= 6
@@ -8,9 +8,8 @@ TARGET_SUFFIX= -nas
CONFLICTS+= mpg123-[0-9]*
-USE_X11= yes
-
.include "../../audio/mpg123/Makefile.common"
.include "../../audio/nas/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 0acf3c4171c..26b20544521 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/31 22:23:50 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= MuSE-0.9
@@ -15,7 +15,6 @@ COMMENT= Multiple Streaming Engine
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-USE_X11= yes
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-ncurses
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 0eba07084ca..2ceef7dc92d 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:38 jlam Exp $
DISTNAME= musicbox-1.01p2
CATEGORIES= audio
@@ -11,7 +11,6 @@ COMMENT= X11 front-interface for mpg123
DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
WRKSRC= ${WRKDIR}/musicbox-1.01
-USE_X11= yes
CFLAGS+= -D${OPSYS}
MAKE_ENV+= QT1DIR="${QT1DIR}"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 783fbf2b83b..7def4d71527 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= rhythmbox-0.8.8
@@ -24,7 +24,6 @@ USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_X11= YES
PKGCONFIG_OVERRIDE= data/rhythmbox.pc.in
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 2c6c152eee3..e539c2818e6 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:38 jlam Exp $
DISTNAME= rosegarden-2.1pl4
PKGNAME= rosegarden-2.1.4
@@ -17,7 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
MAKE_ENV+= GCC=yes
-USE_X11= YES
+
+.include "../../mk/x11.buildlink3.mk"
post-extract:
cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index ff60d697e7e..95667af3564 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/30 19:51:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:38 jlam Exp $
DISTNAME= rsynth-2.0
PKGREVISION= 1
@@ -16,7 +16,6 @@ EXTRACT_ONLY= rsynth-2.0.tar.gz
DIST_SUBDIR= rsynth
GNU_CONFIGURE= YES
-USE_X11= YES
CONFIGURE_ARGS+=--with-aDict="${WRKDIR}/cmudict.0.4"
CONFIGURE_ARGS+=--without-bDict
@@ -32,4 +31,5 @@ post-install:
.include "../../audio/nas/buildlink3.mk"
.include "../../databases/gdbm/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 515b4aed976..ad9f95c67a1 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= snd
@@ -16,7 +16,6 @@ NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
-USE_X11= YES
MAKEFILE= makefile.netbsd
BUILD_TARGET= snd
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 302488d0e87..4cb3aa42c6c 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -17,7 +17,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
*-*-vax
USE_LANGUAGES= c++
-USE_X11= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 96e56c36c87..dee64f72b49 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= SpiralSynth-2.0.0
@@ -16,7 +16,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
*-*-vax
USE_LANGUAGES= c++
-USE_X11= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 8d5ea0601fc..f2b4d5c4fbb 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $
#
DISTNAME= streamtuner-0.99
@@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_X11= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 9c4cf4475b5..76a9630153a 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= sweep-0.8.3
@@ -16,7 +16,6 @@ USE_DIRS+= gnome1-1.5
USE_LIBTOOL= YES
USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
-USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-oggtest
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index dff01830967..235563f7808 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/17 01:10:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
DISTNAME= snack2.2.8
PKGNAME= tcl-snack-2.2.8
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= YES
-USE_X11= YES
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index b2d1d65e577..9fe771b52ac 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= terminatorX-3.82
@@ -15,7 +15,6 @@ DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
DEPENDS+= sox-[0-9]*:../../audio/sox
DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
-USE_X11= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 2786e8ec30a..dc85d485363 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $
DISTNAME= wmmp3-0.12
PKGREVISION= 1
@@ -12,7 +12,6 @@ COMMENT= Front-end for mpg123 in a Window Maker dockapp
DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
GNU_CONFIGURE= yes
-USE_X11= yes
post-patch:
${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index b44799ec9ce..27b942cf187 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:39 jlam Exp $
DISTNAME= wmusic-1.5.0
PKGREVISION= 1
@@ -11,7 +11,6 @@ COMMENT= WindowMaker dockable remote for XMMS
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-USE_X11= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 53b6b5e71de..ed0e46b23db 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:39 jlam Exp $
DISTNAME= xamp-0.8-10
PKGNAME= xamp-0.8.10
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-USE_X11= yes
CONFIGURE_ARGS+= --with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 54d6c8e23ba..5e32c0add5b 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xanalyser-1.24
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.suse.de/~arvin/xanalyser/
COMMENT= Frequency spectrum analyser for X
USE_LANGUAGES= c++
-USE_X11= # defined
GNU_CONFIGURE= # defined
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 0230fc2a7b5..d9fe2cdd395 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xhippo-3.3
@@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/xhippo/xhippo.html
COMMENT= Generic playlist manager for UNIX
-USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= --with-gnome=no
diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile
index 6241b813ca6..5b50925d05e 100644
--- a/audio/xmms-alarm/Makefile
+++ b/audio/xmms-alarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xmms-alarm-0.3.6
@@ -9,7 +9,6 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://www.snika.uklinux.net/index.php?show=xmms-alarm
COMMENT= Plugin which allows XMMS to be used as an alarm clock
-USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
diff --git a/audio/xmms-bezier/Makefile b/audio/xmms-bezier/Makefile
index dcd69da1727..c112c3df10e 100644
--- a/audio/xmms-bezier/Makefile
+++ b/audio/xmms-bezier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= bezier-0.0.3
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
COMMENT= OpenGL XMMS plugin
GNU_CONFIGURE= yes
-USE_X11= yes
USE_LIBTOOL= yes
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
LIBS+= -lX11 -lm
diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile
index d12f7d475b6..ac0b5741e2d 100644
--- a/audio/xmms-blursk/Makefile
+++ b/audio/xmms-blursk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:39 jlam Exp $
DISTNAME= Blursk-1.3
PKGNAME= xmms-blursk-1.3
@@ -15,7 +15,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_X11= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index d7d018e0d8f..4085db71596 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xmms-crossfade-0.2.9
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/
COMMENT= Crossfading/Gapless Plugin for XMMS
-USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 989ad70049c..d7c832cd34b 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= dflowers-1.2
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
COMMENT= XMMS plugin for dual flower scope
-USE_X11= YES
USE_LIBTOOL= YES
.include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index b13d506e3ed..5bda7683dcc 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= dscope-1.2
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
COMMENT= XMMS plugin for dual scope
-USE_X11= YES
USE_LIBTOOL= YES
pre-build:
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index 7f2ba3a4aa5..45e9eab8da0 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= dspectogram-1.2
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.shell.linux.se/bm/index.php?page=xmmsplugin
COMMENT= XMMS plugin for dual spectogram
-USE_X11= YES
USE_LIBTOOL= YES
pre-build:
diff --git a/audio/xmms-dspectral/Makefile b/audio/xmms-dspectral/Makefile
index 29dd2b53853..0917c7b8b10 100644
--- a/audio/xmms-dspectral/Makefile
+++ b/audio/xmms-dspectral/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= dspectral-1.2
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
COMMENT= XMMS plugin for dual spectral analyzer
-USE_X11= YES
USE_LIBTOOL= YES
pre-build:
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index 151abae19cb..5aaad7a4f4d 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xmms-FMRadio-1.4
@@ -14,7 +14,6 @@ COMMENT= Use a Radio Tuner card in XMMS
ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
-USE_X11= YES
BINOWN?= ${ROOT_USER}
BINGRP?= ${ROOT_GROUP}
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index 9787453ac9a..6a0733530dd 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= FunTimeDancer-0.1
@@ -12,8 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/ftd/
COMMENT= XMMS plugin displaying an animation
-USE_X11= yes
-
post-install:
cd ${WRKDIR} && \
${PAX} -rw -pe FunTimeDancer ${PREFIX}/lib/xmms/Visualization
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 73bc32a27f5..8b092498f53 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= gdancer-0.4.3
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://figz.com/gdancer/
COMMENT= XMMS plugin to animate characters to the beat of the music
-USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 0b3134f6752..426ed3bfa56 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= modplugxmms-2.05
@@ -14,7 +14,6 @@ COMMENT= XMMS plugin based on modplug
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
LDFLAGS+= -lm ${LIBOSSAUDIO}
-USE_X11= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= libtool-disable-static
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 3d7177f5984..c9fe077b9a8 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= neato
@@ -14,7 +14,6 @@ COMMENT= Circle effect XMMS plugin
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_LIBTOOL= yes
-USE_X11= yes
GNU_CONFIGURE= YES
diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile
index c3e5686d00b..f745fe4bcc2 100644
--- a/audio/xmms-paranormal/Makefile
+++ b/audio/xmms-paranormal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/24 13:58:04 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= paranormal-0.2.0
@@ -14,7 +14,6 @@ COMMENT= Extremely customizable (pseudo-programmable) XMMS plugin
GNU_CONFIGURE= yes
USE_BUILDLINK_ONLY= YES
USE_LIBTOOL= yes
-USE_X11= yes
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
# Might be better in textproc/libxml2/buildlink.mk:
diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile
index 27351a591d6..2194c7b2043 100644
--- a/audio/xmms-synaesthesia/Makefile
+++ b/audio/xmms-synaesthesia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $
#
DISTNAME= synaesthesia-xmms-0.0.3-rc3
@@ -13,7 +13,6 @@ COMMENT= Port of Synaesthesia to an XMMS plugin
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_X11= yes
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index ba77666646f..60ee0bfef49 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:40 jlam Exp $
#
DISTNAME= vismsa-xmms-plugin-0.2
@@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://a.godau.org/
COMMENT= Vis plugin similar to the Spectrum Analyser from Open Cubic Player
-USE_X11= YES
USE_LIBTOOL= YES
pre-build:
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index ae2f15d17e1..1e3b2bdc69e 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/31 16:28:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:02:39 jlam Exp $
#
DISTNAME= xmms-1.2.10
@@ -14,7 +14,6 @@ COMMENT= X Multimedia System - an audio player with a Winamp GUI
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake
-USE_X11= yes
GNU_CONFIGURE= yes
DISTINFO_FILE= ${.CURDIR}/../../audio/xmms/distinfo
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index b8ce2104c3b..b1c3052f3ee 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:40 jlam Exp $
DISTNAME= xmp-2.0.4
PKGREVISION= 2
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-xmms \
--sysconfdir=${PKG_SYSCONFDIR}
-USE_X11= yes
USE_TOOLS+= gmake
EGDIR= ${PREFIX}/share/examples/xmp
@@ -31,6 +30,8 @@ CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
.include "../../audio/esound/buildlink3.mk"
.endif
+.include "../../mk/x11.buildlink3.mk"
+
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index cb901b6a98e..62a4830b91c 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:40 jlam Exp $
DISTNAME= yamt-0.5
PKGREVISION= 7
@@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_X11= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes