Fixed PKGMANDIR and a missing Bash interpreter. PKGREVISION++

4 files changed, 36 insertions, 10 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 1667d56e954..9bb7f4fcf7e 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/11/03 07:01:06 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/01/04 02:38:13 rillig Exp $
 
 DISTNAME=	mono-1.1.13.8.1
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://go-mono.com/sources/mono-1.1/
 
@@ -20,7 +21,7 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 # LP64 problems
 NOT_FOR_PLATFORM+=	*-*-alpha *-*-sparc64 *-*-x86_64
 
-USE_TOOLS+=		bison gmake gtar perl:run pkg-config
+USE_TOOLS+=		bison gmake gtar perl:run pkg-config bash:run
 USE_LIBTOOL=		yes
 EXTRACT_USING=		gtar
 
@@ -31,6 +32,7 @@ CONFIGURE_ARGS+=	--with-preview=yes
 CONFIGURE_ARGS+=	--with-libgdiplus=installed
 
 MAKE_FLAGS+=		PERL=${PERL5:Q}
+MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 UNLIMIT_RESOURCES=	datasize
 UNLIMIT_RESOURCES+=	stacksize
 UNLIMIT_RESOURCES+=	memorysize
@@ -50,6 +52,9 @@ REPLACE_PERL+=	mono/cil/make-opcodes-def.pl
 REPLACE_PERL+=	mono/metadata/make-bundle.pl
 REPLACE_PERL+=	mono/tests/stress-runner.pl
 
+REPLACE_BASH+=	scripts/mono-find-provides.in
+REPLACE_BASH+=	scripts/mono-find-requires.in
+
 EGDIR=		${PREFIX}/share/examples/mono
 PKG_SYSCONFSUBDIR=	mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index b4ab3429e82..d2b8e677ad7 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/10/17 19:33:47 drochner Exp $
+$NetBSD: distinfo,v 1.28 2007/01/04 02:38:14 rillig Exp $
 
 SHA1 (mono-1.1.13.8.1.tar.gz) = f2cb79844073694859b1fb92eb770e3705239a3d
 RMD160 (mono-1.1.13.8.1.tar.gz) = a100a96b19300b253c12a2ad70caf65721418209
@@ -16,8 +16,9 @@ SHA1 (patch-al) = 96e7125b2e9046784e3cf1b1c094de26d55d073e
 SHA1 (patch-am) = 07b004da1bf0cda00b79f731fd46b440cdff01ba
 SHA1 (patch-an) = 9ebaf8024e1a5b9581e5fdf20899331308074db4
 SHA1 (patch-ao) = aa16cc813f443832488e63d9df5e17e9a1483f05
-SHA1 (patch-ap) = c063e63bea85898fc840875f9fb853d3c2170920
+SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc
 SHA1 (patch-aq) = 7c43ded1ac6371df4d31a063032dd3a46d69d4a9
 SHA1 (patch-ar) = 83fed158f52b9717298c0594bc0bbef8edc7e509
 SHA1 (patch-ba) = 1aee2cf3dce0d2d378941b6cbff5600640c4d564
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
+SHA1 (patch-bd) = a52007ae22f8b23d20abf4a56e5b9d57ccd1fbbe
diff --git a/lang/mono/patches/patch-ap b/lang/mono/patches/patch-ap
index e5ed382d2da..3d27c58789d 100644
--- a/lang/mono/patches/patch-ap
+++ b/lang/mono/patches/patch-ap
@@ -1,19 +1,27 @@
-$NetBSD: patch-ap,v 1.1 2006/08/03 18:15:08 drochner Exp $
+$NetBSD: patch-ap,v 1.2 2007/01/04 02:38:14 rillig Exp $
 
---- mcs/jay/Makefile.orig	2006-07-27 12:57:02.000000000 +0200
-+++ mcs/jay/Makefile
-@@ -21,12 +21,12 @@ ifndef NO_INSTALL
+--- mcs/jay/Makefile.orig	2006-04-11 00:22:08.000000000 +0200
++++ mcs/jay/Makefile	2007-01-03 23:44:47.000000000 +0100
+@@ -21,19 +21,19 @@ ifndef NO_INSTALL
  install-local:
  	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
  	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/jay
 -	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/man/man1
-+	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/man/man1
++	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	$(INSTALL_BIN) jay $(DESTDIR)$(prefix)/bin
  	for datafile in $(datafiles) ; do \
  	   $(INSTALL_DATA) $$datafile $(DESTDIR)$(prefix)/share/jay ; \
  	done
 -	$(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/share/man/man1
-+	$(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/man/man1
++	$(INSTALL_DATA) jay.1 $(DESTDIR)$(mandir)/man1
  
  uninstall-local:
  	-rm -f $(DESTDIR)$(prefix)/bin/jay
+ 	for datafile in $(datafiles) ; do \
+ 	   rm -f $(DESTDIR)$(prefix)/share/jay/$$datafile || : ; \
+ 	done
+-	-rm -f $(DESTDIR)$(prefix)/share/man/man1/jay.1
++	-rm -f $(DESTDIR)$(mandir)/man1/jay.1
+ endif
+ 
+ clean-local:
diff --git a/lang/mono/patches/patch-bd b/lang/mono/patches/patch-bd
new file mode 100644
index 00000000000..ad1f5dde7b8
--- /dev/null
+++ b/lang/mono/patches/patch-bd
@@ -0,0 +1,12 @@
+$NetBSD: patch-bd,v 1.1 2007/01/04 02:38:14 rillig Exp $
+
+--- mcs/build/config-default.make.orig	2006-04-11 00:22:08.000000000 +0200
++++ mcs/build/config-default.make	2007-01-04 01:11:48.000000000 +0100
+@@ -17,6 +17,7 @@ LIBRARY_FLAGS = /noconfig
+ CFLAGS = -g -O2
+ prefix = /usr/local
+ exec_prefix = $(prefix)
++mandir = $(prefix)/man
+ mono_libdir = $(exec_prefix)/lib
+ #RUNTIME = mono
+ RUNTIME = false