Fix prefix/exec_prefix in pkgconfig files.

spotted by Vadim Zhukov

Regen patches while here.
This commit is contained in:
ajacoutot 2011-11-03 09:55:12 +00:00
parent 2965adca24
commit 1787e4c6d4
9 changed files with 21 additions and 60 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.64 2011/09/16 10:31:21 espie Exp $
# $OpenBSD: Makefile,v 1.65 2011/11/03 09:55:12 ajacoutot Exp $
COMMENT= cross platform, open source .NET developement framework
DISTNAME= mono-2.10.5
REVISION= 0
REVISION= 1
CATEGORIES= lang devel
@ -91,6 +91,9 @@ pre-configure:
for i in ${BASH_SCRIPTS}; do \
perl -pi -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/$${i}; \
done
perl -pi -e 's,^prefix=.*,prefix=\@prefix\@,g;' \
-e 's,^exec_prefix=.*,exec_prefix=\@prefix\@,g' \
${WRKSRC}/data/*.pc.in
# Force using the internal mcs compiler
pre-build:

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-data_mint_pc_in,v 1.1 2008/10/16 16:00:27 robert Exp $
--- data/mint.pc.in.orig Thu Oct 16 10:03:12 2008
+++ data/mint.pc.in Thu Oct 16 10:24:59 2008
@@ -1,5 +1,5 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
+prefix=@prefix@
+exec_prefix=@prefix@
libdir=${prefix}/lib
includedir=${prefix}/include/mono-@API_VER@

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-data_mono-cairo_pc_in,v 1.1 2008/10/16 16:00:27 robert Exp $
--- data/mono-cairo.pc.in.orig Thu Oct 16 10:03:20 2008
+++ data/mono-cairo.pc.in Thu Oct 16 10:25:10 2008
@@ -1,5 +1,5 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
+prefix=@prefix@
+exec_prefix=@prefix@
libdir=${prefix}/@reloc_libdir@
includedir=${prefix}/include

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-data_mono-nunit_pc_in,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- data/mono-nunit.pc.in.orig Sun Aug 23 11:18:44 2009
+++ data/mono-nunit.pc.in Sun Aug 23 11:18:57 2009
@@ -1,4 +1,4 @@
-prefix=${pcfiledir}/../..
+prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-data_mono_pc_in,v 1.1 2008/10/16 16:00:27 robert Exp $
--- data/mono.pc.in.orig Thu Oct 16 10:03:28 2008
+++ data/mono.pc.in Thu Oct 16 10:25:22 2008
@@ -1,5 +1,5 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
+prefix=@prefix@
+exec_prefix=@prefix@
libdir=${prefix}/@reloc_libdir@
includedir=${prefix}/include/mono-@API_VER@
sysconfdir=@sysconfdir@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_metadata_class_c,v 1.4 2011/03/02 08:37:51 robert Exp $
--- mono/metadata/class.c.orig Wed Feb 23 20:21:01 2011
+++ mono/metadata/class.c Sun Feb 27 14:15:30 2011
@@ -1721,7 +1721,8 @@ mono_class_layout_fields (MonoClass *class)
$OpenBSD: patch-mono_metadata_class_c,v 1.5 2011/11/03 09:55:12 ajacoutot Exp $
--- mono/metadata/class.c.orig Tue Aug 23 02:10:06 2011
+++ mono/metadata/class.c Thu Nov 3 08:54:45 2011
@@ -1736,7 +1736,8 @@ mono_class_layout_fields (MonoClass *class)
field->offset &= ~(align - 1);
}
/*TypeBuilders produce all sort of weird things*/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_profiler_Makefile_in,v 1.2 2011/03/02 08:37:51 robert Exp $
--- mono/profiler/Makefile.in.orig Sun Feb 27 14:41:13 2011
+++ mono/profiler/Makefile.in Sun Feb 27 14:41:34 2011
@@ -328,7 +328,7 @@ libmono_profiler_aot_la_LIBADD = $(top_builddir)/mono/
$OpenBSD: patch-mono_profiler_Makefile_in,v 1.3 2011/11/03 09:55:12 ajacoutot Exp $
--- mono/profiler/Makefile.in.orig Tue Aug 23 02:11:01 2011
+++ mono/profiler/Makefile.in Thu Nov 3 08:54:56 2011
@@ -346,7 +346,7 @@ libmono_profiler_aot_la_LIBADD = $(top_builddir)/mono/
#libmono_profiler_logging_la_SOURCES = mono-profiler-logging.c
#libmono_profiler_logging_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS)
libmono_profiler_iomap_la_SOURCES = mono-profiler-iomap.c

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_utils_gc_wrapper_h,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- mono/utils/gc_wrapper.h.orig Tue Sep 1 14:20:56 2009
+++ mono/utils/gc_wrapper.h Tue Sep 1 14:21:25 2009
@@ -33,6 +33,12 @@
$OpenBSD: patch-mono_utils_gc_wrapper_h,v 1.2 2011/11/03 09:55:12 ajacoutot Exp $
--- mono/utils/gc_wrapper.h.orig Tue Aug 23 02:10:06 2011
+++ mono/utils/gc_wrapper.h Thu Nov 3 08:54:45 2011
@@ -37,6 +37,12 @@
# endif
# endif

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-runtime_monodis-wrapper_in,v 1.3 2010/09/28 18:33:06 jasper Exp $
--- runtime/monodis-wrapper.in.orig Fri Sep 25 16:58:09 2009
+++ runtime/monodis-wrapper.in Sat Mar 20 11:03:12 2010
$OpenBSD: patch-runtime_monodis-wrapper_in,v 1.4 2011/11/03 09:55:12 ajacoutot Exp $
--- runtime/monodis-wrapper.in.orig Tue Aug 9 03:18:47 2011
+++ runtime/monodis-wrapper.in Thu Nov 3 08:54:45 2011
@@ -3,4 +3,4 @@ r='@mono_build_root@'
MONO_CFG_DIR='@mono_cfg_dir@'
MONO_SHARED_DIR=$r/runtime
export MONO_CFG_DIR MONO_SHARED_DIR
-exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono.la" "$r/mono/dis/monodis" "$@"
-exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono-2.0.la" "$r/mono/dis/monodis" "$@"
+exec "${LIBTOOL}" --mode=execute -dlopen "$r/mono/mini/libmono.la" "$r/mono/dis/monodis" "$@"