diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/skipstone/Makefile | 11 | ||||
| -rw-r--r-- | www/skipstone/distinfo | 2 | ||||
| -rw-r--r-- | www/skipstone/files/patch-aa | 27 | ||||
| -rw-r--r-- | www/skipstone/files/patch-ab | 29 | ||||
| -rw-r--r-- | www/skipstone/files/patch-ac | 36 |
5 files changed, 25 insertions, 80 deletions
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile index 45a3b3395c19..a77a50823773 100644 --- a/www/skipstone/Makefile +++ b/www/skipstone/Makefile @@ -6,25 +6,26 @@ # PORTNAME= skipstone -PORTVERSION= 0.8.1 +PORTVERSION= 0.8.3 CATEGORIES= www MASTER_SITES= http://www.muhri.net/skipstone/ MAINTAINER= eric@FreeBSD.org -BROKEN= "Does not work with the current mozilla port" - BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/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 \ wget:${PORTSDIR}/ftp/wget +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-mozilla-includes=${X11BASE}/include/mozilla --with-mozilla-libs=${X11BASE}/lib/mozilla-embedded + USE_GTK= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_X_PREFIX= yes post-patch: - @${PERL} -pi -e 's#/usr/local#${X11BASE}#' ${WRKSRC}/src/skipstone.h - @${PERL} -pi -e 's#X11BASE#${X11BASE}#' ${WRKSRC}/src/skipstone + @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo index 2d40217709f2..5efe761eec1c 100644 --- a/www/skipstone/distinfo +++ b/www/skipstone/distinfo @@ -1 +1 @@ -MD5 (skipstone-0.8.1.tar.gz) = c620c039023e17d7c0027b8edaa17dde +MD5 (skipstone-0.8.3.tar.gz) = d44324e3664723c2cbe82ce60464dc51 diff --git a/www/skipstone/files/patch-aa b/www/skipstone/files/patch-aa index 8479d90536ae..dd1a2212c92a 100644 --- a/www/skipstone/files/patch-aa +++ b/www/skipstone/files/patch-aa @@ -1,11 +1,20 @@ ---- src/Makefile.orig Thu Apr 18 00:49:56 2002 -+++ src/Makefile Thu Apr 18 00:50:25 2002 -@@ -12,7 +12,7 @@ - ifeq ($(freebsd),1) - LIBS = $(GTK_LIBS) $(MOZILLA_LIBS) -lc_r +--- configure.old Thu Jul 4 11:36:30 2002 ++++ configure Thu Jul 4 11:37:06 2002 +@@ -657,7 +657,7 @@ + fi + fi + +-if test -f $mozilla_libs/chrome/comm.jar ; then ++if test -f $mozilla_libs/chrome/embed.jar ; then + MOZILLA_LIB_HOME=$mozilla_libs + else --LIBS = $(GTK_LIBS) $(MOZILLA_LIBS) -lpthread -+LIBS = $(GTK_LIBS) $(MOZILLA_LIBS) -pthread - endif +@@ -1258,7 +1258,7 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lpthread $LIBS" ++ LIBS="-pthread $LIBS" - LOCALEDIR ?= /usr/share/locale + else + echo "$ac_t""no" 1>&6 diff --git a/www/skipstone/files/patch-ab b/www/skipstone/files/patch-ab deleted file mode 100644 index b2066757614f..000000000000 --- a/www/skipstone/files/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ ---- config.mk.orig Fri Nov 30 21:37:54 2001 -+++ config.mk Fri Nov 30 21:40:06 2001 -@@ -1,4 +1,4 @@ --PREFIX=/usr/local -+PREFIX=$(X11BASE) - PLUGINDIR=$(HOME)/.skipstone/plugins - - MOZILLA_INCLUDES = \ -@@ -71,16 +71,16 @@ - - MOZILLA_LIBS = \ - -L/usr/lib/mozilla \ -- -L$(PREFIX)/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-ac b/www/skipstone/files/patch-ac deleted file mode 100644 index 4251c15e3130..000000000000 --- a/www/skipstone/files/patch-ac +++ /dev/null @@ -1,36 +0,0 @@ ---- src/skipstone.orig Thu Nov 8 14:39:36 2001 -+++ src/skipstone Thu Nov 8 14:40:26 2001 -@@ -1,29 +1,6 @@ --#!/bin/bash --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 /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 -+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:X11BASE/lib/mozilla-embedded -+export MOZILLA_FIVE_HOME=X11BASE/lib/mozilla-embedded - --if [ -f ./skipstone-bin ]; then -- exec ./skipstone-bin $@ --else -- exec skipstone-bin $@ --fi -+exec skipstone-bin $@ |