Unbreak findlib and dynlink:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630490

Also fix dependencies and WANTLIB.

OK dcoppa@, looks good aja@

sysutils/findlib/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2012/07/09 20:36:18 edd Exp $
+# $OpenBSD: Makefile,v 1.22 2012/07/12 10:11:38 edd Exp $
 
 COMMENT=	Objective Caml package manager
 CATEGORIES=	sysutils
 DISTNAME=	findlib-1.2.7
-REVISION=	0
+REVISION =	1
+
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
@@ -14,11 +15,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
-WANTLIB=		X11 c curses m pthread pthread-stubs tcl85 xcb
+
+WANTLIB =	c curses m pthread
 
 MODULES+=	lang/ocaml x11/tk
-LIB_DEPENDS =	${MODTK_LIB_DEPENDS}
-WANTLIB +=	${MODTK_WANTLIB}
+BUILD_DEPENDS =	${MODTK_BUILD_DEPENDS}
+RUN_DEPENDS =	${MODTK_RUN_DEPENDS}
+
 NO_REGRESS=	Yes
 
 CONFIGURE_STYLE=simple

sysutils/findlib/patches/patch-site-lib-src_camlp4_310_META_in

@@ -0,0 +1,24 @@
+$OpenBSD: patch-site-lib-src_camlp4_310_META_in,v 1.1 2012/07/12 10:11:38 edd Exp $
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630490
+
+--- site-lib-src/camlp4.310/META.in.orig	Thu Jul 12 10:18:41 2012
++++ site-lib-src/camlp4.310/META.in	Thu Jul 12 10:19:43 2012
+@@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor.
+ `directory = "'camlp4_dir`"'
+ 
+ `# For the toploop:'
+-`requires(byte,toploop) = "'camlp4_dynlink`"'
++`requires(byte,toploop) = "dynlink"'
+ `archive(byte,toploop,camlp4o) = "camlp4o.cma"'
+ `archive(byte,toploop,camlp4r) = "camlp4r.cma"'
+ 
+@@ -16,7 +16,7 @@ dnl This file is input of the m4 macro processor.
+ `preprocessor = "'camlp4_cmd`"'
+ 
+ `package "lib" ('
+-`  requires = "camlp4 'camlp4_dynlink`"'
++`  requires = "camlp4 dynlink"'
+ `  version = "[distributed with Ocaml]"'
+ `  description = "Camlp4 library"'
+ `  archive(byte) = "camlp4lib.cma"'