Adjust dependencies after ocaml has been splitted into three different

packages: ocaml, ocaml-graphics and labltk.  Bump PKGREVISION.

10 files changed, 24 insertions, 21 deletions

diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 4f712748258..d7a09589261 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=		camlimages-2.11
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 EXTRACT_SUFX=		.tgz
@@ -23,11 +23,12 @@ PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .endif
 
 .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 "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 86cac3e6de2..51ec5ccdc17 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/24 17:21:01 jmmv Exp $
 #
 
 DISTNAME=	coq-7.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V7.4/
 
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index e4e25dcd07e..dcb9db9fe85 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2004/11/29 22:05:08 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.58 2004/12/24 17:21:01 jmmv Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
 PKGNAME=	${SCIBASE}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Scilab/distributions/
 
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 4b4b4b56b4d..d4eda9c9f83 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/12/24 17:21:01 jmmv Exp $
 #
 
 DISTNAME=	mldonkey-2.5.21
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
 
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 77bf3f33bcd..48ee55986ca 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:01 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.20
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/latest/
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index b9a1956cd3b..0efaa4ee4f6 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:18:01 tv Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 05cbdbd87d1..8fd59ebe810 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:03 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=		advi-1.4.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
 
@@ -38,12 +38,13 @@ post-install:
 
 .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 "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/swiftsurf/Makefile b/www/swiftsurf/Makefile
index 915eba96246..add41aa18ec 100644
--- a/www/swiftsurf/Makefile
+++ b/www/swiftsurf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:15:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=		swiftsurf-1.2.5
-PKGREVISION=	1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swiftsurf/}
 
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 51cffc004a3..ecc68a8dfea 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/24 17:21:01 jmmv Exp $
 
 DISTNAME=	lablgtk-1.2.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 9bbdf856e55..acb9798e5dc 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/04 20:39:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/24 17:21:01 jmmv Exp $
 #
 
 DISTNAME=	lablgtk-2.4.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/