Use the devel/boehm-gc port instead of the bundled gc library.

www/w3m/Makefile

@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2002/07/20 12:03:18 naddy Exp $
-
-ONLY_FOR_ARCHS=	alpha i386 m68k powerpc sparc
+# $OpenBSD: Makefile,v 1.47 2002/08/28 12:38:15 naddy Exp $
 
 COMMENT=	"pager/text-based web browser"
 
@@ -18,23 +16,28 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=w3m/}
-MASTER_SITES0=		http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=w3m/}
+MASTER_SITES0=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 
 SUPDISTFILES=	w3m-${VERSION}${EXTRACT_SUFX} \
 		w3m-${VERSION}-m17n-${M17N_VERSION}${EXTRACT_SUFX}:0
 
+LIB_DEPENDS=	gc.1::devel/boehm-gc
+
 FLAVORS=	image japanese m17n
 FLAVOR?=
 
 CONFIGURE_STYLE= simple
 CONFIGURE_ARGS=	--nonstop \
 		--prefix="${PREFIX}" \
+		--gc-includedir="${LOCALBASE}/include" \
+		--gc-libdir="${LOCALBASE}/lib" \
 		--sysconfdir="${SYSCONFDIR}/w3m" \
 		--model=monster \
 		--mimetypes=/var/www/mime.types
 CONFIGURE_ENV=	use_ssl_verify=y \
-		dmail=mail ded=vi dbrowser=lynx
+		dmail=mail ded=vi dbrowser=lynx \
+		use_bundled_gclib=n
 
 NO_REGRESS=	Yes
 

www/w3m/patches/patch-configure

@@ -1,19 +0,0 @@
-$OpenBSD: patch-configure,v 1.9 2002/07/20 12:03:18 naddy Exp $
---- configure.orig	Tue May 14 17:30:01 2002
-+++ configure	Wed Jul 17 18:12:52 2002
-@@ -1025,6 +1025,7 @@ Linux|linux|LINUX)
-  ;;
- esac
- 
-+if false; then # always use the included gclib for now
- gclib=''
- gcinclude=''
- gctarget=''
-@@ -1044,6 +1045,7 @@ do
-     break
-   fi
- done
-+fi
- 
- case $sysname in
-   linux|Linux|LINUX|aix|Aix|AIX)

www/w3m/patches/patch-gc_dyn_load_c

@@ -1,33 +0,0 @@
-$OpenBSD: patch-gc_dyn_load_c,v 1.3 2002/07/20 12:03:18 naddy Exp $
---- gc/dyn_load.c.orig	Wed Jul 17 18:09:45 2002
-+++ gc/dyn_load.c	Wed Jul 17 18:11:42 2002
-@@ -57,7 +57,9 @@
-     !defined(HPUX) && !(defined(LINUX) && defined(__ELF__)) && \
-     !defined(RS6000) && !defined(SCO_ELF) && !defined(DGUX) && \
-     !(defined(FREEBSD) && defined(__ELF__)) && \
--    !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD)
-+    !(defined(NETBSD) && defined(__ELF__)) && \
-+    !(defined(OPENBSD) && defined(__ELF__)) && \
-+    !defined(HURD)
-  --> We only know how to find data segments of dynamic libraries for the
-  --> above.  Additional SVR4 variants might not be too
-  --> hard to add.
-@@ -265,7 +267,8 @@ void GC_register_dynamic_libraries()
- 
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
--    (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-+    (defined(OPENBSD) && defined(__ELF__)) || \
-+    defined(HURD)
- 
- 
- #ifdef USE_PROC_FOR_LIBRARIES
-@@ -520,7 +523,7 @@ GC_bool GC_register_dynamic_libraries_dl
- /* This doesn't necessarily work in all cases, e.g. with preloaded
-  * dynamic libraries.						*/
- 
--#if defined(NETBSD)
-+#if defined(NETBSD) || defined(OPENBSD)
- #  include <sys/exec_elf.h>
- #else
- #  include <elf.h>

www/w3m/patches/patch-gc_include_private_gcconfig_h

@@ -1,34 +0,0 @@
-$OpenBSD: patch-gc_include_private_gcconfig_h,v 1.2 2002/07/20 12:03:18 naddy Exp $
---- gc/include/private/gcconfig.h.orig	Wed Jul 10 16:21:17 2002
-+++ gc/include/private/gcconfig.h	Wed Jul 17 18:12:52 2002
-@@ -61,10 +61,14 @@
- #    define HP
- #    define mach_type_known
- # endif
--# if defined(OPENBSD) && defined(m68k)
-+# if defined(OPENBSD) && defined(__m68k__)
- #    define M68K
- #    define mach_type_known
- # endif
-+# if defined(OPENBSD) && defined(__powerpc__)
-+#    define POWERPC
-+#    define mach_type_known
-+# endif
- # if defined(OPENBSD) && defined(__sparc__)
- #    define SPARC
- #    define mach_type_known
-@@ -710,6 +714,14 @@
- #   ifdef NETBSD
- #     define ALIGNMENT 4
- #     define OS_TYPE "NETBSD"
-+#     define HEURISTIC2
-+      extern char etext;
-+#     define DATASTART GC_data_start
-+#     define DYNAMIC_LOADING
-+#   endif
-+#   ifdef OPENBSD
-+#     define ALIGNMENT 4
-+#     define OS_TYPE "OPENBSD"
- #     define HEURISTIC2
-       extern char etext[];
- #     define DATASTART GC_data_start