Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

6 files changed, 16 insertions, 26 deletions

diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index a8c441ac423..88ea129c098 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:49:53 jlam Exp $
 
 PKGNAME=		freetype-utils-${FT_VERS}
 COMMENT=		Utilities for manipulating TrueType fonts
 
 BUILDLINK_DEPENDS.freetype=	freetype-lib>=${FT_VERS}
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 
 .include "../freetype-lib/Makefile.common"
 
@@ -12,6 +13,6 @@ CONFIGURE_ARGS+=	--with-x
 ALL_TARGET=		tttest
 INSTALL_TARGET=		install-tttest
 
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile
index ae2c10a9876..d88d2589727 100644
--- a/graphics/freetype/Makefile
+++ b/graphics/freetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:52 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
 FT_VERS=		1.3.1
@@ -13,6 +13,7 @@ COMMENT=		FreeType libraries and utilities
 DEPENDS+=		freetype-lib-${FT_VERS}:../../graphics/freetype-lib
 DEPENDS+=		freetype-utils-${FT_VERS}:../../graphics/freetype-utils
 
+USE_BUILDLINK2=		# defined
 USE_X11=		# defined	# freetype-utils uses X11
 
 EXTRACT_ONLY=		# empty
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index e7b608ac7a7..e8bbcec8de5 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:09 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:53 jlam Exp $
 #
 
 DISTNAME=	gqview-1.0.1
@@ -11,8 +11,8 @@ HOMEPAGE=	http://gqview.sourceforge.net/
 COMMENT=	another gtk-based graphic file viewer
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK_ONLY=	yes
 
+USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_GNOME_CONFIG=no
@@ -20,8 +20,8 @@ CONFIGURE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.11.0nb1
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab
deleted file mode 100644
index 2f3131cf7b1..00000000000
--- a/graphics/gqview/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2001/12/29 11:40:29 zuntum Exp $
-
---- src/Makefile.in.orig	Sun Dec 16 02:43:25 2001
-+++ src/Makefile.in
-@@ -103,7 +103,7 @@
- INCLUDES = -I$(srcdir) -I$(builddir)    \
- 	-I$(top_srcdir) -I$(top_builddir)       \
- 	-DLOCALEDIR=\""$(localedir)"\"		\
--	-I$(includedir) $(GTK_CFLAGS)	\
-+	$(GTK_CFLAGS)	\
- 	$(GDK_PIXBUF_CFLAGS)
- 
- 
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index ac3bb94626a..59f750a67b3 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/08/20 05:01:59 rh Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:49:54 jlam Exp $
 
 DISTNAME=		flash_${DISTUNAME}
 CATEGORIES=		graphics www
@@ -42,6 +42,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_BUILDLINK2=		yes
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 CHECK_SHLIBS=		no
diff --git a/graphics/ns-flash/distinfo b/graphics/ns-flash/distinfo
index 3ad67483798..af411cdcbb0 100644
--- a/graphics/ns-flash/distinfo
+++ b/graphics/ns-flash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/20 05:01:59 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:55 jlam Exp $
 
 SHA1 (flash/5.0r50/flash_linux.tar.gz) = 572e13227afc18b7c0f5a6d675a8683fc903a5da
 Size (flash/5.0r50/flash_linux.tar.gz) = 574447 bytes