- Add FreeBSD 6.4 support

Thanks to:	Florian Smeets

16 files changed, 224 insertions, 42 deletions

diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 7be1971b1b2a..ea6660143377 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	nspr>=4.7:${PORTSDIR}/devel/nspr
 USE_AUTOTOOLS=	autoconf:213:run
 LATEST_LINK=	firefox3-devel
 USE_GECKO=	gecko
-CONFLICTS=	firefox-3.0.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
@@ -41,6 +40,7 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 NO_MOZPKGINSTALL=yes
+CONFLICTS=      firefox-3.0.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -59,8 +59,12 @@ OPTIONS=	DBUS "Enable D-BUS support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700042
-BROKEN=		does not build on 6.x.
+
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
 WRKSRC:=	${WRKSRC}-1.9.1
diff --git a/www/firefox3-devel/files/libsydney_oss b/www/firefox3-devel/files/libsydney_oss
new file mode 100644
index 000000000000..7dfcc33cde9f
--- /dev/null
+++ b/www/firefox3-devel/files/libsydney_oss
@@ -0,0 +1,16 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi  2009-04-10 12:12:45.000000000 +0200
++++ 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 \
+
diff --git a/www/firefox3-devel/files/patch-config_autoconf.mk.in b/www/firefox3-devel/files/patch-config_autoconf.mk.in
index 6fa4f0df5ced..0c6127366c69 100644
--- a/www/firefox3-devel/files/patch-config_autoconf.mk.in
+++ b/www/firefox3-devel/files/patch-config_autoconf.mk.in
@@ -1,5 +1,5 @@
---- config/autoconf.mk.in.orig	2009-04-28 10:03:50.583691270 +0000
-+++ config/autoconf.mk.in	2009-04-28 10:05:25.152703253 +0000
+--- config/autoconf.mk.in.orig	2009-04-24 03:46:37.000000000 +0200
++++ config/autoconf.mk.in	2009-05-11 15:03:26.000000000 +0200
 @@ -57,14 +57,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -19,3 +19,12 @@
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS	= @CPPFLAGS@
+ OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS	= @LDFLAGS@
++OS_LDFLAGS	= @LDFLAGS@ -lc
+ 
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
diff --git a/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in b/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
index 5a32a29685fd..e52ba517e14a 100644
--- a/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
+++ b/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
@@ -5,7 +5,7 @@
  include $(DEPTH)/config/autoconf.mk
  
 +OS_CFLAGS	 = -I../../../dist/include/sqlite3
-+OS_LIBS		 = %%PTHREAD_LIBS%%
++OS_LIBS		 = %%PTHREAD_LIBS%% -lc
  MODULE           = sqlite3
  LIBRARY_NAME     = sqlite3
  FORCE_SHARED_LIB = 1
diff --git a/www/firefox3-devel/files/patch-js-src-Makefile.in b/www/firefox3-devel/files/patch-js-src-Makefile.in
new file mode 100644
index 000000000000..751596240adf
--- /dev/null
+++ b/www/firefox3-devel/files/patch-js-src-Makefile.in
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig	2009-05-11 15:21:19.000000000 +0200
++++ js/src/Makefile.in	2009-05-11 15:21:34.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
diff --git a/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp b/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
new file mode 100644
index 000000000000..8dbc916589af
--- /dev/null
+++ b/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
@@ -0,0 +1,32 @@
+--- js/src/xpconnect/src/xpcquickstubs.cpp.orig        2009-05-10 14:31:55.000000000 +0200
++++ js/src/xpconnect/src/xpcquickstubs.cpp     2009-05-10 14:33:07.000000000 +0200
+@@ -210,8 +210,8 @@
+     if(setterobjp)
+         *setterobjp = setterobj;
+     return JS_DefinePropertyById(cx, obj, interned_id, JSVAL_VOID,
+-                                 (JSPropertyOp)getterobj,
+-                                 (JSPropertyOp)setterobj,
++                                     JS_DATA_TO_FUNC_PTR(JSPropertyOp, getterobj),
++                                     JS_DATA_TO_FUNC_PTR(JSPropertyOp, setterobj),
+                                  attrs);
+ }
+
+@@ -255,7 +255,7 @@
+         if(attrs & JSPROP_GETTER)
+         {
+             JS_SET_RVAL(cx, vp,
+-                        OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(getter)));
++                         OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, getter)));
+             return JS_TRUE;
+         }
+     }
+@@ -264,7 +264,7 @@
+         if(attrs & JSPROP_SETTER)
+         {
+             JS_SET_RVAL(cx, vp,
+-                        OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(setter)));
++                        OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, setter)));
+             return JS_TRUE;
+         }
+     }
+
diff --git a/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in b/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in
deleted file mode 100644
index 816bf49a2e6c..000000000000
--- a/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in_orgi	2009-04-10 12:12:45.000000000 +0200
-+++ 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 \
diff --git a/www/firefox3-devel/files/releng6_pulseaudio b/www/firefox3-devel/files/releng6_pulseaudio
new file mode 100644
index 000000000000..1f600320f362
--- /dev/null
+++ b/www/firefox3-devel/files/releng6_pulseaudio
@@ -0,0 +1,34 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi  2009-04-10 12:12:45.000000000 +0200
++++ 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_pulseaudio.c \
++              $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS         = \
+               sydney_audio_alsa.c \
+
+--- toolkit/library/Makefile.in.orig   2009-04-24 03:47:06.000000000 +0200
++++ toolkit/library/Makefile.in        2009-05-11 11:05:23.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
+ 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
+
+
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 7be1971b1b2a..ea6660143377 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	nspr>=4.7:${PORTSDIR}/devel/nspr
 USE_AUTOTOOLS=	autoconf:213:run
 LATEST_LINK=	firefox3-devel
 USE_GECKO=	gecko
