summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-25 19:21:43 +0000
committerjlam <jlam>2002-08-25 19:21:43 +0000
commitd257fd9c86ab9f4bf75bd5c7918c6728844d3da3 (patch)
treec69c41be2f3b44bedceeee7e348c2ae58c476c6a /devel
parent65df886c1484d0f586189778ec4e72c364fa5a17 (diff)
downloadpkgsrc-d257fd9c86ab9f4bf75bd5c7918c6728844d3da3.tar.gz
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
Diffstat (limited to 'devel')
-rw-r--r--devel/GConf/Makefile2
-rw-r--r--devel/GConf/PLIST2
-rw-r--r--devel/GConf/buildlink.mk2
-rw-r--r--devel/GConf/buildlink2.mk23
-rw-r--r--devel/GConf/distinfo2
-rw-r--r--devel/GConf/patches/patch-ab2
-rw-r--r--devel/GConf2/Makefile2
-rw-r--r--devel/GConf2/PLIST2
-rw-r--r--devel/GConf2/buildlink.mk2
-rw-r--r--devel/GConf2/buildlink2.mk23
-rw-r--r--devel/GConf2/distinfo2
-rw-r--r--devel/SDL/Makefile2
-rw-r--r--devel/SDL/buildlink.mk2
-rw-r--r--devel/SDL/buildlink2.mk30
-rw-r--r--devel/SDL/distinfo2
-rw-r--r--devel/SDL/files/SDL_sysjoystick.c2
-rw-r--r--devel/SDL/patches/patch-aj2
-rw-r--r--devel/SDL/patches/patch-am2
-rw-r--r--devel/SDL/patches/patch-ap2
-rw-r--r--devel/SDL/patches/patch-as2
-rw-r--r--devel/SDL_gfx/buildlink2.mk26
-rw-r--r--devel/SDL_ttf/buildlink2.mk25
-rw-r--r--devel/atk/buildlink.mk2
-rw-r--r--devel/atk/buildlink2.mk22
-rw-r--r--devel/atk/patches/patch-ab2
-rw-r--r--devel/binutils/Makefile2
-rw-r--r--devel/binutils/PLIST2
-rw-r--r--devel/binutils/PLIST.SunOS2
-rw-r--r--devel/binutils/buildlink.mk2
-rw-r--r--devel/binutils/buildlink2.mk55
-rw-r--r--devel/bonobo-activation/Makefile2
-rw-r--r--devel/bonobo-activation/PLIST2
-rw-r--r--devel/bonobo-activation/buildlink.mk2
-rw-r--r--devel/bonobo-activation/buildlink2.mk40
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/bonobo-conf/PLIST2
-rw-r--r--devel/bonobo-conf/buildlink2.mk28
-rw-r--r--devel/bonobo-conf/distinfo2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bonobo/PLIST2
-rw-r--r--devel/bonobo/buildlink.mk2
-rw-r--r--devel/bonobo/buildlink2.mk34
-rw-r--r--devel/bonobo/distinfo2
-rw-r--r--devel/bonobo/patches/patch-ac2
-rw-r--r--devel/cdk/buildlink2.mk34
-rw-r--r--devel/dlcompat/Makefile2
-rw-r--r--devel/dlcompat/PLIST2
-rw-r--r--devel/dlcompat/buildlink.mk2
-rw-r--r--devel/dlcompat/buildlink2.mk19
-rw-r--r--devel/dlcompat/distinfo2
-rw-r--r--devel/dlcompat/patches/patch-aa2
-rw-r--r--devel/gal/Makefile2
-rw-r--r--devel/gal/PLIST2
-rw-r--r--devel/gal/buildlink2.mk27
-rw-r--r--devel/gal/distinfo2
-rw-r--r--devel/gal/patches/patch-aa2
-rw-r--r--devel/glib2/buildlink.mk2
-rw-r--r--devel/glib2/buildlink2.mk33
-rw-r--r--devel/glib2/patches/patch-aa2
-rw-r--r--devel/glib2/patches/patch-ab2
-rw-r--r--devel/glib2/patches/patch-ac2
-rw-r--r--devel/glib2/patches/patch-ad2
-rw-r--r--devel/hdf/buildlink2.mk21
-rw-r--r--devel/hdf5/buildlink2.mk50
-rw-r--r--devel/libdockapp/buildlink2.mk21
-rw-r--r--devel/libgetopt/buildlink2.mk36
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglade/buildlink2.mk28
-rw-r--r--devel/libole2/buildlink2.mk21
-rw-r--r--devel/libsigc++/buildlink2.mk20
-rw-r--r--devel/libslang/Makefile2
-rw-r--r--devel/libslang/buildlink2.mk20
-rw-r--r--devel/libtar/buildlink2.mk20
-rw-r--r--devel/libtar/distinfo2
-rw-r--r--devel/libusb/Makefile2
-rw-r--r--devel/libusb/PLIST2
-rw-r--r--devel/libusb/buildlink2.mk19
-rw-r--r--devel/libusb/distinfo2
-rw-r--r--devel/libusb/patches/patch-ac2
-rw-r--r--devel/netcdf/buildlink2.mk23
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/oaf/PLIST2
-rw-r--r--devel/oaf/buildlink.mk2
-rw-r--r--devel/oaf/buildlink2.mk24
-rw-r--r--devel/oaf/distinfo2
-rw-r--r--devel/oaf/patches/patch-ac2
-rw-r--r--devel/oaf/patches/patch-ag2
-rw-r--r--devel/pango/PLIST.xf42
-rw-r--r--devel/pango/buildlink.mk2
-rw-r--r--devel/pango/buildlink2.mk22
-rw-r--r--devel/pango/patches/patch-aa2
-rw-r--r--devel/pango/patches/patch-ab2
-rw-r--r--devel/pango/patches/patch-ac2
-rw-r--r--devel/pango/patches/patch-ad2
-rw-r--r--devel/pango/patches/patch-ae2
-rw-r--r--devel/pkgconfig/PLIST2
-rw-r--r--devel/pkgconfig/buildlink2.mk15
-rw-r--r--devel/popt/buildlink2.mk21
-rw-r--r--devel/ptl2/Makefile2
-rw-r--r--devel/ptl2/buildlink.mk2
-rw-r--r--devel/ptl2/buildlink2.mk21
-rw-r--r--devel/ptl2/distinfo2
-rw-r--r--devel/ptl2/patches/patch-ae2
-rw-r--r--devel/ptl2/patches/patch-af2
-rw-r--r--devel/rx/buildlink2.mk19
-rw-r--r--devel/smpeg/buildlink2.mk22
-rw-r--r--devel/stlport/buildlink2.mk20
-rw-r--r--devel/stlport/patches/patch-ag2
-rw-r--r--devel/stlport/patches/patch-ah2
-rw-r--r--devel/unproven-pthreads/Makefile2
-rw-r--r--devel/unproven-pthreads/buildlink2.mk16
-rw-r--r--devel/unproven-pthreads/distinfo2
-rw-r--r--devel/unproven-pthreads/patches/patch-ac2
-rw-r--r--devel/unproven-pthreads/patches/patch-af2
-rw-r--r--devel/unproven-pthreads/patches/patch-bc2
116 files changed, 960 insertions, 82 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 4c955d3f468..1d702074fa4 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/07/18 02:19:36 rh Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 19:22:13 jlam Exp $
#
DISTNAME= GConf-1.0.9
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 2890f3f7985..a9af1c38de7 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2002/07/31 11:38:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2002/08/25 19:22:14 jlam Exp $
bin/gconf-config
bin/gconf-config-1
bin/gconf-sanity-check-1
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index 1630fa5fd03..1739752be14 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/05/22 16:02:25 agc Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:14 jlam Exp $
#
# This Makefile fragment is included by packages that use gconf.
#
diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
new file mode 100644
index 00000000000..77c91f119fe
--- /dev/null
+++ b/devel/GConf/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:14 jlam Exp $
+
+.if !defined(GCONF_BUILDLINK2_MK)
+GCONF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gconf
+BUILDLINK_DEPENDS.gconf?= GConf>=1.0.7nb1
+BUILDLINK_PKGSRCDIR.gconf?= ../../devel/GConf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=GConf
+BUILDLINK_PREFIX.gconf_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gconf= include/gconf/1/gconf/*
+BUILDLINK_FILES.gconf+= lib/libgconf-*
+
+.include "../../databases/db3/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gconf-buildlink
+
+gconf-buildlink: _BUILDLINK_USE
+
+.endif # GCONF_BUILDLINK2_MK
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 9a277f8e8c8..0c5e5a354db 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/07/29 01:48:12 rh Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 19:22:15 jlam Exp $
SHA1 (GConf-1.0.9.tar.bz2) = 91a1172c7855a235bf09e2ab925343a2e5250c13
Size (GConf-1.0.9.tar.bz2) = 784363 bytes
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
index b3332ac4bd7..9e109bfdaf7 100644
--- a/devel/GConf/patches/patch-ab
+++ b/devel/GConf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/07/18 02:19:37 rh Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/25 19:22:15 jlam Exp $
--- gconf.pc.in.orig Sat Mar 24 08:52:30 2001
+++ gconf.pc.in
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 78c22b35402..b58247994ac 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/22 16:08:42 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:16 jlam Exp $
#
DISTNAME= GConf-1.1.10
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index f4fec9e9e1a..5ba0e3ec66a 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/17 17:48:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:16 jlam Exp $
bin/gconf-sanity-check-2
bin/gconfd-2
bin/gconftool-2
diff --git a/devel/GConf2/buildlink.mk b/devel/GConf2/buildlink.mk
index 31ce4fe35fb..e5e622d17f2 100644
--- a/devel/GConf2/buildlink.mk
+++ b/devel/GConf2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/22 16:36:12 agc Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:16 jlam Exp $
#
# This Makefile fragment is included by packages that use gconf2.
#
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
new file mode 100644
index 00000000000..eb0962dd058
--- /dev/null
+++ b/devel/GConf2/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:16 jlam Exp $
+
+.if !defined(GCONF2_BUILDLINK2_MK)
+GCONF2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gconf2
+BUILDLINK_DEPENDS.gconf2?= GConf2>=1.1.10
+BUILDLINK_PKGSRCDIR.gconf2?= ../../devel/GConf2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gconf2=GConf2
+BUILDLINK_PREFIX.gconf2_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gconf2= include/gconf/2/gconf/*
+BUILDLINK_FILES.gconf2+= lib/libgconf-2*
+
+.include "../../databases/db3/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gconf2-buildlink
+
+gconf2-buildlink: _BUILDLINK_USE
+
+.endif # GCONF2_BUILDLINK2_MK
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index df4a60e30bf..59fa8a2a499 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/22 16:08:42 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:17 jlam Exp $
SHA1 (GConf-1.1.10.tar.bz2) = 7fa90d0c5f8962fd5307a2f38177daf26b795312
Size (GConf-1.1.10.tar.bz2) = 878638 bytes
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 7cc2d003ad2..7aea9ad0e54 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/08/08 16:17:07 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2002/08/25 19:22:17 jlam Exp $
#
DISTNAME= SDL-1.2.3
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index cb5df31ce7a..795d35d92c7 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.16 2002/08/01 06:40:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.17 2002/08/25 19:22:17 jlam Exp $
#
# This Makefile fragment is included by packages that use SDL.
#
diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk
new file mode 100644
index 00000000000..0fe667c9f09
--- /dev/null
+++ b/devel/SDL/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:17 jlam Exp $
+
+.if !defined(SDL_BUILDLINK2_MK)
+SDL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= SDL
+BUILDLINK_DEPENDS.SDL?= SDL>=1.2.0
+BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL
+BUILDLINK_PREFIX.SDL_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL= include/SDL/*
+BUILDLINK_FILES.SDL+= lib/libSDL.*
+BUILDLINK_FILES.SDL+= lib/libSDLmain.*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(SDL_USE_NAS)
+. include "../../audio/nas/buildlink2.mk"
+.endif
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/pth/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/aalib-x11/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL-buildlink
+
+SDL-buildlink: _BUILDLINK_USE
+
+.endif # SDL_BUILDLINK2_MK
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index c095695ad4a..794b8832780 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 19:22:17 jlam Exp $
SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845
Size (SDL-1.2.3.tar.gz) = 1568671 bytes
diff --git a/devel/SDL/files/SDL_sysjoystick.c b/devel/SDL/files/SDL_sysjoystick.c
index 39a42180c83..bc2d7080090 100644
--- a/devel/SDL/files/SDL_sysjoystick.c
+++ b/devel/SDL/files/SDL_sysjoystick.c
@@ -29,7 +29,7 @@
#ifdef SAVE_RCSID
static char rcsid =
- "@(#) $Id: SDL_sysjoystick.c,v 1.1 2002/07/14 07:28:40 kristerw Exp $";
+ "@(#) $Id: SDL_sysjoystick.c,v 1.2 2002/08/25 19:22:18 jlam Exp $";
#endif
#include <stdio.h>
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 945289ef446..cc64d832002 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.12 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: patch-aj,v 1.13 2002/08/25 19:22:18 jlam Exp $
--- configure.in.orig Thu Nov 8 08:28:00 2001
+++ configure.in Mon Jul 15 23:28:12 2002
@@ -374,10 +374,7 @@
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 67919b43355..fa336c5b8cb 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: patch-am,v 1.6 2002/08/25 19:22:19 jlam Exp $
--- configure.orig Thu Nov 8 08:28:08 2001
+++ configure Mon Jul 15 23:31:06 2002
@@ -3588,10 +3588,7 @@
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
index adf2b569cc0..37d94bf21c5 100644
--- a/devel/SDL/patches/patch-ap
+++ b/devel/SDL/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2002/07/13 16:17:33 wiz Exp $
+$NetBSD: patch-ap,v 1.5 2002/08/25 19:22:19 jlam Exp $
--- src/hermes/Makefile.in.orig Thu Nov 8 08:28:07 2001
+++ src/hermes/Makefile.in
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
index a37f7a4ccfe..0542a38a9c3 100644
--- a/devel/SDL/patches/patch-as
+++ b/devel/SDL/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1 2002/07/13 16:17:33 wiz Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:22:19 jlam Exp $
--- src/Makefile.in.orig Thu Nov 8 08:28:02 2001
+++ src/Makefile.in
diff --git a/devel/SDL_gfx/buildlink2.mk b/devel/SDL_gfx/buildlink2.mk
new file mode 100644
index 00000000000..f2b21926a7e
--- /dev/null
+++ b/devel/SDL_gfx/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:19 jlam Exp $
+
+.if !defined(SDL_GFX_BUILDLINK2_MK)
+SDL_GFX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= SDL_gfx
+BUILDLINK_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.3
+BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_gfx=SDL_gfx
+
+BUILDLINK_PREFIX.SDL_gfx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL_gfx= include/SDL_framerate.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_gfxPrimitives.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_gfxPrimitives_font.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_imageFilter.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_rotozoom.h
+BUILDLINK_FILES.SDL_gfx+= lib/libSDL_gfx.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL_gfx-buildlink
+
+SDL_gfx-buildlink: _BUILDLINK_USE
+
+.endif # SDL_GFX_BUILDLINK2_MK
diff --git a/devel/SDL_ttf/buildlink2.mk b/devel/SDL_ttf/buildlink2.mk
new file mode 100644
index 00000000000..20522410787
--- /dev/null
+++ b/devel/SDL_ttf/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:20 jlam Exp $
+
+.if !defined(SDL_TTF_BUILDLINK2_MK)
+SDL_TTF_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_PACKAGES+= SDL_ttf
+BUILDLINK_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.3
+BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_ttf=SDL_ttf
+BUILDLINK_PREFIX.SDL_ttf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL_ttf= include/SDL/SDL_ttf.h
+BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf-*
+BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf.*
+
+.include "../../devel/SDL/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL_ttf-buildlink
+
+SDL_ttf-buildlink: _BUILDLINK_USE
+
+.endif # SDL_TTF_BUILDLINK2_MK
diff --git a/devel/atk/buildlink.mk b/devel/atk/buildlink.mk
index 0d02e9a7f48..038ea0b6468 100644
--- a/devel/atk/buildlink.mk
+++ b/devel/atk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/06/30 14:04:26 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:21 jlam Exp $
#
# This Makefile fragment is included by packages that use atk.
#
diff --git a/devel/atk/buildlink2.mk b/devel/atk/buildlink2.mk
new file mode 100644
index 00000000000..edd565b5755
--- /dev/null
+++ b/devel/atk/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:21 jlam Exp $
+
+.if !defined(ATK_BUILDLINK2_MK)
+ATK_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= atk
+BUILDLINK_DEPENDS.atk?= atk>=1.0.2
+BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.atk=atk
+BUILDLINK_PREFIX.atk_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.atk= include/atk-1.0/*/*
+BUILDLINK_FILES.atk+= include/atk-1.0/*
+BUILDLINK_FILES.atk+= lib/libatk-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= atk-buildlink
+
+atk-buildlink: _BUILDLINK_USE
+
+.endif # ATK_BUILDLINK2_MK
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
index af19a2679e1..fa01353ae6b 100644
--- a/devel/atk/patches/patch-ab
+++ b/devel/atk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:26 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:22:22 jlam Exp $
--- atk.pc.in.orig Wed Mar 6 03:27:29 2002
+++ atk.pc.in
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 08a46d2fba3..6b4383e8374 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:22 jlam Exp $
#
DISTNAME= binutils-2.11.2
diff --git a/devel/binutils/PLIST b/devel/binutils/PLIST
index 28ebeb07a85..c1355b8b440 100644
--- a/devel/binutils/PLIST
+++ b/devel/binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:22 jlam Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/PLIST.SunOS b/devel/binutils/PLIST.SunOS
index 209e752b892..9e36f7cda27 100644
--- a/devel/binutils/PLIST.SunOS
+++ b/devel/binutils/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2002/07/11 16:09:36 agc Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2002/08/25 19:22:22 jlam Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/buildlink.mk b/devel/binutils/buildlink.mk
index 729ec66d842..77043a87671 100644
--- a/devel/binutils/buildlink.mk
+++ b/devel/binutils/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/21 11:04:12 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:22 jlam Exp $
#
# This Makefile fragment is included by packages that use binutils.
#
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
new file mode 100644
index 00000000000..6d22509ac78
--- /dev/null
+++ b/devel/binutils/buildlink2.mk
@@ -0,0 +1,55 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:22 jlam Exp $
+
+.if !defined(BINUTILS_BUILDLINK2_MK)
+BINUTILS_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.binutils?= binutils>=2.11.2
+BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
+BUILDLINK_DEPMETHOD.binutils?= build
+
+_NEED_BINUTILS= NO
+.if ${OPSYS} == "NetBSD"
+_INCOMPAT_BINUTILS= 0.* 1.[01234]* 1.5.* 1.5[A-X]
+. for PATTERN in ${_INCOMPAT_BINUTILS}
+. if ${OS_VERSION:M${PATTERN}} != ""
+_NEED_BINUTILS= YES
+. endif
+. endfor
+.else
+# XXX: logic for other operating systems needed here
+.endif
+
+.if ${_NEED_BINUTILS} == "YES"
+BUILDLINK_PACKAGES+= binutils
+EVAL_PREFIX+= BUILDLINK_PREFIX.binutils=binutils
+BUILDLINK_PREFIX.binutils_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.binutils+= include/ansidecl.h
+BUILDLINK_FILES.binutils+= include/bfd.h
+BUILDLINK_FILES.binutils+= include/bfdlink.h
+BUILDLINK_FILES.binutils+= lib/libbfd.*
+BUILDLINK_FILES.binutils+= lib/libiberty.*
+BUILDLINK_FILES.binutils+= lib/libopcodes.*
+BUILDLINK_FILES.binutils+= bin/addr2line
+BUILDLINK_FILES.binutils+= bin/ar
+BUILDLINK_FILES.binutils+= bin/as
+BUILDLINK_FILES.binutils+= bin/c++filt
+BUILDLINK_FILES.binutils+= bin/gasp
+BUILDLINK_FILES.binutils+= bin/gprof
+BUILDLINK_FILES.binutils+= bin/ld
+BUILDLINK_FILES.binutils+= bin/nm
+BUILDLINK_FILES.binutils+= bin/objcopy
+BUILDLINK_FILES.binutils+= bin/objdump
+BUILDLINK_FILES.binutils+= bin/ranlib
+BUILDLINK_FILES.binutils+= bin/readelf
+BUILDLINK_FILES.binutils+= bin/size
+BUILDLINK_FILES.binutils+= bin/strings
+BUILDLINK_FILES.binutils+= bin/strip
+
+BUILDLINK_TARGETS+= binutils-buildlink
+
+binutils-buildlink: _BUILDLINK_USE
+.endif # _NEED_BINUTILS
+
+.endif # BINUTILS_BUILDLINK2_MK
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index b0dc7525316..a38bb751760 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/12 15:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:22:23 jlam Exp $
#
DISTNAME= bonobo-activation-1.0.2
diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST
index 24c98794b35..f6f0bfe630f 100644
--- a/devel/bonobo-activation/PLIST
+++ b/devel/bonobo-activation/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/12 19:34:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:23 jlam Exp $
bin/activation-client
bin/bonobo-activation-empty-server
bin/bonobo-activation-run-query
diff --git a/devel/bonobo-activation/buildlink.mk b/devel/bonobo-activation/buildlink.mk
index 1efc9bf4a02..98798c4728c 100644
--- a/devel/bonobo-activation/buildlink.mk
+++ b/devel/bonobo-activation/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 15:59:45 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:23 jlam Exp $
#
# This Makefile fragment is included by packages that use bonobo-activation.
#
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
new file mode 100644
index 00000000000..39a241bc5c7
--- /dev/null
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:23 jlam Exp $
+
+.if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
+BONOBO_ACTIVATION_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo-activation
+BUILDLINK_DEPENDS.bonobo-activation?= bonobo-activation>=1.0.2
+BUILDLINK_PKGSRCDIR.bonobo-activation?= ../../devel/bonobo-activation
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
+BUILDLINK_PREFIX.bonobo-activation_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-base-service.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-id.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/broken.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/empty.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/plugin.server
+BUILDLINK_FILES.bonobo-activation+= lib/libbonobo-activation.*
+BUILDLINK_FILES.bonobo-activation+= lib/pkgconfig/bonobo-activation-2.0.pc
+
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-activation-buildlink
+
+bonobo-activation-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_ACTIVATION_BUILDLINK2_MK
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 04e70417660..103f0ab9876 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/12 15:59:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:23 jlam Exp $
SHA1 (bonobo-activation-1.0.2.tar.bz2) = fe5830eb3e6ca5234541bb20c8f19e5096ee0bbc
Size (bonobo-activation-1.0.2.tar.bz2) = 425653 bytes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index d08cc195601..5414ad444ae 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/05/25 11:31:29 rh Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 19:22:23 jlam Exp $
DISTNAME= bonobo-conf-0.14
PKGREVISION= 2
diff --git a/devel/bonobo-conf/PLIST b/devel/bonobo-conf/PLIST
index 902883ff7b1..e4ecc28b243 100644
--- a/devel/bonobo-conf/PLIST
+++ b/devel/bonobo-conf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 19:22:23 jlam Exp $
bin/bonobo-moniker-xmldb
bin/cedit
include/bonobo-conf/Bonobo_Config.h
diff --git a/devel/bonobo-conf/buildlink2.mk b/devel/bonobo-conf/buildlink2.mk
new file mode 100644
index 00000000000..ea1a6dd2867
--- /dev/null
+++ b/devel/bonobo-conf/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:24 jlam Exp $
+
+.if !defined(BONOBO_CONF_BUILDLINK2_MK)
+BONOBO_CONF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo-conf
+BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>0.14nb1
+BUILDLINK_PKGSRCDIR.bonobo-conf?= ../../devel/bonobo-conf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
+BUILDLINK_PREFIX.bonobo-conf_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.bonobo-conf= include/bonobo-conf/*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo/monikers/libmoniker_config*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo/monikers/libmoniker_gconf*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo_conf*
+BUILDLINK_FILES.bonobo-conf+= lib/libbonobo_conf*
+
+.include "../../devel/GConf/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-conf-buildlink
+
+bonobo-conf-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_CONF_BUILDLINK2_MK
diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo
index 2c328a79d2c..e6558962dd4 100644
--- a/devel/bonobo-conf/distinfo
+++ b/devel/bonobo-conf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/25 11:31:29 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:24 jlam Exp $
SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a
Size (bonobo-conf-0.14.tar.gz) = 438259 bytes
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a776808468..5fb8ce7422e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/07/18 02:19:39 rh Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/25 19:22:24 jlam Exp $
#
DISTNAME= bonobo-1.0.18
diff --git a/devel/bonobo/PLIST b/devel/bonobo/PLIST
index 7aa1fe02b30..94226d9229b 100644
--- a/devel/bonobo/PLIST
+++ b/devel/bonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/07/12 19:34:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:22:24 jlam Exp $
bin/bonobo-application-x-mines
bin/bonobo-audio-ulaw
bin/bonobo-echo
diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk
index 45adcab2c3c..1793a5c9cda 100644
--- a/devel/bonobo/buildlink.mk
+++ b/devel/bonobo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/07/14 00:58:27 rh Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:24 jlam Exp $
#
# This Makefile fragment is included by packages that use bonobo.
#
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
new file mode 100644
index 00000000000..7ccda482999
--- /dev/null
+++ b/devel/bonobo/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+
+.if !defined(BONOBO_BUILDLINK2_MK)
+BONOBO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo
+BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18nb1
+BUILDLINK_PKGSRCDIR.bonobo?= ../../devel/bonobo
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo=bonobo
+BUILDLINK_PREFIX.bonobo_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.bonobo+= include/efs*
+BUILDLINK_FILES.bonobo+= include/gnome-1.0/bonobo.h
+BUILDLINK_FILES.bonobo+= include/gnome-1.0/bonobo/*
+BUILDLINK_FILES.bonobo+= lib/bonobo/*/*
+BUILDLINK_FILES.bonobo+= lib/libbonobo.*
+BUILDLINK_FILES.bonobo+= lib/libbonobox.*
+BUILDLINK_FILES.bonobo+= lib/libbonobo-print.*
+BUILDLINK_FILES.bonobo+= lib/libefs.*
+BUILDLINK_FILES.bonobo+= share/idl/Bonobo*.idl
+
+CPPFLAGS+= -I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0
+
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-buildlink
+
+bonobo-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_BUILDLINK2_MK
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index c45928810c7..87da2f18704 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/07/18 02:19:39 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 19:22:25 jlam Exp $
SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
diff --git a/devel/bonobo/patches/patch-ac b/devel/bonobo/patches/patch-ac
index 4d7b9e7017b..ce7b652a534 100644
--- a/devel/bonobo/patches/patch-ac
+++ b/devel/bonobo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 02:19:40 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:25 jlam Exp $
--- libefs/libefs.pc.in.orig Tue Oct 10 18:02:25 2000
+++ libefs/libefs.pc.in
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
new file mode 100644
index 00000000000..0a0842b5b2e
--- /dev/null
+++ b/devel/cdk/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+
+.if !defined(CDK_BUILDLINK2_MK)
+CDK_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.cdk?= cdk>=4.9.6
+BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk
+
+.if defined(USE_CDK)
+_NEED_CDK= YES
+.elif exists(/usr/include/cdk/cdk.h)
+_NEED_CDK= NO
+.else
+_NEED_CDK= YES
+.endif
+
+.if ${_NEED_CDK} == "YES"
+BUILDLINK_PACKAGES+= cdk
+EVAL_PREFIX+= BUILDLINK_PREFIX.cdk=cdk
+BUILDLINK_PREFIX.cdk_DEFAULT= ${LOCALBASE}
+.else
+BUILDLINK_PREFIX.cdk= /usr
+.endif
+
+BUILDLINK_FILES.cdk= include/cdk/*.h
+BUILDLINK_FILES.cdk+= lib/libcdk.*
+
+.include "../../devel/ncurses/buildlink2.mk"
+
+BUILDLINK_TARGETS+= cdk-buildlink
+
+cdk-buildlink: _BUILDLINK_USE
+
+.endif # CDK_BUILDLINK2_MK
diff --git a/devel/dlcompat/Makefile b/devel/dlcompat/Makefile
index 0d079029c8d..e26a1fb3cd1 100644
--- a/devel/dlcompat/Makefile
+++ b/devel/dlcompat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/22 00:54:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:26 jlam Exp $
#
DISTNAME= dlcompat-20020606
diff --git a/devel/dlcompat/PLIST b/devel/dlcompat/PLIST
index b757d7e53ec..86f36b1f29f 100644
--- a/devel/dlcompat/PLIST
+++ b/devel/dlcompat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/17 16:56:02 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:26 jlam Exp $
include/dlfcn.h
lib/libdl.0.dylib
lib/libdl.a
diff --git a/devel/dlcompat/buildlink.mk b/devel/dlcompat/buildlink.mk
index 534322462da..b7a96f22c77 100644
--- a/devel/dlcompat/buildlink.mk
+++ b/devel/dlcompat/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/22 00:54:36 schmonz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:26 jlam Exp $
#
# This Makefile fragment is included by packages that use dlcompat (libdl).
#
diff --git a/devel/dlcompat/buildlink2.mk b/devel/dlcompat/buildlink2.mk
new file mode 100644
index 00000000000..1d79308ed2f
--- /dev/null
+++ b/devel/dlcompat/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:26 jlam Exp $
+
+.if !defined(DLCOMPAT_BUILDLINK2_MK)
+DLCOMPAT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= dlcompat
+BUILDLINK_DEPENDS.dlcompat?= dlcompat>=20020606
+BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.dlcompat=dlcompat
+BUILDLINK_PREFIX.dlcompat_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.dlcompat= include/dlfcn.h
+BUILDLINK_FILES.dlcompat+= lib/libdl.*
+
+BUILDLINK_TARGETS+= dlcompat-buildlink
+
+dlcompat-buildlink: _BUILDLINK_USE
+
+.endif # DLCOMPAT_BUILDLINK2_MK
diff --git a/devel/dlcompat/distinfo b/devel/dlcompat/distinfo
index 16dfa056770..36d17ed82a5 100644
--- a/devel/dlcompat/distinfo
+++ b/devel/dlcompat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/22 00:54:36 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:26 jlam Exp $
SHA1 (dlcompat-20020606.tar.gz) = 4ac0bb67d1693bb6af7d4ebf095f7ccc4feb59e2
Size (dlcompat-20020606.tar.gz) = 8131 bytes
diff --git a/devel/dlcompat/patches/patch-aa b/devel/dlcompat/patches/patch-aa
index 8576ea9e889..f394b7252ce 100644
--- a/devel/dlcompat/patches/patch-aa
+++ b/devel/dlcompat/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/07/22 00:54:37 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:27 jlam Exp $
--- Makefile.orig Sun May 12 22:36:53 2002
+++ Makefile
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 964f099b3d3..8305b9a920b 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/07/12 23:38:44 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 19:22:27 jlam Exp $
DISTNAME= gal-0.19.3
CATEGORIES= gnome devel
diff --git a/devel/gal/PLIST b/devel/gal/PLIST
index c531b0b3167..a6250b98c27 100644
--- a/devel/gal/PLIST
+++ b/devel/gal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/12 23:38:44 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 19:22:27 jlam Exp $
include/gal/util/e-util.h
include/gal/util/e-xml-utils.h
include/gal/util/e-cache.h
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
new file mode 100644
index 00000000000..7f06d3b3a8b
--- /dev/null
+++ b/devel/gal/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:27 jlam Exp $
+
+.if !defined(GAL_BUILDLINK2_MK)
+GAL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gal
+BUILDLINK_DEPENDS.gal?= gal>=0.19nb1
+BUILDLINK_PKGSRCDIR.gal?= ../../devel/gal
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gal=gal
+BUILDLINK_PREFIX.gal_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gal+= include/gal/*
+BUILDLINK_FILES.gal+= include/gal/*/*
+BUILDLINK_FILES.gal+= lib/libgal.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gal-buildlink
+
+gal-buildlink: _BUILDLINK_USE
+
+.endif # GAL_BUILDLINK2_MK
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index 19727bc47c3..3738d1b911e 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/07/12 23:38:44 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 19:22:27 jlam Exp $
SHA1 (gal-0.19.3.tar.bz2) = db4a09f01f5d2d1f3c2c3466988f3c42cc0d2073
Size (gal-0.19.3.tar.bz2) = 903527 bytes
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
index 7b6ffc6c922..5a310e89220 100644
--- a/devel/gal/patches/patch-aa
+++ b/devel/gal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2002/07/12 23:38:45 mycroft Exp $
+$NetBSD: patch-aa,v 1.9 2002/08/25 19:22:28 jlam Exp $
--- configure.orig Thu Jun 20 04:40:53 2002
+++ configure Wed Jul 10 22:54:42 2002
diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 00daedfb02b..0cdf2f91c0e 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/01 05:48:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:28 jlam Exp $
#
# This Makefile fragment is included by packages that use glib2.
#
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
new file mode 100644
index 00000000000..7c38a68ad69
--- /dev/null
+++ b/devel/glib2/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:28 jlam Exp $
+
+.if !defined(GLIB2_BUILDLINK2_MK)
+GLIB2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= glib2
+BUILDLINK_DEPENDS.glib2?= glib2>=2.0.1nb1
+BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2
+BUILDLINK_PREFIX.glib2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.glib2= include/glib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+= include/glib/glib-2.0/*
+BUILDLINK_FILES.glib2+= lib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+= lib/libglib-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgmodule-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgobject-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgthread-2.0.*
+
+USE_PTHREAD= native ptl2
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= glib2-buildlink
+
+glib2-buildlink: _BUILDLINK_USE
+
+.endif # GLIB2_BUILDLINK2_MK
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index d30f2708194..a7f0a3fb863 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- glib-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ glib-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
index b3a94992acd..0a573dc1a4a 100644
--- a/devel/glib2/patches/patch-ab
+++ b/devel/glib2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gmodule-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gmodule-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
index 2cca15a7de4..e8d8654643c 100644
--- a/devel/glib2/patches/patch-ac
+++ b/devel/glib2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gobject-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gobject-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
index ea777af1f06..30b94c05563 100644
--- a/devel/glib2/patches/patch-ad
+++ b/devel/glib2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/05/10 01:17:30 rh Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gthread-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gthread-2.0.pc.in
diff --git a/devel/hdf/buildlink2.mk b/devel/hdf/buildlink2.mk
new file mode 100644
index 00000000000..5cc1fe9f8e5
--- /dev/null
+++ b/devel/hdf/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:29 jlam Exp $
+
+.if !defined(HDF_BUILDLINK2_MK)
+HDF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= hdf
+BUILDLINK_DEPENDS.hdf?= hdf>=4.1r5
+BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.hdf=hdf
+BUILDLINK_PREFIX.hdf_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.hdf= include/hdf/*
+BUILDLINK_FILES.hdf+= lib/libdf.*
+BUILDLINK_FILES.hdf+= lib/libmfhdf.*
+
+BUILDLINK_TARGETS+= hdf-buildlink
+
+hdf-buildlink: _BUILDLINK_USE
+
+.endif # HDF_BUILDLINK2_MK
diff --git a/devel/hdf5/buildlink2.mk b/devel/hdf5/buildlink2.mk
new file mode 100644
index 00000000000..d16f69e3d9f
--- /dev/null
+++ b/devel/hdf5/buildlink2.mk
@@ -0,0 +1,50 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(HDF5_BUILDLINK2_MK)
+HDF5_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= hdf5
+BUILDLINK_DEPENDS.hdf5?= hdf5>=1.4.3
+BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.hdf5=hdf5
+BUILDLINK_PREFIX.hdf5_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.hdf5= include/H5ACpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Apublic.h
+BUILDLINK_FILES.hdf5+= include/H5Bpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Dpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Epublic.h
+BUILDLINK_FILES.hdf5+= include/H5FDcore.h
+BUILDLINK_FILES.hdf5+= include/H5FDfamily.h
+BUILDLINK_FILES.hdf5+= include/H5FDgass.h
+BUILDLINK_FILES.hdf5+= include/H5FDlog.h
+BUILDLINK_FILES.hdf5+= include/H5FDmpio.h
+BUILDLINK_FILES.hdf5+= include/H5FDmulti.h
+BUILDLINK_FILES.hdf5+= include/H5FDpublic.h
+BUILDLINK_FILES.hdf5+= include/H5FDsec2.h
+BUILDLINK_FILES.hdf5+= include/H5FDsrb.h
+BUILDLINK_FILES.hdf5+= include/H5FDstdio.h
+BUILDLINK_FILES.hdf5+= include/H5FDstream.h
+BUILDLINK_FILES.hdf5+= include/H5Fpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Gpublic.h
+BUILDLINK_FILES.hdf5+= include/H5HGpublic.h
+BUILDLINK_FILES.hdf5+= include/H5HLpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Ipublic.h
+BUILDLINK_FILES.hdf5+= include/H5MMpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Opublic.h
+BUILDLINK_FILES.hdf5+= include/H5Ppublic.h
+BUILDLINK_FILES.hdf5+= include/H5Rpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Spublic.h
+BUILDLINK_FILES.hdf5+= include/H5Tpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Zpublic.h
+BUILDLINK_FILES.hdf5+= include/H5api_adpt.h
+BUILDLINK_FILES.hdf5+= include/H5pubconf.h
+BUILDLINK_FILES.hdf5+= include/H5public.h
+BUILDLINK_FILES.hdf5+= lib/libhdf5.*
+
+BUILDLINK_TARGETS+= hdf5-buildlink
+
+hdf5-buildlink: _BUILDLINK_USE
+
+.endif # HDF5_BUILDLINK2_MK
diff --git a/devel/libdockapp/buildlink2.mk b/devel/libdockapp/buildlink2.mk
new file mode 100644
index 00000000000..ec7a27467c1
--- /dev/null
+++ b/devel/libdockapp/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(LIBDOCKAPP_BUILDLINK2_MK)
+LIBDOCKAPP_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libdockapp
+BUILDLINK_DEPENDS.libdockapp?= libdockapp>=0.4.0
+BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libdockapp=libdockapp
+BUILDLINK_PREFIX.libdockapp_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libdockapp= include/dockapp.h
+BUILDLINK_FILES.libdockapp+= lib/libdockapp.*
+
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libdockapp-buildlink
+
+libdockapp-buildlink: _BUILDLINK_USE
+
+.endif # LIBDOCKAPP_BUILDLINK2_MK
diff --git a/devel/libgetopt/buildlink2.mk b/devel/libgetopt/buildlink2.mk
new file mode 100644
index 00000000000..c7e19d5c9f3
--- /dev/null
+++ b/devel/libgetopt/buildlink2.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(GETOPT_BUILDLINK2_MK)
+GETOPT_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.getopt?= libgetopt>=1.3
+BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
+
+.if exists(/usr/include/getopt.h)
+_NEED_GETOPT= NO
+.else
+_NEED_GETOPT= YES
+.endif
+
+.if ${_NEED_GETOPT} == "NO"
+BUILDLINK_PREFIX.getopt= /usr
+BUILDLINK_FILES.getopt= include/getopt.h
+LIBGETOPT= # empty
+.else
+BUILDLINK_PACKAGES+= getopt
+EVAL_PREFIX+= BUILDLINK_PREFIX.getopt=libgetopt
+BUILDLINK_PREFIX.getopt_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.getopt= include/getopt.h
+BUILDLINK_FILES.getopt+= lib/libgetopt.*
+BUILDLINK_FILES.getopt+= lib/libgetopt_pic.a
+LIBGETOPT= -lgetopt
+.endif
+
+CONFIGURE_ENV+= LIBGETOPT="${LIBGETOPT}"
+MAKE_ENV+= LIBGETOPT="${LIBGETOPT}"
+
+BUILDLINK_TARGETS+= getopt-buildlink
+
+getopt-buildlink: _BUILDLINK_USE
+
+.endif # GETOPT_BUILDLINK2_MK
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index c0523a7e43b..2322f4ea58b 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/07/31 16:16:48 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2002/08/25 19:22:31 jlam Exp $
#
DISTNAME= libglade-0.17
diff --git a/devel/libglade/buildlink2.mk b/devel/libglade/buildlink2.mk
new file mode 100644
index 00000000000..e0ad1ba69e5
--- /dev/null
+++ b/devel/libglade/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:31 jlam Exp $
+
+.if !defined(LIBGLADE_BUILDLINK2_MK)
+LIBGLADE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libglade
+BUILDLINK_DEPENDS.libglade?= libglade>=0.17nb1
+BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libglade=libglade
+BUILDLINK_PREFIX.libglade_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.libglade= include/libglade-1.0/glade/*
+BUILDLINK_FILES.libglade+= lib/libglade.*
+BUILDLINK_FILES.libglade+= lib/libglade-gnome.*
+BUILDLINK_FILES.libglade+= lib/libgladeConf.sh
+
+CPPFLAGS+= -I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libglade-buildlink
+
+pre-configure: ${BUILDLINK_TARGETS.libglade}
+
+.endif # LIBGLADE_BUILDLINK2_MK
diff --git a/devel/libole2/buildlink2.mk b/devel/libole2/buildlink2.mk
new file mode 100644
index 00000000000..40f0abdcd77
--- /dev/null
+++ b/devel/libole2/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:31 jlam Exp $
+
+.if !defined(LIBOLE2_BUILDLINK2_MK)
+LIBOLE2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libole2
+BUILDLINK_DEPENDS.libole2?= libole2>=0.2.4
+BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libole2=libole2
+BUILDLINK_PREFIX.libole2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libole2+= include/libole2/*
+BUILDLINK_FILES.libole2+= lib/libgnomeole2.*
+
+.include "../../devel/glib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libole2-buildlink
+
+libole2-buildlink: _BUILDLINK_USE
+
+.endif # LIBOLE2_BUILDLINK2_MK
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
new file mode 100644
index 00000000000..abbb73b0523
--- /dev/null
+++ b/devel/libsigc++/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:32 jlam Exp $
+
+.if !defined(LIBSIGCXX_BUILDLINK2_MK)
+LIBSIGCXX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libsigcxx
+BUILDLINK_DEPENDS.libsigcxx?= libsigc++>=0.4
+BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libsigcxx=libsigc++
+BUILDLINK_PREFIX.libsigcxx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libsigcxx= include/sigc++/*
+BUILDLINK_FILES.libsigcxx+= lib/sigc++/include/sigc++config.h
+BUILDLINK_FILES.libsigcxx+= lib/libsigc.*
+
+BUILDLINK_TARGETS+= libsigcxx-buildlink
+
+libsigcxx-buildlink: _BUILDLINK_USE
+
+.endif # LIBSIGCXX_BUILDLINK2_MK
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index ac60d850fe0..6cf4c213755 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/07/27 09:38:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/25 19:22:32 jlam Exp $
#
DISTNAME= slang-1.4.5
diff --git a/devel/libslang/buildlink2.mk b/devel/libslang/buildlink2.mk
new file mode 100644
index 00000000000..4ea3d04a6a6
--- /dev/null
+++ b/devel/libslang/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:32 jlam Exp $
+
+.if !defined(LIBSLANG_BUILDLINK2_MK)
+LIBSLANG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libslang
+BUILDLINK_DEPENDS.libslang?= libslang>=1.4.4
+BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libslang=libslang
+BUILDLINK_PREFIX.libslang_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libslang= include/slcurses.h
+BUILDLINK_FILES.libslang+= include/slang.h
+BUILDLINK_FILES.libslang+= lib/libslang.*
+
+BUILDLINK_TARGETS+= libslang-buildlink
+
+libslang-buildlink: _BUILDLINK_USE
+
+.endif # LIBSLANG_BUILDLINK2_MK
diff --git a/devel/libtar/buildlink2.mk b/devel/libtar/buildlink2.mk
new file mode 100644
index 00000000000..2a7f626ed2b
--- /dev/null
+++ b/devel/libtar/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:33 jlam Exp $
+
+.if !defined(LIBTAR_BUILDLINK2_MK)
+LIBTAR_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libtar
+BUILDLINK_DEPENDS.libtar?= libtar>=1.2.5
+BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libtar=libtar
+BUILDLINK_PREFIX.libtar_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.libtar= include/libtar*
+BUILDLINK_FILES.libtar+= lib/libtar.*
+
+BUILDLINK_TARGETS+= libtar-buildlink
+
+libtar-buildlink: _BUILDLINK_USE
+
+.endif # LIBTAR_BUILDLINK2_MK
diff --git a/devel/libtar/distinfo b/devel/libtar/distinfo
index 74899af9da2..059f86bca21 100644
--- a/devel/libtar/distinfo
+++ b/devel/libtar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 12:43:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:22:33 jlam Exp $
SHA1 (libtar-1.2.5.tar.gz) = 35e84315a071d0a0e36471716b64489eb97a8797
Size (libtar-1.2.5.tar.gz) = 88243 bytes
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 1cfae2c897a..4348c516cf4 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/21 11:05:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 19:22:33 jlam Exp $
#
DISTNAME= libusb-0.1.6a
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 542fa5fec8d..cddca2429b4 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/19 19:07:19 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:33 jlam Exp $
bin/libusb-config
include/usb.h
lib/libusb-0.1.so
diff --git a/devel/libusb/buildlink2.mk b/devel/libusb/buildlink2.mk
new file mode 100644
index 00000000000..1e3f62dcde8
--- /dev/null
+++ b/devel/libusb/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:33 jlam Exp $
+
+.if !defined(LIBUSB_BUILDLINK2_MK)
+LIBUSB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libusb
+BUILDLINK_DEPENDS.libusb?= libusb>=0.1.5
+BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libusb=libusb
+BUILDLINK_FILES.libusb= include/usb.h
+BUILDLINK_FILES.libusb+= lib/libusb-*.*
+BUILDLINK_FILES.libusb+= lib/libusb.*
+
+BUILDLINK_TARGETS+= libusb-buildlink
+
+libusb-buildlink: _BUILDLINK_USE
+
+.endif # LIBUSB_BUILDLINK2_MK
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 52aa46b039a..fedd7df3a99 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/19 19:07:19 mycroft Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:33 jlam Exp $
SHA1 (libusb-0.1.6a.tar.gz) = 79ef093d70b5f4597a4227178ad00b6aa5ed49b0
Size (libusb-0.1.6a.tar.gz) = 180291 bytes
diff --git a/devel/libusb/patches/patch-ac b/devel/libusb/patches/patch-ac
index 77c9f483124..fd3c943d48d 100644
--- a/devel/libusb/patches/patch-ac
+++ b/devel/libusb/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/08/19 19:07:21 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:34 jlam Exp $
--- libusb-config.in.orig Mon May 13 22:29:07 2002
+++ libusb-config.in Thu Jul 11 01:57:07 2002
diff --git a/devel/netcdf/buildlink2.mk b/devel/netcdf/buildlink2.mk
new file mode 100644
index 00000000000..1ab2e2c4f43
--- /dev/null
+++ b/devel/netcdf/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:34 jlam Exp $
+
+.if !defined(NETCDF_BUILDLINK2_MK)
+NETCDF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= netcdf
+BUILDLINK_DEPENDS.netcdf?= netcdf>=3.4
+BUILDLINK_PKGSRCDIR.netcdf?= ../../devel/netcdf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.netcdf=netcdf
+BUILDLINK_PREFIX.netcdf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.netcdf= include/netcdf.h
+BUILDLINK_FILES.netcdf+= include/netcdf.inc
+BUILDLINK_FILES.netcdf+= include/netcdf.hh
+BUILDLINK_FILES.netcdf+= include/ncvalues.hh
+BUILDLINK_FILES.netcdf+= lib/libnetcdf.*
+BUILDLINK_FILES.netcdf+= lib/libnetcdf_c++.*
+
+BUILDLINK_TARGETS+= netcdf-buildlink
+
+netcdf-buildlink: _BUILDLINK_USE
+
+.endif # NETCDF_BUILDLINK2_MK
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 81ab9f9d404..9ecad8cf98b 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/31 17:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:22:35 jlam Exp $
#
DISTNAME= oaf-0.6.10
diff --git a/devel/oaf/PLIST b/devel/oaf/PLIST
index befc113be80..bc56cb1a643 100644
--- a/devel/oaf/PLIST
+++ b/devel/oaf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/18 10:54:16 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:35 jlam Exp $
bin/oaf-client
bin/oaf-config
bin/oaf-empty-server
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index 4210c916d84..d12382a5dbc 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2002/07/14 01:11:42 rh Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/08/25 19:22:35 jlam Exp $
#
# This Makefile fragment is included by packages that use oaf.
#
diff --git a/devel/oaf/buildlink2.mk b/devel/oaf/buildlink2.mk
new file mode 100644
index 00000000000..ff301afc31b
--- /dev/null
+++ b/devel/oaf/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:35 jlam Exp $
+
+.if !defined(OAF_BUILDLINK2_MK)
+OAF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= oaf
+BUILDLINK_DEPENDS.oaf?= oaf>=0.6.7nb1
+BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.oaf=oaf
+BUILDLINK_PREFIX.oaf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.oaf= include/liboaf/*
+BUILDLINK_FILES.oaf+= lib/liboaf.*
+BUILDLINK_FILES.oaf+= lib/oafConf.sh
+
+.include "../../devel/popt/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= oaf-buildlink
+
+oaf-buildlink: _BUILDLINK_USE
+
+.endif # OAF_BUILDLINK2_MK
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index c3f824ca716..eedc4163ec5 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/18 10:54:16 mjl Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:22:35 jlam Exp $
SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5
Size (oaf-0.6.10.tar.bz2) = 435621 bytes
diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac
index e2db5f3cbcb..f865a087213 100644
--- a/devel/oaf/patches/patch-ac
+++ b/devel/oaf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/05/18 10:54:17 mjl Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 19:22:35 jlam Exp $
--- liboaf/Makefile.in.orig Sat May 18 12:22:48 2002
+++ liboaf/Makefile.in Sat May 18 12:23:02 2002
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index 49401b8dd58..e5930d9ab5d 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.6 2002/05/18 10:54:18 mjl Exp $
+$NetBSD: patch-ag,v 1.7 2002/08/25 19:22:35 jlam Exp $
--- configure.orig Sat May 18 12:24:35 2002
+++ configure Sat May 18 12:25:54 2002
diff --git a/devel/pango/PLIST.xf4 b/devel/pango/PLIST.xf4
index 9cab0b8b9d2..26e9b7e55ac 100644
--- a/devel/pango/PLIST.xf4
+++ b/devel/pango/PLIST.xf4
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.xf4,v 1.1 2002/07/03 01:29:39 dmcmahill Exp $
+@comment $NetBSD: PLIST.xf4,v 1.2 2002/08/25 19:22:36 jlam Exp $
include/pango-1.0/pango/pangoxft.h
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.la
diff --git a/devel/pango/buildlink.mk b/devel/pango/buildlink.mk
index 8c9526f32b5..bf7d48415b5 100644
--- a/devel/pango/buildlink.mk
+++ b/devel/pango/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/06/30 01:51:30 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:36 jlam Exp $
#
# This Makefile fragment is included by packages that use pango.
#
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
new file mode 100644
index 00000000000..3650d548edc
--- /dev/null
+++ b/devel/pango/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:36 jlam Exp $
+
+.if !defined(PANGO_BUILDLINK2_MK)
+PANGO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= pango
+BUILDLINK_DEPENDS.pango?= pango>=1.0.3
+BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.pango=pango
+BUILDLINK_PREFIX.pango_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.pango= include/pango-1.0/*/*
+BUILDLINK_FILES.pango+= include/pango-1.0/*
+BUILDLINK_FILES.pango+= lib/libpango*-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= pango-buildlink
+
+pango-buildlink: _BUILDLINK_USE
+
+.endif # PANGO_BUILDLINK2_MK
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index 2e6da162716..4c9a0caedda 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:36 jlam Exp $
--- pango.pc.in.orig Thu Mar 7 03:04:39 2002
+++ pango.pc.in
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
index 732b4fd2edd..19c337a82b5 100644
--- a/devel/pango/patches/patch-ab
+++ b/devel/pango/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:37 jlam Exp $
--- pangoft2.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangoft2.pc.in
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
index 37da3087795..4150323b76b 100644
--- a/devel/pango/patches/patch-ac
+++ b/devel/pango/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:37 jlam Exp $
--- pangox.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangox.pc.in
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
index 6e39d53a732..2f19b3c5749 100644
--- a/devel/pango/patches/patch-ad
+++ b/devel/pango/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam Exp $
--- pangowin32.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangowin32.pc.in
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
index 34b48cecb36..58ea5954f98 100644
--- a/devel/pango/patches/patch-ae
+++ b/devel/pango/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam Exp $
--- pangoxft.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangoxft.pc.in
diff --git a/devel/pkgconfig/PLIST b/devel/pkgconfig/PLIST
index d61d0763bd6..ff3e57c2c0e 100644
--- a/devel/pkgconfig/PLIST
+++ b/devel/pkgconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:39 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:37 jlam Exp $
bin/pkg-config
man/man1/pkg-config.1
share/aclocal/pkg.m4
diff --git a/devel/pkgconfig/buildlink2.mk b/devel/pkgconfig/buildlink2.mk
new file mode 100644
index 00000000000..945a25da049
--- /dev/null
+++ b/devel/pkgconfig/buildlink2.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:37 jlam Exp $
+
+.if !defined(PKGCONFIG_BUILDLINK2_MK)
+PKGCONFIG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= pkgconfig
+BUILDLINK_DEPENDS.pkgconfig?= pkgconfig-[0-9]*
+BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig
+BUILDLINK_DEPMETHOD.pkgconfig?= build
+
+PKG_CONFIG_PATH?= ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
+CONFIGURE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+MAKE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+
+.endif # PKGCONFIG_BUILDLINK2_MK
diff --git a/devel/popt/buildlink2.mk b/devel/popt/buildlink2.mk
new file mode 100644
index 00000000000..972def1a8f6
--- /dev/null
+++ b/devel/popt/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:37 jlam Exp $
+
+.if !defined(POPT_BUILDLINK2_MK)
+POPT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= popt
+BUILDLINK_DEPENDS.popt?= popt>=1.6.2
+BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.popt=popt
+BUILDLINK_PREFIX.popt_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.popt= include/popt.h
+BUILDLINK_FILES.popt+= lib/libpopt.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= popt-buildlink
+
+popt-buildlink: _BUILDLINK_USE
+
+.endif # POPT_BUILDLINK2_MK
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index b257b9a74dd..c287e92d00c 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/07/24 19:45:23 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2002/08/25 19:22:38 jlam Exp $
DISTNAME= PTL-2.1.8
PKGNAME= ptl-2.1.8
diff --git a/devel/ptl2/buildlink.mk b/devel/ptl2/buildlink.mk
index 3511c95101f..bf11c3abc34 100644
--- a/devel/ptl2/buildlink.mk
+++ b/devel/ptl2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 09:57:43 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:38 jlam Exp $
#
# This Makefile fragment is included by packages that use ptl2.
#
diff --git a/devel/ptl2/buildlink2.mk b/devel/ptl2/buildlink2.mk
new file mode 100644
index 00000000000..7d9b67d610f
--- /dev/null
+++ b/devel/ptl2/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:38 jlam Exp $
+
+.if !defined(PTL2_BUILDLINK2_MK)
+PTL2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ptl2
+BUILDLINK_DEPENDS.ptl2?= ptl>=2.1.7
+BUILDLINK_PKGSRCDIR.ptl2?= ../../devel/ptl2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ptl2=ptl
+BUILDLINK_PREFIX.ptl2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.ptl2= PTL/include/*/*/*.h
+BUILDLINK_FILES.ptl2+= PTL/include/*/*.h
+BUILDLINK_FILES.ptl2+= PTL/include/*.h
+BUILDLINK_FILES.ptl2+= lib/libPTL.*
+
+BUILDLINK_TARGETS+= ptl2-buildlink
+
+ptl2-buildlink: _BUILDLINK_USE
+
+.endif # PTL2_BUILDLINK2_MK
diff --git a/devel/ptl2/distinfo b/devel/ptl2/distinfo
index f94340a7be1..1536cfa3b79 100644
--- a/devel/ptl2/distinfo
+++ b/devel/ptl2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/06/24 12:09:43 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:38 jlam Exp $
SHA1 (PTL-2.1.8.tar.gz) = b62ba82f12dd99e2ff8a20b15c2b02c809c07d16
Size (PTL-2.1.8.tar.gz) = 678474 bytes
diff --git a/devel/ptl2/patches/patch-ae b/devel/ptl2/patches/patch-ae
index dd3d17145a0..346878f14c6 100644
--- a/devel/ptl2/patches/patch-ae
+++ b/devel/ptl2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2002/06/24 12:09:44 skrll Exp $
+$NetBSD: patch-ae,v 1.4 2002/08/25 19:22:39 jlam Exp $
--- Util/config.guess.orig Mon Jun 24 07:57:31 2002
+++ Util/config.guess
diff --git a/devel/ptl2/patches/patch-af b/devel/ptl2/patches/patch-af
index 3e5a17b19b2..31a830821b0 100644
--- a/devel/ptl2/patches/patch-af
+++ b/devel/ptl2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2002/06/24 12:09:44 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:22:39 jlam Exp $
--- libaltsys/utils/config.guess.orig Mon Jun 24 07:57:31 2002
+++ libaltsys/utils/config.guess
diff --git a/devel/rx/buildlink2.mk b/devel/rx/buildlink2.mk
new file mode 100644
index 00000000000..e66c790155c
--- /dev/null
+++ b/devel/rx/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:39 jlam Exp $
+
+.if !defined(RX_BUILDLINK2_MK)
+RX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= rx
+BUILDLINK_DEPENDS.rx?= rx>=1.5
+BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.rx=rx
+BUILDLINK_PREFIX.rx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.rx= include/rxposix.h
+BUILDLINK_FILES.rx+= lib/librx.*
+
+BUILDLINK_TARGETS+= rx-buildlink
+
+rx-buildlink: _BUILDLINK_USE
+
+.endif # RX_BUILDLINK2_MK
diff --git a/devel/smpeg/buildlink2.mk b/devel/smpeg/buildlink2.mk
new file mode 100644
index 00000000000..7bf3e8a1153
--- /dev/null
+++ b/devel/smpeg/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:40 jlam Exp $
+
+.if !defined(SMPEG_BUILDLINK2_MK)
+SMPEG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= smpeg
+BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.3
+BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.smpeg=smpeg
+BUILDLINK_PREFIX.smpeg_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.smpeg= include/smpeg/*
+BUILDLINK_FILES.smpeg+= lib/libsmpeg-*
+BUILDLINK_FILES.smpeg+= lib/libsmpeg.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= smpeg-buildlink
+
+smpeg-buildlink: _BUILDLINK_USE
+
+.endif # SMPEG_BUILDLINK2_MK
diff --git a/devel/stlport/buildlink2.mk b/devel/stlport/buildlink2.mk
new file mode 100644
index 00000000000..5300254c385
--- /dev/null
+++ b/devel/stlport/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:41 jlam Exp $
+
+.if !defined(STLPORT_BUILDLINK2_MK)
+STLPORT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= stlport
+BUILDLINK_DEPENDS.stlport?= stlport>=4.0
+BUILDLINK_PKGSRCDIR.stlport?= ../../devel/stlport
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.stlport=stlport
+BUILDLINK_PREFIX.stlport_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.stlport= include/stlport/*
+BUILDLINK_FILES.stlport+= include/stlport/*/*
+BUILDLINK_FILES.stlport+= lib/libstlport*
+
+BUILDLINK_TARGETS+= stlport-buildlink
+
+stlport-buildlink: _BUILDLINK_USE
+
+.endif # STLPORT_BUILDLINK2_MK
diff --git a/devel/stlport/patches/patch-ag b/devel/stlport/patches/patch-ag
index fd11c579587..63da87ea3d1 100644
--- a/devel/stlport/patches/patch-ag
+++ b/devel/stlport/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/05/20 17:43:05 cjep Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:22:41 jlam Exp $
--- stlport/typeinfo.orig Sat Nov 10 19:38:11 2001
+++ stlport/typeinfo Sat Nov 10 19:39:12 2001
@@ -23,7 +23,9 @@
diff --git a/devel/stlport/patches/patch-ah b/devel/stlport/patches/patch-ah
index 7d4d079aba3..57814c5546c 100644
--- a/devel/stlport/patches/patch-ah
+++ b/devel/stlport/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2002/05/20 17:43:05 cjep Exp $
+$NetBSD: patch-ah,v 1.3 2002/08/25 19:22:41 jlam Exp $
--- stlport/stl/_config.h.orig Sat Nov 10 19:51:04 2001
+++ stlport/stl/_config.h Sat Nov 10 19:51:28 2001
@@ -174,7 +174,7 @@
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 7abdf0d11ac..57c293cee55 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/08/16 20:15:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 19:22:41 jlam Exp $
#
DISTNAME= unproven-pthreads-0.17
diff --git a/devel/unproven-pthreads/buildlink2.mk b/devel/unproven-pthreads/buildlink2.mk
new file mode 100644
index 00000000000..3ef49bb707a
--- /dev/null
+++ b/devel/unproven-pthreads/buildlink2.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:42 jlam Exp $
+
+.if !defined(UNPROVEN_PTHREADS_BUILDLINK2_MK)
+UNPROVEN_PTHREADS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= unproven-pthreads
+BUILDLINK_DEPENDS.unproven-pthreads?= unproven-pthreads>=0.17
+BUILDLINK_PKGSRCDIR.unproven-pthreads?= ../../devel/unproven-pthreads
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.unproven-pthreads=unproven-pthreads
+BUILDLINK_PREFIX.unproven-pthreads_DEFAULT= ${LOCALBASE}
+
+CC= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pgcc
+CXX= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pg++
+
+.endif # UNPROVEN_PTHREADS_BUILDLINK2_MK
diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo
index 349c2ca3368..e1fb7d48584 100644
--- a/devel/unproven-pthreads/distinfo
+++ b/devel/unproven-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/18 09:17:27 agc Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:42 jlam Exp $
SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
diff --git a/devel/unproven-pthreads/patches/patch-ac b/devel/unproven-pthreads/patches/patch-ac
index 2c080c2805d..f6d8baa6c1e 100644
--- a/devel/unproven-pthreads/patches/patch-ac
+++ b/devel/unproven-pthreads/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:43 jlam Exp $
--- config/configure.in.orig Mon Jul 10 14:03:06 2000
+++ config/configure.in
diff --git a/devel/unproven-pthreads/patches/patch-af b/devel/unproven-pthreads/patches/patch-af
index 56bf101ebf3..084843145b0 100644
--- a/devel/unproven-pthreads/patches/patch-af
+++ b/devel/unproven-pthreads/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-af,v 1.4 2002/08/25 19:22:43 jlam Exp $
--- config/configure.orig Mon Jul 10 14:03:06 2000
+++ config/configure
diff --git a/devel/unproven-pthreads/patches/patch-bc b/devel/unproven-pthreads/patches/patch-bc
index 901102d8300..a346a029cda 100644
--- a/devel/unproven-pthreads/patches/patch-bc
+++ b/devel/unproven-pthreads/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2002/07/10 21:40:11 skrll Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 19:22:43 jlam Exp $
--- include/pthread.h.orig Mon Jul 10 19:23:14 2000
+++ include/pthread.h