[pkgsrc/trunk]: pkgsrc/lang/mono Fix a problem, when applications using winfo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/392ec03d996a
branches:  trunk
changeset: 560748:392ec03d996a
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sun Jun 21 21:37:47 2009 +0000

description:
Fix a problem, when applications using winforms can't find libX11.so with
native NetBSD Xorg by giving them full path to the shared library.

diffstat:

 lang/mono/Makefile         |  10 ++++++++--
 lang/mono/distinfo         |   4 ++--
 lang/mono/patches/patch-ab |  11 ++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r 16fb041aa808 -r 392ec03d996a lang/mono/Makefile
--- a/lang/mono/Makefile        Sun Jun 21 18:12:04 2009 +0000
+++ b/lang/mono/Makefile        Sun Jun 21 21:37:47 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2009/06/13 13:41:52 ahoka Exp $
+# $NetBSD: Makefile,v 1.87 2009/06/21 21:37:47 ahoka Exp $
 
 DISTNAME=      mono-${MONO_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=  .tar.bz2
@@ -127,6 +127,12 @@
 SUBST_FILES.fix-cfgdir=                mcs/tools/mconfig/Makefile
 SUBST_SED.fix-cfgdir=          -e 's,$$(sysconfdir)/mono,${EGDIR},g'
 
+SUBST_CLASSES+=                        fix-libx11
+SUBST_STAGE.fix-prefix=                pre-configure
+SUBST_MESSAGE.fix-prefix=      Fixing libX11 search path configuration
+SUBST_FILES.fix-prefix=                configure
+SUBST_SED.fix-prefix=          -e 's,@X11BASE@,${X11BASE},g'
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff -r 16fb041aa808 -r 392ec03d996a lang/mono/distinfo
--- a/lang/mono/distinfo        Sun Jun 21 18:12:04 2009 +0000
+++ b/lang/mono/distinfo        Sun Jun 21 21:37:47 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2009/06/13 13:41:52 ahoka Exp $
+$NetBSD: distinfo,v 1.50 2009/06/21 21:37:48 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) = 2ed32870daa53b672f79da301d14efe69b58d450
+SHA1 (patch-ab) = cd21ae3674ff3c19343a60556a20198ead2d0e16
 SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
 SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
diff -r 16fb041aa808 -r 392ec03d996a lang/mono/patches/patch-ab
--- a/lang/mono/patches/patch-ab        Sun Jun 21 18:12:04 2009 +0000
+++ b/lang/mono/patches/patch-ab        Sun Jun 21 21:37:47 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.18 2009/06/13 13:41:53 ahoka Exp $
+$NetBSD: patch-ab,v 1.19 2009/06/21 21:37:48 ahoka Exp $
 
 --- configure.orig     2009-03-13 15:51:11.000000000 +0100
 +++ configure
@@ -46,6 +46,15 @@
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
+@@ -39626,7 +39633,7 @@ LIBC="libc.so.6"
+ INTL="libc.so.6"
+ SQLITE="libsqlite.so.0"
+ SQLITE3="libsqlite3.so.0"
+-X11="libX11.so"
++X11="@X11BASE@/lib/libX11.so"
+ 
+ sizeof_register="SIZEOF_VOID_P"
+ 
 @@ -40046,10 +40053,10 @@ case "$host" in
        X11="libX11.dylib"
        ;;