5 files changed, 74 insertions, 31 deletions

diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index 61c59e806efb..cd325897bcfc 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	skipstone
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.muhri.net/skipstone/
 
diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo
index e2ca2852263a..a41ca91067bc 100644
--- a/www/skipstone/distinfo
+++ b/www/skipstone/distinfo
@@ -1 +1 @@
-MD5 (skipstone-0.7.3.tar.gz) = 60685a1cde0a5b78514efb81b5b7ecec
+MD5 (skipstone-0.7.4.tar.gz) = 5d7131b67149edf69c4732e19fb0efe2
diff --git a/www/skipstone/files/patch-aa b/www/skipstone/files/patch-aa
index eac954d4ab26..0c9a0fd5161d 100644
--- a/www/skipstone/files/patch-aa
+++ b/www/skipstone/files/patch-aa
@@ -1,31 +1,11 @@
---- src/Makefile.orig	Thu Jun 21 06:55:00 2001
-+++ src/Makefile	Thu Jun 21 06:59:30 2001
-@@ -1,21 +1,21 @@
--PREFIX=/usr/local
-+PREFIX=${X11BASE}
- VERSION = 0.7.3
- 
--MOZILLA_INCLUDES = -I/usr/include/mozilla -I/usr/local/include/mozilla -I/usr/include/nspr -I/usr/local/include/mozilla/nspr -I/usr/include/mozilla/nspr -I/usr/local/include/mozilla/nspr
--MOZILLA_LIBS = -L/usr/lib/mozilla -L/usr/local/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
-+MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla -I${X11BASE}/include/mozilla/nspr
-+MOZILLA_LIBS = -L${X11BASE}/lib/mozilla-embedded -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
- 
- #my stuff
- #MOZILLA_INCLUDES = -I/usr/moz/mozilla/dist/include
- #MOZILLA_LIBS = -L/usr/moz/mozilla/dist/bin/ -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
- 
--GTK_LIBS = $(shell gtk-config --libs)
--GTK_INCLUDES = $(shell gtk-config --cflags)
-+GTK_LIBS = $(shell $(GTK_CONFIG) --libs)
-+GTK_INCLUDES = $(shell $(GTK_CONFIG) --cflags)
- 
- SOURCES = main.c go.c callbacks.c moz_callbacks.c support.c ipc.c bookmarks.c interface.c interface-notebook.c history.c crash.c skipstone_config.c context.c skipstone-plugin.c skipstone-print.c mozilla.cpp SkipStonePrompter.cpp PromptService.cpp 
- OBJS = main.o go.o callbacks.o moz_callbacks.o support.o ipc.o bookmarks.o interface.o interface-notebook.o history.o crash.o skipstone-config.o context.o skipstone-plugin.o skipstone-print.o mozilla.o SkipStonePrompter.o PromptService.o 
+--- src/Makefile.orig	Tue Jul 24 06:16:22 2001
++++ src/Makefile	Tue Jul 24 06:16:30 2001
+@@ -7,7 +7,7 @@
  DOWNLOADOBJS = skipdownload.o
--FLAGS = -g -O2 -Wall -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) 
--LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread
-+FLAGS = -g -O2 -Wall -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -D_THREAD_SAFE -pthread
-+LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS)
- CC = gcc $(FLAGS) 
- CXX = c++ -fno-rtti $(FLAGS)
  PROG = skipstone
+ BINARY = skipstone-bin
+-LIBS = $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread
++LIBS = $(GTK_LIBS) $(MOZILLA_LIBS) -pthread
+ 
+ LOCALEDIR ?= /usr/share/locale
+ export LOCALEDIR
diff --git a/www/skipstone/files/patch-ab b/www/skipstone/files/patch-ab
new file mode 100644
index 000000000000..d6fc335dec7e
--- /dev/null
+++ b/www/skipstone/files/patch-ab
@@ -0,0 +1,36 @@
+--- config.mk.orig	Fri Jul 13 12:25:24 2001
++++ config.mk	Tue Jul 24 06:15:59 2001
+@@ -1,26 +1,21 @@
+-PREFIX=/usr/local
++PREFIX=$(X11BASE)
+ PLUGINDIR=$(HOME)/.skipstone/plugins
+ 
+ MOZILLA_INCLUDES = \
+-	-I/usr/include/mozilla \
+-	-I/usr/local/include/mozilla \
+-	-I/usr/include/nspr \
+-	-I/usr/local/include/nspr \
+-	-I/usr/include/mozilla/nspr \
+-	-I/usr/local/include/mozilla/nspr
++	-I$(PREFIX)/include/mozilla \
++	-I$(PREFIX)/include/mozilla/nspr
+ 
+ MOZILLA_LIBS = \
+-	-L/usr/lib/mozilla \
+-	-L/usr/local/lib/mozilla \
++	-L$(PREFIX)/lib/mozilla-embedded \
+ 	-lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
+ 
+-GTK_LIBS = $(shell gtk-config --libs)
+-GTK_INCLUDES = $(shell gtk-config --cflags)
++GTK_LIBS = $(shell $(GTK_CONFIG) --libs)
++GTK_INCLUDES = $(shell $(GTK_CONFIG) --cflags)
+ 
+ CC = gcc
+ CXX = g++
+ 
+ CPPFLAGS = $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
+-CFLAGS = -g -O2 -Wall
++CFLAGS = -g -O2 -Wall -D_THREAD_SAFE
+ CXXFLAGS = $(CFLAGS) -fno-rtti
+ 
diff --git a/www/skipstone/files/patch-ad b/www/skipstone/files/patch-ad
new file mode 100644
index 000000000000..448e44d67aba
--- /dev/null
+++ b/www/skipstone/files/patch-ad
@@ -0,0 +1,27 @@
+--- src/ipc.c.orig	Fri Jul 13 12:25:24 2001
++++ src/ipc.c	Tue Jul 24 05:43:12 2001
+@@ -88,13 +88,13 @@
+      	fclose(pidfile);
+      	if (kill(pid,0) == 0) { /* its alive */
+ 		if (argc < 2) { /* No args, just a new window */
+-		     	kill(pid,10);
++		     	kill(pid,SIGUSR1);
+ 		} else { /* Url, print it to file so we can read it when we launch the new window */
+ 		    	arg = g_strconcat(home,"/.skipstone/sig_url",NULL);
+       		     	url_file = fopen(arg,"w");
+ 		     	if (url_file == NULL) {
+ 			     	g_print(_("Could not open the url arg file for some reason\n"));
+-			     	kill(pid,10);
++			     	kill(pid,SIGUSR1);
+ 			     	g_free(arg);
+ 			} else {
+ 			     	gint i;
+@@ -108,7 +108,7 @@
+ 				     	fprintf(url_file,"url=%s\n",argv[i]);					     
+ 				}
+ 				fclose(url_file);			     	
+-			     	kill(pid,10);
++			     	kill(pid,SIGUSR1);
+ 			     	g_free(arg);
+ 			}
+