Fix build under Mac OS X, which does not provide a static libcrypto.

Do this by linking against the shared library version, and depend on
openssl to fulfill this dependency.

4 files changed, 32 insertions, 5 deletions

diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 1a3db1ce193..f91286dd033 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/07/17 20:02:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/17 21:47:40 jmmv Exp $
 #
 
 DISTNAME=		monotone-viz-0.15
@@ -25,6 +25,7 @@ do-install:
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/lablgtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/monotone-viz/distinfo b/devel/monotone-viz/distinfo
index 26d2f68c68c..fe1c465b5fc 100644
--- a/devel/monotone-viz/distinfo
+++ b/devel/monotone-viz/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/30 08:03:39 dan Exp $
+$NetBSD: distinfo,v 1.5 2007/07/17 21:47:40 jmmv Exp $
 
 SHA1 (monotone-viz-0.15.tar.gz) = a9415e37b3da6a1202d3981860cd091239af5c02
 RMD160 (monotone-viz-0.15.tar.gz) = 569af354eaabff27505757e3e2934d2bff9bf223
 Size (monotone-viz-0.15.tar.gz) = 509782 bytes
-SHA1 (patch-aa) = b04a92e013fed9c4128677b2fe4cb7dcd4b9500c
+SHA1 (patch-aa) = ddbfc363f4345eccc7ee9d36234de4dea3f57267
+SHA1 (patch-ab) = 5cdcb30b6943da668815a55a0d517dff7c3e93cf
diff --git a/devel/monotone-viz/patches/patch-aa b/devel/monotone-viz/patches/patch-aa
index 8ea4d0dedb9..ec584acbb86 100644
--- a/devel/monotone-viz/patches/patch-aa
+++ b/devel/monotone-viz/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2006/10/30 08:03:39 dan Exp $
+$NetBSD: patch-aa,v 1.5 2007/07/17 21:47:40 jmmv Exp $
 
---- configure.orig	2006-10-30 18:39:40.000000000 +1100
+--- configure.orig	2006-05-25 15:51:47.000000000 +0200
 +++ configure
 @@ -2178,32 +2178,6 @@ echo "${ECHO_T}yes" >&6
  fi
@@ -35,3 +35,11 @@ $NetBSD: patch-aa,v 1.4 2006/10/30 08:03:39 dan Exp $
  
  
  # Check for libcrypto using pkg-config, defaulting to /usr/lib
+@@ -2211,6 +2185,7 @@ echo "$as_me:$LINENO: checking OpenSSL's
+ echo $ECHO_N "checking OpenSSL's crypto lib... $ECHO_C" >&6
+ CRYPTO_LIB_DIR="$(pkg-config openssl --variable=libdir)"
+ CRYPTO_LIB="${CRYPTO_LIB_DIR:-/usr/lib}/libcrypto.a"
++CRYPTO_LIB="-lcrypto"
+ echo "$as_me:$LINENO: result: $CRYPTO_LIB" >&5
+ echo "${ECHO_T}$CRYPTO_LIB" >&6
+ 
diff --git a/devel/monotone-viz/patches/patch-ab b/devel/monotone-viz/patches/patch-ab
new file mode 100644
index 00000000000..6f374fd2bf0
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2007/07/17 21:47:40 jmmv Exp $
+
+--- Makefile.orig	2006-10-16 22:05:43.000000000 +0200
++++ Makefile
+@@ -73,9 +73,11 @@ else
+ LIB3RDPARTY_OBJ = $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $(C_OBJ)
+ endif
+ 
++CRYPTO_LINK     = -cclib "$(CRYPTO_LIB)"
++
+ ifeq ($(OCAMLBEST), opt)
+ monotone-viz : $(OBJX) lib3rdparty.a
+-	$(OCAMLOPT) -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK)
++	$(OCAMLOPT) -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LINK) $(SQLITE_LINK)
+ monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa 
+ ifeq ($(LOCAL_LABLGTK), yes)
+ $(OBJX) : .lablgtk