buildlink1 -> buildlink2

11 files changed, 38 insertions, 69 deletions

diff --git a/chat/xchat-gnome/Makefile b/chat/xchat-gnome/Makefile
index b98653c8bf0..2df4c8dd4be 100644
--- a/chat/xchat-gnome/Makefile
+++ b/chat/xchat-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 23:53:13 jlam Exp $
 
 .include "../xchat/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT+=	and GNOME libraries
 
 CONFIGURE_ARGS+=	--enable-panel
 
-.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 41f3785f477..50b1d6620a0 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/22 00:07:25 jlam Exp $
 #
 
 DISTNAME=	gtkdiff-1.6.0
@@ -10,10 +10,9 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html
 COMMENT=	diff front-end program using GNOME
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-# At least ORBIT and GNORBA need fixing (orbit-idl and ???)
-#USE_BUILDLINK_ONLY=	YES
 
-.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/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index cbade434532..71e7006c9a5 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/22 00:03:03 jlam Exp $
 
 DISTNAME=	gnotepad+-1.3.3
 PKGNAME=	${DISTNAME:S/+//}
@@ -10,17 +10,17 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://gnotepad.sourceforge.net/
 COMMENT=	easy-to-use, yet fairly feature-rich, simple HTML and text editor for X11
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 
-USE_X11BASE=	YES
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_BUILDLINK_ONLY=	YES
 
-GNU_CONFIGURE=	# defined
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 14e8c48c10d..2c3f61be0aa 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/04/23 02:08:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/22 00:06:23 jlam Exp $
 #
 
 DISTNAME=	Ngraph-6.3.06-src
@@ -15,7 +15,7 @@ COMMENT=	the 2D graph and data analysis program
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
 
@@ -25,6 +25,5 @@ post-extract:
 post-install:
 	${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3-doc.tar.gz
 
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Ngraph/distinfo b/graphics/Ngraph/distinfo
index 61baaba1373..9ad2b01c984 100644
--- a/graphics/Ngraph/distinfo
+++ b/graphics/Ngraph/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/09/12 03:06:04 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/09/22 00:06:23 jlam Exp $
 
 SHA1 (Ngraph-6.3.06-src.tar.gz) = bea0e06300c37a69e7a084f0713e973dd806c458
 Size (Ngraph-6.3.06-src.tar.gz) = 364733 bytes
@@ -6,5 +6,5 @@ SHA1 (Ngraph-6.3-doc.tar.gz) = d1024e53d01cca2e4cd00a5d8a53dc618c4e9fc1
 Size (Ngraph-6.3-doc.tar.gz) = 556956 bytes
 SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e
 Size (ileaf-widgets.tar.Z) = 70223 bytes
-SHA1 (patch-aa) = cdb8d7446ebcae962890e240e48549cc60548a96
+SHA1 (patch-aa) = f3f95cb0f68ee101e73ea54ec43e7bf07e7296c6
 SHA1 (patch-ab) = 194dbb122c85c6c0cad999496388f8cd9e22c238
diff --git a/graphics/Ngraph/patches/patch-aa b/graphics/Ngraph/patches/patch-aa
index 291e68eeb51..49345ca257f 100644
--- a/graphics/Ngraph/patches/patch-aa
+++ b/graphics/Ngraph/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/09/12 03:06:04 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/22 00:06:23 jlam Exp $
 
 --- Makefile.orig	Sat Oct 16 06:00:08 1999
 +++ Makefile
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2001/09/12 03:06:04 jlam Exp $
 -PLATFORM  = '"for X11 [Linux(glibc2)+Motif2.1]"'
 +DEFS = ${MOTIF_DEFS}
 +PLATFORM  = '"for X11 [NetBSD + OpenMotif/LessTif]"'
-+X11INCLUDE = -I${BUILDLINK_X11_DIR}/include -I../combo
++X11INCLUDE = -I${X11BASE}/include -I../combo
 +STATICLINK = ./combo/ComboBox.o
 +X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM
 +#
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 95ddabfffb3..ed17f5b8880 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:03 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/22 00:08:19 jlam Exp $
 #
 
 DISTNAME=	autotrace-0.29
@@ -10,9 +10,9 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://autotrace.sourceforge.net/
 COMMENT=	convert bitmap to vector graphics
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../graphics/ImageMagick/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/autotrace/patches/patch-ab b/graphics/autotrace/patches/patch-ab
deleted file mode 100644
index fbf647bb822..00000000000
--- a/graphics/autotrace/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/03 14:03:02 wiz Exp $
-
---- configure.orig	Mon Dec 24 11:57:35 2001
-+++ configure
-@@ -1152,9 +1152,9 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--	if test "x$MAGICK_CONFIG" = "xMagick-config" ; then
-+	if test "x$MAGICK_CONFIG" != "x" ; then
- 		CPPFLAGS_BACKUP="$CPPFLAGS"
--		CPPFLAGS=`Magick-config --cppflags`
-+		CPPFLAGS=`$MAGICK_CONFIG --cppflags`
- 		ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for magick/api.h""... $ac_c" 1>&6
- echo "configure:1161: checking for magick/api.h" >&5
-@@ -1192,10 +1192,10 @@
- 		MAGICK_CFLAGS=${CPPFLAGS}
- 		CPPFLAGS=${CPPFLAGS_BACKUP}
- 		if test "x${magick_header_found}" = xyes ; then
--			MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`"
-+			MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`"
- 												echo $ac_n "checking ImageMagick - version >= 5.2.1""... $ac_c" 1>&6
- echo "configure:1198: checking ImageMagick - version >= 5.2.1" >&5
--						MAGICK_VERSION=`Magick-config --version`
-+						MAGICK_VERSION=`$MAGICK_CONFIG --version`
- 						MAGICK_MAJOR_VERSION=`echo $MAGICK_VERSION \
- 			| sed -e "s/^\([0-9]*\).[0-9]*.[0-9]*$/\1/"`
- 			MAGICK_MINOR_VERSION=`echo $MAGICK_VERSION \
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 095d06406f2..2a3813245c4 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/04 23:45:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/22 00:07:57 jlam Exp $
 #
 
 DISTNAME=	clara-0.9.9
@@ -15,13 +15,13 @@ COMMENT=	Optical Character Recognition (OCR) program for books
 
 DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 
-USE_PERL5=		YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 REPLACE_PERL=		clara.pl mkdoc.pl selthresh.pl
-USE_BUILDLINK_ONLY=	YES
 
 # install a example input file
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/imre.pbm ${PREFIX}/share/doc/clara
 
-.include "../../mk/x11.buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/claraocr/distinfo b/graphics/claraocr/distinfo
index 2eb1331a523..0764a1615e1 100644
--- a/graphics/claraocr/distinfo
+++ b/graphics/claraocr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/05/04 23:45:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/09/22 00:07:57 jlam Exp $
 
 SHA1 (clara-0.9.9.tar.gz) = 7d18088ad086d476cce2821497db16f4f444231e
 Size (clara-0.9.9.tar.gz) = 419529 bytes
-SHA1 (patch-aa) = efc5d69e3330e814ad198d3cd9719402804eb3b1
+SHA1 (patch-aa) = 3c8ae0031b579917299f314eb34918b7e2b955a1
diff --git a/graphics/claraocr/patches/patch-aa b/graphics/claraocr/patches/patch-aa
index f8aa1b65ba4..c9619ac589c 100644
--- a/graphics/claraocr/patches/patch-aa
+++ b/graphics/claraocr/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/05/04 23:45:44 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/22 00:07:57 jlam Exp $
 
 --- Makefile.orig	Sat May  4 03:45:07 2002
 +++ Makefile
@@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.2 2002/05/04 23:45:44 wiz Exp $
  #
 -INCLUDE = -I/usr/X11R6/include
 -LIBPATH = -L/usr/X11R6/lib
-+INCLUDE = -I${BUILDLINK_DIR}/include
-+LIBPATH = -L${BUILDLINK_DIR}/lib
++INCLUDE = -I${X11BASE}/include -I${LOCALBASE}/include
++LIBPATH = -L${X11BASE}/lib -L${LOCALBASE}/include
  CC = gcc
  
  #