ports/159710: [PATCH] www/firefox36: misc changes

[Ruslan Mahmatkhanov]

>Number:         159710
>Category:       ports
>Synopsis:       [PATCH] www/firefox36: misc changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 12 11:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- remove duplicated MAKE_JOBS_SAFE=yes
- remove conflicts with not existing firefox3.5
- remove noop SMB option
- remove checks for OS versions that we doesn't supporting
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa firefox36.orig/Makefile firefox36/Makefile
--- firefox36.orig/Makefile	2011-06-22 00:35:48.000000000 +0400
+++ firefox36/Makefile	2011-08-12 15:24:02.000000000 +0400
@@ -38,9 +38,7 @@
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS_INSTALL=	firefox-3.5.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -52,17 +50,11 @@
 		--enable-canvas --enable-libxul --disable-necko-wifi \
 		--disable-ipc
 
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		SMB "Enable smb:// URI support using gnomevfs" off
+OPTIONS=	DBUS "Enable D-BUS support" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
-.else
 EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
-.endif
 
 .if ${ARCH} == powerpc64
 .if ${OSVERSION} < 900033
diff -ruNa firefox36.orig/files/patch-js_src_jsnum.cpp firefox36/files/patch-js_src_jsnum.cpp
--- firefox36.orig/files/patch-js_src_jsnum.cpp	2011-03-22 18:17:24.000000000 +0300
+++ firefox36/files/patch-js_src_jsnum.cpp	2011-08-12 15:11:23.000000000 +0400
@@ -14,7 +14,7 @@
  
  #else
  
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if defined(__FreeBSD__)
 +#if __BSD_VISIBLE == 0
 +#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
 +#endif
@@ -24,7 +24,7 @@
 +
  #define FIX_FPU() ((void)0)
  
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++#endif
 +
  #endif
  
diff -ruNa firefox36.orig/files/releng6_pulseaudio firefox36/files/releng6_pulseaudio
--- firefox36.orig/files/releng6_pulseaudio	2011-03-22 18:17:24.000000000 +0300
+++ firefox36/files/releng6_pulseaudio	1970-01-01 03:00:00.000000000 +0300
@@ -1,32 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.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 \
---- toolkit/library/Makefile.in.orig	2009-08-11 17:22:45.000000000 +0200
-+++ toolkit/library/Makefile.in	2009-08-11 17:23:22.000000000 +0200
-@@ -231,12 +231,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
- 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
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 


>Release-Note:
>Audit-Trail:
>Unformatted: