Convert to buildlink3.

20 files changed, 219 insertions, 114 deletions

diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index e6bc713ab7d..a2804588f6d 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/03 15:58:55 wiz Exp $
 #
 
 DISTNAME=	guile-pg-0.07
@@ -12,7 +12,7 @@ COMMENT=	PostgreSQL interface for Guile
 
 DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
@@ -20,6 +20,6 @@ CONFIGURE_ARGS+=	--with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/includ
 
 INFO_FILES=	guile-pg.info
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index ed15a5de6e5..2e69d1a9b18 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	g-wrap-1.3.4
 PKGREVISION=	3
@@ -11,22 +11,20 @@ COMMENT=	Tool for importing types, functions, and constants into guile
 
 DEPENDS+=	guile-slib>=2.4.2:../../devel/guile-slib
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
+MAKE_ENV+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
 
 USE_MAKEINFO=		YES
 INFO_FILES=		g-wrap.info
 
-CONFIGURE_ARGS+=	--with-modules-dir=${GUILE14_PREFIX}/share/guile
-CONFIGURE_ENV+=		GUILE=${GUILE14}
-CONFIGURE_ENV+=		BUILD_GUILE=${GUILE14_CONFIG}
+CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/${GUILE14_SUBDIR}/share/guile
 CONFIGURE_ENV+=		ac_cv_path_RSCHEME="nope"
-CONFIGURE_ENV+=		ac_cv_path_GUILE="${LOCALBASE}/guile/1.4/bin/guile"
 
-.include "../../devel/glib/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../devel/guile-gtk/buildlink2.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../devel/guile-gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
new file mode 100644
index 00000000000..b118a77bc3a
--- /dev/null
+++ b/devel/g-wrap/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	g-wrap
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng-wrap}
+BUILDLINK_PACKAGES+=	g-wrap
+
+.if !empty(G_WRAP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb3
+BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap
+.endif	# G_WRAP_BUILDLINK3_MK
+
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../devel/guile-gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index 30d5687ea50..47dffd381d4 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/06/24 14:39:16 seb Exp $
+$NetBSD: distinfo,v 1.7 2004/05/03 15:58:55 wiz Exp $
 
 SHA1 (g-wrap-1.3.4.tar.gz) = 764f1c878e18341bf437f3e1ddc5f8618019bfc2
 Size (g-wrap-1.3.4.tar.gz) = 403570 bytes
 SHA1 (patch-aa) = 284e62e9a3456ab03a8337298fde587b2729c786
 SHA1 (patch-ab) = 92f8e1ed55a3ba563837b36e2f39888734aebefe
-SHA1 (patch-ac) = 098bb2e6c239b38afa40d28362cc553982ac3e38
+SHA1 (patch-ac) = 7bd1543e1941668d71507d8ee6e1c5f1614f6472
diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac
index 94e73c31313..6b7067c9277 100644
--- a/devel/g-wrap/patches/patch-ac
+++ b/devel/g-wrap/patches/patch-ac
@@ -1,10 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/02/24 20:50:19 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2004/05/03 15:58:55 wiz Exp $
 
---- bin/Makefile.in.orig	Thu Apr 12 05:14:14 2001
-+++ bin/Makefile.in	Sun Jul  1 16:16:37 2001
-@@ -232,7 +232,7 @@
+--- bin/Makefile.in.orig	2002-11-08 05:40:46.000000000 +0100
++++ bin/Makefile.in
+@@ -333,9 +333,9 @@ g-wrap: g-wrap.in Makefile
+ g-wrap-config: g-wrap-config.in
+ 	rm -f $@.tmp
  	sed < $@.in > $@.tmp \
- 	    -e 's:@-GUILE-@:${GUILE}:' \
+-	    -e 's:@-GUILE-@:${GUILE}:' \
++	    -e 's:@-GUILE-@:${PREFIX}/${GUILE14_SUBDIR}/bin/guile:' \
  	    -e 's:@-VERSION-@:${VERSION}:' \
 -	    -e 's:@-libdir-@:${libdir}:' \
 +	    -e 's:@-libdir-@:${libdir}:g' \
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index 1f060754536..d2b8feaedb1 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	guile-fcgi-0.1
 PKGREVISION=	3
@@ -9,7 +9,7 @@ MAINTAINER=	epg@pretzelnet.org
 HOMEPAGE=	http://www.bgu.ru/%7Edsa/guilefcgi.html
 COMMENT=	Guile interface to FastCGI
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--with-fcgi-includes=${BUILDLINK_PREFIX.fcgi}/include
@@ -19,6 +19,6 @@ do-build:
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} guile-fcgi.x
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
 
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../www/fcgi/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../www/fcgi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index a26c9d334e4..b27ef872b6d 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/21 06:51:42 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/03 15:58:55 wiz Exp $
 #
 
 DISTNAME=		guile-gtk-0.19
