Update to latest release, remove broken notice as it is in sync with

mozilla again, and return to depending on mozilla-embedded now that the
scroll bar issue is fixed.
This commit is contained in:
Eric Melville 2001-06-21 21:24:49 +00:00
parent 7d988b1292
commit c4f9e98142
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44295
4 changed files with 17 additions and 20 deletions

View file

@ -5,18 +5,16 @@
# $FreeBSD$ # $FreeBSD$
# #
BROKEN= "out-of-sync with mozilla, next release will fix"
PORTNAME= skipstone PORTNAME= skipstone
PORTVERSION= 0.7.2 PORTVERSION= 0.7.3
CATEGORIES= www CATEGORIES= www
MASTER_SITES= http://www.muhri.net/skipstone/ MASTER_SITES= http://www.muhri.net/skipstone/
MAINTAINER= eric@FreeBSD.org MAINTAINER= eric@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/mozilla/libgtkembedmoz.so:${PORTSDIR}/www/mozilla ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded
RUN_DEPENDS= ${X11BASE}/lib/mozilla/libgtkembedmoz.so:${PORTSDIR}/www/mozilla RUN_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded
USE_GTK= yes USE_GTK= yes
USE_GMAKE= yes USE_GMAKE= yes

View file

@ -1 +1 @@
MD5 (skipstone-0.7.2.tar.gz) = 7a82b4d59a3424f9ba7dc34ca3a068b1 MD5 (skipstone-0.7.3.tar.gz) = 60685a1cde0a5b78514efb81b5b7ecec

View file

@ -1,27 +1,26 @@
--- src/Makefile.orig Tue Apr 17 00:31:55 2001 --- src/Makefile.orig Thu Jun 21 06:55:00 2001
+++ src/Makefile Tue Apr 17 00:30:46 2001 +++ src/Makefile Thu Jun 21 06:59:30 2001
@@ -1,22 +1,22 @@ @@ -1,21 +1,21 @@
-PREFIX=/usr/local -PREFIX=/usr/local
+PREFIX=${X11BASE} +PREFIX=${X11BASE}
VERSION = 0.7.2 VERSION = 0.7.3
MILESTONE = M18
-MOZILLA_INCLUDES = -I/usr/include/mozilla -I/usr/local/include/mozilla -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_LIBS = -L/usr/lib/mozilla -L/usr/local/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
+MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla +MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla -I${X11BASE}/include/mozilla/nspr
+MOZILLA_LIBS = -L${X11BASE}/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom +MOZILLA_LIBS = -L${X11BASE}/lib/mozilla-embedded -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
#my stuff #my stuff
#MOZILLA_INCLUDES = -I/usr/moz/mozilla/package/include #MOZILLA_INCLUDES = -I/usr/moz/mozilla/dist/include
#MOZILLA_LIBS = -L/usr/moz/mozilla/package/bin/ -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom #MOZILLA_LIBS = -L/usr/moz/mozilla/dist/bin/ -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
-GTK_LIBS = $(shell gtk-config --libs) -GTK_LIBS = $(shell gtk-config --libs)
-GTK_INCLUDES = $(shell gtk-config --cflags) -GTK_INCLUDES = $(shell gtk-config --cflags)
+GTK_LIBS = $(shell $(GTK_CONFIG) --libs) +GTK_LIBS = $(shell $(GTK_CONFIG) --libs)
+GTK_INCLUDES = $(shell $(GTK_CONFIG) --cflags) +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 mozilla.cpp 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 mozilla.o 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
DOWNLOADOBJS = skipdownload.o DOWNLOADOBJS = skipdownload.o
-FLAGS = -g -O2 -Wall -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -FLAGS = -g -O2 -Wall -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
-LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread -LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread

View file

@ -22,8 +22,8 @@
-echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them" -echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
- exit - exit
-fi -fi
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:X11BASE/lib/mozilla +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:X11BASE/lib/mozilla-embedded
+export MOZILLA_FIVE_HOME=X11BASE/lib/mozilla +export MOZILLA_FIVE_HOME=X11BASE/lib/mozilla-embedded
-if [ -f ./skipstone-bin ]; then -if [ -f ./skipstone-bin ]; then
- exec ./skipstone-bin $@ - exec ./skipstone-bin $@