5 files changed, 4 insertions, 194 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 2a6c86b88aa3..f0d1033b3f66 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	boehm-gc
-PORTVERSION=	6.0
+PORTVERSION=	6.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 DISTNAME=	gc${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-
-ONLY_FOR_ARCHS=	i386	# XXX can't figure out whether to define
-#			# XXX SEARCH_FOR_DATA_START on other platforms
+MAINTAINER=	nobutaka@FreeBSD.org
 
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-threads
 
 MAN3=		gc.3
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 33ceaab818cd..0929094d686f 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1 +1 @@
-MD5 (gc6.0.tar.gz) = 528371164ac9838dcb263fede456eff6
+MD5 (gc6.1.tar.gz) = 00a87b68f4baa21c56fa42d811e98f7c
diff --git a/devel/boehm-gc/files/patch-ac b/devel/boehm-gc/files/patch-ac
deleted file mode 100644
index f7dfc74ccf7a..000000000000
--- a/devel/boehm-gc/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- include/private/gc_priv.h.orig	Mon Mar 22 11:44:53 1999
-+++ include/private/gc_priv.h	Tue Jul 20 02:31:51 1999
-@@ -50,8 +50,13 @@
- # endif
- 
- typedef int GC_bool;
-+# ifdef __cplusplus
-+#	define TRUE true
-+#	define FALSE false
-+# else
- # define TRUE 1
- # define FALSE 0
-+# endif
- 
- typedef char * ptr_t;	/* A generic pointer to which we can add	*/
- 			/* byte displacements.				*/
diff --git a/devel/boehm-gc/files/patch-ae b/devel/boehm-gc/files/patch-ae
deleted file mode 100644
index 0d47c350cab4..000000000000
--- a/devel/boehm-gc/files/patch-ae
+++ /dev/null
@@ -1,151 +0,0 @@
---- include/private/gcconfig.h.orig	Mon Oct  8 10:36:25 2001
-+++ include/private/gcconfig.h	Mon Oct  8 10:56:43 2001
-@@ -23,10 +23,19 @@
- 
- /* Machine specific parts contributed by various people.  See README file. */
- 
--/* First a unified test for Linux: */
-+/* First a unified test for the Multi-platform OS's: */
- # if defined(linux) || defined(__linux__)
- #    define LINUX
- # endif
-+# if defined(__FreeBSD__)
-+#    define FREEBSD
-+# endif
-+# if defined(__OpenBSD__)
-+#    define OPENBSD
-+# endif
-+# if defined(bsdi)
-+#    define BSDI
-+# endif
- 
- /* And one for NetBSD: */
- # if defined(__NetBSD__)
-@@ -44,25 +53,19 @@
- #    define HP
- #    define mach_type_known
- # endif
--# if defined(__OpenBSD__) && defined(m68k)
-+# if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(m68k)
- #    define M68K
--#    define OPENBSD
- #    define mach_type_known
- # endif
--# if defined(__OpenBSD__) && defined(__sparc__)
-+# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__sparc__)
- #    define SPARC
--#    define OPENBSD
- #    define mach_type_known
- # endif
--# if defined(__NetBSD__) && defined(m68k)
--#    define M68K
--#    define mach_type_known
--# endif
--# if defined(__NetBSD__) && defined(__powerpc__)
-+# if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__powerpc__)
- #    define POWERPC
- #    define mach_type_known
- # endif
--# if defined(__NetBSD__) && defined(__arm32__)
-+# if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__arm32__)
- #    define ARM32
- #    define mach_type_known
- # endif
-@@ -125,7 +128,7 @@
- #   define mach_type_known
- # endif
- # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
--     && !defined(__OpenBSD__) && !(__NetBSD__)
-+     && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !(__NetBSD__)
- #   define SPARC
- #   define DRSNX
- #   define mach_type_known
-@@ -170,7 +173,7 @@
- #    define I386
- #    define mach_type_known
- # endif
--# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
-+# if (defined(__FreeBSD__) || defined(LINUX)) && (defined(__ia64__) || defined(__ia64))
- #    define IA64
- #    define mach_type_known
- # endif
-@@ -196,7 +199,7 @@
- # endif
- # if defined(__alpha) || defined(__alpha__)
- #   define ALPHA
--#   if !defined(LINUX) && !defined(NETBSD)
-+#   if !defined(LINUX) && !defined(__FreeBSD__) && !defined(NETBSD) && !defined(__OpenBSD__)
- #     define OSF1	/* a.k.a Digital Unix */
- #   endif
- #   define mach_type_known
-@@ -218,6 +221,9 @@
- #   define MACOS
- #   define mach_type_known
- # endif
-+# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi)) && (defined(__powerpc) || defined(__ppc__) || defined(__ppc))
-+#    define POWERPC
-+# endif
- # if defined(macosx) || \
-      defined(__APPLE__) && defined(__MACH__) && defined(__ppc__)
- #    define MACOSX
-@@ -239,25 +245,10 @@
- #   define NEXT
- #   define mach_type_known
- # endif
--# if defined(__OpenBSD__) && (defined(i386) || defined(__i386__))
-+# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)) && (defined(i386) || defined(__i386__))
- #   define I386
--#   define OPENBSD
- #   define mach_type_known
- # endif
--# if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
--#   define I386
--#   define FREEBSD
--#   define mach_type_known
--# endif
--# if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
--#   define I386
--#   define mach_type_known
--# endif
--# if defined(bsdi) && (defined(i386) || defined(__i386__))
--#    define I386
--#    define BSDI
--#    define mach_type_known
--# endif
- # if !defined(mach_type_known) && defined(__386BSD__)
- #   define I386
- #   define THREE86BSD
-@@ -391,7 +382,7 @@
- 		    /*			(SUNOS4, SUNOS5, LINUX,		*/
- 		    /*			 DRSNX variants)		*/
- 		    /* 		   ALPHA      ==> DEC Alpha 		*/
--		    /*			(OSF1 and LINUX variants)	*/
-+		    /*			(OSF1, BSD and LINUX variants)	*/
- 		    /* 		   M88K       ==> Motorola 88XX0        */
- 		    /* 		        (CX_UX and DGUX)		*/
- 		    /* 		   S370	      ==> 370-like machine	*/
-@@ -1262,6 +1253,24 @@
- #   	define CPP_WORDSZ 64
- #   	define MPROTECT_VDB
- #   	define DYNAMIC_LOADING
-+#   endif
-+#   ifdef FREEBSD
-+#       define OS_TYPE "FREEBSD"
-+#       define CPP_WORDSZ 64
-+#      define HEURISTIC2
-+#       define STACKBOTTOM ((ptr_t) 0x120000000)
-+/* #           define DATASTART ((ptr_t) 0x140000000) */
-+#       define DATASTART GC_data_start
-+/* #       define DYNAMIC_LOADING */
-+       extern int _end;
-+#      define DATAEND (&_end)
-+#   endif
-+#   if defined(OPENBSD)
-+#       define OS_TYPE "OPENBSD"
-+#       define CPP_WORDSZ 64
-+#      define HEURISTIC2
-+       extern int _end;
-+#      define DATAEND (&_end)
- #   endif
- #   ifdef LINUX
- #       define OS_TYPE "LINUX"
diff --git a/devel/boehm-gc/files/patch-af b/devel/boehm-gc/files/patch-af
deleted file mode 100644
index b64608534c5a..000000000000
--- a/devel/boehm-gc/files/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
---- os_dep.c.orig	Mon Oct  8 10:33:42 2001
-+++ os_dep.c	Mon Oct  8 10:35:32 2001
-@@ -84,11 +84,16 @@
- #   define NEED_FIND_LIMIT
- # endif
- 
-+# if defined(FREEBSD) && \
-+     (defined(POWERPC) || defined(SPARC) || defined(ALPHA) || defined(IA64))
-+#   define NEED_FIND_LIMIT
-+# endif
-+
- #ifdef NEED_FIND_LIMIT
- #   include <setjmp.h>
- #endif
- 
--#ifdef FREEBSD
-+#if defined(FREEBSD) && defined(I386)
- #  include <machine/trap.h>
- #endif
-