@@ -13,23 +13,15 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
 COMMENT=		Library to make GTK accessible from guile
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--datadir=${GUILE14_PREFIX}/share
-PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/${GUILE14_SUBDIR}/share
+PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
-pre-build:
-	cd ${WRKSRC}; for file in build-guile-gtk; do			\
-		${SED}	-e "s,^exec guile,exec ${GUILE14},"		\
-			$$file > $$file.new;				\
-		${MV} -f $$file.new $$file;				\
-	done
-
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
new file mode 100644
index 00000000000..9f7bb30b06a
--- /dev/null
+++ b/devel/guile-gtk/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	guile-gtk
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-gtk}
+BUILDLINK_PACKAGES+=	guile-gtk
+
+.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
+BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile-gtk
+.endif	# GUILE_GTK_BUILDLINK3_MK
+
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index 0cfc7bce37c..9b8c663067d 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	guile-slib-2.4.2
 PKGREVISION=	3
@@ -12,17 +12,18 @@ COMMENT=	SLIB installation for guile Scheme interpreter
 
 DEPENDS+=	slib>=2.4.2:../../devel/slib
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 
-PLIST_SUBST+=	GUILE14_SUBDIR=${GUILE14_SUBDIR}
+PLIST_SUBST+=	GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
 
 do-install:
-	${LN} -sf ${PREFIX}/share/slib ${GUILE14_PREFIX}/share/guile/slib
-	cd ${GUILE14_PREFIX}/share/guile/slib; \
-		${GUILE14} -q -s ${FILESDIR}/gencat.scm
+	${LN} -sf ${PREFIX}/share/slib ${PREFIX}/${GUILE14_SUBDIR}/share/guile/slib
+	cd ${PREFIX}/${GUILE14_SUBDIR}/share/guile/slib; \
+		${PREFIX}/${GUILE14_SUBDIR}/bin/guile -q -s \
+			${FILESDIR}/gencat.scm
 
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-www/Makefile b/devel/guile-www/Makefile
index dd963be8007..5b30adb3cf7 100644
--- a/devel/guile-www/Makefile
+++ b/devel/guile-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 10:44:43 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	guile-www-1.0.1
 PKGREVISION=	2
