pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mono6: install config files to examples



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri Aug 2 22:07:21 2019 +0100
Changeset:	4b08b9d82c4994c19108d10589c5bd4fbd65512a

Modified Files:
	mono6/Makefile
	mono6/TODO
	mono6/distinfo
Added Files:
	mono6/patches/patch-data_Makefile.am
	mono6/patches/patch-data_net__2__0_Browsers_Makefile.am
	mono6/patches/patch-data_net__2__0_Makefile.am
	mono6/patches/patch-data_net__4__0_Browsers_Makefile.am
	mono6/patches/patch-data_net__4__0_Makefile.am
	mono6/patches/patch-data_net__4__5_Browsers_Makefile.am
	mono6/patches/patch-data_net__4__5_Makefile.am

Log Message:
mono6: install config files to examples

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b08b9d82c4994c19108d10589c5bd4fbd65512a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono6/Makefile                                     | 37 ++++++++++++++++++++--
 mono6/TODO                                         |  1 -
 mono6/distinfo                                     |  7 ++++
 mono6/patches/patch-data_Makefile.am               | 14 ++++++++
 .../patch-data_net__2__0_Browsers_Makefile.am      | 12 +++++++
 mono6/patches/patch-data_net__2__0_Makefile.am     | 14 ++++++++
 .../patch-data_net__4__0_Browsers_Makefile.am      | 12 +++++++
 mono6/patches/patch-data_net__4__0_Makefile.am     | 14 ++++++++
 .../patch-data_net__4__5_Browsers_Makefile.am      | 12 +++++++
 mono6/patches/patch-data_net__4__5_Makefile.am     | 14 ++++++++
 10 files changed, 134 insertions(+), 3 deletions(-)

diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 0870fd6d55..6ad2b15f58 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -25,8 +25,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} --with-icu=yes
 CONFIGURE_ARGS+=	--disable-dtrace
 
-USE_CWRAPPERS=		no
-
 USE_CWRAPPERS=		no
 MAKE_FLAGS+=		PERL=${PERL5:Q} mandir=${PREFIX}/${PKGMANDIR}
 UNLIMIT_RESOURCES=	datasize stacksize memorysize
@@ -61,6 +59,41 @@ REPLACE_BASH+=	mcs/mkinstalldirs mkinstalldirs
 
 EGDIR=		${PREFIX}/share/examples/mono
 
