diff options
| author | rh <rh> | 2001-08-09 14:17:16 +0000 |
|---|---|---|
| committer | rh <rh> | 2001-08-09 14:17:16 +0000 |
| commit | 62890ce41cb24af388955a093aff4d2c99f6f0cd (patch) | |
| tree | d7239420753df8a41d693a129aa784dfae3e806f /www | |
| parent | f1c094315226976c28167958e6d112471fd2add6 (diff) | |
| download | pkgsrc-62890ce41cb24af388955a093aff4d2c99f6f0cd.tar.gz | |
Search for mozilla includes and libraries in X11PREFIX (not PREFIX) so this
compiles without xpkgwedge as well.
Diffstat (limited to 'www')
| -rw-r--r-- | www/skipstone/Makefile | 4 | ||||
| -rw-r--r-- | www/skipstone/distinfo | 4 | ||||
| -rw-r--r-- | www/skipstone/patches/patch-aa | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile index 25f9affa40e..f04f1a7fa99 100644 --- a/www/skipstone/Makefile +++ b/www/skipstone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $ +# $NetBSD: Makefile,v 1.2 2001/08/09 14:17:16 rh Exp $ # DISTNAME= skipstone-0.7.4 @@ -13,6 +13,8 @@ DEPENDS+= mozilla>=0.9:../../www/mozilla USE_GMAKE= yes +MAKE_ENV+= X11PREFIX="${X11PREFIX}" + post-patch: ${SED} -e s,@PREFIX@,${PREFIX},g \ < ${WRKSRC}/src/skipstone > ${WRKSRC}/src/skipstone.tmp diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo index f23d9548aaa..76e2a83afe4 100644 --- a/www/skipstone/distinfo +++ b/www/skipstone/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $ +$NetBSD: distinfo,v 1.2 2001/08/09 14:17:17 rh Exp $ SHA1 (skipstone-0.7.4.tar.gz) = 49c7962dad50a9a382eba67f5cdca68881544e88 Size (skipstone-0.7.4.tar.gz) = 451953 bytes -SHA1 (patch-aa) = d2ce0a3816dd153b77528d1818432fd438d8b70a +SHA1 (patch-aa) = 641de1030195280b81fe6d940b72e004cec0e7a5 SHA1 (patch-ab) = 82dc54fe4c1d084a846e2c5245acdaaecb2c8ea6 SHA1 (patch-ac) = 47579c822dda858eec4330cb1da2f8ffdd331eec SHA1 (patch-ad) = e8c424287f4c46298d6a3e976b4176a3f44c8d40 diff --git a/www/skipstone/patches/patch-aa b/www/skipstone/patches/patch-aa index c77994f0f7b..c0c134f5622 100644 --- a/www/skipstone/patches/patch-aa +++ b/www/skipstone/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $ +$NetBSD: patch-aa,v 1.2 2001/08/09 14:17:18 rh Exp $ ---- config.mk.orig Mon Jul 2 21:41:30 2001 -+++ config.mk Thu Jul 19 14:53:31 2001 +--- config.mk.orig Fri Jul 13 19:25:24 2001 ++++ config.mk @@ -1,17 +1,12 @@ -PREFIX=/usr/local +#PREFIX=/usr/local @@ -14,13 +14,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $ - -I/usr/local/include/nspr \ - -I/usr/include/mozilla/nspr \ - -I/usr/local/include/mozilla/nspr -+ -I${PREFIX}/include/mozilla/nspr \ -+ -I${PREFIX}/include/mozilla ++ -I${X11PREFIX}/include/mozilla/nspr \ ++ -I${X11PREFIX}/include/mozilla MOZILLA_LIBS = \ - -L/usr/lib/mozilla \ - -L/usr/local/lib/mozilla \ -+ -L${PREFIX}/lib/mozilla -Wl,-R${PREFIX}/lib/mozilla \ ++ -L${X11PREFIX}/lib/mozilla -Wl,-R${X11PREFIX}/lib/mozilla \ -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom GTK_LIBS = $(shell gtk-config --libs) |