@@ -9,9 +9,9 @@ MAINTAINER=	epg@pretzelnet.org
 HOMEPAGE=	http://www.gnu.org/software/guile/
 COMMENT=	Guile WWW module
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 INFO_FILES=	guile-www.info
 
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk
new file mode 100644
index 00000000000..1975fc8caec
--- /dev/null
+++ b/devel/swig/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SWIG_BUILDLINK3_MK:=	${SWIG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	swig
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig}
+BUILDLINK_PACKAGES+=	swig
+
+.if !empty(SWIG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.swig+=	swig>=1.1p5nb1
+BUILDLINK_PKGSRCDIR.swig?=	../../devel/swig
+# only contains a static library
+BUILDLINK_DEPMETHOD.swig?=	build
+.endif	# SWIG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 89b7bd14a65..7cf248048df 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.63 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=		gnucash-1.8.8
 PKGREVISION=		5
@@ -13,25 +13,24 @@ COMMENT=		Personal double-entry accounting program
 DEPENDS+=		p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
 DEPENDS+= 		p5-finance-quote>=1.06:../../finance/p5-finance-quote
 
-BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
-
 BUILD_DEPENDS+=			bison>=1.28:../../devel/bison
 
 USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
-# LIBTOOL_FLAGS+=		--preserve-dup-deps
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-perl-includes=${PERL5_ARCHLIB}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ENV+=		GUILE="${GUILE14}"
 CONFIGURE_ENV+=		PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 
+#CFLAGS+=		-L${PREFIX}/${GUILE14_SUBDIR}/lib -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/lib
+LDFLAGS+=		-L${PREFIX}/${GUILE14_SUBDIR}/lib -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/lib
+
 AM_MAKEFLAGS=		LIBTOOL='${LIBTOOL} ${LIBTOOL_FLAGS}'
 MAKE_ENV+=		AM_MAKEFLAGS="${AM_MAKEFLAGS}"
 
@@ -65,29 +64,22 @@ GNUCASH_GUILE_MAKEFILE_IN_FILES= \
 	src/register/register-core/Makefile.in \
 	src/report/report-gnome/Makefile.in
 
-post-patch:
-	cd ${WRKSRC};							\
-	for f in ${GNUCASH_GUILE_MAKEFILE_IN_FILES}; do			\
-		${MV} $$f $$f.orig;					\
-		${SED} -e 's|gnome guile|gnome $${GUILE}|g' $$f.orig > $$f;	\
-	done
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../devel/g-wrap/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/swig/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../math/guppi/buildlink2.mk"
-.include "../../net/ORBit/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../www/gtkhtml/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../devel/g-wrap/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../math/guppi/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../www/gtkhtml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index a8bd46925fa..0c5de596f13 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -25,26 +25,20 @@ CONFIGURE_ARGS=		--disable-gnumeric
 PLIST_SUBST+=		GNUMERIC="@comment "
 .endif
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
+USE_X11=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
-post-install:
-	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/libguppi.m4 \
-		${LOCALBASE}/share/aclocal/libguppi.m4
-
-.include "../../devel/bonobo/buildlink2.mk"
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/guppi/PLIST b/math/guppi/PLIST
index 64dfaf4e414..b3f596c1459 100644
--- a/math/guppi/PLIST
+++ b/math/guppi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2003/06/27 19:53:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/05/03 15:58:55 wiz Exp $
 ${GNUMERIC}bin/guppi-gnumeric
 include/gnome-1.0/libguppi/gnan.h
 include/gnome-1.0/libguppi/guppi-2d.h
@@ -318,8 +318,6 @@ share/pixmaps/guppi/resize-to-win.png
 share/pixmaps/guppi/scatter.xpm
 share/pixmaps/guppi/stock.xpm
 share/pixmaps/guppi/surface.xpm
-@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/libguppi.m4
-@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libguppi.m4 ${LOCALBASE}/share/aclocal/libguppi.m4
 @exec ${MKDIR} %D/share/gnome/help/guppi/C/images
 @dirrm share/pixmaps/guppi
 ${GNUMERIC}@dirrm share/guppi/scripts
diff --git a/math/guppi/buildlink3.mk b/math/guppi/buildlink3.mk
new file mode 100644
index 00000000000..ac4bc2e290a
--- /dev/null
+++ b/math/guppi/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GUPPI_BUILDLINK3_MK:=	${GUPPI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	guppi
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguppi}
+BUILDLINK_PACKAGES+=	guppi
+
+.if !empty(GUPPI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.guppi+=	guppi>=0.40.3nb8
+BUILDLINK_PKGSRCDIR.guppi?=	../../math/guppi
+.endif	# GUPPI_BUILDLINK3_MK
+
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index a3338315f67..e40e798cc0b 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.40 2004/05/03 15:58:55 wiz Exp $
 #
 
 DISTNAME=       siag-3.5.7
@@ -18,7 +18,7 @@ CONFLICTS+=	antiword-[0-9]*
 CONFIGURE_ARGS+=--with-x
 CONFIGURE_ARGS+=--with-guile
 CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=  YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
@@ -35,9 +35,9 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
 CONFIGURE_ARGS+=--with-xawm=Xaw
 .endif
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/mowitz/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/mowitz/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/distinfo b/misc/siag/distinfo
index ad8de710b21..ddd61ea8c8e 100644
--- a/misc/siag/distinfo
+++ b/misc/siag/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/03/05 14:30:59 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/05/03 15:58:55 wiz Exp $
 
 SHA1 (siag-3.5.7.tar.gz) = 007030eb29fc1a4d3a0d78f9d93893cf40b6b84b
 Size (siag-3.5.7.tar.gz) = 1653929 bytes
+SHA1 (patch-ab) = 564a906957521afae681662d0e19fc06996682ac
 SHA1 (patch-av) = 2e2598ca694ed93ff6bd34c9bb4625f915d412ad
diff --git a/misc/siag/patches/patch-ab b/misc/siag/patches/patch-ab
new file mode 100644
index 00000000000..935ce2453cd
--- /dev/null
+++ b/misc/siag/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.5 2004/05/03 15:58:55 wiz Exp $
+
+--- xsiag/window.c.orig	2003-02-28 20:06:27.000000000 +0100
++++ xsiag/window.c
+@@ -2822,8 +2822,8 @@ static void save_plugin(char *p) {
+ 		if (savematrix(p, w_list->buf, NULL)) {
+ 			printf("501 Can't save %s\n", p);
+ 		} else {
+-			w_list->buf->change = FALSE; printf("250 Saved
+-			%s\n", p);
++			w_list->buf->change = FALSE; printf("250 Saved "
++			"%s\n", p);
+ 		}
+ 	}
+ }
+@@ -2834,8 +2834,8 @@ static void load_plugin(char *p) {
+ 		if (loadmatrix(p, w_list->buf, NULL)) {
+ 			printf("501 Can't load %s\n", p);
+ 		} else {
+-			w_list->buf->change = FALSE; printf("250 Loaded
+-			%s\n", p);
++			w_list->buf->change = FALSE; printf("250 Loaded "
++			"%s\n", p);
+ 		}
+ 	}
+ }
+@@ -2865,8 +2865,8 @@ static void quit_plugin(char *p) {
+ 
+ static void prnt_plugin(char *p) {
+ 	Widget w = w_list->ui->grid; Display *dpy = XtDisplay(w); Pixmap
+-	pm = MwTablePixmap(w); XFreePixmap(dpy, pm); printf("502 Can't
+-	print yet\n");
++	pm = MwTablePixmap(w); XFreePixmap(dpy, pm); printf("502 Can't "
++	"print yet\n");
+ }
+ 
+ static struct {
diff --git a/www/galway/Makefile b/www/galway/Makefile
index 2c1ab38a5a4..b172f79693a 100644
--- a/www/galway/Makefile
+++ b/www/galway/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:33 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/03 15:58:55 wiz Exp $
 #
 
 DISTNAME=	galway-0.33
@@ -13,14 +13,14 @@ COMMENT=	Web editor programmed in Scheme
 
 DEPENDS+=	guile-gtk>=0.19nb2:../../devel/guile-gtk
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 NO_BUILD=	yes
 
 do-configure:
 	cd ${WRKSRC}; for i in *.scm; do				\
 		${SED}	-e "s|/usr/local|${PREFIX}|g"			\
-			-e "s|^\(exec\) guile |\1 ${GUILE14} |g"	\
-			-e "s|guile-config|${GUILE14_CONFIG} |g"	\
+			-e "s|^\(exec\) guile |\1 ${PREFIX}/${GUILE14_SUBDIR}/bin/guile |g"	\
+			-e "s|guile-config|${PREFIX}/${GUILE14_SUBDIR}/bin/guile |g"		\
 			< $$i > $$i.cfg;				\
 		${MV} $$i.cfg $$i;					\
 		${CHMOD} +x $$i;					\
@@ -29,5 +29,5 @@ do-configure:
 do-install:
 	cd ${WRKSRC} && ./install.scm
 
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index c05c14d031c..ba8c716601a 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:56 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/03 15:58:56 wiz Exp $
 
 DISTNAME=	Mowitz-0.2.2
 CATEGORIES=	x11
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://siag.nu/mowitz/
 COMMENT=	"More widgets" library
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_X11=	yes
@@ -25,6 +25,6 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
 CONFIGURE_ARGS+=--with-xawm=Xaw
 .endif
 
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"