bl3ify

8 files changed, 46 insertions, 49 deletions

diff --git a/mail/sylpheed-claws-dillo-viewer/Makefile b/mail/sylpheed-claws-dillo-viewer/Makefile
index 7d1491266ed..e467147763a 100644
--- a/mail/sylpheed-claws-dillo-viewer/Makefile
+++ b/mail/sylpheed-claws-dillo-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/01 21:42:34 cube Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/11 12:23:19 jmmv Exp $
 #
 
 PLUGIN_NAME=	dillo_viewer
@@ -11,6 +11,6 @@ DEPENDS+=	dillo>=0.7.2:../../www/dillo
 
 CONFIGURE_ARGS+=	--enable-dillo-viewer-plugin
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile
index 692ff302b50..093227cd4c1 100644
--- a/mail/sylpheed-claws-ghostscript-viewer/Makefile
+++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/11 12:23:19 jmmv Exp $
 #
 
 DISTNAME=	ghostscript-viewer-0.6
@@ -12,16 +12,16 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://reboot.animeirc.de/sylpheed/ghostscript_viewer/
 COMMENT=	Plugin to make Sylpheed-claws display PostScript and PDF attachments
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
 PLIST_SRC=	${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
 PLIST_SUBST+=	PLUGIN_NAME=ghostscript_viewer
 
-.include "../../mail/sylpheed-claws/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../mk/ghostscript.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mail/sylpheed-claws/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
+.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws-image-viewer/Makefile b/mail/sylpheed-claws-image-viewer/Makefile
index 2e80d86f9eb..73b235770d9 100644
--- a/mail/sylpheed-claws-image-viewer/Makefile
+++ b/mail/sylpheed-claws-image-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/11 12:23:19 jmmv Exp $
 #
 
 PLUGIN_NAME=	image_viewer
@@ -11,7 +11,7 @@ COMMENT=	Plugin to allow Sylpheed-claws to display images attached to mails
 
 CONFIGURE_ARGS+=	--enable-image-viewer-plugin
 
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws-trayicon/Makefile b/mail/sylpheed-claws-trayicon/Makefile
index d6285fc243a..d5a0d159a1c 100644
--- a/mail/sylpheed-claws-trayicon/Makefile
+++ b/mail/sylpheed-claws-trayicon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/01 21:43:27 cube Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/11 12:23:19 jmmv Exp $
 #
 
 PLUGIN_NAME=	trayicon
@@ -9,6 +9,6 @@ COMMENT=	Plugin to make Sylpheed-claws display an icon in the system tray
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 38d214a0e27..31bae625433 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/02/26 14:07:23 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/11 12:23:19 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -40,14 +40,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 FACES_IS_INSTALLED!=	${PKG_INFO} -e faces || ${ECHO}
 .if empty(FACES_IS_INSTALLED)
-.  include "../../graphics/compface/buildlink2.mk"
+.  include "../../graphics/compface/buildlink3.mk"
 .else
-.  include "../../mail/faces/buildlink2.mk"
+.  include "../../mail/faces/buildlink3.mk"
 .endif
 
 .if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
 CONFIGURE_ARGS+=	--enable-ldap
-.include "../../databases/openldap/buildlink2.mk"
+.include "../../databases/openldap/buildlink3.mk"
 .endif
 
 EGDIR=		${PREFIX}/share/examples/sylpheed
@@ -58,10 +58,10 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/sylpheed*.png ${PREFIX}/share/sylpheed
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../security/gpgme03/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/aspell/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/gpgme03/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/aspell/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index ba3d4a3241d..48f04c32c1a 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/03/08 15:46:42 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/03/11 12:23:19 jmmv Exp $
 #
 
 DISTNAME=	sylpheed-${SYLPHEED_VERSION}claws
@@ -11,7 +11,7 @@ HOMEPAGE=	http://sylpheed-claws.sourceforge.net/
 DISTINFO_FILE=	${.CURDIR}/../../mail/sylpheed-claws/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/sylpheed-claws/patches
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/mail/sylpheed-claws/buildlink2.mk b/mail/sylpheed-claws/buildlink2.mk
deleted file mode 100644
index 8e8ff283bd1..00000000000
--- a/mail/sylpheed-claws/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2004/01/02 09:14:59 cube Exp $
-#
-# This Makefile fragment is included by packages that use sylpheed-claws.
-#
-# This file was created automatically using createbuildlink 2.5.
-#
-
-.if !defined(SYLPHEED_CLAWS_BUILDLINK2_MK)
-SYLPHEED_CLAWS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			sylpheed-claws
-BUILDLINK_DEPENDS.sylpheed-claws?=		sylpheed-claws>=0.9.7nb1
-BUILDLINK_PKGSRCDIR.sylpheed-claws?=		../../mail/sylpheed-claws
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.sylpheed-claws=sylpheed-claws
-BUILDLINK_PREFIX.sylpheed-claws_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.sylpheed-claws+=	include/sylpheed/*.h
-BUILDLINK_FILES.sylpheed-claws+=	include/sylpheed/common/*.h
-BUILDLINK_FILES.sylpheed-claws+=	include/sylpheed/gtk/*.h
-
-BUILDLINK_TARGETS+=	sylpheed-claws-buildlink
-
-sylpheed-claws-buildlink: _BUILDLINK_USE
-
-.endif	# SYLPHEED_CLAWS_BUILDLINK2_MK
diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk
new file mode 100644
index 00000000000..24e115f26be
--- /dev/null
+++ b/mail/sylpheed-claws/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 12:23:19 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use sylpheed-claws.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SYLPHEED_CLAWS_BUILDLINK3_MK:=	${SYLPHEED_CLAWS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sylpheed-claws
+.endif
+
+.if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			sylpheed-claws
+BUILDLINK_DEPENDS.sylpheed-claws+=		sylpheed-claws>=0.9.7nb1
+BUILDLINK_PKGSRCDIR.sylpheed-claws?=		../../mail/sylpheed-claws
+
+.endif # SYLPHEED_CLAWS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}