Attachment #101747 for bug #141374

View | Details | Raw Unified | Return to bug 141374
Collapse All | Expand All




#

PORTNAME=	mono
PORTVERSION=	2.4.3
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/


ONLY_FOR_ARCHS=	i386 amd64 powerpc

MAN1=		al.1 cert2spc.1 certmgr.1 chktrust.1 cilc.1 csharp.1 disco.1 \
		dtd2xsd.1 gacutil.1 genxs.1 httpcfg.1 ilasm.1 jay.1 lc.1 \
		macpack.1 makecert.1 mconfig.1 mcs.1 mdassembler.1 \
		mdoc-assemble.1 mdoc-export-html.1 mdoc-export-msxdoc.1 \
		mdoc-update.1 mdoc-validate.1 mdoc.1 mdvalidater.1 mint.1 \
		mkbundle.1 mono-cil-strip.1 mono-service.1 mono-shlib-cop.1 \
		mono-xmltool.1 mono.1 monodis.1 monodocer.1 monodocs2html.1 \
		monolinker.1 monop.1 monostyle.1 mozroots.1 oldmono.1 \
		permview.1 prj2make.1 resgen.1 secutil.1 setreg.1 sgen.1 \
		signcode.1 sn.1 soapsuds.1 sqlsharp.1 wsdl.1 xbuild.1 xsd.1
MAN5=		mdoc.5 mono-config.5

.include <bsd.port.pre.mk>

Lines 1-3 Link Here

(-)/tmp/mono/distinfo (-3 / +3 lines)
1	MD5 (mono-2.4.2.3.tar.bz2) = 696f25afc8453cd0d1c78de6e905dcf2	1	MD5 (mono-2.4.3.tar.bz2) = 32d76ff066a5c69f40ee0e5c6229be01
2	SHA256 (mono-2.4.2.3.tar.bz2) = 1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae	2	SHA256 (mono-2.4.3.tar.bz2) = 2521a9fe60ecf10f0f307a7c85bfefcd3bc39867936c1075a84d1bfc2335d331
3	SIZE (mono-2.4.2.3.tar.bz2) = 24815426	3	SIZE (mono-2.4.3.tar.bz2) = 24962829





$FreeBSD: ports/lang/mono/files/patch-mcs_tools_security_certmgr.cs,v 1.1 2009/06/22 07:55:47 flz Exp $

--- mcs/tools/security/certmgr.cs.orig
+++ mcs/tools/security/certmgr.cs
@@ -492,8 +492,11 @@
 			ObjectType type = ObjectType.None;
 
 			int n = 1;
-			if (action != Action.Ssl)
-				type = GetObjectType (args [n++]);
+			if (action != Action.Ssl) {
+				type = GetObjectType (args [n]);
+				if (type != ObjectType.None)
+					n++;
+			}
 			
 			bool verbose = (GetCommand (args [n]) == "V");
 			if (verbose)





$FreeBSD: ports/lang/mono/files/patch-mono_io-layer_processes.c,v 1.1 2009/08/09 18:53:09 flz Exp $

