Update to the latest (0.7.2), and depend on mozilla rather than

mozilla-embedded as some additional files are now required.

Approved by:	murray

4 files changed, 46 insertions, 37 deletions

diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index e7ed0f8ac310..58569fef4b65 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,27 +1,27 @@
-# New ports collection makefile for:	SkipStone
+# New ports collection makefile for:	skipstone
 # Date created:				16 November 2000
-# Whom:					eric <eric@osd.bsdi.com>
+# Whom:					eric
 #
 # $FreeBSD$
 #
 
 PORTNAME=	skipstone
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.muhri.net/skipstone/
+MASTER_SITES=	http://muhri.net/skipstone/
 
-MAINTAINER=	eric@osd.bsdi.com
+MAINTAINER=	eric@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
-		${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded
-RUN_DEPENDS=	${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded
+		${X11BASE}/lib/mozilla/libgtkembedmoz.so:${PORTSDIR}/www/mozilla
+RUN_DEPENDS=	${X11BASE}/lib/mozilla/libgtkembedmoz.so:${PORTSDIR}/www/mozilla
 
 USE_GTK=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 post-patch:
-	@${PERL} -pi -e 's#/usr/local#${PREFIX}#' ${WRKSRC}/src/skipstone.h ${WRKSRC}/src/skipstone
-	@${PERL} -pi -e 's#/usr/share#${PREFIX}/share#' ${WRKSRC}/src/skipstone.h
+	@${PERL} -pi -e 's#/usr/local#${X11BASE}#' ${WRKSRC}/src/skipstone.h
+	@${PERL} -pi -e 's#X11BASE#${X11BASE}#' ${WRKSRC}/src/skipstone
 
 .include <bsd.port.mk>
diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo
index 5e15c2876ad4..1340bee3dc10 100644
--- a/www/skipstone/distinfo
+++ b/www/skipstone/distinfo
@@ -1 +1 @@
-MD5 (skipstone-0.6.1.tar.gz) = 3c6cae32480d6769ba864ebf12e5c6ac
+MD5 (skipstone-0.7.2.tar.gz) = 7a82b4d59a3424f9ba7dc34ca3a068b1
diff --git a/www/skipstone/files/patch-aa b/www/skipstone/files/patch-aa
index 54eb19aca7c1..409472807079 100644
--- a/www/skipstone/files/patch-aa
+++ b/www/skipstone/files/patch-aa
@@ -1,31 +1,31 @@
---- src/Makefile.orig	Sun Oct 29 17:38:13 2000
-+++ src/Makefile	Thu Nov 16 22:46:12 2000
+--- src/Makefile.orig	Tue Apr 17 00:31:55 2001
++++ src/Makefile	Tue Apr 17 00:30:46 2001
 @@ -1,22 +1,22 @@
 -PREFIX=/usr/local
-+PREFIX?=/usr/local
- VERSION = 0.6.1
++PREFIX=${X11BASE}
+ VERSION = 0.7.2
  MILESTONE = M18
  
 -MOZILLA_INCLUDES = -I/usr/include/mozilla -I/usr/local/include/mozilla
 -MOZILLA_LIBS = -L/usr/lib/mozilla -L/usr/local/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
 +MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla
-+MOZILLA_LIBS = -L${X11BASE}/lib/mozilla-embedded -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
++MOZILLA_LIBS = -L${X11BASE}/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
  
  #my stuff
- #MOZILLA_INCLUDES = -I/usr/moz/package/include
- #MOZILLA_LIBS = -L/usr/moz/package/bin/ -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
+ #MOZILLA_INCLUDES = -I/usr/moz/mozilla/package/include
+ #MOZILLA_LIBS = -L/usr/moz/mozilla/package/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 callbacks.c moz_callbacks.c support.c ipc.c bookmarks.c interface.c interface-notebook.c history.c crash.c skipstone_config.c mozilla.cpp 
- OBJS = main.o callbacks.o moz_callbacks.o support.o ipc.o bookmarks.o interface.o interface-notebook.o history.o crash.o skipstone-config.o mozilla.o
+ 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 mozilla.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 mozilla.o
  DOWNLOADOBJS = skipdownload.o
--FLAGS = -g -O2 -Wall -D$(MILESTONE) -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
+-FLAGS = -g -O2 -Wall -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) 
 -LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread
-+FLAGS = -g -Wall -D$(MILESTONE) -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -D_THREAD_SAFE -pthread
++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)
diff --git a/www/skipstone/files/patch-ac b/www/skipstone/files/patch-ac
index faf69a83b5c2..f9fdf4ce15b2 100644
--- a/www/skipstone/files/patch-ac
+++ b/www/skipstone/files/patch-ac
@@ -1,24 +1,33 @@
---- src/skipstone.orig	Mon Oct 30 04:38:13 2000
-+++ src/skipstone	Thu Nov 23 23:43:40 2000
-@@ -1,4 +1,4 @@
+--- src/skipstone.orig	Tue Apr 17 00:32:07 2001
++++ src/skipstone	Tue Apr 17 00:24:57 2001
+@@ -1,26 +1,6 @@
 -#!/bin/bash
-+#!/bin/sh
- if test -n "$MOZILLA_FIVE_HOME"; then
- 	LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
- 	export LD_LIBRARY_PATH
-@@ -7,12 +7,9 @@
- 	else
- 		exec skipstone-bin $@
- 	fi
+-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 /usr/local/lib/mozilla-embedded/libgtkembedmoz.so ]; then
-+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/mozilla-embedded
-+	export MOZILLA_FIVE_HOME=/usr/local/lib/mozilla-embedded
- else 
+-else 
++#!/bin/sh
+ 
+-echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
+-     exit
+-fi
++export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:X11BASE/lib/mozilla
++export MOZILLA_FIVE_HOME=X11BASE/lib/mozilla
  
- echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
+-if [ -f ./skipstone-bin ]; then
+-	exec ./skipstone-bin $@
+-else
+-	exec skipstone-bin $@
+-fi
++exec skipstone-bin $@