summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorahoka <ahoka@pkgsrc.org>2009-06-13 13:41:52 +0000
committerahoka <ahoka@pkgsrc.org>2009-06-13 13:41:52 +0000
commitab1e2f5b0a6bdd1f14382e91be9e67253bf0ff31 (patch)
treea09f89d75af62f7a18b106593d217a0602960a50
parent508e7bbdac39249472c15270ab3092eb871c7c58 (diff)
downloadpkgsrc-ab1e2f5b0a6bdd1f14382e91be9e67253bf0ff31.tar.gz
Dont explicitly look for libintl.so.0, but libintl.so (why was this
hardcoded I wonder?). Fixes System.DllNotFoundException on NetBSD.
-rw-r--r--lang/mono/Makefile4
-rw-r--r--lang/mono/distinfo4
-rw-r--r--lang/mono/patches/patch-ab26
3 files changed, 24 insertions, 10 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 05e94b4665b..2b117915428 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2009/04/28 10:31:58 hasso Exp $
+# $NetBSD: Makefile,v 1.86 2009/06/13 13:41:52 ahoka Exp $
DISTNAME= mono-${MONO_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index f68f78143da..94ec812548c 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.48 2009/04/28 10:31:58 hasso Exp $
+$NetBSD: distinfo,v 1.49 2009/06/13 13:41:52 ahoka Exp $
SHA1 (mono-2.4.tar.bz2) = a0b5ea2f17f9ecc1d85f34e12e83797342104f5d
RMD160 (mono-2.4.tar.bz2) = cc0581b0ef13349a7bbdc4284cf985af9c52bd94
Size (mono-2.4.tar.bz2) = 24861051 bytes
-SHA1 (patch-ab) = e2a9c788c072f347dcb4c427d91b50b5153bff2f
+SHA1 (patch-ab) = 2ed32870daa53b672f79da301d14efe69b58d450
SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index 8f62e2d4be4..c286e0fafc6 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.17 2009/04/28 10:31:58 hasso Exp $
+$NetBSD: patch-ab,v 1.18 2009/06/13 13:41:53 ahoka Exp $
---- configure.orig 2009-03-13 16:51:11 +0200
-+++ configure 2009-04-27 12:56:28 +0300
+--- configure.orig 2009-03-13 15:51:11.000000000 +0100
++++ configure
@@ -2939,11 +2939,11 @@ _ACEOF
CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
libmono_ldflags="-pthread"
@@ -46,12 +46,26 @@ $NetBSD: patch-ab,v 1.17 2009/04/28 10:31:58 hasso Exp $
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -40049,7 +40056,7 @@ case "$host" in
- LIBC="libc.so.12"
- INTL="libintl.so.0"
+@@ -40046,10 +40053,10 @@ case "$host" in
+ X11="libX11.dylib"
+ ;;
+ *-*-*netbsd*)
+- LIBC="libc.so.12"
+- INTL="libintl.so.0"
++ LIBC="libc.so"
++ INTL="libintl.so"
;;
- *-*-*freebsd*)
+ *-*-*freebsd*|*-*-*dragonfly*)
LIBC="libc.so"
INTL="libintl.so"
;;
+@@ -41778,6 +41785,8 @@ do
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++ : Avoid regenerating within pkgsrc
++ exit 0
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;