From f0b211a9165755642032dfdde1b3eebef69c1330 Mon Sep 17 00:00:00 2001
From: wilfried <wilfried@openbsd.org>
Date: Fri, 15 Aug 2003 11:33:04 +0000
Subject: [PATCH] make it compile on sparc64

---
 www/galeon/Makefile                              |  6 ++++--
 www/galeon/patches/patch-configure               | 16 +++++++++-------
 .../patch-src_mozilla_TOCProtocolHandler_cpp     | 12 ++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index e9e77b7f467..bb00a0cea38 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/08/15 08:49:33 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2003/08/15 11:33:04 wilfried Exp $
 
 COMMENT=		"GNOME web browser based on gecko"
 
@@ -17,7 +17,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}
 
-MODULES=		gettext
+MODULES=		gettext gcc3
+MODGCC3_ARCHES=		alpha sparc64
+MODGCC3_LANGS=		C++
 
 BUILD_DEPENDS=		:mozilla-${MOZ}:www/mozilla \
 			:mozilla-devel-${MOZ}:www/mozilla,-devel \
diff --git a/www/galeon/patches/patch-configure b/www/galeon/patches/patch-configure
index af65be8e4e5..fa6b8a01b4c 100644
--- a/www/galeon/patches/patch-configure
+++ b/www/galeon/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.3 2003/07/04 06:41:12 marcm Exp $
---- configure.orig	Sun Jun  8 16:18:42 2003
-+++ configure	Thu Jul  3 22:32:12 2003
+$OpenBSD: patch-configure,v 1.4 2003/08/15 11:33:04 wilfried Exp $
+--- configure.orig	2003-06-09 01:18:42.000000000 +0200
++++ configure	2003-08-15 11:10:16.000000000 +0200
 @@ -11708,6 +11708,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -28,16 +28,18 @@ $OpenBSD: patch-configure,v 1.3 2003/07/04 06:41:12 marcm Exp $
  	NetBSD)
  		;;
  	FreeBSD)
-@@ -12342,7 +12348,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
- 
- CC="$_save_cc"
+@@ -12340,9 +12346,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
  
+-CC="$_save_cc"
+-
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin $GTK_LIBS"
  echo "$as_me:$LINENO: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
  echo $ECHO_N "checking for gdk_superwin_get_type in -lgtksuperwin... $ECHO_C" >&6
  if test "${ac_cv_lib_gtksuperwin_gdk_superwin_get_type+set}" = set; then
-@@ -12402,14 +12408,14 @@ if test $ac_cv_lib_gtksuperwin_gdk_super
+@@ -12402,14 +12406,14 @@ if test $ac_cv_lib_gtksuperwin_gdk_super
  fi
  
  
diff --git a/www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp b/www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp
new file mode 100644
index 00000000000..85513f6c01d
--- /dev/null
+++ b/www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_mozilla_TOCProtocolHandler_cpp,v 1.1 2003/08/15 11:33:04 wilfried Exp $
+--- src/mozilla/TOCProtocolHandler.cpp.orig	2003-01-26 03:17:47.000000000 +0100
++++ src/mozilla/TOCProtocolHandler.cpp	2003-08-15 12:50:31.000000000 +0200
+@@ -404,7 +404,7 @@ NS_METHOD GTOCProtocolHandler::CreateHel
+ 	nsresult rv;
+ 
+ 	struct dirent **namelist;
+-	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, select,
++	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, (int (*)(struct dirent *))select,
+ 			 alphasort);
+ 	if (n<0) return NS_ERROR_FAILURE;
+