buildlink1 -> buildlink2

6 files changed, 27 insertions, 26 deletions

diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 4b52b3a4bdc..e1b11c2b483 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/09/10 16:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2002/09/22 00:14:06 jlam Exp $
 
 DISTNAME=		ee-0.3.12
 PKGREVISION=		2
@@ -9,17 +9,19 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Image viewer based on imlib by the Rasterman.  Gtk clone of xv
 
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		# defined
+USE_X11BASE=		# defined
 USE_GMAKE=		# defined
+
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--with-glib-prefix=${BUILDLINK_DIR}
+			--with-glib-prefix=${BUILDLINK_PREFIX.glib}
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 637e8a3e3b4..e160c25e5c0 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/04/23 02:08:53 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/22 00:18:25 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -10,13 +10,13 @@ COMMENT=		Interactive geometry viewing program
 
 CONFLICTS=		ImageMagick-[0-9]*	# both have a program named 'animate'
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--without-xforms
-CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-motif=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_PREFIX.Mesa}
+CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE}
 CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca
 
 INFO_FILES=		geomview
@@ -41,8 +41,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/html/pix/*			\
 	${PREFIX}/share/doc/html/geomview/pix
 
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index fee4b93dff3..91f510864dd 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:07 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/22 00:16:58 jlam Exp $
 #
 
 DISTNAME=	gfract-0.21
@@ -11,8 +11,7 @@ MAINTAINER=	collver@linuxfreemail.com
 HOMEPAGE=	http://www.cs.Helsinki.FI/u/salerma/gfract/
 COMMENT=	gtk-based fractal program
 
-USE_BUILDLINK_ONLY=	yes
-
+USE_BUILDLINK2=	yes
 USE_X11=	yes
 ALL_TARGET=	gfract
 
@@ -36,7 +35,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${PREFIX}/share/gfract/
 	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/
 
-.include "../../graphics/png/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/distinfo b/graphics/gfract/distinfo
index 6682fb2622b..ebd55126afc 100644
--- a/graphics/gfract/distinfo
+++ b/graphics/gfract/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/08/23 19:45:42 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/09/22 00:16:58 jlam Exp $
 
 SHA1 (gfract-0.21.tar.gz) = 0d996547359ba5f52e43fdb2b4c4baf2a4773a88
 Size (gfract-0.21.tar.gz) = 27927 bytes
 SHA1 (gfract-palettes-0.1.tar.gz) = f05e06e6012e1b1526e0c796ca7f6617fca8ab7d
 Size (gfract-palettes-0.1.tar.gz) = 223648 bytes
-SHA1 (patch-aa) = 1a5edf6a5c0f1d638aba617f316b3f8d20e19a0a
+SHA1 (patch-aa) = d04a36b152ba2cd511a0ef18730121bf533cf221
diff --git a/graphics/gfract/patches/patch-aa b/graphics/gfract/patches/patch-aa
index 75d0ef96650..84de134e163 100644
--- a/graphics/gfract/patches/patch-aa
+++ b/graphics/gfract/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/08/23 19:45:43 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/22 00:16:59 jlam Exp $
 
 --- Makefile.orig	Fri Feb  9 01:25:57 2001
 +++ Makefile
@@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.2 2001/08/23 19:45:43 jlam Exp $
  #CFLAGS=-g -Wall
 -CFLAGS=-O2 -Wall -Winline
 -LIBS=-lpng -lz
-+CFLAGS+=`${GTK_CONFIG} --cflags`
-+LIBS+=`${GTK_CONFIG} --libs` -lpng -lz
++CFLAGS+=`gtk-config --cflags`
++LIBS+=`gtk-config --libs` -lpng -lz
  
  OBJS=main.o fractal.o palette.o globals.o misc.o attr_dlg.o my_png.o \
  pal_rot_dlg.o timer.o
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 6e479f3709c..db33a93eb32 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:17 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/22 00:18:56 jlam Exp $
 #
 
 DISTNAME=	gifsicle-1.29
@@ -9,8 +9,8 @@ MAINTAINER=	ben@wongs.net
 HOMEPAGE=	http://www.lcdf.org/~eddietwo/gifsicle/
 COMMENT=	create, edit, and inspect GIFs from shell
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"