summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/gnomeicu/Makefile12
-rw-r--r--devel/gtkdiff/Makefile6
-rw-r--r--sysutils/gtop/Makefile10
-rw-r--r--sysutils/libgtop/Makefile8
-rw-r--r--sysutils/libgtop/buildlink3.mk21
5 files changed, 39 insertions, 18 deletions
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 74da27813ba..c117b63725a 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/26 05:36:31 snj Exp $
DISTNAME= gnomeicu-0.96
PKGREVISION= 11
@@ -10,16 +10,16 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://gnomeicu.sourceforge.net/
COMMENT= GNOME ICQ client
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11BASE= YES
USE_GNU_TOOLS+= make
-.include "../../databases/gdbm/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index d005d2d2742..352221fdce9 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/26 05:41:30 snj Exp $
#
DISTNAME= gtkdiff-1.8.0
@@ -10,10 +10,10 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://home.catv.ne.jp/pp/ginoue/software/gtkdiff/index-e.html
COMMENT= Diff front-end program using GNOME
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 94d5831ae39..e71d391b67d 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2004/04/26 05:44:33 snj Exp $
DISTNAME= gtop-1.0.13
PKGREVISION= 8
@@ -12,7 +12,7 @@ COMMENT= GNOME system monitor - top like, memory graphs, process viewer
BUILD_USES_MSGFMT= YES
OSVERSION_SPECIFIC= YES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
USE_GNU_TOOLS+= make
@@ -23,7 +23,7 @@ GNU_CONFIGURE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ENV+= LOCALEDIR=${PKGLOCALEDIR}
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../sysutils/libgtop/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index a622ae6fcc8..39e2e1e7063 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/05 09:07:56 tron Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/26 05:44:05 snj Exp $
DISTNAME= libgtop-1.0.13
PKGREVISION= 4
@@ -31,7 +31,7 @@ PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)"
.endif
USE_PERL5= build
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
USE_X11BASE= YES
USE_GNU_TOOLS+= make
@@ -50,6 +50,6 @@ CONFIGURE_ARGS+= --with-glib-prefix=${BUILDLINK_PREFIX.glib} \
--with-catgets --with-libgtop-guile=no
CONFIGURE_ENV+= AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk
new file mode 100644
index 00000000000..b3ab3ecf5ab
--- /dev/null
+++ b/sysutils/libgtop/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 05:44:05 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+LIBGTOP_BUILDLINK3_MK:= ${LIBGTOP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= libgtop
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop}
+BUILDLINK_PACKAGES+= libgtop
+
+.if !empty(LIBGTOP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libgtop+= libgtop>=1.0.13nb4
+BUILDLINK_PKGSRCDIR.libgtop?= ../../sysutils/libgtop
+.endif # LIBGTOP_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}