From 443194dcaa135720dd5cda05ed64c8906e8d9fee Mon Sep 17 00:00:00 2001
From: kefren <kefren>
Date: Fri, 15 Feb 2008 15:57:14 +0000
Subject: don't install a config file directly into etc/ Reported by wiz@

---
 lang/mono/Makefile | 12 ++++++++++--
 lang/mono/PLIST    |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'lang')

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 22ca4c013cb..0a188fcc875 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2008/02/13 14:16:43 kefren Exp $
+# $NetBSD: Makefile,v 1.61 2008/02/15 15:57:14 kefren Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
 CATEGORIES=	lang
@@ -69,7 +69,9 @@ CONF_FILES+=	${EGDIR}/1.0/machine.config \
 CONF_FILES+=	${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \
 		${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx
 CONF_FILES+=	${EGDIR}/2.0/machine.config \
-		${PKG_SYSCONFDIR}/mono/2.0/machine.confi
+		${PKG_SYSCONFDIR}/mono/2.0/machine.config
+CONF_FILES+=	${EGDIR}/mconfig/config.xml \
+		${PKG_SYSCONFDIR}/mono/mconfig/config.xml
 
 TEST_TARGET=	check
 
@@ -85,6 +87,12 @@ SUBST_MESSAGE.fix-mcs=		Fixing mcs default prefix
 SUBST_FILES.fix-mcs=		mcs/build/config-default.make
 SUBST_SED.fix-mcs=		-e 's,/usr/local,${PREFIX},g'
 
+SUBST_CLASSES+=			fix-cfgdir
+SUBST_STAGE.fix-cfgdir=		post-patch
+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'
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 34ee87dc256..975523af23f 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/02/13 14:16:43 kefren Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/02/15 15:57:14 kefren Exp $
 bin/al
 bin/al2
 bin/caspol
@@ -686,6 +686,7 @@ share/examples/mono/2.0/machine.config
 share/examples/mono/2.0/web.config
 share/examples/mono/browscap.ini
 share/examples/mono/config
+share/examples/mono/mconfig/config.xml
 share/jay/ACKNOWLEDGEMENTS
 share/jay/NEW_FEATURES
 share/jay/NOTES
@@ -731,6 +732,7 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm share/mono-1.0
 @dirrm share/libgc-mono
 @dirrm share/jay
+@dirrm share/examples/mono/mconfig
 @dirrm share/examples/mono/2.0
 @dirrm share/examples/mono/1.0
 @dirrm share/examples/mono
-- 
cgit v1.2.3