Author: beat
Date: Wed Jan 20 22:16:50 2010
New Revision: 239
Log:
- Add Thunderbird 3.1a1 Build 1 candidate as mail/thunderbird3-devel.
It already builds and runs (at least on FreeBSD 8.0/amd64) but install
fails. We have the same problem with Thunderbird 3.0.1 and Sunbird 1.0b1
at the moment.
Added:
branches/experimental/mail/thunderbird3-devel/
- copied from r238, branches/experimental/mail/thunderbird3/
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp
Deleted:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-config-config.mk
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
Modified:
branches/experimental/mail/thunderbird3-devel/Makefile
branches/experimental/mail/thunderbird3-devel/distinfo
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-layout-generic-Makefile.in
Modified: branches/experimental/mail/thunderbird3-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Tue Jan 19 12:49:27
2010 (r238)
+++ branches/experimental/mail/thunderbird3-devel/Makefile Wed Jan 20
22:16:50 2010 (r239)
@@ -6,11 +6,10 @@
#
PORTNAME= thunderbird
-DISTVERSION= 3.0
-PORTREVISION= 1
+DISTVERSION= 3.1a1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source/
+MASTER_SITE_SUBDIR=
${PORTNAME}/nightly/${DISTVERSION}-candidates/build1/source/
DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= ge...@freebsd.org
@@ -19,9 +18,9 @@
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf:213
-LATEST_LINK= thunderbird3
+LATEST_LINK= thunderbird3-devel
USE_GECKO= gecko
-CONFLICTS= thunderbird-2* lightning-0.[0-9]*
+CONFLICTS= thunderbird-2* thunderbird-3.0* lightning-0.[0-9]*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
@@ -40,7 +39,8 @@
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding
+ --enable-application=mail --enable-official-branding \
+ --disable-necko-wifi
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZILLA_PLIST_DIRS= bin lib
@@ -56,7 +56,7 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-1.9.1
+WRKSRC= ${WRKDIR}/comm-central
MOZSRC:= ${WRKSRC}/mozilla
.if ${OSVERSION} < 700000
@@ -76,9 +76,10 @@
.endif
.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+= --disable-dbus
+MOZ_OPTIONS+= --disable-dbus --disable-libnotify
.else
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ notify.1:${PORTSDIR}/devel/libnotify
.endif
post-extract::
Modified: branches/experimental/mail/thunderbird3-devel/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird3/distinfo Tue Jan 19 12:49:27
2010 (r238)
+++ branches/experimental/mail/thunderbird3-devel/distinfo Wed Jan 20
22:16:50 2010 (r239)
@@ -1,3 +1,3 @@
-MD5 (thunderbird-3.0.source.tar.bz2) = 9a564ac2489b1b0f9348dc298b913f6c
-SHA256 (thunderbird-3.0.source.tar.bz2) =
750fc955e4474eef9ec36e8193df2811bcafb2b8cf27ecc0ebe65cec2eb33067
-SIZE (thunderbird-3.0.source.tar.bz2) = 60022838
+MD5 (thunderbird-3.1a1.source.tar.bz2) = a1a24fd12b3c06bbf3c8e04efeec2ac8
+SHA256 (thunderbird-3.1a1.source.tar.bz2) =
6ff3c5e01d08af573cbb67644bd054778612ef288cc6f9162915a285e32c53c5
+SIZE (thunderbird-3.1a1.source.tar.bz2) = 61650756
Deleted:
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
==============================================================================
---
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
Wed Jan 20 22:16:50 2010 (r238)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/config.mk.orgi 2009-04-21 15:12:51.000000000
+0200
-+++ mozilla/js/src/config/config.mk 2009-04-21 15:15:37.000000000 +0200
-@@ -490,7 +490,7 @@
- INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK)
-I$(PUBLIC) $(OS_INCLUDES)
-
- ifndef MOZILLA_INTERNAL_API
--INCLUDES += -I$(LIBXUL_DIST)/sdk/include
-+INCLUDES += -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
- endif
-
- include $(topsrcdir)/config/static-checking-config.mk
Modified:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
==============================================================================
---
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
Tue Jan 19 12:49:27 2010 (r238)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
Wed Jan 20 22:16:50 2010 (r239)
@@ -1,11 +1,11 @@
---- mozilla/js/src/config/mkdepend/Makefile.in.orig 2009-03-05
22:31:53.000000000 +0100
-+++ mozilla/js/src/config/mkdepend/Makefile.in 2009-04-21 14:10:27.000000000
+0200
-@@ -72,7 +72,7 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig 2010-01-19
21:27:45.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in 2010-01-20 21:55:56.000000000
+0100
+@@ -71,7 +71,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-layout-generic-Makefile.in
==============================================================================
---
branches/experimental/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
Tue Jan 19 12:49:27 2010 (r238)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-layout-generic-Makefile.in
Wed Jan 20 22:16:50 2010 (r239)
@@ -1,9 +1,9 @@
---- mozilla/layout/generic/Makefile.in.orig 2008-06-19 12:29:06.000000000
-0500
-+++ mozilla/layout/generic/Makefile.in 2008-06-19 12:30:04.000000000 -0500
-@@ -188,9 +188,10 @@
+--- mozilla/layout/generic/Makefile.in.orig 2010-01-20 18:57:00.000000000
+0100
++++ mozilla/layout/generic/Makefile.in 2010-01-20 18:57:48.000000000 +0100
+@@ -191,9 +191,10 @@
-I$(srcdir)/../../content/base/src \
-I$(srcdir)/../../content/html/content/src \
- -I$(srcdir)/../../dom/src/base \
+ -I$(srcdir)/../../dom/base \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
Deleted:
branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
==============================================================================
---
branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
Wed Jan 20 22:16:50 2010 (r238)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2007-09-26
13:45:01.000000000 -0400
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2007-09-26
13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
-- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {}
$(DESTDIR)$(includedir)/unstable \;
-+ find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1)
{} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
- $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
Added:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp
Wed Jan 20 22:16:50 2010 (r239)
@@ -0,0 +1,20 @@
+--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.orig
2009-09-16 04:41:19.000000000 +0200
++++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2009-09-18
01:49:47.000000000 +0200
+@@ -511,7 +511,7 @@
+ struct stat ss;
+
+ AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
+- if (sfile == NULL || fstat(fileno(sfile), &ss)) {
++ if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
+ LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(),
spath, errno));
+ return READ_ERROR;
+ }
+@@ -1660,7 +1660,7 @@
+ return READ_ERROR;
+
+ struct stat ms;
+- rv = fstat(fileno(mfile), &ms);
++ rv = fstat(fileno((FILE*)mfile), &ms);
+ if (rv)
+ return READ_ERROR;
+
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
