Convert to buildlink3.

18 files changed, 98 insertions, 202 deletions

diff --git a/audio/esound/buildlink2.mk b/audio/esound/buildlink2.mk
deleted file mode 100644
index ec37357b4e5..00000000000
--- a/audio/esound/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:05 jlam Exp $
-
-.if !defined(ESOUND_BUILDLINK2_MK)
-ESOUND_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		esound
-BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
-BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.esound=esound
-BUILDLINK_PREFIX.esound_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.esound=		include/esd.h
-BUILDLINK_FILES.esound+=	lib/libesd.*
-
-.include "../../audio/libaudiofile/buildlink2.mk"
-
-BUILDLINK_TARGETS+=		esound-buildlink
-
-esound-buildlink: _BUILDLINK_USE
-
-.endif	# ESOUND_BUILDLINK2_MK
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 4f1016df639..31702093924 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -18,7 +18,7 @@ BUILD_USES_MSGFMT=	YES
 
 CONFLICTS+=		gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
@@ -70,18 +70,18 @@ post-install:
 		${LN} -fs ${PREFIX}/share/aclocal/gimp.m4		\
 			${LOCALBASE}/share/aclocal/gimp.m4
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
 .if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
 PLIST_SUBST+=	HELPBROWSER=""
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 .else
 PLIST_SUBST+=	HELPBROWSER="@comment "
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-base/buildlink2.mk b/graphics/gimp1-base/buildlink2.mk
deleted file mode 100644
index 1d32d820bd0..00000000000
--- a/graphics/gimp1-base/buildlink2.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 22:24:20 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gimp-base.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(GIMP_BASE_BUILDLINK2_MK)
-GIMP_BASE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			gimp-base
-BUILDLINK_DEPENDS.gimp-base?=		gimp-base>=1.2.5nb2
-BUILDLINK_PKGSRCDIR.gimp-base?=		../../graphics/gimp1-base
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gimp-base=gimp-base
-BUILDLINK_PREFIX.gimp-base_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gimp-base+=	include/gck/*
-BUILDLINK_FILES.gimp-base+=	include/libgimp/*
-BUILDLINK_FILES.gimp-base+=	lib/libgck*
-BUILDLINK_FILES.gimp-base+=	lib/libgimp*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/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/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
new file mode 100644
index 00000000000..111874d5cb4
--- /dev/null
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:41 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gimp-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-base}
+BUILDLINK_PACKAGES+=	gimp-base
+
+.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb2
+BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
+.endif	# GIMP_BASE_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile
index 7cf77b6ca99..f0a02d7b75b 100644
--- a/graphics/gimp1-data/Makefile
+++ b/graphics/gimp1-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-data-extras-1.2.0
@@ -16,9 +16,9 @@ COMMENT=	GNU Image Manipulation Program (extra brushes and patterns)
 
 CONFLICTS+=	gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
index 6c2d5db0e3c..8df30f8eab7 100644
--- a/graphics/gimp1-wideangle/Makefile
+++ b/graphics/gimp1-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/29 22:22:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	wideangleFeb03
@@ -13,11 +13,11 @@ HOMEPAGE=	http://www.ozemail.com.au/~hodsond/
 COMMENT=	GIMP plugin for wideangle lens distortions
 
 WRKSRC=		${WRKDIR}/wideangle
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	wideangle
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 9609da3d8af..8d7460ab15f 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/29 22:31:13 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	pygimp-1.2
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
 
 PYTHON_PATCH_SCRIPTS= plug-ins/clothify.py plug-ins/foggify.py
 PYTHON_PATCH_SCRIPTS+= plug-ins/gimpcons.py plug-ins/gtkcons.py
@@ -30,6 +30,6 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../graphics/gimp1-base/buildlink2.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
+.include "../../x11/pygtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index 55f70107d96..d6470153b8a 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	hh2000-0.6
@@ -13,13 +13,13 @@ COMMENT=	Astronomical simulation and visualization program
 
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	yes
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtkglarea/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtkglarea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 96f4ffff913..a803986cb68 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/02/01 01:43:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/05/05 02:26:41 snj Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.07
@@ -23,7 +23,7 @@ CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
 DEPENDS+=	ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
@@ -88,11 +88,11 @@ post-install:
 		${PREFIX}/libexec/cups/filter
 	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
 
-.include "../../security/openssl/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
-.include "../../print/gimp-print-lib/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index a5c3ac90a44..042985763bd 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-print-4.2.6
@@ -20,8 +20,8 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index 4b881256f72..31b81b98756 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/03/02 14:56:07 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	gimp-print-4.2.6
 PKGNAME=	gimp-print-escputil-4.2.6
@@ -20,10 +20,10 @@ CONFIGURE_ARGS+= --without-cups --without-translated-ppds
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index e4ac8ca72fa..f920fee8287 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	gimp-print-4.2.6
 PKGNAME=	gimp-print-ijs-4.2.6
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print IJS server
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		# defined
 USE_GNU_TOOLS+=		make
 
@@ -30,6 +30,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/ghost/README ${DOCDIR}
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../print/ijs/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../print/ijs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-lib/buildlink2.mk b/print/gimp-print-lib/buildlink2.mk
deleted file mode 100644
index 659a5a7b14d..00000000000
--- a/print/gimp-print-lib/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/02 14:56:07 drochner Exp $
-
-.if !defined(GIMP_PRINT_BUILDLINK2_MK)
-GIMP_PRINT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=	gimp-print-lib
-BUILDLINK_DEPENDS.gimp-print-lib?=	gimp-print-lib-4.2.6{,nb*}
-BUILDLINK_PKGSRCDIR.gimp-print-lib?=	../../print/gimp-print-lib
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gimp-print-lib=gimp-print-lib
-BUILDLINK_PREFIX.gimp-print-lib_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gimp-print-lib=		include/gimp-print/*
-BUILDLINK_FILES.gimp-print-lib+=	lib/libgimpprint.*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	gimp-print-lib-buildlink
-
-gimp-print-lib-buildlink: _BUILDLINK_USE
-
-.endif	# GIMP_PRINT_BUILDLINK2_MK
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index bb6f5ab5554..ec8c3b1fedc 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/29 22:25:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-print-4.2.6
@@ -18,9 +18,9 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 0642a1e29d4..163313ab4ff 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	ijs-0.34
 CATEGORIES=	print
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.linuxprinting.org/ijs/
 COMMENT=	Protocol library for raster page transmission
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
diff --git a/print/ijs/buildlink2.mk b/print/ijs/buildlink2.mk
deleted file mode 100644
index 103499970a8..00000000000
--- a/print/ijs/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/11 18:40:12 jlam Exp $
-
-.if !defined(IJS_BUILDLINK2_MK)
-IJS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		ijs
-BUILDLINK_DEPENDS.ijs?=		ijs>=0.34
-BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.ijs=ijs
-BUILDLINK_PREFIX.ijs_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ijs=	include/ijs/*
-BUILDLINK_FILES.ijs+=	lib/libijs.*
-
-BUILDLINK_TARGETS+=	ijs-buildlink
-
-ijs-buildlink: _BUILDLINK_USE
-
-.endif	# IJS_BUILDLINK2_MK
diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk
new file mode 100644
index 00000000000..c3f4db4395b
--- /dev/null
+++ b/print/ijs/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:42 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+IJS_BUILDLINK3_MK:=	${IJS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ijs
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nijs}
+BUILDLINK_PACKAGES+=	ijs
+
+.if !empty(IJS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ijs+=	ijs>=0.34
+BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
+.endif	# IJS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk
deleted file mode 100644
index 4b03acdb67c..00000000000
--- a/x11/gnome-libs/buildlink2.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/01/03 18:49:56 reed Exp $
-
-.if !defined(GNOME_LIBS_BUILDLINK2_MK)
-GNOME_LIBS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			gnome-libs
-BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.2nb1
-BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-libs=gnome-libs
-BUILDLINK_PREFIX.gnome-libs_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gnome-libs=	include/gnome-1.0/gnome.h
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/gtk-xmhtml/*
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libart_lgpl/*
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnome/*
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnomeui/*
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnorba/*
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/popt-gnome.h
-BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/zvt/*
-BUILDLINK_FILES.gnome-libs+=	lib/gnome-libs/*/*
-BUILDLINK_FILES.gnome-libs+=	lib/libart_lgpl.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgnome.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgnomesupport.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgnomeui.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgnorba.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgnorbagtk.*
-BUILDLINK_FILES.gnome-libs+=	lib/libgtkxmhtml.*
-BUILDLINK_FILES.gnome-libs+=	lib/libzvt.*
-BUILDLINK_FILES.gnome-libs+=	share/idl/GnomeObject.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/Table.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/desktop-editor.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/desktop-textviewer.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/gnome-factory.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/gnome-unknown.idl
-BUILDLINK_FILES.gnome-libs+=	share/idl/name-service.idl
-
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../net/ORBit/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=		gnome-libs-buildlink
-
-gnome-libs-buildlink: _BUILDLINK_USE
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink2.mk"
-.endif
-
-.endif	# GNOME_LIBS_BUILDLINK2_MK