From 988b4c8bf5f08fd6615e178b4dd0ab1b55fcecaa Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 17 Dec 2008 23:16:50 +0000 Subject: -Really- make it use sqlite3 from pkgsrc. This should finally close PR pkg/39085. Bump PKGREVISION for this change. --- www/firefox3/Makefile | 5 +++-- www/firefox3/PLIST | 4 +--- www/firefox3/distinfo | 3 ++- www/firefox3/patches/patch-ei | 13 +++++++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 www/firefox3/patches/patch-ei diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile index bb4f277cf33..35ddeea645f 100644 --- a/www/firefox3/Makefile +++ b/www/firefox3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/12/17 20:06:43 tnn Exp $ +# $NetBSD: Makefile,v 1.13 2008/12/17 23:16:50 tnn Exp $ MOZILLA= firefox3 # allow coexisting with firefox2 COMMENT= Lightweight gecko-based web browser @@ -23,6 +23,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} MAINTAINER= tnn@NetBSD.org MOZ_VER= 3.0.5 +PKGREVISION= 1 XPTCFILES:= ${XPTCFILES:C,^,../../firefox3/files/,} DESCR_SRC= ${.CURDIR}/../../www/firefox/DESCR @@ -89,7 +90,7 @@ CONFIGURE_ARGS+= --disable-dbus # Avoids needing curl on Linux CONFIGURE_ARGS+= --disable-crashreporter -#CONFIGURE_ARGS+= --enable-system-sqlite +CONFIGURE_ARGS+= --enable-system-sqlite .include "../../databases/sqlite3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox3/PLIST b/www/firefox3/PLIST index 7fab3063f54..46925f9001e 100644 --- a/www/firefox3/PLIST +++ b/www/firefox3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/12/17 19:50:42 tnn Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/12/17 23:16:50 tnn Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -32,7 +32,6 @@ lib/${MOZILLA}/libplc4.${SO_SUFFIX} lib/${MOZILLA}/libplds4.${SO_SUFFIX} lib/${MOZILLA}/libsmime3.${SO_SUFFIX} lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX} -lib/${MOZILLA}/libsqlite3.${SO_SUFFIX} lib/${MOZILLA}/libssl3.${SO_SUFFIX} lib/${MOZILLA}/libxpcom.${SO_SUFFIX} lib/${MOZILLA}/libxul.${SO_SUFFIX} @@ -1263,7 +1262,6 @@ include/${MOZILLA}/zipwriter/nsIZipWriter.h include/${MOZILLA}/morkreader/nsMorkReader.h include/${MOZILLA}/cookie/nsICookieAcceptDialog.h include/${MOZILLA}/cookie/nsICookiePromptService.h -include/${MOZILLA}/sqlite3/sqlite3.h include/${MOZILLA}/rdf/rdfIDataSource.h include/${MOZILLA}/rdf/rdfITripleVisitor.h include/${MOZILLA}/rdf/rdfISerializer.h diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo index 77008639ab9..d2ae8a73fac 100644 --- a/www/firefox3/distinfo +++ b/www/firefox3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2008/12/17 15:43:01 tnn Exp $ +$NetBSD: distinfo,v 1.11 2008/12/17 23:16:50 tnn Exp $ SHA1 (firefox-3.0.5-source.tar.bz2) = f934e073efaad3d4dde847c8491fa9529564d5d2 RMD160 (firefox-3.0.5-source.tar.bz2) = ec6e7eab65649c5c79587a5a8ffb9b6b386b5a18 @@ -37,6 +37,7 @@ SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241 SHA1 (patch-ed) = 3c6281a75373843c5767fc1213d8cc67dc549e03 SHA1 (patch-ee) = d5aeca91305ed2e1f522b2c0ed4bb17f7f8b881b SHA1 (patch-eh) = 60aca7f94ee04c957386014f7d4df9e3c8ac8ff1 +SHA1 (patch-ei) = 4484d57e19e39ef86760716d5886ebf2a3e69f63 SHA1 (patch-wc) = 2de8665ed6c23c26566ca6d50165c0cf413a753d SHA1 (patch-wd) = fc5c3103ae6f2a2eccc01911a8207f3ca614008b SHA1 (patch-we) = f7fecce05454e9794ff7a4e7789031a5ef49c42d diff --git a/www/firefox3/patches/patch-ei b/www/firefox3/patches/patch-ei new file mode 100644 index 00000000000..0216a9e6f6f --- /dev/null +++ b/www/firefox3/patches/patch-ei @@ -0,0 +1,13 @@ +$NetBSD: patch-ei,v 1.1 2008/12/17 23:16:50 tnn Exp $ + +--- security/nss/lib/softoken/config.mk.orig 2008-02-25 19:55:39.000000000 +0100 ++++ security/nss/lib/softoken/config.mk +@@ -86,7 +86,7 @@ else + EXTRA_SHARED_LIBS += \ + -L$(DIST)/lib \ + -lnssutil3 \ +- -lsqlite3 \ ++ `pkg-config --libs sqlite3` \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ -- cgit v1.2.3