-CONFLICTS=	firefox-3.0.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
@@ -41,6 +40,7 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 NO_MOZPKGINSTALL=yes
+CONFLICTS=      firefox-3.0.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -59,8 +59,12 @@ OPTIONS=	DBUS "Enable D-BUS support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700042
-BROKEN=		does not build on 6.x.
+
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
 WRKSRC:=	${WRKSRC}-1.9.1
diff --git a/www/firefox35/files/libsydney_oss b/www/firefox35/files/libsydney_oss
new file mode 100644
index 000000000000..7dfcc33cde9f
--- /dev/null
+++ b/www/firefox35/files/libsydney_oss
@@ -0,0 +1,16 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi  2009-04-10 12:12:45.000000000 +0200
++++ 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 \
+
diff --git a/www/firefox35/files/patch-config_autoconf.mk.in b/www/firefox35/files/patch-config_autoconf.mk.in
index 6fa4f0df5ced..0c6127366c69 100644
--- a/www/firefox35/files/patch-config_autoconf.mk.in
+++ b/www/firefox35/files/patch-config_autoconf.mk.in
@@ -1,5 +1,5 @@
---- config/autoconf.mk.in.orig	2009-04-28 10:03:50.583691270 +0000
-+++ config/autoconf.mk.in	2009-04-28 10:05:25.152703253 +0000
+--- config/autoconf.mk.in.orig	2009-04-24 03:46:37.000000000 +0200
++++ config/autoconf.mk.in	2009-05-11 15:03:26.000000000 +0200
 @@ -57,14 +57,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -19,3 +19,12 @@
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS	= @CPPFLAGS@
+ OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS	= @LDFLAGS@
++OS_LDFLAGS	= @LDFLAGS@ -lc
+ 
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
diff --git a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in b/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
index 5a32a29685fd..e52ba517e14a 100644
--- a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
+++ b/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
@@ -5,7 +5,7 @@
  include $(DEPTH)/config/autoconf.mk
  
 +OS_CFLAGS	 = -I../../../dist/include/sqlite3
-+OS_LIBS		 = %%PTHREAD_LIBS%%
++OS_LIBS		 = %%PTHREAD_LIBS%% -lc
  MODULE           = sqlite3
  LIBRARY_NAME     = sqlite3
  FORCE_SHARED_LIB = 1
diff --git a/www/firefox35/files/patch-js-src-Makefile.in b/www/firefox35/files/patch-js-src-Makefile.in
new file mode 100644
index 000000000000..751596240adf
--- /dev/null
+++ b/www/firefox35/files/patch-js-src-Makefile.in
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig	2009-05-11 15:21:19.000000000 +0200
++++ js/src/Makefile.in	2009-05-11 15:21:34.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
diff --git a/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp b/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
new file mode 100644
index 000000000000..8dbc916589af
--- /dev/null
+++ b/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
@@ -0,0 +1,32 @@
+--- js/src/xpconnect/src/xpcquickstubs.cpp.orig        2009-05-10 14:31:55.000000000 +0200
++++ js/src/xpconnect/src/xpcquickstubs.cpp     2009-05-10 14:33:07.000000000 +0200
+@@ -210,8 +210,8 @@
+     if(setterobjp)
+         *setterobjp = setterobj;
+     return JS_DefinePropertyById(cx, obj, interned_id, JSVAL_VOID,
+-                                 (JSPropertyOp)getterobj,
+-                                 (JSPropertyOp)setterobj,
++                                     JS_DATA_TO_FUNC_PTR(JSPropertyOp, getterobj),
++                                     JS_DATA_TO_FUNC_PTR(JSPropertyOp, setterobj),
+                                  attrs);
+ }
+
+@@ -255,7 +255,7 @@
+         if(attrs & JSPROP_GETTER)
+         {
+             JS_SET_RVAL(cx, vp,
+-                        OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(getter)));
++                         OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, getter)));
+             return JS_TRUE;
+         }
+     }
+@@ -264,7 +264,7 @@
+         if(attrs & JSPROP_SETTER)
+         {
+             JS_SET_RVAL(cx, vp,
+-                        OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(setter)));
++                        OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, setter)));
+             return JS_TRUE;
+         }
+     }
+
diff --git a/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in b/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in
deleted file mode 100644
index 816bf49a2e6c..000000000000
--- a/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in_orgi	2009-04-10 12:12:45.000000000 +0200
-+++ 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 \
diff --git a/www/firefox35/files/releng6_pulseaudio b/www/firefox35/files/releng6_pulseaudio
new file mode 100644
index 000000000000..1f600320f362
--- /dev/null
+++ b/www/firefox35/files/releng6_pulseaudio
@@ -0,0 +1,34 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi  2009-04-10 12:12:45.000000000 +0200
++++ 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_pulseaudio.c \
++              $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS         = \
+               sydney_audio_alsa.c \
+
+--- toolkit/library/Makefile.in.orig   2009-04-24 03:47:06.000000000 +0200
++++ toolkit/library/Makefile.in        2009-05-11 11:05:23.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
+ 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
+
+