pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix serious bug where BUILDLINK_PACKAGES wasn't being ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ab401a434af3
branches: trunk
changeset: 471106:ab401a434af3
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Mar 18 09:12:08 2004 +0000
description:
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region. This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.
BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list. This ordering property is used to check for builtin
packages in the correct order. The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end. However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
diffstat:
archivers/libcomprex/buildlink3.mk | 5 +-
archivers/zziplib/buildlink3.mk | 5 +-
audio/SDL_mixer/buildlink3.mk | 5 +-
audio/SDL_sound/buildlink3.mk | 5 +-
audio/arts/buildlink3.mk | 5 +-
audio/esound/buildlink3.mk | 5 +-
audio/flac/buildlink3.mk | 5 +-
audio/gnome-speech/buildlink3.mk | 5 +-
audio/id3lib/buildlink3.mk | 5 +-
audio/libcddb/buildlink3.mk | 5 +-
audio/libid3tag/buildlink3.mk | 5 +-
audio/libmikmod/buildlink3.mk | 5 +-
audio/libsamplerate/buildlink3.mk | 5 +-
audio/libshout/buildlink3.mk | 5 +-
audio/libvorbis/buildlink3.mk | 5 +-
audio/musicbrainz/buildlink3.mk | 5 +-
audio/py-ogg/buildlink3.mk | 5 +-
audio/rplay/buildlink3.mk | 5 +-
audio/speex/buildlink3.mk | 5 +-
audio/sweep/buildlink3.mk | 5 +-
audio/wsoundserver/buildlink3.mk | 5 +-
audio/xfce4-mixer/buildlink3.mk | 5 +-
audio/xfce4-xmms-plugin/buildlink3.mk | 5 +-
audio/xmms-meta-input/buildlink3.mk | 5 +-
audio/xmms/buildlink3.mk | 5 +-
cad/libgeda/buildlink3.mk | 5 +-
chat/ekg/buildlink3.mk | 5 +-
chat/jabberd/buildlink3.mk | 5 +-
chat/loudmouth/buildlink3.mk | 7 +-
comms/jpilot/buildlink3.mk | 5 +-
comms/pilot-link-libs/buildlink3.mk | 5 +-
converters/wv/buildlink3.mk | 5 +-
databases/db/buildlink3.mk | 12 +-
databases/db3/buildlink3.mk | 14 +-
databases/db4/buildlink3.mk | 17 +-
databases/dbxml/buildlink3.mk | 5 +-
databases/gnome-mime-data/buildlink3.mk | 5 +-
databases/libgda/buildlink3.mk | 5 +-
databases/libgnomedb/buildlink3.mk | 5 +-
databases/mysql-client/buildlink3.mk | 5 +-
databases/openldap/buildlink3.mk | 5 +-
databases/p5-DBI/buildlink3.mk | 5 +-
databases/postgresql-lib/buildlink3.mk | 5 +-
databases/rrdtool/buildlink3.mk | 5 +-
databases/tcl-postgresql/buildlink3.mk | 5 +-
devel/GConf/buildlink3.mk | 5 +-
devel/GConf2-ui/buildlink3.mk | 5 +-
devel/GConf2/buildlink3.mk | 6 +-
devel/SDL/buildlink3.mk | 9 +-
devel/SDL_gfx/buildlink3.mk | 5 +-
devel/SDL_ttf/buildlink3.mk | 5 +-
devel/SDLmm/buildlink3.mk | 5 +-
devel/apr/buildlink3.mk | 13 +-
devel/at-spi/buildlink3.mk | 5 +-
devel/atk/buildlink3.mk | 5 +-
devel/devIL/buildlink3.mk | 5 +-
devel/eel2/buildlink3.mk | 5 +-
devel/gail/buildlink3.mk | 5 +-
devel/gal2/buildlink3.mk | 5 +-
devel/gettext-lib/buildlink3.mk | 5 +-
devel/giblib/buildlink3.mk | 5 +-
devel/glib/buildlink3.mk | 5 +-
devel/glib2/buildlink3.mk | 5 +-
devel/gnome-objc/buildlink3.mk | 5 +-
devel/libast/buildlink3.mk | 5 +-
devel/libbonobo/buildlink3.mk | 5 +-
devel/libbonoboui/buildlink3.mk | 5 +-
devel/libdockapp/buildlink3.mk | 16 +-
devel/libglade/buildlink3.mk | 5 +-
devel/libglade2/buildlink3.mk | 5 +-
devel/libgnome/buildlink3.mk | 5 +-
devel/libgnomeui/buildlink3.mk | 5 +-
devel/libgphoto2/buildlink3.mk | 5 +-
devel/libgsf/buildlink3.mk | 5 +-
devel/libgtop2/buildlink3.mk | 5 +-
devel/libidn/buildlink3.mk | 5 +-
devel/libslang/buildlink3.mk | 5 +-
devel/libstroke/buildlink3.mk | 5 +-
devel/libtar/buildlink3.mk | 5 +-
devel/libwnck/buildlink3.mk | 5 +-
devel/oaf/buildlink3.mk | 5 +-
devel/ogre/buildlink3.mk | 5 +-
devel/pango/buildlink3.mk | 5 +-
devel/physfs/buildlink3.mk | 5 +-
devel/popt/buildlink3.mk | 5 +-
devel/smpeg/buildlink3.mk | 5 +-
devel/subversion/buildlink3.mk | 9 +-
devel/swig-build/buildlink3.mk | 9 +-
devel/swig-perl/buildlink3.mk | 9 +-
devel/swig-python/buildlink3.mk | 15 +-
devel/tcl-tclcl/buildlink3.mk | 5 +-
emulators/libspectrum/buildlink3.mk | 5 +-
fonts/Xft2/buildlink3.mk | 5 +-
fonts/fontconfig/buildlink3.mk | 5 +-
fonts/gucharmap/buildlink3.mk | 5 +-
games/gnome2-games/buildlink3.mk | 5 +-
graphics/ImageMagick/buildlink3.mk | 5 +-
graphics/OpenRM/buildlink3.mk | 5 +-
graphics/SDL_image/buildlink3.mk | 5 +-
graphics/cairo/buildlink3.mk | 5 +-
graphics/cal3d/buildlink3.mk | 5 +-
graphics/fnlib/buildlink3.mk | 5 +-
graphics/freetype-lib/buildlink3.mk | 5 +-
graphics/gd/buildlink3.mk | 5 +-
graphics/gdk-pixbuf-gnome/buildlink3.mk | 5 +-
graphics/gdk-pixbuf/buildlink3.mk | 5 +-
graphics/gle/buildlink3.mk | 5 +-
graphics/glu/buildlink3.mk | 5 +-
graphics/glut/buildlink3.mk | 5 +-
graphics/gtkglext/buildlink3.mk | 5 +-
graphics/imlib/buildlink3.mk | 5 +-
graphics/imlib2/buildlink3.mk | 5 +-
graphics/jasper/buildlink3.mk | 5 +-
graphics/libexif/buildlink3.mk | 5 +-
graphics/libgdgeda/buildlink3.mk | 5 +-
graphics/libgdiplus/buildlink3.mk | 5 +-
graphics/libgnomecanvas/buildlink3.mk | 5 +-
graphics/librsvg2/buildlink3.mk | 5 +-
graphics/libwmf/buildlink3.mk | 5 +-
graphics/mng/buildlink3.mk | 5 +-
graphics/netpbm/buildlink3.mk | 5 +-
graphics/plotutils/buildlink3.mk | 5 +-
graphics/png/buildlink3.mk | 5 +-
graphics/py-imaging/buildlink3.mk | 5 +-
graphics/swfdec/buildlink3.mk | 5 +-
graphics/tiff/buildlink3.mk | 5 +-
graphics/xfce4-artwork/buildlink3.mk | 5 +-
graphics/xfce4-iconbox/buildlink3.mk | 5 +-
inputmethod/sj3-lib/buildlink3.mk | 5 +-
lang/gcc/buildlink3.mk | 9 +-
lang/gcc3-c++/buildlink3.mk | 9 +-
lang/gcc3-c/buildlink3.mk | 9 +-
lang/gcc3-f77/buildlink3.mk | 9 +-
lang/gcc3-java/buildlink3.mk | 9 +-
lang/gcc3-objc/buildlink3.mk | 9 +-
lang/guile/buildlink3.mk | 5 +-
lang/libperl/buildlink3.mk | 5 +-
lang/librep/buildlink3.mk | 8 +-
lang/mono/buildlink3.mk | 5 +-
lang/pnet/buildlink3.mk | 5 +-
lang/pnetC/buildlink3.mk | 5 +-
lang/pnetlib/buildlink3.mk | 5 +-
lang/tcl-expect/buildlink3.mk | 5 +-
lang/tcl-otcl/buildlink3.mk | 5 +-
mail/libesmtp/buildlink3.mk | 6 +-
mail/sylpheed-claws/buildlink3.mk | 16 +--
math/gsl/buildlink3.mk | 14 +-
meta-pkgs/xfce4/buildlink3.mk | 5 +-
mk/bdb.buildlink3.mk | 42 ++++----
mk/buildlink3/bsd.buildlink3.mk | 112 +++++++++++++++++++++++-
mk/curses.buildlink3.mk | 14 +-
mk/krb5.buildlink3.mk | 36 +++---
mk/ossaudio.buildlink3.mk | 53 +++++-----
mk/pthread.buildlink3.mk | 10 +-
multimedia/gstreamer/buildlink3.mk | 5 +-
multimedia/mjpegtools/buildlink3.mk | 5 +-
multimedia/openquicktime/buildlink3.mk | 5 +-
multimedia/xine-lib/buildlink3.mk | 5 +-
net/ORBit/buildlink3.mk | 5 +-
net/ORBit2/buildlink3.mk | 5 +-
net/SDL_net/buildlink3.mk | 5 +-
net/gnet/buildlink3.mk | 5 +-
net/gnet1/buildlink3.mk | 5 +-
net/libIDL/buildlink3.mk | 5 +-
net/libsoup/buildlink3.mk | 5 +-
net/netatalk/buildlink3.mk | 5 +-
net/py-ORBit/buildlink3.mk | 5 +-
print/cups/buildlink3.mk | 5 +-
print/gimp-print-lib/buildlink3.mk | 5 +-
print/libgnomeprint/buildlink3.mk | 5 +-
print/libgnomeprintui/buildlink3.mk | 5 +-
print/pdflib/buildlink3.mk | 5 +-
print/xfce4-print/buildlink3.mk | 10 +-
security/gnutls/buildlink3.mk | 5 +-
security/gpgme/buildlink3.mk | 5 +-
security/gsasl/buildlink3.mk | 5 +-
security/libgcrypt/buildlink3.mk | 5 +-
security/libgpg-error/buildlink3.mk | 5 +-
security/libksba/buildlink3.mk | 5 +-
security/libtcpa/buildlink3.mk | 5 +-
security/opencdk/buildlink3.mk | 5 +-
security/openssl/buildlink3.mk | 5 +-
sysutils/gkrellm/buildlink3.mk | 5 +-
sysutils/gkrellm1/buildlink3.mk | 5 +-
sysutils/gnome-vfs/buildlink3.mk | 5 +-
sysutils/gnome-vfs2/buildlink3.mk | 5 +-
sysutils/nautilus/buildlink3.mk | 5 +-
sysutils/xfce4-diskperf-plugin/buildlink3.mk | 5 +-
sysutils/xfce4-fm-icons/buildlink3.mk | 5 +-
sysutils/xfce4-fm/buildlink3.mk | 5 +-
sysutils/xfce4-minicmd-plugin/buildlink3.mk | 5 +-
sysutils/xfce4-netload-plugin/buildlink3.mk | 5 +-
sysutils/xfce4-showdesktop-plugin/buildlink3.mk | 5 +-
sysutils/xfce4-systemload-plugin/buildlink3.mk | 5 +-
sysutils/xfce4-systray/buildlink3.mk | 5 +-
textproc/enchant/buildlink3.mk | 5 +-
textproc/gnome-spell/buildlink3.mk | 5 +-
textproc/gtkspell/buildlink3.mk | 5 +-
textproc/intltool/buildlink3.mk | 5 +-
textproc/libcroco/buildlink3.mk | 5 +-
textproc/libpathan/buildlink3.mk | 5 +-
textproc/libxml/buildlink3.mk | 5 +-
textproc/libxml2/buildlink3.mk | 5 +-
textproc/libxslt/buildlink3.mk | 5 +-
textproc/opensp/buildlink3.mk | 5 +-
textproc/py-xml/buildlink3.mk | 5 +-
textproc/scrollkeeper/buildlink3.mk | 5 +-
textproc/xalan-c/buildlink3.mk | 5 +-
textproc/xerces-c/buildlink3.mk | 5 +-
time/py-mxDateTime/buildlink3.mk | 4 +-
time/xfce4-datetime-plugin/buildlink3.mk | 5 +-
wm/metacity/buildlink3.mk | 5 +-
wm/openbox/buildlink3.mk | 5 +-
wm/windowmaker/buildlink3.mk | 5 +-
wm/xfce4-wm-themes/buildlink3.mk | 5 +-
wm/xfce4-wm/buildlink3.mk | 5 +-
www/ap-perl/buildlink3.mk | 5 +-
www/apache2/buildlink3.mk | 20 ++--
www/curl/buildlink3.mk | 5 +-
www/gtkhtml3/buildlink3.mk | 5 +-
www/libgtkhtml/buildlink3.mk | 5 +-
www/libwww/buildlink3.mk | 5 +-
www/mozilla-gtk2/buildlink3.mk | 5 +-
www/mozilla-stable/buildlink3.mk | 5 +-
www/mozilla/buildlink3.mk | 5 +-
www/neon/buildlink3.mk | 5 +-
x11/Xfixes/buildlink3.mk | 5 +-
x11/Xrandr-mixedcase/buildlink3.mk | 5 +-
x11/Xrender/buildlink3.mk | 5 +-
x11/blt/buildlink3.mk | 5 +-
x11/controlcenter/buildlink3.mk | 5 +-
x11/fltk/buildlink3.mk | 5 +-
x11/fox/buildlink3.mk | 9 +-
x11/gnome-desktop/buildlink3.mk | 5 +-
x11/gnome-libs/buildlink3.mk | 7 +-
x11/gnome-mag/buildlink3.mk | 5 +-
x11/gnome-panel/buildlink3.mk | 5 +-
x11/gnome2-control-center/buildlink3.mk | 5 +-
x11/gtk/buildlink3.mk | 5 +-
x11/gtk2-engines/buildlink3.mk | 5 +-
x11/gtk2/buildlink3.mk | 5 +-
x11/gtkglarea/buildlink3.mk | 5 +-
x11/gtkglarea2/buildlink3.mk | 5 +-
x11/gtkmm/buildlink3.mk | 5 +-
x11/gtksourceview/buildlink3.mk | 5 +-
x11/lablgtk/buildlink3.mk | 5 +-
x11/libxfce4gui/buildlink3.mk | 5 +-
x11/libxfce4mcs/buildlink3.mk | 5 +-
x11/libxfce4util/buildlink3.mk | 5 +-
x11/libxklavier/buildlink3.mk | 5 +-
x11/libzvt/buildlink3.mk | 5 +-
x11/paragui/buildlink3.mk | 5 +-
x11/py-gnome2/buildlink3.mk | 5 +-
x11/py-gtk2/buildlink3.mk | 5 +-
x11/tk/buildlink3.mk | 6 +-
x11/tk83/buildlink3.mk | 6 +-
x11/vte/buildlink3.mk | 5 +-
x11/wxGTK/buildlink3.mk | 5 +-
x11/xcursor/buildlink3.mk | 5 +-
x11/xfce4-clipman-plugin/buildlink3.mk | 5 +-
x11/xfce4-desktop/buildlink3.mk | 5 +-
x11/xfce4-gtk2-engines/buildlink3.mk | 5 +-
x11/xfce4-mcs-manager/buildlink3.mk | 5 +-
x11/xfce4-mcs-plugins/buildlink3.mk | 5 +-
x11/xfce4-menueditor/buildlink3.mk | 5 +-
x11/xfce4-notes-plugin/buildlink3.mk | 5 +-
x11/xfce4-panel/buildlink3.mk | 5 +-
x11/xfce4-themes/buildlink3.mk | 5 +-
x11/xfce4-toys/buildlink3.mk | 5 +-
x11/xfce4-trigger-launcher/buildlink3.mk | 5 +-
x11/xfce4-utils/buildlink3.mk | 5 +-
x11/xscreensaver/buildlink3.mk | 5 +-
272 files changed, 785 insertions(+), 963 deletions(-)
diffs (truncated from 6492 to 300 lines):
diff -r 607fdff8b6b4 -r ab401a434af3 archivers/libcomprex/buildlink3.mk
--- a/archivers/libcomprex/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/archivers/libcomprex/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCOMPREX_BUILDLINK3_MK:= ${LIBCOMPREX_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(LIBCOMPREX_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libcomprex+= libcomprex>=0.3.2
BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex
+.endif # LIBCOMPREX_BUILDLINK3_MK
.include "../../www/curl/buildlink3.mk"
-.endif # LIBCOMPREX_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 archivers/zziplib/buildlink3.mk
--- a/archivers/zziplib/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/archivers/zziplib/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 06:45:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZZIPLIB_BUILDLINK3_MK:= ${ZZIPLIB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(ZZIPLIB_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.zziplib+= zziplib>=0.10.82
BUILDLINK_PKGSRCDIR.zziplib?= ../../archivers/zziplib
+.endif # ZZIPLIB_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
-.endif # ZZIPLIB_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/SDL_mixer/buildlink3.mk
--- a/audio/SDL_mixer/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/SDL_mixer/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
@@ -14,9 +14,8 @@
BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
+.endif # SDL_MIXER_BUILDLINK3_MK
.include "../../devel/SDL/buildlink3.mk"
-.endif # SDL_MIXER_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/SDL_sound/buildlink3.mk
--- a/audio/SDL_sound/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/SDL_sound/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 06:58:39 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@
.if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
+.endif # SDL_SOUND_BUILDLINK3_MK
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/smpeg/buildlink3.mk"
-.endif # SDL_SOUND_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/arts/buildlink3.mk
--- a/audio/arts/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/arts/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
.if !empty(ARTS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
+.endif # ARTS_BUILDLINK3_MK
.include "../../audio/esound/buildlink3.mk"
.include "../../audio/libaudiofile/buildlink3.mk"
@@ -22,6 +23,4 @@
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
-.endif # ARTS_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/esound/buildlink3.mk
--- a/audio/esound/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/esound/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(ESOUND_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.esound+= esound>=0.2.18
BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
+.endif # ESOUND_BUILDLINK3_MK
.include "../../audio/libaudiofile/buildlink3.mk"
-.endif # ESOUND_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/flac/buildlink3.mk
--- a/audio/flac/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/flac/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(FLAC_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1
BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
+.endif # FLAC_BUILDLINK3_MK
.include "../../audio/libogg/buildlink3.mk"
-.endif # FLAC_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/gnome-speech/buildlink3.mk
--- a/audio/gnome-speech/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/gnome-speech/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@
.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.2.7
BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
+.endif # GNOME_SPEECH_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.endif # GNOME_SPEECH_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/id3lib/buildlink3.mk
--- a/audio/id3lib/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/id3lib/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(ID3LIB_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3
BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
+.endif # ID3LIB_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
-.endif # ID3LIB_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libcddb/buildlink3.mk
--- a/audio/libcddb/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libcddb/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4
BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
+.endif # LIBCDDB_BUILDLINK3_MK
.include "../../misc/libcdio/buildlink3.mk"
-.endif # LIBCDDB_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libid3tag/buildlink3.mk
--- a/audio/libid3tag/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libid3tag/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b
BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
+.endif # LIBID3TAG_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
-.endif # LIBID3TAG_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libmikmod/buildlink3.mk
--- a/audio/libmikmod/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libmikmod/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
@@ -15,11 +15,10 @@
.if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libmikmod+= libmikmod>=3.1.9
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
+.endif # LIBMIKMOD_BUILDLINK3_MK
.if defined(USE_ESOUND) && !empty(USE_ESOUND:M[Yy][Ee][Ss])
. include "../../audio/esound/buildlink3.mk"
.endif
-.endif # LIBMIKMOD_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libsamplerate/buildlink3.mk
--- a/audio/libsamplerate/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libsamplerate/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@
.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
+.endif # LIBSAMPLERATE_BUILDLINK3_MK
.include "../../audio/libsndfile/buildlink3.mk"
-.endif # LIBSAMPLERATE_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libshout/buildlink3.mk
--- a/audio/libshout/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libshout/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@
.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libshout+= libshout>=2.0
BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
+.endif # LIBSHOUT_BUILDLINK3_MK
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.endif # LIBSHOUT_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 607fdff8b6b4 -r ab401a434af3 audio/libvorbis/buildlink3.mk
--- a/audio/libvorbis/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
+++ b/audio/libvorbis/buildlink3.mk Thu Mar 18 09:12:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
Home |
Main Index |
Thread Index |
Old Index