summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/camlimages/Makefile20
-rw-r--r--graphics/camlimages/buildlink2.mk20
-rw-r--r--graphics/camlimages/buildlink3.mk19
-rw-r--r--print/advi/Makefile22
4 files changed, 40 insertions, 41 deletions
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index ca24f8fb1c5..37078e71f22 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/03 21:50:41 snj Exp $
DISTNAME= camlimages-2.11
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://pauillac.inria.fr/camlimages/
COMMENT= Image processing library for Objective Caml
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
@@ -22,12 +22,12 @@ ALL_TARGET+= all.opt
PLIST_SRC+= ${PKGDIR}/PLIST.opt
.endif
-.include "../../lang/ocaml/buildlink2.mk"
-.include "../../x11/lablgtk/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/camlimages/buildlink2.mk b/graphics/camlimages/buildlink2.mk
deleted file mode 100644
index 3f207dd55de..00000000000
--- a/graphics/camlimages/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/08/31 01:24:41 jtb Exp $
-#
-# This Makefile fragment is included by packages that use camlimages.
-
-.if !defined(CAMLIMAGES_BUILDLINK2_MK)
-CAMLIMAGES_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= camlimages
-BUILDLINK_DEPENDS.camlimages?= camlimages>=2.11
-BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.camlimages=camlimages
-BUILDLINK_PREFIX.camlimages_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.camlimages+= lib/ocaml/camlimages/*
-
-BUILDLINK_TARGETS+= camlimages-buildlink
-
-camlimages-buildlink: _BUILDLINK_USE
-
-.endif # CAMLIMAGES_BUILDLINK2_MK
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
new file mode 100644
index 00000000000..6aacc31b9b6
--- /dev/null
+++ b/graphics/camlimages/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 21:50:41 snj Exp $
+# XXX BUILDLINK_DEPMETHOD.camlimages?= build
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+CAMLIMAGES_BUILDLINK3_MK:= ${CAMLIMAGES_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= camlimages
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncamlimages}
+BUILDLINK_PACKAGES+= camlimages
+
+.if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.camlimages+= camlimages>=2.11
+BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages
+.endif # CAMLIMAGES_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/advi/Makefile b/print/advi/Makefile
index a11f2bdc41f..c8465bbc809 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/03 21:50:41 snj Exp $
DISTNAME= advi-1.4.0
PKGREVISION= 3
@@ -11,7 +11,7 @@ COMMENT= Active-DVI Presenter
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
@@ -36,14 +36,14 @@ post-install:
cd ${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* .
${INSTALL_MAN} ${WRKSRC}/doc/advi.1 ${PREFIX}/man/man1
-.include "../../lang/ocaml/buildlink2.mk"
-.include "../../graphics/camlimages/buildlink2.mk"
-.include "../../x11/lablgtk/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../graphics/camlimages/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"