Date: Fri, 17 Nov 2000 13:01:46 -0800 (PST) From: eric@osd.bsdi.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/22925: updated (fixed) port of skipstone Message-ID: <200011172101.eAHL1kq25489@magdalena.osd.bsdi.com>
next in thread | raw e-mail | index | archive | help
>Number: 22925 >Category: ports >Synopsis: updated (fixed) port of skipstone >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 17 13:10:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Eric Melville >Release: FreeBSD 4.1.1-STABLE i386 >Organization: OSD/BSDi >Environment: >Description: I appologize if this diff is in the wrong format, just let me know how to fix it if needed. diff -ur old/www/skipstone/Makefile new/www/skipstone/Makefile --- old/www/skipstone/Makefile Fri Nov 17 12:41:13 2000 +++ new/www/skipstone/Makefile Fri Nov 17 12:40:53 2000 @@ -1,22 +1,21 @@ -# New ports collection makefile for: SkipStone -# Date created: 16 November 2000 -# Whom: eric +# New ports collection makefile for: SkipStone +# Date created: 16 November 2000 +# Whom: eric # # $FreeBSD$ # -PORTNAME= skipstone -PORTVERSION= 0.6.1 -CATEGORIES= www -MASTER_SITES= http://www.muhri.net/skipstone/ -DISTNAME= skipstone-${PORTVERSION} +PORTNAME= skipstone +PORTVERSION= 0.6.1 +CATEGORIES= www +MASTER_SITES= http://www.muhri.net/skipstone/ -MAINTAINER= eric@osd.bsdi.com +MAINTAINER= eric@osd.bsdi.com -BUILD_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded -RUN_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded +BUILD_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded +RUN_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded -USE_GMAKE= yes -USE_X_PREFIX= yes +USE_GMAKE= yes +USE_X_PREFIX= yes .include <bsd.port.mk> diff -ur old/www/skipstone/files/patch-aa new/www/skipstone/files/patch-aa --- old/www/skipstone/files/patch-aa Fri Nov 17 12:41:13 2000 +++ new/www/skipstone/files/patch-aa Fri Nov 17 12:40:53 2000 @@ -1,32 +1,32 @@ ---- src/Makefile.orig Sun Oct 29 17:38:13 2000 -+++ src/Makefile Thu Nov 16 22:46:12 2000 +--- src/Makefile.orig Fri Nov 17 12:07:13 2000 ++++ src/Makefile Fri Nov 17 12:08:27 2000 @@ -1,22 +1,22 @@ -PREFIX=/usr/local -+PREFIX=/usr/X11R6 ++PREFIX=${X11BASE} VERSION = 0.6.1 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/usr/X11R6/include/mozilla-embedded -+MOZILLA_LIBS = -L/usr/X11R6/lib/mozilla-embedded -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom - ++MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla-embedded ++MOZILLA_LIBS = -L${X11BASE}/lib/mozilla-embedded -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 - + -GTK_LIBS = $(shell gtk-config --libs) -GTK_INCLUDES = $(shell gtk-config --cflags) +GTK_LIBS = $(shell gtk12-config --libs) +GTK_INCLUDES = $(shell gtk12-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 + + 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 DOWNLOADOBJS = skipdownload.o -FLAGS = -g -O2 -Wall -D$(MILESTONE) -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread -+FLAGS = -g -O2 -Wall -D$(MILESTONE) -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -D_THREAD_SAFE -pthread ++FLAGS = -g -O2 -Wall -D$(MILESTONE) -I.. $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -D_THREAD_SAFE -pthread -DSKIPSTONE_LOCAL_THEME_DIR=\"${X11BASE}/share/skipstone/pixmaps\" -DSKIPSTONE_SYSTEM_THEME_DIR=\"${X11BASE}/share/skipstone/pixmaps\" +LIBS = -g $(GTK_LIBS) $(MOZILLA_LIBS) - CC = gcc $(FLAGS) + CC = gcc $(FLAGS) CXX = c++ -fno-rtti $(FLAGS) PROG = skipstone diff -ur old/www/skipstone/files/patch-ab new/www/skipstone/files/patch-ab --- old/www/skipstone/files/patch-ab Fri Nov 17 12:41:13 2000 +++ new/www/skipstone/files/patch-ab Fri Nov 17 12:40:53 2000 @@ -1,11 +1,14 @@ ---- src/skipstone.h.orig Thu Nov 16 20:09:46 2000 -+++ src/skipstone.h Thu Nov 16 20:10:03 2000 -@@ -28,7 +28,7 @@ +--- src/skipstone.h.orig Sun Oct 29 17:38:13 2000 ++++ src/skipstone.h Fri Nov 17 12:06:03 2000 +@@ -27,10 +27,7 @@ + #define SKIPSTONE_MICRO 1 /* ------------------- */ - - /* dirs */ + +-/* dirs */ -#define SKIPSTONE_LOCAL_THEME_DIR "/usr/local/share/skipstone/pixmaps" -+#define SKIPSTONE_LOCAL_THEME_DIR "/usr/X11R6/share/skipstone/pixmaps" - #define SKIPSTONE_SYSTEM_THEME_DIR "/usr/share/skipstone/pixmaps" - /*--------*/ - +-#define SKIPSTONE_SYSTEM_THEME_DIR "/usr/share/skipstone/pixmaps" +-/*--------*/ ++/* dirs for themes now handled by defines from the Makefile */ + + typedef struct /* Browser window structure */ + { diff -ur old/www/skipstone/files/patch-ac new/www/skipstone/files/patch-ac --- old/www/skipstone/files/patch-ac Fri Nov 17 12:41:14 2000 +++ new/www/skipstone/files/patch-ac Fri Nov 17 12:40:53 2000 @@ -1,24 +1,24 @@ ---- src/skipstone.orig Thu Nov 16 19:45:53 2000 -+++ src/skipstone Thu Nov 16 20:23:19 2000 +--- src/skipstone.orig Thu Nov 16 19:45:53 2000 ++++ src/skipstone Thu Nov 16 20:23:19 2000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if test -n "$MOZILLA_FIVE_HOME"; then - LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH + LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH @@ -7,12 +7,9 @@ - else - exec skipstone-bin $@ - fi + 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 +- 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 +- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/mozilla +- export MOZILLA_FIVE_HOME=/usr/local/lib/mozilla +elif [ -f /usr/X11R6/lib/mozilla/libgtkembedmoz.so ]; then -+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/X11R6/lib/mozilla -+ export MOZILLA_FIVE_HOME=/usr/X11R6/lib/mozilla - else - ++ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/X11R6/lib/mozilla ++ export MOZILLA_FIVE_HOME=/usr/X11R6/lib/mozilla + else + echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them" diff -ur old/www/skipstone/pkg-descr new/www/skipstone/pkg-descr --- old/www/skipstone/pkg-descr Fri Nov 17 12:41:13 2000 +++ new/www/skipstone/pkg-descr Fri Nov 17 12:40:53 2000 @@ -1,4 +1,4 @@ -SkipStone is a web browser that is indended for just browsing the web. It does +SkipStone is a web browser that is intended for just browsing the web. It does not include features to read email, edit html, or use newsgroups. It does have a number of interesting features such as tabbed mode, where many pages can appear within a single notebook-like window. SkipStone is built around >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200011172101.eAHL1kq25489>