Date: Wed, 6 Jul 2011 18:20:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r584 - branches/experimental/deskutils/lightning branches/experimental/deskutils/lightning-thunderbird branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-i18n branches/experimental/mail/thunderbird/files branches/experimental/mail/thunderbird3 branches/experimental/mail/thunderbird3-i18n branches/experimental/mail/thunderbird3/files branches/experimental/www/firefox branches/experimental/www/firefox-i18n branches/experimental/www/firefox/files branches/experimental/www/firefox35 branches/experimental/www/firefox35-i18n branches/experimental/www/firefox36 branches/experimental/www/firefox36-i18n branches/experimental/www/linux-firefox-devel trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird trunk/mail/thunderbird trunk/mail/thunderbird-i18n trunk/mail/thunderbird/files trunk/mail/thunderbird3 trunk/mail/thunderbird3-i18n trunk/mail/thunderbird3/files trunk/www/firefox trunk/www/firefox-i18n trunk/www/firefox/files ! trunk/www/firefox35 trunk/www/firefox35-i18n trunk/www/firefox36 trunk/www/firefox36-i18n trunk/www/linux-firefox-devel Message-ID: <201107061820.p66IK9j5061311@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Jul 6 18:20:09 2011
New Revision: 584
Log:
- sync with ports
- remove www/firefox35*
Added:
branches/experimental/mail/thunderbird/files/pkg-message.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in
branches/experimental/www/firefox/files/patch-bugzilla-535300
trunk/mail/thunderbird/files/pkg-message.in
trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in
trunk/www/firefox/files/patch-bugzilla-535300
Deleted:
branches/experimental/mail/thunderbird/files/liboggplay_oss
branches/experimental/mail/thunderbird3/files/liboggplay_oss
branches/experimental/mail/thunderbird3/files/releng6_pulseaudio
branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig
branches/experimental/www/firefox35/
branches/experimental/www/firefox35-i18n/
trunk/mail/thunderbird/files/liboggplay_oss
trunk/mail/thunderbird3/files/liboggplay_oss
trunk/mail/thunderbird3/files/releng6_pulseaudio
trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig
trunk/www/firefox35/
trunk/www/firefox35-i18n/
Modified:
branches/experimental/deskutils/lightning-thunderbird/Makefile
branches/experimental/deskutils/lightning-thunderbird/distinfo
branches/experimental/deskutils/lightning/Makefile
branches/experimental/deskutils/lightning/distinfo
branches/experimental/mail/thunderbird-i18n/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3-i18n/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-i18n/Makefile.option
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/firefox36-i18n/Makefile
branches/experimental/www/firefox36-i18n/Makefile.lang
branches/experimental/www/firefox36-i18n/Makefile.option
branches/experimental/www/firefox36/Makefile
branches/experimental/www/linux-firefox-devel/Makefile
trunk/deskutils/lightning-thunderbird/Makefile
trunk/deskutils/lightning-thunderbird/distinfo
trunk/deskutils/lightning/Makefile
trunk/deskutils/lightning/distinfo
trunk/mail/thunderbird-i18n/Makefile
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird3-i18n/Makefile
trunk/mail/thunderbird3/Makefile
trunk/www/firefox-i18n/Makefile.option
trunk/www/firefox/Makefile
trunk/www/firefox/files/patch-configure.in
trunk/www/firefox36-i18n/Makefile
trunk/www/firefox36-i18n/Makefile.lang
trunk/www/firefox36-i18n/Makefile.option
trunk/www/firefox36/Makefile
trunk/www/linux-firefox-devel/Makefile
Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,11 +2,12 @@
# Date created: 2005-02-26
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.37 2010/12/04 07:30:57 ade Exp $
+# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.39 2011/07/04 20:47:14 flo Exp $
#
PORTNAME= lightning
DISTVERSION= 1.0
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source
@@ -16,7 +17,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= An integrated calendar for Thunderbird 3.1
-RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
Modified: branches/experimental/deskutils/lightning-thunderbird/distinfo
==============================================================================
--- branches/experimental/deskutils/lightning-thunderbird/distinfo Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/deskutils/lightning-thunderbird/distinfo Wed Jul 6 18:20:09 2011 (r584)
@@ -1,3 +1,2 @@
-MD5 (lightning-1.0b2.source.tar.bz2) = 2e2ba2279a4e89f11e50ea67b84dd543
SHA256 (lightning-1.0b2.source.tar.bz2) = 887f8d49e6dd36478178b8438f28252370169e60a39383628c0862d8881eb9b2
SIZE (lightning-1.0b2.source.tar.bz2) = 66604225
Modified: branches/experimental/deskutils/lightning/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/deskutils/lightning/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,11 +2,12 @@
# Date created: 2005-02-26
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.35 2010/12/04 07:30:57 ade Exp $
+# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $
#
PORTNAME= lightning
DISTVERSION= 1.0
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source
@@ -15,8 +16,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= An integrated calendar for Thunderbird and SeaMonkey
-OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
- SEAMONKEY "Install SeaMonkey 2.0" off
+RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
@@ -47,14 +47,6 @@
.include <bsd.libnames.mk>
.include <bsd.port.pre.mk>
-.if defined(WITH_THUNDERBIRD)
-RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3
-.endif
-
-.if defined(WITH_SEAMONKEY)
-RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2
-.endif
-
XPI_FILE= ${DISTNAME:C/.source//:C/-sunbird//}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
PLIST_FILES= %%DATADIR%%/${XPI_FILE}
PLIST_DIRS= %%DATADIR%%
Modified: branches/experimental/deskutils/lightning/distinfo
==============================================================================
--- branches/experimental/deskutils/lightning/distinfo Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/deskutils/lightning/distinfo Wed Jul 6 18:20:09 2011 (r584)
@@ -1,3 +1,2 @@
-MD5 (lightning-sunbird-1.0b1.source.tar.bz2) = 418523969c00725bef35e11ef5b06b9b
SHA256 (lightning-sunbird-1.0b1.source.tar.bz2) = 857282e3d148df4ee03ae97d10cf23b2072810817c6a3a1dabe93d0d9b8228fd
SIZE (lightning-sunbird-1.0b1.source.tar.bz2) = 60442959
Modified: branches/experimental/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/mail/thunderbird-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.42 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $
#
PORTNAME= thunderbird-i18n
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/mail/thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $
#
PORTNAME= thunderbird
@@ -54,7 +54,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS=
+OPTIONS= LIGHTNING "Enable calendar extension" off
.include <bsd.port.pre.mk>
@@ -90,6 +90,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if defined(WITH_LIGHTNING)
+MOZ_OPTIONS+= --enable-calendar
+MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
+LIGHTNING_DIR= share/lightning
+SUB_FILES+= pkg-message
+PKGMESSAGE= ${WRKDIR}/pkg-message
+.else
+MOZ_OPTIONS+= --disable-calendar
+.endif
+
post-extract::
${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
@@ -124,10 +134,19 @@
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+.if defined(WITH_LIGHTNING)
+ @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
+ ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
+.endif
post-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
+.if defined(WITH_LIGHTNING)
+ ${MKDIR} ${PREFIX}/${LIGHTNING_DIR}
+ ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi
+ @${CAT} ${PKGMESSAGE}
+.endif
.include <bsd.port.post.mk>
Deleted: branches/experimental/mail/thunderbird/files/liboggplay_oss
==============================================================================
--- branches/experimental/mail/thunderbird/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: branches/experimental/mail/thunderbird/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/pkg-message.in Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,10 @@
+*****************************************************************************
+In order to activate the Lightning extension, every user should install the
+XPI file into his own profile via the menu:
+
+Tools -> Add-ons -> Extensions -> Icon left of the search field
+ -> Install From File
+
+The XPI file was installed as:
+%%PREFIX%%/share/lightning/lightning-thunderbird.xpi
+*****************************************************************************
Modified: branches/experimental/mail/thunderbird3-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/mail/thunderbird3-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.45 2011/01/03 15:14:03 beat Exp $
+# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $
#
PORTNAME= thunderbird-i18n
@@ -20,6 +20,8 @@
RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
.endif
+LATEST_LINK= thunderbird3-i18n
+
NO_BUILD= yes
USE_THUNDERBIRD= 31
USE_XPI= *thunderbird*
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/mail/thunderbird3/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $
#
PORTNAME= thunderbird
@@ -18,8 +18,9 @@
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf213
+LATEST_LINK= thunderbird3
USE_GECKO= gecko
-CONFLICTS_INSTALL= thunderbird-3.0*
+CONFLICTS_INSTALL= thunderbird-5.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
@@ -56,13 +57,6 @@
WRKSRC= ${WRKDIR}/comm-1.9.2
MOZSRC:= ${WRKSRC}/mozilla
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss
-.endif
-
.if ${ARCH} == powerpc64
.if ${OSVERSION} < 900033
BROKEN= Needs binutils 2.17.50 to build
Deleted: branches/experimental/mail/thunderbird3/files/liboggplay_oss
==============================================================================
--- branches/experimental/mail/thunderbird3/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,15 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME = sydneyaudio
+ FORCE_STATIC_LIB= 1
+
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS = \
++ sydney_audio_oss.c \
++ $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS = \
+ sydney_audio_alsa.c \
Deleted: branches/experimental/mail/thunderbird3/files/releng6_pulseaudio
==============================================================================
--- branches/experimental/mail/thunderbird3/files/releng6_pulseaudio Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,66 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000
-+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000
-@@ -235,12 +235,12 @@
- endif
-
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lpulse -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200
-+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200
-@@ -583,6 +583,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-+EXTRA_LIBS += -pthread -lpulse -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200
-+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200
-@@ -269,6 +269,10 @@
- endif
- endif
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_LIBS += -lpulse
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-
- LOCAL_INCLUDES += -I$(srcdir)/../base \
Modified: branches/experimental/www/firefox-i18n/Makefile.option
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.4 2011/06/21 21:12:31 flo Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $
#
OPTIONS= LANG_AF "Africaans" off \
LANG_AK "Akan" off \
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox/Makefile,v 1.241 2011/06/21 21:12:30 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $
#
PORTNAME= firefox
@@ -16,7 +16,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
event-1.4:${PORTSDIR}/devel/libevent
Added: branches/experimental/www/firefox/files/patch-bugzilla-535300
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bugzilla-535300 Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,20 @@
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
+@@ -433,7 +433,16 @@
+ #ifdef ANDROID
+ path += "/lib";
+ #endif
+- newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
++ nsCString new_ld_lib_path;
++ if (ld_library_path && *ld_library_path) {
++ new_ld_lib_path.Assign(ld_library_path);
++ new_ld_lib_path.AppendLiteral(":");
++ new_ld_lib_path.Append(path.get());
++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
++ } else {
++ newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ }
+ #elif OS_MACOSX
+ newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
+ #endif
Modified: branches/experimental/www/firefox/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox/files/patch-configure.in Wed Jul 6 18:20:09 2011 (r584)
@@ -69,3 +69,18 @@
SunOS:x86)
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
Deleted: branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig
==============================================================================
--- branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200
-+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200
-@@ -34,7 +33,8 @@
- #if defined(OS_MACOSX)
- return mach_thread_self();
- #elif defined(OS_LINUX)
-- return syscall(__NR_gettid);
-+ // TODO(BSD): find a better thread ID
-+ return reinterpret_cast<int64>(pthread_self());
- #endif
- }
-
Modified: branches/experimental/www/firefox36-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox36-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox36-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.53 2011/04/29 06:32:48 flo Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $
#
PORTNAME= firefox36-i18n
Modified: branches/experimental/www/firefox36-i18n/Makefile.lang
==============================================================================
--- branches/experimental/www/firefox36-i18n/Makefile.lang Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox36-i18n/Makefile.lang Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.2 2010/04/06 08:14:02 beat Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile.lang,v 1.3 2011/03/22 15:20:43 beat Exp $
#
# Currently, the following 74 languages are supported.
#
Modified: branches/experimental/www/firefox36-i18n/Makefile.option
==============================================================================
--- branches/experimental/www/firefox36-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox36-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.2 2010/04/06 08:14:02 beat Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile.option,v 1.3 2011/03/22 15:20:43 beat Exp $
#
OPTIONS= LANG_AF "Africaans" off \
LANG_SQ "Albanian" off \
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/firefox36/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox36/Makefile,v 1.239 2011/03/22 15:19:45 beat Exp $
+# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $
#
PORTNAME= firefox
Modified: branches/experimental/www/linux-firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/linux-firefox-devel/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ branches/experimental/www/linux-firefox-devel/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 8 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.42 2011/03/01 22:13:35 beat Exp $
+# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.44 2011/04/29 06:36:31 flo Exp $
#
PORTNAME= firefox
Modified: trunk/deskutils/lightning-thunderbird/Makefile
==============================================================================
--- trunk/deskutils/lightning-thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/deskutils/lightning-thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,11 +2,12 @@
# Date created: 2005-02-26
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.37 2010/12/04 07:30:57 ade Exp $
+# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.39 2011/07/04 20:47:14 flo Exp $
#
PORTNAME= lightning
DISTVERSION= 1.0
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source
@@ -16,7 +17,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= An integrated calendar for Thunderbird 3.1
-RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
Modified: trunk/deskutils/lightning-thunderbird/distinfo
==============================================================================
--- trunk/deskutils/lightning-thunderbird/distinfo Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/deskutils/lightning-thunderbird/distinfo Wed Jul 6 18:20:09 2011 (r584)
@@ -1,3 +1,2 @@
-MD5 (lightning-1.0b2.source.tar.bz2) = 2e2ba2279a4e89f11e50ea67b84dd543
SHA256 (lightning-1.0b2.source.tar.bz2) = 887f8d49e6dd36478178b8438f28252370169e60a39383628c0862d8881eb9b2
SIZE (lightning-1.0b2.source.tar.bz2) = 66604225
Modified: trunk/deskutils/lightning/Makefile
==============================================================================
--- trunk/deskutils/lightning/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/deskutils/lightning/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,11 +2,12 @@
# Date created: 2005-02-26
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.35 2010/12/04 07:30:57 ade Exp $
+# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $
#
PORTNAME= lightning
DISTVERSION= 1.0
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source
@@ -15,8 +16,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= An integrated calendar for Thunderbird and SeaMonkey
-OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
- SEAMONKEY "Install SeaMonkey 2.0" off
+RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
@@ -47,14 +47,6 @@
.include <bsd.libnames.mk>
.include <bsd.port.pre.mk>
-.if defined(WITH_THUNDERBIRD)
-RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3
-.endif
-
-.if defined(WITH_SEAMONKEY)
-RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2
-.endif
-
XPI_FILE= ${DISTNAME:C/.source//:C/-sunbird//}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
PLIST_FILES= %%DATADIR%%/${XPI_FILE}
PLIST_DIRS= %%DATADIR%%
Modified: trunk/deskutils/lightning/distinfo
==============================================================================
--- trunk/deskutils/lightning/distinfo Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/deskutils/lightning/distinfo Wed Jul 6 18:20:09 2011 (r584)
@@ -1,3 +1,2 @@
-MD5 (lightning-sunbird-1.0b1.source.tar.bz2) = 418523969c00725bef35e11ef5b06b9b
SHA256 (lightning-sunbird-1.0b1.source.tar.bz2) = 857282e3d148df4ee03ae97d10cf23b2072810817c6a3a1dabe93d0d9b8228fd
SIZE (lightning-sunbird-1.0b1.source.tar.bz2) = 60442959
Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/mail/thunderbird-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.42 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $
#
PORTNAME= thunderbird-i18n
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/mail/thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $
#
PORTNAME= thunderbird
@@ -54,7 +54,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS=
+OPTIONS= LIGHTNING "Enable calendar extension" off
.include <bsd.port.pre.mk>
@@ -90,6 +90,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if defined(WITH_LIGHTNING)
+MOZ_OPTIONS+= --enable-calendar
+MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
+LIGHTNING_DIR= share/lightning
+SUB_FILES+= pkg-message
+PKGMESSAGE= ${WRKDIR}/pkg-message
+.else
+MOZ_OPTIONS+= --disable-calendar
+.endif
+
post-extract::
${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
@@ -124,10 +134,19 @@
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+.if defined(WITH_LIGHTNING)
+ @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
+ ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
+.endif
post-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
+.if defined(WITH_LIGHTNING)
+ ${MKDIR} ${PREFIX}/${LIGHTNING_DIR}
+ ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi
+ @${CAT} ${PKGMESSAGE}
+.endif
.include <bsd.port.post.mk>
Deleted: trunk/mail/thunderbird/files/liboggplay_oss
==============================================================================
--- trunk/mail/thunderbird/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: trunk/mail/thunderbird/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/pkg-message.in Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,10 @@
+*****************************************************************************
+In order to activate the Lightning extension, every user should install the
+XPI file into his own profile via the menu:
+
+Tools -> Add-ons -> Extensions -> Icon left of the search field
+ -> Install From File
+
+The XPI file was installed as:
+%%PREFIX%%/share/lightning/lightning-thunderbird.xpi
+*****************************************************************************
Modified: trunk/mail/thunderbird3-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird3-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/mail/thunderbird3-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.45 2011/01/03 15:14:03 beat Exp $
+# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $
#
PORTNAME= thunderbird-i18n
@@ -20,6 +20,8 @@
RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
.endif
+LATEST_LINK= thunderbird3-i18n
+
NO_BUILD= yes
USE_THUNDERBIRD= 31
USE_XPI= *thunderbird*
Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/mail/thunderbird3/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $
#
PORTNAME= thunderbird
@@ -18,8 +18,9 @@
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf213
+LATEST_LINK= thunderbird3
USE_GECKO= gecko
-CONFLICTS_INSTALL= thunderbird-3.0*
+CONFLICTS_INSTALL= thunderbird-5.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
@@ -56,13 +57,6 @@
WRKSRC= ${WRKDIR}/comm-1.9.2
MOZSRC:= ${WRKSRC}/mozilla
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss
-.endif
-
.if ${ARCH} == powerpc64
.if ${OSVERSION} < 900033
BROKEN= Needs binutils 2.17.50 to build
Deleted: trunk/mail/thunderbird3/files/liboggplay_oss
==============================================================================
--- trunk/mail/thunderbird3/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,15 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME = sydneyaudio
+ FORCE_STATIC_LIB= 1
+
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS = \
++ sydney_audio_oss.c \
++ $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS = \
+ sydney_audio_alsa.c \
Deleted: trunk/mail/thunderbird3/files/releng6_pulseaudio
==============================================================================
--- trunk/mail/thunderbird3/files/releng6_pulseaudio Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,66 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000
-+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000
-@@ -235,12 +235,12 @@
- endif
-
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lpulse -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200
-+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200
-@@ -583,6 +583,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-+EXTRA_LIBS += -pthread -lpulse -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200
-+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200
-@@ -269,6 +269,10 @@
- endif
- endif
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_LIBS += -lpulse
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-
- LOCAL_INCLUDES += -I$(srcdir)/../base \
Modified: trunk/www/firefox-i18n/Makefile.option
==============================================================================
--- trunk/www/firefox-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.4 2011/06/21 21:12:31 flo Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $
#
OPTIONS= LANG_AF "Africaans" off \
LANG_AK "Akan" off \
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox/Makefile,v 1.241 2011/06/21 21:12:30 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $
#
PORTNAME= firefox
@@ -16,7 +16,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
event-1.4:${PORTSDIR}/devel/libevent
Added: trunk/www/firefox/files/patch-bugzilla-535300
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bugzilla-535300 Wed Jul 6 18:20:09 2011 (r584)
@@ -0,0 +1,20 @@
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
+@@ -433,7 +433,16 @@
+ #ifdef ANDROID
+ path += "/lib";
+ #endif
+- newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
++ nsCString new_ld_lib_path;
++ if (ld_library_path && *ld_library_path) {
++ new_ld_lib_path.Assign(ld_library_path);
++ new_ld_lib_path.AppendLiteral(":");
++ new_ld_lib_path.Append(path.get());
++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
++ } else {
++ newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ }
+ #elif OS_MACOSX
+ newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
+ #endif
Modified: trunk/www/firefox/files/patch-configure.in
==============================================================================
--- trunk/www/firefox/files/patch-configure.in Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox/files/patch-configure.in Wed Jul 6 18:20:09 2011 (r584)
@@ -69,3 +69,18 @@
SunOS:x86)
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
Deleted: trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig
==============================================================================
--- trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig Wed Jul 6 18:20:09 2011 (r583)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200
-+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200
-@@ -34,7 +33,8 @@
- #if defined(OS_MACOSX)
- return mach_thread_self();
- #elif defined(OS_LINUX)
-- return syscall(__NR_gettid);
-+ // TODO(BSD): find a better thread ID
-+ return reinterpret_cast<int64>(pthread_self());
- #endif
- }
-
Modified: trunk/www/firefox36-i18n/Makefile
==============================================================================
--- trunk/www/firefox36-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox36-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.53 2011/04/29 06:32:48 flo Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $
#
PORTNAME= firefox36-i18n
Modified: trunk/www/firefox36-i18n/Makefile.lang
==============================================================================
--- trunk/www/firefox36-i18n/Makefile.lang Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox36-i18n/Makefile.lang Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.2 2010/04/06 08:14:02 beat Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile.lang,v 1.3 2011/03/22 15:20:43 beat Exp $
#
# Currently, the following 74 languages are supported.
#
Modified: trunk/www/firefox36-i18n/Makefile.option
==============================================================================
--- trunk/www/firefox36-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox36-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.2 2010/04/06 08:14:02 beat Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile.option,v 1.3 2011/03/22 15:20:43 beat Exp $
#
OPTIONS= LANG_AF "Africaans" off \
LANG_SQ "Albanian" off \
Modified: trunk/www/firefox36/Makefile
==============================================================================
--- trunk/www/firefox36/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/firefox36/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox36/Makefile,v 1.239 2011/03/22 15:19:45 beat Exp $
+# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $
#
PORTNAME= firefox
Modified: trunk/www/linux-firefox-devel/Makefile
==============================================================================
--- trunk/www/linux-firefox-devel/Makefile Thu Jun 30 00:02:12 2011 (r583)
+++ trunk/www/linux-firefox-devel/Makefile Wed Jul 6 18:20:09 2011 (r584)
@@ -2,7 +2,7 @@
# Date created: 8 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.42 2011/03/01 22:13:35 beat Exp $
+# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.44 2011/04/29 06:36:31 flo Exp $
#
PORTNAME= firefox
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107061820.p66IK9j5061311>