diff options
| author | taya <taya> | 2002-05-28 23:31:06 +0000 |
|---|---|---|
| committer | taya <taya> | 2002-05-28 23:31:06 +0000 |
| commit | e674ac2a1c07211bfb00df673031f2cb6841ff81 (patch) | |
| tree | 0b09d59cc532b2ac19c4cc3add24fc7bd1720b2e /www/skipstone | |
| parent | 55eec12c7774c5086131dd2af1567e01b71168e8 (diff) | |
| download | pkgsrc-e674ac2a1c07211bfb00df673031f2cb6841ff81.tar.gz | |
Add LDFLAGS to set rpath.
Add patch-ae forget to add at previous commit.
Diffstat (limited to 'www/skipstone')
| -rw-r--r-- | www/skipstone/Makefile | 10 | ||||
| -rw-r--r-- | www/skipstone/distinfo | 4 | ||||
| -rw-r--r-- | www/skipstone/patches/patch-ae | 37 |
3 files changed, 46 insertions, 5 deletions
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile index 9c6c32e9888..135022bebff 100644 --- a/www/skipstone/Makefile +++ b/www/skipstone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/05/26 12:10:13 taya Exp $ +# $NetBSD: Makefile,v 1.13 2002/05/28 23:31:06 taya Exp $ DISTNAME= skipstone-0.8.2 CATEGORIES= www @@ -10,11 +10,15 @@ COMMENT= GTK+ web browser that embeds Mozilla's renderer DEPENDS+= mozilla>=1.0rc3:../../www/mozilla +EVAL_PREFIX+= MOZ_DIR=mozilla +MOZ_INCDIR= ${MOZ_DIR}/include/mozilla +MOZ_LIBDIR= ${MOZ_DIR}/lib/mozilla USE_GMAKE= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ - --with-mozilla-includes=${PREFIX}/include/mozilla \ - --with-mozilla-libs=${PREFIX}/lib/mozilla + --with-mozilla-includes=${MOZ_INCDIR} \ + --with-mozilla-libs=${MOZ_LIBDIR} +LDFLAGS+= -Wl,-R${MOZ_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo index efaa8866a48..eec043a1f75 100644 --- a/www/skipstone/distinfo +++ b/www/skipstone/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/05/26 12:10:14 taya Exp $ +$NetBSD: distinfo,v 1.9 2002/05/28 23:31:07 taya Exp $ SHA1 (skipstone-0.8.2.tar.gz) = d95e48ecd2f1907998e327fb8cb09f6e7f3da3e1 Size (skipstone-0.8.2.tar.gz) = 420922 bytes SHA1 (patch-ad) = e45ab1dbbed9c007fa427fa358b5744057e5f5c1 -SHA1 (patch-ae) = cf226c33e15e3f9cfd7939541fc8bdbeee32c8d8 +SHA1 (patch-ae) = 72d1f2b4fa9d29161697abcb6d2a09714e6ec46b diff --git a/www/skipstone/patches/patch-ae b/www/skipstone/patches/patch-ae new file mode 100644 index 00000000000..c9d5a6a8c39 --- /dev/null +++ b/www/skipstone/patches/patch-ae @@ -0,0 +1,37 @@ +$NetBSD: patch-ae,v 1.1 2002/05/28 23:31:07 taya Exp $ + +diff -ru ../Orig/skipstone-0.8.2/src/skipstone.in ./src/skipstone.in +--- ../Orig/skipstone-0.8.2/src/skipstone.in Sat May 11 05:20:45 2002 ++++ ./src/skipstone.in Tue May 28 23:59:50 2002 +@@ -1,29 +1,3 @@ + #!/bin/sh +-# allow MOZILLA_FIVE_HOME to override defaults/install path +-if test -n "$MOZILLA_FIVE_HOME"; then +- LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH +- export LD_LIBRARY_PATH +-elif [ -f /usr/lib/libgtkembedmoz.so ]; then +- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/mozilla +- export MOZILLA_FIVE_HOME=/usr/lib/mozilla +-elif [ -f @MOZILLA_LIB_HOME@/libgtkembedmoz.so ]; then +- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@MOZILLA_LIB_HOME@ +- export MOZILLA_FIVE_HOME=@MOZILLA_LIB_HOME@ +-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 +- +-echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them" +- exit +-fi +- +-if [ -f ./skipstone-bin ]; then +- exec ./skipstone-bin $@ +-else +- exec skipstone-bin $@ +-fi ++export MOZILLA_FIVE_HOME=@MOZILLA_LIB_HOME@ ++exec @prefix@/bin/skipstone-bin $@ |