Index: head/www/firefox3-devel/Makefile =================================================================== --- head/www/firefox3-devel/Makefile (revision 233830) +++ head/www/firefox3-devel/Makefile (revision 233831) @@ -1,121 +1,125 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox DISTVERSION= 3.5b4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} MOZ_TOOLKIT= cairo-gtk2 GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib \ lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include MAKE_JOBS_SAFE= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} EXTRA_CFLAGS= -O2 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 MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ --enable-official-branding \ --enable-canvas --enable-libxul SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js OPTIONS= DBUS "Enable D-BUS support" on \ NEWTAB "Open external links in a new tab" on \ SMB "Enable smb:// URI support using gnomevfs" off .include -.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 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui .else MOZ_OPTIONS+= --disable-gnomeui .endif .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .endif post-extract:: @(cd ${WRKSRC} && ${AUTOCONF}) @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/js/src/configure port-pre-install: # ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Property changes on: head/www/firefox3-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.170 \ No newline at end of property +1.171 \ No newline at end of property Index: head/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in =================================================================== --- head/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in (revision 233830) +++ head/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in (nonexistent) @@ -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 \ Property changes on: head/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/firefox3-devel/files/libsydney_oss =================================================================== --- head/www/firefox3-devel/files/libsydney_oss (nonexistent) +++ head/www/firefox3-devel/files/libsydney_oss (revision 233831) @@ -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 \ + Property changes on: head/www/firefox3-devel/files/libsydney_oss ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox3-devel/files/patch-config_autoconf.mk.in =================================================================== --- head/www/firefox3-devel/files/patch-config_autoconf.mk.in (revision 233830) +++ head/www/firefox3-devel/files/patch-config_autoconf.mk.in (revision 233831) @@ -1,21 +1,30 @@ ---- 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@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/%%MOZILLA%% libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = $(datadir)/idl/%%MOZILLA%% -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% 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@ Property changes on: head/www/firefox3-devel/files/patch-config_autoconf.mk.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in =================================================================== --- head/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in (revision 233830) +++ head/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in (revision 233831) @@ -1,11 +1,11 @@ --- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000 +++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000 @@ -45,6 +45,8 @@ 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 Property changes on: head/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/www/firefox3-devel/files/patch-js-src-Makefile.in =================================================================== --- head/www/firefox3-devel/files/patch-js-src-Makefile.in (nonexistent) +++ head/www/firefox3-devel/files/patch-js-src-Makefile.in (revision 233831) @@ -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 Property changes on: head/www/firefox3-devel/files/patch-js-src-Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp =================================================================== --- head/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp (nonexistent) +++ head/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp (revision 233831) @@ -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(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(setter))); ++ OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, setter))); + return JS_TRUE; + } + } + Property changes on: head/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox3-devel/files/releng6_pulseaudio =================================================================== --- head/www/firefox3-devel/files/releng6_pulseaudio (nonexistent) +++ head/www/firefox3-devel/files/releng6_pulseaudio (revision 233831) @@ -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 + + Property changes on: head/www/firefox3-devel/files/releng6_pulseaudio ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox35/Makefile =================================================================== --- head/www/firefox35/Makefile (revision 233830) +++ head/www/firefox35/Makefile (revision 233831) @@ -1,121 +1,125 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox DISTVERSION= 3.5b4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} MOZ_TOOLKIT= cairo-gtk2 GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib \ lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include MAKE_JOBS_SAFE= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} EXTRA_CFLAGS= -O2 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 MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ --enable-official-branding \ --enable-canvas --enable-libxul SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js OPTIONS= DBUS "Enable D-BUS support" on \ NEWTAB "Open external links in a new tab" on \ SMB "Enable smb:// URI support using gnomevfs" off .include -.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 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui .else MOZ_OPTIONS+= --disable-gnomeui .endif .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .endif post-extract:: @(cd ${WRKSRC} && ${AUTOCONF}) @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/js/src/configure port-pre-install: # ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Property changes on: head/www/firefox35/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.170 \ No newline at end of property +1.171 \ No newline at end of property Index: head/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in =================================================================== --- head/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in (revision 233830) +++ head/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in (nonexistent) @@ -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 \ Property changes on: head/www/firefox35/files/patch-media_liboggplay_audio_Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/firefox35/files/libsydney_oss =================================================================== --- head/www/firefox35/files/libsydney_oss (nonexistent) +++ head/www/firefox35/files/libsydney_oss (revision 233831) @@ -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 \ + Property changes on: head/www/firefox35/files/libsydney_oss ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox35/files/patch-config_autoconf.mk.in =================================================================== --- head/www/firefox35/files/patch-config_autoconf.mk.in (revision 233830) +++ head/www/firefox35/files/patch-config_autoconf.mk.in (revision 233831) @@ -1,21 +1,30 @@ ---- 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@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/%%MOZILLA%% libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = $(datadir)/idl/%%MOZILLA%% -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% 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@ Property changes on: head/www/firefox35/files/patch-config_autoconf.mk.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/www/firefox35/files/patch-db_sqlite3_src_Makefile.in =================================================================== --- head/www/firefox35/files/patch-db_sqlite3_src_Makefile.in (revision 233830) +++ head/www/firefox35/files/patch-db_sqlite3_src_Makefile.in (revision 233831) @@ -1,11 +1,11 @@ --- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000 +++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000 @@ -45,6 +45,8 @@ 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 Property changes on: head/www/firefox35/files/patch-db_sqlite3_src_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/www/firefox35/files/patch-js-src-Makefile.in =================================================================== --- head/www/firefox35/files/patch-js-src-Makefile.in (nonexistent) +++ head/www/firefox35/files/patch-js-src-Makefile.in (revision 233831) @@ -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 Property changes on: head/www/firefox35/files/patch-js-src-Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp =================================================================== --- head/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp (nonexistent) +++ head/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp (revision 233831) @@ -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(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(setter))); ++ OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, setter))); + return JS_TRUE; + } + } + Property changes on: head/www/firefox35/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/firefox35/files/releng6_pulseaudio =================================================================== --- head/www/firefox35/files/releng6_pulseaudio (nonexistent) +++ head/www/firefox35/files/releng6_pulseaudio (revision 233831) @@ -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 + + Property changes on: head/www/firefox35/files/releng6_pulseaudio ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property