Date: Wed, 11 Jul 2012 18:59:45 -0400 From: "Mikhail T." <mi+thun@aldan.algebra.com> To: gecko@freebsd.org Subject: USE_MOZILLA=yes for firefox and thunderbird Message-ID: <4FFE0561.9050109@aldan.algebra.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030406090900000003050309
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hello!
Attached is a fairly small patch, that changes the two ports to use ports of all
of the components currently supported by bsd.gecko.mk.
Please, consider committing soon so the work on bringing-in other components
(such as hunspell, sqlite3, or xulrunner) can begin. Thank you! Yours,
-mi
--------------030406090900000003050309
Content-Type: text/plain; charset=KOI8-U;
name="mozilla-update.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="mozilla-update.patch"
Index: www/firefox/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/firefox/Makefile,v
retrieving revision 1.273
diff -U 2 -r1.273 Makefile
--- www/firefox/Makefile 19 Jun 2012 18:23:11 -0000 1.273
+++ www/firefox/Makefile 11 Jul 2012 22:53:23 -0000
@@ -19,4 +19,5 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+ nss>=3.13:${PORTSDIR}/security/nss \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
@@ -29,5 +30,5 @@
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -xft
+USE_MOZILLA= yes
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
@@ -37,5 +38,4 @@
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS= -O0
HAS_CONFIGURE= yes
USE_BZIP2= yes
Index: mail/thunderbird/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/thunderbird/Makefile,v
retrieving revision 1.153
diff -U 2 -r1.153 Makefile
--- mail/thunderbird/Makefile 19 Jun 2012 18:27:11 -0000 1.153
+++ mail/thunderbird/Makefile 11 Jul 2012 22:53:23 -0000
@@ -27,5 +27,5 @@
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -png -nss -dbm -jpeg -xft
+USE_MOZILLA= yes
MOZ_TOOLKIT= cairo-gtk2
@@ -35,5 +35,4 @@
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
-EXTRA_CFLAGS= -O0
HAS_CONFIGURE= yes
USE_BZIP2= yes
Index: mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
===================================================================
RCS file: mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
diff -N mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 11 Jul 2012 22:53:25 -0000
@@ -0,0 +1,14 @@
+--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2012-06-14 19:26:06.000000000 -0400
++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2012-07-11 15:40:42.000000000 -0400
+@@ -176,6 +176,11 @@
+ CUSTOM_LIBS=1
+ endif
+
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++CUSTOM_LIBS=1
++endif
++
+ ifeq ($(OS_ARCH), HP-UX)
+ CUSTOM_LIBS=1
+ endif
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 <sys/stddef.h>
-+#include <sys/sysctl.h>
-+
-+#include <machine/cpu.h>
-+#include <machine/md_var.h>
-+
-+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
-
--------------030406090900000003050309--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FFE0561.9050109>