Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

41 files changed, 414 insertions, 23 deletions

diff --git a/graphics/GUIlib/buildlink2.mk b/graphics/GUIlib/buildlink2.mk
new file mode 100644
index 00000000000..017f9ce1cbd
--- /dev/null
+++ b/graphics/GUIlib/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:43 jlam Exp $
+
+.if !defined(GUILIB_BUILDLINK2_MK)
+GUILIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		GUIlib
+BUILDLINK_DEPENDS.GUIlib?=	GUIlib>=1.1.0
+BUILDLINK_PKGSRCDIR.GUIlib?=	../../graphics/GUIlib
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.GUIlib=GUIlib
+BUILDLINK_PREFIX.GUIlib_DEFAULT=${LOCALBASE}
+BUILDLINK_FILES.GUIlib=		include/GUI/*.h
+BUILDLINK_FILES.GUIlib+=	lib/libGUI-*
+BUILDLINK_FILES.GUIlib+=	lib/libGUI.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	GUIlib-buildlink
+
+GUIlib-buildlink: _BUILDLINK_USE
+
+.endif	# GUILIB_BUILDLINK2_MK
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f603f1d7f88..021e583436c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2002/08/22 08:06:11 tron Exp $
+# $NetBSD: Makefile,v 1.84 2002/08/25 19:22:44 jlam Exp $
 
 DISTNAME=		ImageMagick-5.4.8-2
 PKGNAME=		${DISTNAME:S/-2/.2/}
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 3ca2bd7ae1d..bfc10883585 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/22 08:06:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:44 jlam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
diff --git a/graphics/ImageMagick/buildlink2.mk b/graphics/ImageMagick/buildlink2.mk
new file mode 100644
index 00000000000..5a7039062e4
--- /dev/null
+++ b/graphics/ImageMagick/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:44 jlam Exp $
+
+.if !defined(IMAGEMAGICK_BUILDLINK2_MK)
+IMAGEMAGICK_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			ImageMagick
+BUILDLINK_DEPENDS.ImageMagick?=		ImageMagick>=5.3.9nb1
+BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ImageMagick=ImageMagick
+BUILDLINK_PREFIX.ImageMagick_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ImageMagick=	include/Magick++.h
+BUILDLINK_FILES.ImageMagick+=	include/Magick++/*
+BUILDLINK_FILES.ImageMagick+=	include/magick/*
+BUILDLINK_FILES.ImageMagick+=	lib/libMagick.*
+BUILDLINK_FILES.ImageMagick+=	lib/libMagick++.*
+
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	ImageMagick-buildlink
+
+ImageMagick-buildlink: _BUILDLINK_USE
+
+.endif	# IMAGEMAGICK_BUILDLINK2_MK
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 4b9a5df6b14..aeac4d03018 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/08/22 08:06:11 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 19:22:44 jlam Exp $
 
 SHA1 (ImageMagick-5.4.8-2.tar.bz2) = 5f8149c6235ba74581c19871367c73bbb7a799b9
 Size (ImageMagick-5.4.8-2.tar.bz2) = 2979552 bytes
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index dca68308b74..910b712a2e6 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2002/08/22 08:06:12 tron Exp $
+$NetBSD: patch-aa,v 1.19 2002/08/25 19:22:45 jlam Exp $
 
 --- coders/fits.c.orig	Sun Aug 18 03:20:46 2002
 +++ coders/fits.c	Tue Aug 20 08:35:05 2002
diff --git a/graphics/aalib-x11/buildlink2.mk b/graphics/aalib-x11/buildlink2.mk
new file mode 100644
index 00000000000..223f28b3c79
--- /dev/null
+++ b/graphics/aalib-x11/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:45 jlam Exp $
+
+.if !defined(AALIB_X11_BUILDLINK2_MK)
+AALIB_X11_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+=		aalib-x11
+BUILDLINK_DEPENDS.aalib-x11?=	aalib-x11>=1.4.0.4
+BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.aalib-x11=aalib-x11
+BUILDLINK_PREFIX.aalib-x11_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.aalib-x11=	include/aalib.h
+BUILDLINK_FILES.aalib-x11+=	lib/libaa.*
+
+BUILDLINK_TARGETS+=	aalib-x11-buildlink
+
+aalib-x11-buildlink: _BUILDLINK_USE
+
+.endif # AALIB_X11_BUILDLINK2_MK
diff --git a/graphics/avifile-devel/buildlink2.mk b/graphics/avifile-devel/buildlink2.mk
new file mode 100644
index 00000000000..658b2b778cd
--- /dev/null
+++ b/graphics/avifile-devel/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:46 jlam Exp $
+
+.if !defined(AVIFILE_BUILDLINK2_MK)
+AVIFILE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		avifile
+BUILDLINK_DEPENDS.avifile?=	avifile>=0.6
+BUILDLINK_PKGSRCDIR.avifile?=	../../graphics/avifile-devel
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.avifile=avifile
+BUILDLINK_PREFIX.avifile_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.avifile=	lib/libaviplay.*
+BUILDLINK_FILES.avifile+=	lib/avifile-0.6/*
+BUILDLINK_FILES.avifile+=	include/avifile/*
+BUILDLINK_FILES.avifile+=	include/avifile/wine/*
+
+BUILDLINK_TARGETS.avifile=	avifile-buildlink
+
+avifile-buildlink: _BUILDLINK_USE
+
+.endif	# AVIFILE_BUILDLINK2_MK
diff --git a/graphics/avifile/buildlink2.mk b/graphics/avifile/buildlink2.mk
new file mode 100644
index 00000000000..e2b2d078618
--- /dev/null
+++ b/graphics/avifile/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:46 jlam Exp $
+
+.if !defined(AVIFILE_BUILDLINK2_MK)
+AVIFILE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		avifile
+BUILDLINK_DEPENDS.avifile?=	avifile>=0.53.5
+BUILDLINK_PKGSRCDIR.avifile?=	../../graphics/avifile
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.avifile=avifile
+BUILDLINK_PREFIX.avifile_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.avifile=	lib/libaviplay.*
+BUILDLINK_FILES.avifile+=	include/avifile/*
+BUILDLINK_FILES.avifile+=	include/avifile/wine/*
+
+BUILDLINK_TARGETS+=	avifile-buildlink
+
+avifile-buildlink: _BUILDLINK_USE
+
+.endif	# AVIFILE_BUILDLINK2_MK
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 998afa313b6..693328b293b 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/08/08 16:17:07 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:22:46 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 PKGREVISION=		2
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 62245d275b4..be49fddb9d0 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2002/08/01 06:40:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/08/25 19:22:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
diff --git a/graphics/clanlib/buildlink2.mk b/graphics/clanlib/buildlink2.mk
new file mode 100644
index 00000000000..57ce6f24a3a
--- /dev/null
+++ b/graphics/clanlib/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+
+.if !defined(CLANLIB_BUILDLINK2_MK)
+CLANLIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ClanLib
+BUILDLINK_DEPENDS.ClanLib?=	ClanLib>=0.4.4nb1
+BUILDLINK_PKGSRCDIR.ClanLib?=	../../graphics/ClanLib
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ClanLib=ClanLib
+BUILDLINK_PREFIX.ClanLib_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.ClanLib=	lib/libclanCore.*
+BUILDLINK_FILES.ClanLib+=	lib/ClanLib/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/*.h
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Core/*/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/GL/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/GUI/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Lua/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MIDI/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MPEG/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Magick/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MikMod/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/png/*
+
+.include "../../devel/pth/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/hermes/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	ClanLib-buildlink
+
+ClanLib-buildlink: _BUILDLINK_USE
+
+.endif	# CLANLIB_BUILDLINK2_MK
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 7ab250edbb4..ec37562875d 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/05/11 11:56:58 rh Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 19:22:47 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
 COMMENT=	the GNOME image loading library GNOME canvas support add-on
diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST
index 3d39e623539..2aed178c0cf 100644
--- a/graphics/gdk-pixbuf-gnome/PLIST
+++ b/graphics/gdk-pixbuf-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/11 11:56:59 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:22:47 jlam Exp $
 include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index 0c9755f1490..a8180716d05 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/05/11 11:56:59 rh Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
 #
diff --git a/graphics/gdk-pixbuf-gnome/buildlink2.mk b/graphics/gdk-pixbuf-gnome/buildlink2.mk
new file mode 100644
index 00000000000..ca5223c665d
--- /dev/null
+++ b/graphics/gdk-pixbuf-gnome/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+
+.if !defined(GDK_PIXBUF_GNOME_BUILDLINK2_MK)
+GDK_PIXBUF_GNOME_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gdk-pixbuf-gnome
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome?=	gdk-pixbuf-gnome>=0.11.0nb1
+BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?=	../../graphics/gdk-pixbuf-gnome
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
+BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gdk-pixbuf-gnome=	include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf-gnome+=	lib/libgnomecanvaspixbuf.*
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gdk-pixbuf-gnome-buildlink
+
+gdk-pixbuf-gnome-buildlink: _BUILDLINK_USE
+
+.endif	# GDK_PIXBUF_GNOME_BUILDLINK2_MK
diff --git a/graphics/gimp-base/buildlink2.mk b/graphics/gimp-base/buildlink2.mk
new file mode 100644
index 00000000000..0f3ae41e140
--- /dev/null
+++ b/graphics/gimp-base/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:48 jlam Exp $
+
+.if !defined(GIMP_BASE_BUILDLINK2_MK)
+GIMP_BASE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gimp-base
+BUILDLINK_DEPENDS.gimp-base?=	gimp-base>=1.2.3nb1
+BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp-base
+DEPENDS+=		${BUILDLINK_DEPENDS.gimpbase}:../../graphics/gimp-base
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gimp-base=gimp-base
+BUILDLINK_PREFIX.gimp-base_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gimp-base=	include/libgimp/*
+BUILDLINK_FILES.gimp-base+=	lib/libgimp.*
+BUILDLINK_FILES.gimp-base+=	lib/libgimpui.*
+
+.include "../../devel/glib/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gimp-base-buildlink
+
+gimp-base-buildlink: _BUILDLINK_USE
+
+.endif	# GIMP_BASE_BUILDLINK2_MK
diff --git a/graphics/gle/buildlink2.mk b/graphics/gle/buildlink2.mk
new file mode 100644
index 00000000000..5e96f99f617
--- /dev/null
+++ b/graphics/gle/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:48 jlam Exp $
+
+.if !defined(GLE_BUILDLINK2_MK)
+GLE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gle
+BUILDLINK_DEPENDS.gle?=		gle>=3.0.3
+BUILDLINK_PKGSRCDIR.gle?=	../../graphics/gle
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gle=gle
+BUILDLINK_PREFIX.gle_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gle=		include/GL/gle.h
+BUILDLINK_FILES.gle+=		lib/libgle.*
+
+.include "../../graphics/Mesa/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gle-buildlink
+
+gle-buildlink: _BUILDLINK_USE
+
+.endif	# GLE_BUILDLINK2_MK
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 03f5d65b5da..b2bcc0d658b 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/07/12 21:22:21 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 19:22:49 jlam Exp $
 
 DISTNAME=	gphoto2-2.1.0
 PKGNAME=	gphoto-2.1.0
diff --git a/graphics/gphoto2/PLIST b/graphics/gphoto2/PLIST
index 2f4c81c6f6a..0cf4b728316 100644
--- a/graphics/gphoto2/PLIST
+++ b/graphics/gphoto2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/12 21:22:21 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:49 jlam Exp $
 bin/gphoto2
 bin/gphoto2-config
 bin/gphoto2-port-config
diff --git a/graphics/gphoto2/buildlink2.mk b/graphics/gphoto2/buildlink2.mk
new file mode 100644
index 00000000000..cbe5f141e8d
--- /dev/null
+++ b/graphics/gphoto2/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+
+.if !defined(GPHOTO2_BUILDLINK2_MK)
+GPHOTO2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gphoto2
+BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.0
+BUILDLINK_PKGSRCDIR.gphoto2?=	../../graphics/gphoto2
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gphoto2=gphoto2
+BUILDLINK_PREFIX.gphoto2=	${LOCALBASE}
+BUILDLINK_FILES.gphoto2=	include/gphoto2/*.h
+BUILDLINK_FILES.gphoto2+=	lib/libgphoto2.*
+BUILDLINK_FILES.gphoto2+=	lib/libgphoto2_port.*
+
+BUILDLINK_TARGETS+=	gphoto2-buildlink
+
+gphoto2-buildlink: _BUILDLINK_USE
+
+.endif	# GPHOTO2_BUILDLINK2_MK
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index 2b339ebc26b..481d1b065b3 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/12 21:22:21 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:49 jlam Exp $
 
 SHA1 (gphoto2-2.1.0.tar.gz) = 3ce3280dd90912d8a72b4d7586cff402e5157450
 Size (gphoto2-2.1.0.tar.gz) = 2137982 bytes
diff --git a/graphics/imlib2/buildlink2.mk b/graphics/imlib2/buildlink2.mk
new file mode 100644
index 00000000000..172d7c03fd3
--- /dev/null
+++ b/graphics/imlib2/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+
+.if !defined(IMLIB2_BUILDLINK2_MK)
+IMLIB2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		imlib2
+BUILDLINK_DEPENDS.imlib2?=	imlib2>=1.0.3nb1
+BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib2=imlib2
+BUILDLINK_PREFIX.imlib2_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.imlib2=		include/Imlib2.h
+BUILDLINK_FILES.imlib2+=	lib/libImlib2.*
+BUILDLINK_FILES.imlib2+=	lib/loaders/image/*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../databases/edb/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	imlib2-buildlink
+
+imlib2-buildlink: _BUILDLINK_USE
+
+.endif	# IMLIB2_BUILDLINK2_MK
diff --git a/graphics/jasper/buildlink2.mk b/graphics/jasper/buildlink2.mk
new file mode 100644
index 00000000000..8490a2c2d26
--- /dev/null
+++ b/graphics/jasper/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:50 jlam Exp $
+
+.if !defined(JASPER_BUILDLINK2_MK)
+JASPER_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		jasper
+BUILDLINK_DEPENDS.jasper?=	jasper-1.500.0
+BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.jasper=jasper
+BUILDLINK_PREFIX.jasper_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.jasper=		include/jasper/*
+BUILDLINK_FILES.jasper+=	lib/libjasper.*
+
+BUILDLINK_TARGETS+=	jasper-buildlink
+
+jasper-buildlink: _BUILDLINK_USE
+
+.endif	# JASPER_BUILDLINK2_MK
diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile
index 1f5fc933649..23a2e90d5dc 100644
--- a/graphics/libart2/Makefile
+++ b/graphics/libart2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:50 jlam Exp $
 
 DISTNAME=		libart_lgpl-2.3.8
 PKGNAME=		libart2-2.3.8
diff --git a/graphics/libart2/PLIST b/graphics/libart2/PLIST
index f692ff5cdba..d6ebe4e22cf 100644
--- a/graphics/libart2/PLIST
+++ b/graphics/libart2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:50 jlam Exp $
 bin/libart2-config
 include/libart-2.0/libart_lgpl/art_affine.h
 include/libart-2.0/libart_lgpl/art_alphagamma.h
diff --git a/graphics/libart2/buildlink.mk b/graphics/libart2/buildlink.mk
index e6356e78163..70dd255ee9e 100644
--- a/graphics/libart2/buildlink.mk
+++ b/graphics/libart2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/08 02:14:41 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:50 jlam Exp $
 #
 # This Makefile fragment is included by packages that use the library
 # provided by libart2.
diff --git a/graphics/libart2/buildlink2.mk b/graphics/libart2/buildlink2.mk
new file mode 100644
index 00000000000..17f4e81c15f
--- /dev/null
+++ b/graphics/libart2/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:50 jlam Exp $
+
+.if !defined(LIBART2_BUILDLINK2_MK)
+LIBART2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libart2
+BUILDLINK_DEPENDS.libart2?=	libart2>=2.3.8
+BUILDLINK_PKGSRCDIR.libart2?=	../../graphics/libart2
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libart2=libart2
+BUILDLINK_PREFIX.libart2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libart2=	bin/libart22-config
+BUILDLINK_FILES.libart2+=	include/libart2-2.0/libart2_lgpl/*
+BUILDLINK_FILES.libart2+=	lib/libart2_lgpl_2.*
+
+BUILDLINK_TARGETS+=	libart2-buildlink
+
+libart2-buildlink: _BUILDLINK_USE
+
+.endif	# LIBART2_BUILDLINK2_MK
diff --git a/graphics/libart2/distinfo b/graphics/libart2/distinfo
index 21e08ee0fbe..c080b22ac97 100644
--- a/graphics/libart2/distinfo
+++ b/graphics/libart2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:51 jlam Exp $
 
 SHA1 (libart_lgpl-2.3.8.tar.bz2) = f87fe20d8135a5778112aea28698f6022a779a06
 Size (libart_lgpl-2.3.8.tar.bz2) = 205615 bytes
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index f3ba9a1ccb5..7d2de2b227c 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/01 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:22:51 jlam Exp $
 
 DISTNAME=	libexif-0.5.3
 CATEGORIES=	graphics
diff --git a/graphics/libexif/PLIST b/graphics/libexif/PLIST
index 2cdef1b3eae..a1f0e732d3d 100644
--- a/graphics/libexif/PLIST
+++ b/graphics/libexif/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/01 23:19:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:51 jlam Exp $
 include/libexif/exif-byte-order.h
 include/libexif/exif-content.h
 include/libexif/exif-data.h
diff --git a/graphics/libexif/buildlink2.mk b/graphics/libexif/buildlink2.mk
new file mode 100644
index 00000000000..5acfacae10b
--- /dev/null
+++ b/graphics/libexif/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:52 jlam Exp $
+
+.if !defined(LIBEXIF_BUILDLINK2_MK)
+LIBEXIF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libexif
+BUILDLINK_DEPENDS.libexif?=	libexif>=0.5
+BUILDLINK_PKGSRCDIR.libexif?=	../../graphics/libexif
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.libexif=libexif
+BUILDLINK_PREFIX.libexif_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libexif=	include/libexif/*.h
+BUILDLINK_FILES.libexif+=	lib/libexif.*
+
+BUILDLINK_TARGETS+=	libexif-buildlink
+
+libexif-buildlink: _BUILDLINK_USE
+
+.endif	# LIBEXIF_BUILDLINK2_MK
diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo
index 51bcdad53c8..f537981d24c 100644
--- a/graphics/libexif/distinfo
+++ b/graphics/libexif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/01 23:19:06 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:52 jlam Exp $
 
 SHA1 (libexif-0.5.3.tar.bz2) = 13ad8d8e5b478ba822b7f6b738f23985cd3ee261
 Size (libexif-0.5.3.tar.bz2) = 236917 bytes
diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk
new file mode 100644
index 00000000000..62f6464260f
--- /dev/null
+++ b/graphics/libwmf/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:52 jlam Exp $
+
+.if !defined(LIBWMF_BUILDLINK2_MK)
+LIBWMF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libwmf
+BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.2nb1
+BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libwmf=libwmf
+BUILDLINK_PREFIX.libwmf_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libwmf=		include/libwmf/libwmf/*.h
+BUILDLINK_FILES.libwmf+=	include/libwmf/libwmf/gd/*.h
+BUILDLINK_FILES.libwmf+=	lib/libwmf-0.2.so*
+BUILDLINK_FILES.libwmf+=	lib/libwmf.*
+
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libwmf-buildlink
+
+libwmf-buildlink: _BUILDLINK_USE
+
+.endif	# LIBWMF_BUILDLINK2_MK
diff --git a/graphics/mpeg-lib/buildlink2.mk b/graphics/mpeg-lib/buildlink2.mk
new file mode 100644
index 00000000000..00e1208ad3b
--- /dev/null
+++ b/graphics/mpeg-lib/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:53 jlam Exp $
+
+.if !defined(MPEG_BUILDLINK2_MK)
+MPEG_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		mpeg
+BUILDLINK_DEPENDS.mpeg?=	mpeg>=1.3.1
+BUILDLINK_PKGSRCDIR.mpeg?=	../../graphics/mpeg-lib
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.mpeg=mpeg
+BUILDLINK_PREFIX.mpeg_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.mpeg=		include/mpeg.h
+BUILDLINK_FILES.mpeg+=		lib/libmpeg_lib.*
+
+BUILDLINK_TARGETS+=		mpeg-buildlink
+
+mpeg-buildlink: _BUILDLINK_USE
+
+.endif	# MPEG_BUILDLINK2_MK
diff --git a/graphics/py-imaging/buildlink2.mk b/graphics/py-imaging/buildlink2.mk
new file mode 100644
index 00000000000..01612a8431b
--- /dev/null
+++ b/graphics/py-imaging/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:53 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+=		pyimaging
+BUILDLINK_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging-*
+BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 4378c4c3ccf..298d4d00d86 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 19:22:53 jlam Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 29ecfa3fb20..0736e318a5e 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:53 jlam Exp $
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
diff --git a/graphics/sane-backends/buildlink2.mk b/graphics/sane-backends/buildlink2.mk
new file mode 100644
index 00000000000..876390b35b2
--- /dev/null
+++ b/graphics/sane-backends/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:54 jlam Exp $
+
+.if !defined(SANE_BUILDLINK2_MK)
+SANE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		sane
+BUILDLINK_DEPENDS.sane?=	sane-backends>=1.0.3
+BUILDLINK_PKGSRCDIR.sane?=	../../graphics/sane-backends
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.sane=sane-backends
+BUILDLINK_PREFIX.sane_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.sane=		include/sane/*.h
+BUILDLINK_FILES.sane+=		lib/libsane.*
+
+.include "../../devel/libusb/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	sane-buildlink
+
+sane-buildlink: _BUILDLINK_USE
+
+.endif	# SANE_BUILDLINK2_MK
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index f86fa80337c..af47a12a3db 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 19:22:54 jlam Exp $
 
 SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a
 Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 015b78b3531..a96762d63eb 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 19:22:54 jlam Exp $
 
 --- doc/Makefile.in.orig	Sun May  5 16:59:45 2002
 +++ doc/Makefile.in	Sat Jul 13 03:15:58 2002