--- mono/io-layer/processes.c.orig
+++ mono/io-layer/processes.c
@@ -1950,7 +1950,7 @@
 	{
 		mods = load_modules ();
 #else
-	filename = g_strdup_printf ("/proc/%d/maps", pid);
+	filename = g_strdup_printf ("/proc/%d/map", pid);
 	if ((fp = fopen (filename, "r")) == NULL) {
 		/* No /proc/<pid>/maps so just return the main module
 		 * shortcut for now
@@ -2111,7 +2111,7 @@
 	{
 		mods = load_modules ();
 #else
-	filename = g_strdup_printf ("/proc/%d/maps", pid);
+	filename = g_strdup_printf ("/proc/%d/map", pid);
 	if ((fp = fopen (filename, "r")) == NULL) {
 		if (errno == EACCES && module == NULL && base == TRUE) {
 			procname_ext = get_process_name_from_proc (pid);
@@ -2266,7 +2266,7 @@
 		mods = load_modules ();
 #else
 	/* Look up the address in /proc/<pid>/maps */
-	filename = g_strdup_printf ("/proc/%d/maps", pid);
+	filename = g_strdup_printf ("/proc/%d/map", pid);
 	if ((fp = fopen (filename, "r")) == NULL) {
 		/* No /proc/<pid>/maps, so just return failure
 		 * for now

Lines 437-442 Link Here

(-)/tmp/mono/pkg-plist (+9 lines)
437	lib/mono/2.0/ilasm.exe.mdb	437	lib/mono/2.0/ilasm.exe.mdb
438	lib/mono/2.0/installutil.exe	438	lib/mono/2.0/installutil.exe
439	lib/mono/2.0/installutil.exe.mdb	439	lib/mono/2.0/installutil.exe.mdb
		440	lib/mono/2.0/lc.exe
		441	lib/mono/2.0/lc.exe.mdb
440	lib/mono/2.0/mconfig.exe	442	lib/mono/2.0/mconfig.exe
441	lib/mono/2.0/mconfig.exe.mdb	443	lib/mono/2.0/mconfig.exe.mdb
442	lib/mono/2.0/mdoc.exe	444	lib/mono/2.0/mdoc.exe
Lines 824-829 Link Here
824	lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll	826	lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll
825	lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll.mdb	827	lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll.mdb
826	lib/mono/monodoc/monodoc.dll	828	lib/mono/monodoc/monodoc.dll
		829	lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
827	lib/monodoc/monodoc.xml	830	lib/monodoc/monodoc.xml
828	lib/monodoc/sources/Mono.source	831	lib/monodoc/sources/Mono.source
829	lib/monodoc/sources/Mono.tree	832	lib/monodoc/sources/Mono.tree
Lines 861-866 Link Here
861	libdata/pkgconfig/smcs.pc	864	libdata/pkgconfig/smcs.pc
862	libdata/pkgconfig/system.web.extensions.design_1.0.pc	865	libdata/pkgconfig/system.web.extensions.design_1.0.pc
863	libdata/pkgconfig/system.web.extensions_1.0.pc	866	libdata/pkgconfig/system.web.extensions_1.0.pc
		867	libdata/pkgconfig/system.web.mvc.pc
864	libdata/pkgconfig/wcf.pc	868	libdata/pkgconfig/wcf.pc
865	share/jay/ACKNOWLEDGEMENTS	869	share/jay/ACKNOWLEDGEMENTS
866	share/jay/NEW_FEATURES	870	share/jay/NEW_FEATURES
Lines 912-917 Link Here
912	@dirrm share/jay	916	@dirrm share/jay
913	@dirrm lib/monodoc/sources	917	@dirrm lib/monodoc/sources
914	@dirrm lib/monodoc	918	@dirrm lib/monodoc
		919	@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications
		920	@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v9.0
		921	@dirrm lib/mono/xbuild/Microsoft/VisualStudio
		922	@dirrm lib/mono/xbuild/Microsoft
		923	@dirrm lib/mono/xbuild
915	@dirrm lib/mono/monodoc	924	@dirrm lib/mono/monodoc
916	@dirrm lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77	925	@dirrm lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77
917	@dirrm lib/mono/gac/nunit.util	926	@dirrm lib/mono/gac/nunit.util

Return to bug 141374

Lines 7-14 Link Here

(-)/tmp/mono/Makefile (-8 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= mono	9	PORTNAME= mono
10	PORTVERSION= 2.4.2.3	10	PORTVERSION= 2.4.3
11	PORTREVISION= 1
12	CATEGORIES= lang	11	CATEGORIES= lang
13	MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/	12	MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
14		13
Lines 45-59 Link Here
45	ONLY_FOR_ARCHS= i386 amd64 powerpc	44	ONLY_FOR_ARCHS= i386 amd64 powerpc
46		45
47	MAN1= al.1 cert2spc.1 certmgr.1 chktrust.1 cilc.1 csharp.1 disco.1 \	46	MAN1= al.1 cert2spc.1 certmgr.1 chktrust.1 cilc.1 csharp.1 disco.1 \
48	dtd2xsd.1 gacutil.1 genxs.1 httpcfg.1 ilasm.1 jay.1 macpack.1 \	47	dtd2xsd.1 gacutil.1 genxs.1 httpcfg.1 ilasm.1 jay.1 lc.1 \
49	makecert.1 mconfig.1 mcs.1 mdassembler.1 mdoc-assemble.1 \	48	macpack.1 makecert.1 mconfig.1 mcs.1 mdassembler.1 \
50	mdoc-export-html.1 mdoc-export-msxdoc.1 mdoc-update.1 \	49	mdoc-assemble.1 mdoc-export-html.1 mdoc-export-msxdoc.1 \
51	mdoc-validate.1 mdoc.1 mdvalidater.1 mint.1 mkbundle.1 \	50	mdoc-update.1 mdoc-validate.1 mdoc.1 mdvalidater.1 mint.1 \
52	mono-cil-strip.1 mono-service.1 mono-shlib-cop.1 \	51	mkbundle.1 mono-cil-strip.1 mono-service.1 mono-shlib-cop.1 \
53	mono-xmltool.1 mono.1 monodis.1 monodocer.1 monodocs2html.1 \	52	mono-xmltool.1 mono.1 monodis.1 monodocer.1 monodocs2html.1 \
54	monolinker.1 monop.1 monostyle.1 mozroots.1 oldmono.1 \	53	monolinker.1 monop.1 monostyle.1 mozroots.1 oldmono.1 \
55	permview.1 prj2make.1 resgen.1 secutil.1 setreg.1 sgen.1 \	54	permview.1 prj2make.1 resgen.1 secutil.1 setreg.1 sgen.1 \
56	signcode.1 sn.1 soapsuds.1 sqlsharp.1 wsdl.1 xsd.1	55	signcode.1 sn.1 soapsuds.1 sqlsharp.1 wsdl.1 xbuild.1 xsd.1
57	MAN5= mdoc.5 mono-config.5	56	MAN5= mdoc.5 mono-config.5
58		57
59	.include <bsd.port.pre.mk>	58	.include <bsd.port.pre.mk>

Lines 1-19 Link Here

(-)/tmp/mono/files/patch-mcs_tools_security_certmgr.cs (-19 lines)
1
2	$FreeBSD: ports/lang/mono/files/patch-mcs_tools_security_certmgr.cs,v 1.1 2009/06/22 07:55:47 flz Exp $
3
4	--- mcs/tools/security/certmgr.cs.orig
5	+++ mcs/tools/security/certmgr.cs
6	@@ -492,8 +492,11 @@
7	ObjectType type = ObjectType.None;
8
9	int n = 1;
10	- if (action != Action.Ssl)
11	- type = GetObjectType (args [n++]);
12	+ if (action != Action.Ssl) {
13	+ type = GetObjectType (args [n]);
14	+ if (type != ObjectType.None)
15	+ n++;
16	+ }
17
18	bool verbose = (GetCommand (args [n]) == "V");
19	if (verbose)

Lines 1-32 Link Here

(-)/tmp/mono/files/patch-mono_io-layer_processes.c (-32 lines)
1
2	$FreeBSD: ports/lang/mono/files/patch-mono_io-layer_processes.c,v 1.1 2009/08/09 18:53:09 flz Exp $
3
4	--- mono/io-layer/processes.c.orig
5	+++ mono/io-layer/processes.c
6	@@ -1950,7 +1950,7 @@
7	{
8	mods = load_modules ();
9	#else
10	- filename = g_strdup_printf ("/proc/%d/maps", pid);
11	+ filename = g_strdup_printf ("/proc/%d/map", pid);
12	if ((fp = fopen (filename, "r")) == NULL) {
13	/* No /proc/<pid>/maps so just return the main module
14	* shortcut for now
15	@@ -2111,7 +2111,7 @@
16	{
17	mods = load_modules ();
18	#else
19	- filename = g_strdup_printf ("/proc/%d/maps", pid);
20	+ filename = g_strdup_printf ("/proc/%d/map", pid);
21	if ((fp = fopen (filename, "r")) == NULL) {
22	if (errno == EACCES && module == NULL && base == TRUE) {
23	procname_ext = get_process_name_from_proc (pid);
24	@@ -2266,7 +2266,7 @@
25	mods = load_modules ();
26	#else
27	/* Look up the address in /proc/<pid>/maps */
28	- filename = g_strdup_printf ("/proc/%d/maps", pid);
29	+ filename = g_strdup_printf ("/proc/%d/map", pid);
30	if ((fp = fopen (filename, "r")) == NULL) {
31	/* No /proc/<pid>/maps, so just return failure
32	* for now