>Number:         15124
>Category:       pkg
>Synopsis:       Patch for upgrading skipstone pkgsrc to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 03 06:00:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        NetBSD 1.5ZA
>Organization:
	Very Little
>Environment:
System: NetBSD trumpton.intra.nut 1.5ZA NetBSD 1.5ZA (TRUMPTON) #1: Wed Jan 2 13:13:33 GMT 2002 sketch@trumpton.intra.nut:/usr/src/sys/arch/i386/compile/TRUMPTON i386
Architecture: i386
Machine: i386
>Description:
	Current version of www/skipstone is pretty old, and it doesn't
	even compile! (hence priority: medium)  I started to fix it up,
	but ended up finding it easier just to upgrade to the latest
	version (which works flawlessly).  Not sure how the current
	pkgsrc version escaped notice for this long - it's broken in so
	many ways.

	I don't mind being maintainer for this package if it'd help -
	it's by far the best browser for my needs I've found and use
	it quite extensively.  It's Just So Small And Fast! [tm] :)
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/pkgsrc/www/skipstone/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2001/08/09 14:17:16	1.2
+++ Makefile	2002/01/03 13:36:25
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
 #
 
-DISTNAME=	skipstone-0.7.4
+DISTNAME=	skipstone-0.7.8
 CATEGORIES=	www
 MASTER_SITES=	http://www.muhri.net/skipstone/
 
@@ -12,11 +12,12 @@
 DEPENDS+=	mozilla>=0.9:../../www/mozilla
 
 USE_GMAKE=	yes
+USE_X11BASE=	yes
 
 MAKE_ENV+=	X11PREFIX="${X11PREFIX}"
 
 post-patch:
-		${SED} -e s,@PREFIX@,${PREFIX},g \
+		${SED} -e s,@PREFIX@,${X11PREFIX},g \
 			< ${WRKSRC}/src/skipstone > ${WRKSRC}/src/skipstone.tmp
 		${MV} ${WRKSRC}/src/skipstone.tmp ${WRKSRC}/src/skipstone
 
Index: PLIST
===================================================================
RCS file: /home/ncvs/pkgsrc/www/skipstone/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	2001/11/01 02:18:51	1.1
+++ PLIST	2002/01/03 13:33:32
@@ -7,6 +7,8 @@
 share/skipstone/pixmaps/default/forward.xpm
 share/skipstone/pixmaps/default/home.xpm
 share/skipstone/pixmaps/default/logo.xpm
+share/skipstone/pixmaps/default/mini_folder.xpm
+share/skipstone/pixmaps/default/mini_link.xpm
 share/skipstone/pixmaps/default/reload.xpm
 share/skipstone/pixmaps/default/stop.xpm
 @dirrm share/skipstone/pixmaps/default
Index: distinfo
===================================================================
RCS file: /home/ncvs/pkgsrc/www/skipstone/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/08/09 14:17:17	1.2
+++ distinfo	2002/01/03 13:29:05
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
 
-SHA1 (skipstone-0.7.4.tar.gz) = 49c7962dad50a9a382eba67f5cdca68881544e88
-Size (skipstone-0.7.4.tar.gz) = 451953 bytes
-SHA1 (patch-aa) = 641de1030195280b81fe6d940b72e004cec0e7a5
+SHA1 (skipstone-0.7.8.tar.gz) = 71fd1856746913b352572b4458727b25999c4975
+Size (skipstone-0.7.8.tar.gz) = 357255 bytes
+SHA1 (patch-aa) = 7d73ffc9e5eb436dc08cc9ebefe3bd8401bc6865
 SHA1 (patch-ab) = 82dc54fe4c1d084a846e2c5245acdaaecb2c8ea6
-SHA1 (patch-ac) = 47579c822dda858eec4330cb1da2f8ffdd331eec
-SHA1 (patch-ad) = e8c424287f4c46298d6a3e976b4176a3f44c8d40
+SHA1 (patch-ac) = 1fb6c2a15ae00760bfc47c5e6be7206bf02d5466
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/pkgsrc/www/skipstone/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	2001/08/09 14:17:18	1.2
+++ patches/patch-aa	2002/01/03 13:21:12
@@ -1,34 +1,118 @@
 $NetBSD$
 
