[SVN-Commit] r96 - in branches/experimental/mail/thunderbird-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sat Aug 22 17:21:21 2009
New Revision: 96

Log:
- Fix build on FreeBSD 6.x
- Remove PORTEPOCH

Added:
   branches/experimental/mail/thunderbird-devel/files/liboggplay_oss
      - copied unchanged from r90, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/releng6_pulseaudio
Deleted:
   branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in
Modified:
   branches/experimental/mail/thunderbird-devel/Makefile

Modified: branches/experimental/mail/thunderbird-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-devel/Makefile	Sat Aug 22 07:41:50 2009	(r95)
+++ branches/experimental/mail/thunderbird-devel/Makefile	Sat Aug 22 17:21:21 2009	(r96)
@@ -7,7 +7,6 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	3.0b3
-PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/nightly/${DISTVERSION}-candidates/build1/source/
@@ -58,6 +57,13 @@
 MOZSRC:=	${WRKDIR}/mozilla
 WRKSRC=		${WRKDIR}
 
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
+.endif
+
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""

Copied: branches/experimental/mail/thunderbird-devel/files/liboggplay_oss (from r90, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/liboggplay_oss	Sat Aug 22 17:21:21 2009	(r96, copy of r90, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in)
@@ -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/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_Makefile.in	Sat Aug 22 17:21:21 2009	(r95)
+++ /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-devel/files/releng6_pulseaudio
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/releng6_pulseaudio	Sat Aug 22 17:21:21 2009	(r96)
@@ -0,0 +1,66 @@
+--- 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	2009-08-20 21:45:20.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(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 \