diff options
| author | ahoka <ahoka> | 2009-06-21 21:37:47 +0000 |
|---|---|---|
| committer | ahoka <ahoka> | 2009-06-21 21:37:47 +0000 |
| commit | 853e732964b9dabd2a48e632def7ad1fa7d0e9cf (patch) | |
| tree | 598327b7addcbdf4ec33ded3cced96491cdd7de5 | |
| parent | 9e43a80ed6eab9b0dbf2fe66354a2f772102051c (diff) | |
| download | pkgsrc-853e732964b9dabd2a48e632def7ad1fa7d0e9cf.tar.gz | |
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.
| -rw-r--r-- | lang/mono/Makefile | 10 | ||||
| -rw-r--r-- | lang/mono/distinfo | 4 | ||||
| -rw-r--r-- | lang/mono/patches/patch-ab | 11 |
3 files changed, 20 insertions, 5 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 2b117915428..36ab71b447f 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -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_MESSAGE.fix-cfgdir= Fixing configuration files install dir 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 --git a/lang/mono/distinfo b/lang/mono/distinfo index 94ec812548c..dd8253978f5 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -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 --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index c286e0fafc6..aef4acaedce 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.18 2009/06/13 13:41:53 ahoka Exp $ _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" ;; |