+CONF_FILES+=	${EGDIR}/mono/2.0/Browsers/Compat.browser \
+		${PKG_SYSCONFDIR}/mono/2.0/Browsers/Compat.browser
+CONF_FILES+=	${EGDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx \
+		${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=	${EGDIR}/mono/2.0/machine.config \
+		${PKG_SYSCONFDIR}/mono/2.0/machine.config
+CONF_FILES+=	${EGDIR}/mono/2.0/settings.map \
+		${PKG_SYSCONFDIR}/mono/2.0/settings.map
+CONF_FILES+=	${EGDIR}/mono/2.0/web.config \
+		${PKG_SYSCONFDIR}/mono/2.0/web.config
+CONF_FILES+=	${EGDIR}/mono/4.0/Browsers/Compat.browser \
+		${PKG_SYSCONFDIR}/mono/4.0/Browsers/Compat.browser
+CONF_FILES+=	${EGDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx \
+		${PKG_SYSCONFDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=	${EGDIR}/mono/4.0/machine.config \
+		${PKG_SYSCONFDIR}/mono/4.0/machine.config
+CONF_FILES+=	${EGDIR}/mono/4.0/settings.map \
+		${PKG_SYSCONFDIR}/mono/4.0/settings.map
+CONF_FILES+=	${EGDIR}/mono/4.0/web.config \
+		${PKG_SYSCONFDIR}/mono/4.0/web.config
+CONF_FILES+=	${EGDIR}/mono/4.5/Browsers/Compat.browser \
+		${PKG_SYSCONFDIR}/mono/4.5/Browsers/Compat.browser
+CONF_FILES+=	${EGDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx \
+		${PKG_SYSCONFDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=	${EGDIR}/mono/4.5/machine.config \
+		${PKG_SYSCONFDIR}/mono/4.5/machine.config
+CONF_FILES+=	${EGDIR}/mono/4.5/settings.map \
+		${PKG_SYSCONFDIR}/mono/4.5/settings.map
+CONF_FILES+=	${EGDIR}/mono/4.5/web.config \
+		${PKG_SYSCONFDIR}/mono/4.5/web.config
+CONF_FILES+=	${EGDIR}/mono/browscap.ini \
+		${PKG_SYSCONFDIR}/mono/browscap.ini
+CONF_FILES+=	${EGDIR}/mono/config \
+		${PKG_SYSCONFDIR}/mono/config
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/2.0
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/2.0/Browsers
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/4.0
diff --git a/mono6/TODO b/mono6/TODO
index 7bbf28833a..91b693743e 100644
--- a/mono6/TODO
+++ b/mono6/TODO
@@ -1,2 +1 @@
 - Requires disabling cwrappers to build, as we need "" as an argument
-- Installs to etc
diff --git a/mono6/distinfo b/mono6/distinfo
index 4f5707c3a4..e62e9647c1 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -5,6 +5,13 @@ RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f
 SHA512 (mono-6.0.0.313.tar.xz) = a1de452eb1c6edba503723217a4b5839563d154ff0c01852b551a41b3c98b5b617637e4e435de87bf275cfdce4066e70bfc763b607882f0b42e14196d7d5c156
 Size (mono-6.0.0.313.tar.xz) = 218124872 bytes
 SHA1 (patch-configure.ac) = cc4f5bf80495c3248a161d1b857e2aa63a437e4e
+SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
+SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 49f8ab47f449d474a7d9ca5f43b9ad55fef26c78
+SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
+SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883
+SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
+SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
+SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
 SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2
 SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730
 SHA1 (patch-mono_metadata_threads.c) = 5b55d0b3b5e506bf08ac14712f44a8db4594b254
diff --git a/mono6/patches/patch-data_Makefile.am b/mono6/patches/patch-data_Makefile.am
new file mode 100644
index 0000000000..d3a10bf9ac
--- /dev/null
+++ b/mono6/patches/patch-data_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = net_2_0 net_4_0 net_4_5
+ 
+-monodir = $(sysconfdir)/mono
++monodir = $(datadir)/examples/mono
+ monolldbdir = $(libdir)/mono/lldb
+ 
+ EXTRA_DIST =  	\
diff --git a/mono6/patches/patch-data_net__2__0_Browsers_Makefile.am b/mono6/patches/patch-data_net__2__0_Browsers_Makefile.am
new file mode 100644
index 0000000000..3f0dc2c84a
--- /dev/null
+++ b/mono6/patches/patch-data_net__2__0_Browsers_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_2_0/Browsers/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_2_0/Browsers/Makefile.am
+@@ -1,4 +1,4 @@
+-monodir = $(sysconfdir)/mono/2.0/Browsers
++monodir = $(datadir)/share/mono/2.0/Browsers
+ 
+ EXTRA_DIST =  ../../Browsers/Compat.browser
+ 
diff --git a/mono6/patches/patch-data_net__2__0_Makefile.am b/mono6/patches/patch-data_net__2__0_Makefile.am
new file mode 100644
index 0000000000..055eef766f
--- /dev/null
+++ b/mono6/patches/patch-data_net__2__0_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_2_0/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_2_0/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = Browsers
+ 
+-monodir = $(sysconfdir)/mono/2.0
++monodir = $(datadir)/examples/mono/2.0
+ 
+ EXTRA_DIST =  machine.config \
+ 	      web.config \
diff --git a/mono6/patches/patch-data_net__4__0_Browsers_Makefile.am b/mono6/patches/patch-data_net__4__0_Browsers_Makefile.am
new file mode 100644
index 0000000000..461123b53b
--- /dev/null
+++ b/mono6/patches/patch-data_net__4__0_Browsers_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_4_0/Browsers/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_4_0/Browsers/Makefile.am
+@@ -1,4 +1,4 @@
+-monodir = $(sysconfdir)/mono/4.0/Browsers
++monodir = $(datadir)/examples/mono/4.0/Browsers
+ 
+ EXTRA_DIST =  ../../Browsers/Compat.browser
+ 
diff --git a/mono6/patches/patch-data_net__4__0_Makefile.am b/mono6/patches/patch-data_net__4__0_Makefile.am
new file mode 100644
index 0000000000..3ab230d0f1
--- /dev/null
+++ b/mono6/patches/patch-data_net__4__0_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_4_0/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_4_0/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = Browsers
+ 
+-monodir = $(sysconfdir)/mono/4.0
++monodir = $(datadir)/examples/mono/4.0
+ 
+ EXTRA_DIST =  machine.config \
+ 	      web.config \
diff --git a/mono6/patches/patch-data_net__4__5_Browsers_Makefile.am b/mono6/patches/patch-data_net__4__5_Browsers_Makefile.am
new file mode 100644
index 0000000000..28470c18e3
--- /dev/null
+++ b/mono6/patches/patch-data_net__4__5_Browsers_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_4_5/Browsers/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_4_5/Browsers/Makefile.am
+@@ -1,4 +1,4 @@
+-monodir = $(sysconfdir)/mono/4.5/Browsers
++monodir = $(datadir)/examples/mono/4.5/Browsers
+ 
+ EXTRA_DIST =  ../../Browsers/Compat.browser
+ 
diff --git a/mono6/patches/patch-data_net__4__5_Makefile.am b/mono6/patches/patch-data_net__4__5_Makefile.am
new file mode 100644
index 0000000000..00dcd3f220
--- /dev/null
+++ b/mono6/patches/patch-data_net__4__5_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install configuration files to the examples directory.
+
+--- data/net_4_5/Makefile.am.orig	2019-07-18 07:46:04.000000000 +0000
++++ data/net_4_5/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = Browsers
+ 
+-monodir = $(sysconfdir)/mono/4.5
++monodir = $(datadir)/examples/mono/4.5
+ 
+ EXTRA_DIST =  machine.config \
+ 	      web.config \


Home | Main Index | Thread Index | Old Index