From owner-freebsd-gecko@FreeBSD.ORG Fri Jul 8 12:22:47 2011 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E7F81065678 for ; Fri, 8 Jul 2011 12:22:47 +0000 (UTC) (envelope-from mi+thun@aldan.algebra.com) Received: from smtp03.lnh.mail.rcn.net (smtp03.lnh.mail.rcn.net [207.172.157.103]) by mx1.freebsd.org (Postfix) with ESMTP id 0EB918FC28 for ; Fri, 8 Jul 2011 12:22:46 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 08 Jul 2011 08:22:46 -0400 Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11]) by mr17.lnh.mail.rcn.net (MOS 4.2.3-GA) with ESMTP id AYX79835; Fri, 8 Jul 2011 08:22:45 -0400 Received-SPF: None identity=pra; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=mailfrom; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=helo; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="postmaster@[192.168.1.8]"; x-conformance=sidf_compatible X-Auth-ID: anat Received: from unknown (HELO [192.168.1.8]) ([209.6.61.133]) by smtp01.lnh.mail.rcn.net with ESMTP; 08 Jul 2011 08:22:40 -0400 Message-ID: <4E16F684.4010303@aldan.algebra.com> Date: Fri, 08 Jul 2011 08:22:28 -0400 From: "Mikhail T." User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110706 Thunderbird/5.0 MIME-Version: 1.0 To: gecko@freebsd.org References: <4DDD6807.5090302@aldan.algebra.com> <4E0CCD19.9010605@aldan.algebra.com> In-Reply-To: <4E0CCD19.9010605@aldan.algebra.com> Content-Type: multipart/mixed; boundary="------------020405030400030800060100" X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: Re: sqlite3 and other already-installed components X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2011 12:22:47 -0000 This is a multi-part message in MIME format. --------------020405030400030800060100 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Attached are the patches for Mk/bsd.gecko.mk and firefox and thunderbird ports, which build both applications with all the 3rd-party components coming from other ports. This presumes, the png is built with APNG enabled, which, hopefully, will soon become the default: http://www.freebsd.org/cgi/query-pr.cgi?pr=158716 until then, USE_MOZILLA can be set to -png (rather than yes), but there really is no excuse not to use all other components. I'm sending this letter using the newly-built Thunderbird-5. The new Firefox-5 works nicely too. Please, review the patch -- other ports in your care might need tweaking too, but I doubt it... Thank you! Yours, -mi --------------020405030400030800060100 Content-Type: text/plain; name="mozilla.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mozilla.diff" Index: Mk/bsd.gecko.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.gecko.mk,v retrieving revision 1.30 diff -U 2 -r1.30 bsd.gecko.mk --- Mk/bsd.gecko.mk 30 Jun 2011 18:19:47 -0000 1.30 +++ Mk/bsd.gecko.mk 8 Jul 2011 12:07:53 -0000 @@ -566,7 +566,11 @@ # Standard depends -_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip +_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip sqlite3 -cairo_LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +sqlite3_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 +sqlite3_MOZ_OPTIONS= --enable-system-sqlite +sqlite3_EXTRACT_AFTER_ARGS= --exclude mozilla/db/sqlite3/src/*.h + +cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo @@ -574,5 +578,5 @@ dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm -jpeg_LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg @@ -587,9 +591,8 @@ nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} - -png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +png_LIB_DEPENDS= png:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} -xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +xft_LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft zip_DEPENDS= zip:${PORTSDIR}/archivers/zip Index: www/firefox/Makefile =================================================================== RCS file: /home/pcvs/ports/www/firefox/Makefile,v retrieving revision 1.242 diff -U 2 -r1.242 Makefile --- www/firefox/Makefile 4 Jul 2011 17:28:33 -0000 1.242 +++ www/firefox/Makefile 8 Jul 2011 12:07:53 -0000 @@ -18,4 +18,5 @@ BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.12.9:${PORTSDIR}/security/nss \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ @@ -25,5 +26,5 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 @@ -97,8 +98,8 @@ @${ECHO} "*****************************************************************" @${ECHO} "To build Firefox with PGO support you need a running X server and" - @${ECHO} " build this port with an user who could access the X server! " + @${ECHO} " build this port with as user who could access the X server! " @${ECHO} "" @${ECHO} "During the build a Firefox instance will start and run some test." - @${ECHO} " Do not interrupt or close Firefox during this tests! " + @${ECHO} " Do not interrupt or close Firefox during these tests! " @${ECHO} "*****************************************************************" @sleep 10 Index: www/firefox/files/patch-db_sqlite3_src_Makefile.in =================================================================== RCS file: www/firefox/files/patch-db_sqlite3_src_Makefile.in diff -N www/firefox/files/patch-db_sqlite3_src_Makefile.in --- www/firefox/files/patch-db_sqlite3_src_Makefile.in 7 Feb 2010 21:48:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000 -+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% -lc - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 Index: mail/thunderbird/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/thunderbird/Makefile,v retrieving revision 1.128 diff -U 2 -r1.128 Makefile --- mail/thunderbird/Makefile 4 Jul 2011 21:27:06 -0000 1.128 +++ mail/thunderbird/Makefile 8 Jul 2011 12:07:53 -0000 @@ -16,5 +16,6 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.5:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent @@ -23,5 +24,5 @@ USE_GECKO= gecko CONFLICTS_INSTALL= thunderbird-3.1* -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZ_TOOLKIT= cairo-gtk2 @@ -59,4 +60,8 @@ .include +.if exists(${LOCALBASE}/include/jsapi.h) +.error The installed SpiderMonkey headers interfere with the build +.endif + WRKSRC= ${WRKDIR}/comm-miramar MOZSRC:= ${WRKSRC}/mozilla @@ -111,6 +116,5 @@ ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${MOZSRC}/storage/build/Makefile.in \ - ${MOZSRC}/toolkit/library/Makefile.in \ - ${MOZSRC}/db/sqlite3/src/Makefile.in + ${MOZSRC}/toolkit/library/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ Index: mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in =================================================================== RCS file: mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in diff -N mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 8 Jul 2011 12:07:53 -0000 @@ -0,0 +1,12 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-04-14 14:37:48.000000000 -0400 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-05-25 13:32:01.000000000 -0400 +@@ -153,4 +154,9 @@ + endif + ++ifeq ($(OS_ARCH), FreeBSD)) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) $(NSSLINK) -lpthread ++CUSTOM_LIBS=1 ++endif ++ + ifeq ($(OS_ARCH), IRIX) + EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) Index: mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in =================================================================== RCS file: mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in diff -N mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in --- mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in 3 Aug 2010 20:55:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500 -+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 Index: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c =================================================================== RCS file: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c diff -N mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c --- mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c 1 Mar 2011 22:27:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - --------------020405030400030800060100--