---- config.mk.orig	Fri Jul 13 19:25:24 2001
-+++ config.mk
-@@ -1,17 +1,12 @@
+--- config.mk.orig	Thu Jan  3 13:20:47 2002
++++ config.mk	Thu Jan  3 13:20:47 2002
+@@ -1,80 +1,33 @@
 -PREFIX=/usr/local
 +#PREFIX=/usr/local
  PLUGINDIR=$(HOME)/.skipstone/plugins
  
  MOZILLA_INCLUDES = \
 -	-I/usr/include/mozilla \
--	-I/usr/local/include/mozilla \
+-	-I$(PREFIX)/include/mozilla \
 -	-I/usr/include/nspr \
--	-I/usr/local/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/local/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/appcomps \
++	-I${X11PREFIX}/include/mozilla/content \
++	-I${X11PREFIX}/include/mozilla/docshell \
++	-I${X11PREFIX}/include/mozilla/dom \
++	-I${X11PREFIX}/include/mozilla/find \
++	-I${X11PREFIX}/include/mozilla/gfx \
++	-I${X11PREFIX}/include/mozilla/gtkembedmoz \
++	-I${X11PREFIX}/include/mozilla/layout \
++	-I${X11PREFIX}/include/mozilla/mpfilelocprovider \
++	-I${X11PREFIX}/include/mozilla/necko \
 +	-I${X11PREFIX}/include/mozilla/nspr \
++	-I${X11PREFIX}/include/mozilla/pref \
++	-I${X11PREFIX}/include/mozilla/shistory \
++	-I${X11PREFIX}/include/mozilla/string \
++	-I${X11PREFIX}/include/mozilla/txtsvc \
++	-I${X11PREFIX}/include/mozilla/uconv \
++	-I${X11PREFIX}/include/mozilla/webbrowserpersist \
++	-I${X11PREFIX}/include/mozilla/webbrwsr \
++	-I${X11PREFIX}/include/mozilla/webshell \
++	-I${X11PREFIX}/include/mozilla/widget \
++	-I${X11PREFIX}/include/mozilla/windowwatcher \
++	-I${X11PREFIX}/include/mozilla/xpcom \
 +	-I${X11PREFIX}/include/mozilla
  
  MOZILLA_LIBS = \
 -	-L/usr/lib/mozilla \
--	-L/usr/local/lib/mozilla \
+-	-L$(PREFIX)/lib/mozilla \
 +	-L${X11PREFIX}/lib/mozilla -Wl,-R${X11PREFIX}/lib/mozilla \
  	-lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
  
  GTK_LIBS = $(shell gtk-config --libs)
-@@ -21,6 +16,7 @@
+@@ -84,6 +37,7 @@
  CXX = g++
  
  CPPFLAGS = $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
-+CPPFLAGS += -DPREFIX=\"${PREFIX}\"
++CPPFLAGS+= -DPREFIX=\"${PREFIX}\"
  CFLAGS = -g -O2 -Wall
  CXXFLAGS = $(CFLAGS) -fno-rtti
  
Index: patches/patch-ac
===================================================================
RCS file: /home/ncvs/pkgsrc/www/skipstone/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patches/patch-ac	2001/08/09 07:56:24	1.1.1.1
+++ patches/patch-ac	2002/01/03 13:28:24
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/skipstone.orig	Tue Jan 16 21:16:06 2001
-+++ src/skipstone	Mon Jul  2 21:43:48 2001
-@@ -1,26 +1,3 @@
+--- src/skipstone.orig	Thu Jan  3 13:15:43 2002
++++ src/skipstone	Thu Jan  3 13:15:16 2002
+@@ -1,29 +1,6 @@
 -#!/bin/bash
 -if test -n "$MOZILLA_FIVE_HOME"; then
 -	LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
@@ -18,17 +18,21 @@
 -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 
--
++#!/bin/sh
+ 
 -echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
 -     exit
 -fi
--
++MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla
++export MOZILLA_FIVE_HOME
+ 
 -if [ -f ./skipstone-bin ]; then
 -	exec ./skipstone-bin $@
 -else
 -	exec skipstone-bin $@
 -fi
-+#!/bin/sh
-+export MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla
 +exec skipstone-bin $@

and cvs rm patches/patch-ad - it's no longer relevant (been merged into
skipstone distribution).
>Release-Note:
>Audit-Trail:
>Unformatted: