Update skipstone to 0.8.2

and add some patch to work with mozilla-1.0rc3

Changes from ChangeLog:
- Patch from Tai, to make find have the options to wrap around, search
  in frames and match entire words.
- Updated nl.po from Francois Duprez.
- Petr Balhos sent in a patch for the zoomer plugin to remmeber
  zoom history, I modified this patch to not store history for each
  site, instead now there is a context menu when right clicking on
  the plugin, it either asks to remember or unremember a setting
  for a specific url.
- Fixed the location entry not resizing when window is resized.
- Patch from Doug Kearns  to enable
  skipstone to convert relative paths to full paths so that the
  mozilla widget can find them correctly.
- Patch from Seth Kingsley to improve argument quoting when passing
  mailto urls to mua's.
- Patch from Daniel to move embed creation in window mode a notch up so
  the favicon plugin doesn't complain.
- Patch from Tai for SearchToolBar to encode search strings, structurize
  and add a border to the toolbar to make it look better.
- Mem leaks in FavIcon fixed.
- Another patch from Daniel, adds an option to go to last focused tab when
  closing another instead of the notebook widget jumping to the most left
  tab. I added config ui and its off by default, to turn it on go to misc
  config node.
- locale fixes from Tai-hwa Liang
- Patch from  Daniel Mooney  - Fixes expansion/shrinking
  of progressbar, adds two context message ids to statusbar and improves
  the overall display of statusbar messages. Also fixed memory leaks pointed
  by Daniel, thanks for his work.
- Added Bulgarian translation by  Miroslav Iordanov
- Alt-+ is changed to Alt-= for next tab.
- Configure patch applied from Nick Blievers .
  SkipStone distributions from now on, will contain configure, people
  checking out from CVS will have to run autoconf to generate a configure
  file. Thanks a lot to Nick and everybody for thier work on this.
- Remove pref that caused entries to have scrollbars when reached the end,
  you also have to remove it from your prefs.js ng.layout.gfx.scrollbars line.
- Changed the printing API and made it possible to print selected ranges in
  addition to all pages or selected pages.
- Compile with debug was broken, fixed. Thanks to Muthu Kumar for finding out.

7 files changed, 50 insertions, 189 deletions

diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index cd2fbf46d5d..9c6c32e9888 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2002/04/22 13:39:26 tron Exp $
+# $NetBSD: Makefile,v 1.12 2002/05/26 12:10:13 taya Exp $
 
-DISTNAME=	skipstone-0.8.1
+DISTNAME=	skipstone-0.8.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.muhri.net/skipstone/
 
@@ -8,15 +8,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.muhri.net/skipstone/
 COMMENT=	GTK+ web browser that embeds Mozilla's renderer
 
-DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
+DEPENDS+=	mozilla>=1.0rc3:../../www/mozilla
 
 USE_GMAKE=	yes
-
-MAKE_ENV+=	X11PREFIX="${X11PREFIX}"
-
-post-patch:
-		${SED} -e s,@PREFIX@,${X11PREFIX},g \
-			< ${WRKSRC}/src/skipstone > ${WRKSRC}/src/skipstone.tmp
-		${MV} ${WRKSRC}/src/skipstone.tmp ${WRKSRC}/src/skipstone
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-mozilla-includes=${PREFIX}/include/mozilla \
+		--with-mozilla-libs=${PREFIX}/lib/mozilla
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/skipstone/PLIST b/www/skipstone/PLIST
index da199f30dca..a7c0a707752 100644
--- a/www/skipstone/PLIST
+++ b/www/skipstone/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/24 13:47:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/26 12:10:13 taya Exp $
+bin/skipdownload
 bin/skipstone
 bin/skipstone-bin
-bin/skipdownload
 share/skipstone/pixmaps/default/back.xpm
 share/skipstone/pixmaps/default/config.xpm
 share/skipstone/pixmaps/default/forward.xpm
diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo
index 4788fcb072e..efaa8866a48 100644
--- a/www/skipstone/distinfo
+++ b/www/skipstone/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/04/22 13:39:26 tron Exp $
+$NetBSD: distinfo,v 1.8 2002/05/26 12:10:14 taya Exp $
 
