[pkgsrc/trunk]: pkgsrc Convert to buildlink3.

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db35900fd3ce
branches:  trunk
changeset: 474672:db35900fd3ce
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon May 03 21:50:41 2004 +0000

description:
Convert to buildlink3.

diffstat:

 graphics/camlimages/Makefile      |  20 ++++++++++----------
 graphics/camlimages/buildlink2.mk |  20 --------------------
 graphics/camlimages/buildlink3.mk |  19 +++++++++++++++++++
 print/advi/Makefile               |  22 +++++++++++-----------
 4 files changed, 40 insertions(+), 41 deletions(-)

diffs (128 lines):

diff -r 6bda7439e9c4 -r db35900fd3ce graphics/camlimages/Makefile
--- a/graphics/camlimages/Makefile      Mon May 03 21:41:36 2004 +0000
+++ b/graphics/camlimages/Makefile      Mon May 03 21:50:41 2004 +0000
@@ -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 @@
 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 @@
 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 -r 6bda7439e9c4 -r db35900fd3ce graphics/camlimages/buildlink2.mk
--- a/graphics/camlimages/buildlink2.mk Mon May 03 21:41:36 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6bda7439e9c4 -r db35900fd3ce graphics/camlimages/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/camlimages/buildlink3.mk Mon May 03 21:50:41 2004 +0000
@@ -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 -r 6bda7439e9c4 -r db35900fd3ce print/advi/Makefile
--- a/print/advi/Makefile       Mon May 03 21:41:36 2004 +0000
+++ b/print/advi/Makefile       Mon May 03 21:50:41 2004 +0000
@@ -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 @@
 
 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 @@
        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"