-SHA1 (skipstone-0.8.1.tar.gz) = 91650eef792acdc02db70b5b1bcac3c9c674cd1e
-Size (skipstone-0.8.1.tar.gz) = 393285 bytes
-SHA1 (patch-aa) = 64d4423f214aa8cfc2792831d3d5f8046e8ad88c
-SHA1 (patch-ab) = 0ce631832790a2fd2e243c75ddf466aad337ec2e
-SHA1 (patch-ac) = d79acc2997b95d3844501ed0f4e767beac6b90ad
-SHA1 (patch-ad) = 0476574e5165030d1a4589ed28c8445444e99384
+SHA1 (skipstone-0.8.2.tar.gz) = d95e48ecd2f1907998e327fb8cb09f6e7f3da3e1
+Size (skipstone-0.8.2.tar.gz) = 420922 bytes
+SHA1 (patch-ad) = e45ab1dbbed9c007fa427fa358b5744057e5f5c1
+SHA1 (patch-ae) = cf226c33e15e3f9cfd7939541fc8bdbeee32c8d8
diff --git a/www/skipstone/patches/patch-aa b/www/skipstone/patches/patch-aa
deleted file mode 100644
index 9f1db133ef3..00000000000
--- a/www/skipstone/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/03/28 10:40:33 jmc Exp $
-
---- config.mk.orig	Wed Mar 27 14:12:02 2002
-+++ config.mk	Thu Mar 28 10:35:00 2002
-@@ -1,78 +1,32 @@
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- PLUGINDIR=$(HOME)/.skipstone/plugins
- 
- MOZILLA_INCLUDES = \
--	-I/usr/include/mozilla \
--	-I$(PREFIX)/include/mozilla \
--	-I/usr/include/nspr \
--	-I/usr/include/mozilla/dom \
--	-I/usr/include/mozilla/windowwatcher \
--	-I/usr/include/mozilla/webbrowserpersist \
--	-I/usr/include/mozilla/appcomps \
--	-I/usr/include/mozilla/find \
--	-I/usr/include/mozilla/txtsvc \
--	-I/usr/include/mozilla/docshell \
--	-I/usr/include/mozilla/shistory \
--	-I/usr/include/mozilla/webshell \
--	-I/usr/include/mozilla/gfx \
--	-I/usr/include/mozilla/necko \
--	-I/usr/include/mozilla/widget \
--	-I/usr/include/mozilla/content \
--	-I/usr/include/mozilla/layout \
--	-I/usr/include/mozilla/browser \
--	-I/usr/include/mozilla/webbrwsr \
--	-I/usr/include/mozilla/string \
--	-I/usr/include/mozilla/xpcom \
--	-I/usr/include/mozilla/pref \
--	-I/usr/include/mozilla/gtkembedmoz \
--	-I/usr/include/mozilla/nspr \
--	-I/usr/include/mozilla/uconv \
--	-I/usr/local/include/nspr \
--	-I/usr/local/include/mozilla/gtkembedmoz \
--	-I/usr/local/include/mozilla/dom \
--	-I/usr/local/include/mozilla/windowwatcher \
--	-I/usr/local/include/mozilla/appcomps \
--	-I/usr/local/include/mozilla/find \
--	-I/usr/local/include/mozilla/txtsvc \
--	-I/usr/local/include/mozilla/docshell \
--	-I/usr/local/include/mozilla/shistory \
--	-I/usr/local/include/mozilla/webshell \
--	-I/usr/local/include/mozilla/gfx \
--	-I/usr/include/mozilla/webbrowserpersist \
--	-I/usr/local/include/mozilla/necko \
--	-I/usr/local/include/mozilla/widget \
--	-I/usr/local/include/mozilla/content \
--	-I/usr/local/include/mozilla/layout \
--	-I/usr/local/include/mozilla/browser \
--	-I/usr/local/include/mozilla/webbrwsr \
--	-I/usr/local/include/mozilla/string \
--	-I/usr/local/include/mozilla/xpcom \
--	-I/usr/local/include/mozilla/pref \
--	-I/usr/local/include/mozilla/uconv \
--	-I$(PREFIX)/include/mozilla/nspr \
--	-I$(PREFIX)/include/mozilla/gtkembedmoz \
--	-I$(PREFIX)/include/mozilla/dom \
--	-I$(PREFIX)/include/mozilla/windowwatcher \
--	-I$(PREFIX)/include/mozilla/appcomps \
--	-I$(PREFIX)/include/mozilla/find \
--	-I$(PREFIX)/include/mozilla/txtsvc \
--	-I$(PREFIX)/include/mozilla/docshell \
--	-I$(PREFIX)/include/mozilla/shistory \
--	-I$(PREFIX)/include/mozilla/webshell \
--	-I$(PREFIX)/include/mozilla/gfx \
--	-I$(PREFIX)/include/mozilla/necko \
--	-I$(PREFIX)/include/mozilla/widget \
--	-I$(PREFIX)/include/mozilla/webbrowserpersist \
--	-I$(PREFIX)/include/mozilla/content \
--	-I$(PREFIX)/include/mozilla/layout \
--	-I$(PREFIX)/include/mozilla/browser \
--	-I$(PREFIX)/include/mozilla/webbrwsr \
--	-I$(PREFIX)/include/mozilla/string \
--	-I$(PREFIX)/include/mozilla/xpcom \
--	-I$(PREFIX)/include/mozilla/pref \
--	-I$(PREFIX)/include/mozilla/uconv 
-+	-I$(X11PREFIX)/include/mozilla/nspr \
-+	-I$(X11PREFIX)/include/mozilla/gtkembedmoz \
-+	-I$(X11PREFIX)/include/mozilla/dom \
-+	-I$(X11PREFIX)/include/mozilla/windowwatcher \
-+	-I$(X11PREFIX)/include/mozilla/appcomps \
-+	-I$(X11PREFIX)/include/mozilla/find \
-+	-I$(X11PREFIX)/include/mozilla/txtsvc \
-+	-I$(X11PREFIX)/include/mozilla/docshell \
-+	-I$(X11PREFIX)/include/mozilla/shistory \
-+	-I$(X11PREFIX)/include/mozilla/webshell \
-+	-I$(X11PREFIX)/include/mozilla/gfx \
-+	-I$(X11PREFIX)/include/mozilla/necko \
-+	-I$(X11PREFIX)/include/mozilla/widget \
-+	-I$(X11PREFIX)/include/mozilla/webbrowserpersist \
-+	-I$(X11PREFIX)/include/mozilla/content \
-+	-I$(X11PREFIX)/include/mozilla/layout \
-+	-I$(X11PREFIX)/include/mozilla/browser \
-+	-I$(X11PREFIX)/include/mozilla/webbrwsr \
-+	-I$(X11PREFIX)/include/mozilla/string \
-+	-I$(X11PREFIX)/include/mozilla/xpcom \
-+	-I$(X11PREFIX)/include/mozilla/pref \
-+	-I$(X11PREFIX)/include/mozilla/uconv 
- 
- MOZILLA_LIBS = \
-+	-L$(X11PREFIX)/lib/mozilla -Wl,-R${X11PREFIX}/lib/mozilla \
- 	-L/usr/lib/mozilla \
- 	-L$(PREFIX)/lib/mozilla \
- 	-lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
-@@ -84,6 +38,7 @@
- CXX = g++
- 
- CPPFLAGS = $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
-+CPPFLAGS += -DPREFIX=\"${PREFIX}\"
- CFLAGS = -g -O2 -Wall
- CXXFLAGS = $(CFLAGS) -fno-rtti
- 
diff --git a/www/skipstone/patches/patch-ab b/www/skipstone/patches/patch-ab
deleted file mode 100644
index 97ac39944da..00000000000
--- a/www/skipstone/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/24 13:47:03 wiz Exp $
-
---- src/skipstone.h.orig	Fri Dec 28 23:27:53 2001
-+++ src/skipstone.h
-@@ -40,6 +40,11 @@
- #define SKIPSTONE_SYSTEM_THEME_DIR "/usr/share/skipstone/pixmaps"
- #define SKIPSTONE_LOCAL_PLUGIN_DIR "/usr/local/share/skipstone/plugins"
- #define SKIPSTONE_SYSTEM_PLUGIN_DIR "/usr/share/skipstone/plugins"
-+
-+#undef SKIPSTONE_SYSTEM_THEME_DIR
-+#undef SKIPSTONE_SYSTEM_PLUGIN_DIR
-+#define SKIPSTONE_SYSTEM_THEME_DIR PREFIX "/share/skipstone/pixmaps"
-+#define SKIPSTONE_SYSTEM_PLUGIN_DIR PREFIX "/share/skipstone/plugins"
- /*--------*/
- 
- /* bookmarks */
diff --git a/www/skipstone/patches/patch-ac b/www/skipstone/patches/patch-ac
deleted file mode 100644
index 6ebca7c7067..00000000000
--- a/www/skipstone/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/03/10 10:47:17 jmc Exp $
-
---- src/skipstone.orig	Wed Feb  6 07:42:16 2002
-+++ src/skipstone	Sun Mar 10 10:35:49 2002
-@@ -1,29 +1,3 @@
- #!/bin/sh
--if test -n "$MOZILLA_FIVE_HOME"; then
--	LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
--	export LD_LIBRARY_PATH
--	if [ -f ./skipstone-bin ]; then
--		exec ./skipstone-bin $@
--	else
--		exec skipstone-bin $@
--	fi
--elif  [ -f /usr/lib/mozilla/libgtkembedmoz.so ]; then
--	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/mozilla
--	export MOZILLA_FIVE_HOME=/usr/lib/mozilla
--elif [ -f /usr/local/lib/mozilla/libgtkembedmoz.so ]; then
--	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/mozilla
--	export MOZILLA_FIVE_HOME=/usr/local/lib/mozilla
--elif [ -f /opt/mozilla/libgtkembedmoz.so ]; then
--        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/mozilla
--        export MOZILLA_FIVE_HOME=/opt/mozilla
--else 
--
--echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
--     exit
--fi
--
--if [ -f ./skipstone-bin ]; then
--	exec ./skipstone-bin $@
--else
--	exec skipstone-bin $@
--fi
-+export MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla
-+exec skipstone-bin $@
diff --git a/www/skipstone/patches/patch-ad b/www/skipstone/patches/patch-ad
index 6a49fde10ed..85557cc51b7 100644
--- a/www/skipstone/patches/patch-ad
+++ b/www/skipstone/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/01/24 13:47:03 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2002/05/26 12:10:15 taya Exp $
 
---- src/mozilla.cpp.orig	Fri Dec 28 23:27:52 2001
-+++ src/mozilla.cpp
+diff -ru ../Orig/skipstone-0.8.2/src/mozilla.cpp ./src/mozilla.cpp
+--- ../Orig/skipstone-0.8.2/src/mozilla.cpp	Sat May 11 05:20:45 2002
++++ ./src/mozilla.cpp	Sun May 26 20:35:02 2002
 @@ -3,6 +3,7 @@
   *							*
   *  released under the GPL				*/
@@ -10,3 +11,34 @@ $NetBSD: patch-ad,v 1.2 2002/01/24 13:47:03 wiz Exp $
  #include <gtk/gtk.h>
  #include <sys/types.h>
  
+@@ -277,7 +278,11 @@
+      	nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(wb));
+      	if (persist)  {
+ 	     	nsCOMPtr<nsILocalFile> file;
++#if 0
+ 	     	NS_NewLocalFile(FullPath, PR_TRUE, getter_AddRefs(file));
++#else
++	     	NS_NewNativeLocalFile(nsDependentCString(FullPath), PR_TRUE, getter_AddRefs(file));
++#endif
+ 	     	if (!file) D_RETURN;
+        		persist->SaveURI(linkURI, nsnull, file);
+ 	}
+@@ -402,10 +407,18 @@
+ 				     	relative_path[i] = '\0';
+ 				     	break;
+ 				}
++#if 0
+ 		     	NS_NewLocalFile(relative_path, PR_TRUE, getter_AddRefs(relative));
++#else
++		     	NS_NewNativeLocalFile(nsDependentCString(relative_path), PR_TRUE, getter_AddRefs(relative));
++#endif
+ 		       
+ 		} 
++#if 0
+ 	     	NS_NewLocalFile(file_name,PR_TRUE,getter_AddRefs(file));
++#else
++	     	NS_NewNativeLocalFile(nsDependentCString(file_name),PR_TRUE,getter_AddRefs(file));
++#endif
+ //#ifdef CVS_MOZILLA
+ 	     	if (file) persist->SaveDocument(domDoc,file,relative, nsnull, 0, 0);
+ //#else