Hi,
firefox 22 will be released tuesday, so please try the port of the
candidate build 2.
Grab it from here:
http://rhaalovely.net/cgit/mozilla-firefox/?h=release
git clone -b release http://rhaalovely.net/git/mozilla-firefox
Or use the attached diff against cvs. lots of patches related to the
now-dead libsydneyaudio removed. i386 got switched back to clang _again_
using --disable-debug-symbols. firefox no longer links against kerberos,
since it was only for gssapi auth (see http://bugzil.la/648730), and the
way it was done broke runtime in strange ways (see
http://bugzil.la/853364). If someone relies on that feature, get in
touch with me for a testbuild.
You'll need the attached mozilla.port.mk diff to fix wantlibs/deps.
Test reports of course welcome...
Landry
Index: mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
retrieving revision 1.55
diff -u -r1.55 mozilla.port.mk
--- mozilla.port.mk 20 Jun 2013 06:54:38 -0000 1.55
+++ mozilla.port.mk 22 Jun 2013 08:39:10 -0000
@@ -64,16 +64,15 @@
.endif
MODMOZ_WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
- Xinerama Xrandr Xrender Xt atk-1.0 c cairo crypto expat \
+ Xinerama Xrandr Xrender Xt atk-1.0 c cairo \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
\
- gobject-2.0 gthread-2.0 gtk-x11-2.0 krb5 m \
+ gobject-2.0 gthread-2.0 gtk-x11-2.0 m \
nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 plc4 plds4 pthread pthread-stubs \
- smime3 sndio nssutil3 ssl3 stdc++ z \
- asn1 com_err heimbase roken wind
+ smime3 sndio nssutil3 ssl3 stdc++ z
# for all mozilla ports, build against systemwide sqlite3
-MODMOZ_WANTLIB += sqlite3>=22
+MODMOZ_WANTLIB += sqlite3>=23
CONFIGURE_ARGS += --enable-system-sqlite
CONFIGURE_ENV += ac_cv_sqlite_secure_delete=yes
@@ -180,10 +179,13 @@
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/${_MOZDIR}/build/autoconf \
${WRKSRC}/${_MOZDIR}/js/src/build/autoconf
+# sydneyaudio was removed in gecko 22
+.if ${MOZILLA_PROJECT} != "firefox"
post-extract:
# syndeyaudio sndio file comes from ffx FILESDIR
cp -f ${PORTSDIR}/www/mozilla-firefox/files/sydney_audio_sndio.c \
${WRKSRC}/${_MOZDIR}/media/libsydneyaudio/src/
+.endif
# files to run SUBST_CMD on
MOZILLA_SUBST_FILES += ${_MOZDIR}/xpcom/io/nsAppFileLocationProvider.cpp \
? misc
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.233
diff -u -r1.233 Makefile
--- Makefile 20 Jun 2013 06:54:38 -0000 1.233
+++ Makefile 22 Jun 2013 08:45:16 -0000
@@ -6,18 +6,16 @@
# Don't forget to bump www/firefox-i18n after updates.
# Don't forget to update devel/xulrunner/2.0 if patches changes.
-MOZILLA_VERSION = 21.0
+MOZILLA_VERSION = 22.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
-REVISION = 1
-#MASTER_SITES=
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
-SO_VERSION = 40.0
+MASTER_SITES=
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build2/source/
+SO_VERSION = 41.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
-MOZILLA_LIBS = browsercomps mozalloc mozgnome \
- xpcom xul
+MOZILLA_LIBS = browsercomps mozalloc mozgnome xul
CATEGORIES = www
@@ -31,9 +29,9 @@
# necessary glue to build with the correct compiler after fx 17
MODULES += gcc4 lang/clang
-MODGCC4_ARCHS = i386 powerpc
+MODGCC4_ARCHS = powerpc
MODGCC4_LANGS = c c++
-MODCLANG_ARCHS = amd64
+MODCLANG_ARCHS = amd64 i386
MODCLANG_LANGS = c c++
USE_GROFF = Yes
@@ -43,6 +41,15 @@
CONFIGURE_STYLE = autoconf no-autoheader
WANTLIB += kvm
+# to be able to link when building with clang on i386
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS += --disable-debug-symbols
+.endif
+
+# XXX remove in 24
+CONFIGURE_ENV+= TERM=xterm
+MAKE_ENV+= TERM=xterm
+
CONFIGURE_ARGS += --enable-gstreamer
LIB_DEPENDS += multimedia/gstreamer-0.10/plugins-base
@@ -58,11 +65,6 @@
# no system png : apng support not bundled in
MOZILLA_AUTOCONF_DIRS += js/src
-
-# add method appeared in 18
-post-patch:
- echo "UNSUPPORTED(int sa_stream_set_stream_type(sa_stream_t *s, const
sa_stream_type_t stream_type))" \
- >>
${WRKSRC}/${_MOZDIR}/media/libsydneyaudio/src/sydney_audio_sndio.c
post-install:
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c
${FILESDIR}/mozilla-firefox.1 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
retrieving revision 1.93
diff -u -r1.93 distinfo
--- distinfo 30 May 2013 14:17:32 -0000 1.93
+++ distinfo 22 Jun 2013 08:45:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-21.0.source.tar.bz2) =
OQkDHLXUA7EseWr7d3W0lQ8DR3hv/QYCh2GFKhB02Rw=
-SIZE (mozilla/firefox-21.0.source.tar.bz2) = 105558931
+SHA256 (mozilla/firefox-22.0.source.tar.bz2) =
XAtalHzvnWi9t+7kCzCEwewYgzuz2rnFGEF9PjDcm6c=
+SIZE (mozilla/firefox-22.0.source.tar.bz2) = 111488387
Index: patches/patch-browser_app_profile_firefox_js
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js,v
retrieving revision 1.21
diff -u -r1.21 patch-browser_app_profile_firefox_js
--- patches/patch-browser_app_profile_firefox_js 30 May 2013 14:17:32
-0000 1.21
+++ patches/patch-browser_app_profile_firefox_js 22 Jun 2013 08:45:16
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.21 2013/05/30 14:17:32
landry Exp $
---- browser/app/profile/firefox.js.orig Tue Apr 2 04:37:59 2013
-+++ browser/app/profile/firefox.js Thu Apr 11 17:37:12 2013
-@@ -605,7 +605,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
+--- browser/app/profile/firefox.js.orig Wed Jun 19 22:27:27 2013
++++ browser/app/profile/firefox.js Thu Jun 20 13:07:17 2013
+@@ -606,7 +606,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url",
"https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%";);
// by default we show an infobar message when pages require plugins the user
has not installed, or are outdated
@@ -9,8 +9,8 @@
+pref("plugins.hide_infobar_for_missing_plugin", true);
pref("plugins.hide_infobar_for_outdated_plugin", false);
- #ifdef XP_MACOSX
-@@ -732,8 +732,8 @@ pref("gecko.handlerService.schemes.ircs.3.uriTemplate"
+ pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/";);
+@@ -729,8 +729,8 @@ pref("gecko.handlerService.schemes.ircs.3.uriTemplate"
pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
#ifdef MOZ_SAFE_BROWSING
Index: patches/patch-browser_installer_Makefile_in
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-browser_installer_Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-browser_installer_Makefile_in
--- patches/patch-browser_installer_Makefile_in 30 May 2013 14:17:32 -0000
1.5
+++ patches/patch-browser_installer_Makefile_in 22 Jun 2013 08:45:16 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-browser_installer_Makefile_in,v 1.5 2013/05/30 14:17:32 landry
Exp $
Don't install the sdk / headers etc
---- browser/installer/Makefile.in.orig Tue Apr 2 04:38:01 2013
-+++ browser/installer/Makefile.in Thu Apr 11 17:37:38 2013
-@@ -107,10 +107,6 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
+--- browser/installer/Makefile.in.orig Wed May 29 03:15:14 2013
++++ browser/installer/Makefile.in Fri May 31 16:53:36 2013
+@@ -109,10 +109,6 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
endif
Index: patches/patch-gfx_thebes_gfxPlatform_cpp
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp,v
retrieving revision 1.10
diff -u -r1.10 patch-gfx_thebes_gfxPlatform_cpp
--- patches/patch-gfx_thebes_gfxPlatform_cpp 30 May 2013 14:17:32 -0000
1.10
+++ patches/patch-gfx_thebes_gfxPlatform_cpp 22 Jun 2013 08:45:16 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.10 2013/05/30 14:17:32 landry
Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=715658
---- gfx/thebes/gfxPlatform.cpp.orig Tue Apr 2 04:38:09 2013
-+++ gfx/thebes/gfxPlatform.cpp Thu Apr 11 17:37:12 2013
-@@ -533,6 +533,7 @@ void SourceBufferDestroy(void *srcSurfUD)
+https://bugzilla.mozilla.org/show_bug.cgi?id=722975
+--- gfx/thebes/gfxPlatform.cpp.orig Wed May 29 03:15:33 2013
++++ gfx/thebes/gfxPlatform.cpp Fri May 31 17:07:40 2013
+@@ -543,6 +543,7 @@ void SourceBufferDestroy(void *srcSurfUD)
delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
}
@@ -10,27 +10,35 @@
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
-@@ -540,6 +541,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+@@ -550,6 +551,13 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
++#else
++void SourceSnapshotDetached(void *nullSurf)
++{
++ gfxImageSurface* origSurf = static_cast<gfxImageSurface*>(nullSurf);
++ origSurf->SetData(&kSourceSurface, NULL, NULL);
++}
+#endif
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface
*aSurface)
-@@ -652,6 +654,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -662,6 +670,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
}
-+ #ifdef MOZ_TREE_CAIRO
++#ifdef MOZ_TREE_CAIRO
cairo_surface_t *nullSurf =
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
cairo_surface_set_user_data(nullSurf,
-@@ -660,6 +663,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -670,6 +679,9 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf,
SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);
-+ #endif
++#else
++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
(const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get());
++#endif
}
SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
Index: patches/patch-js_src_configure_in
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-js_src_configure_in,v
retrieving revision 1.21
diff -u -r1.21 patch-js_src_configure_in
--- patches/patch-js_src_configure_in 30 May 2013 14:17:32 -0000 1.21
+++ patches/patch-js_src_configure_in 22 Jun 2013 08:45:16 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-js_src_configure_in,v 1.21 2013/05/30 14:17:32 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
---- js/src/configure.in.orig Tue Apr 2 04:38:11 2013
-+++ js/src/configure.in Thu Apr 11 17:37:12 2013
-@@ -1822,7 +1822,11 @@ ia64*-hpux*)
+--- js/src/configure.in.orig Wed May 29 03:15:39 2013
++++ js/src/configure.in Fri May 31 16:53:03 2013
+@@ -1827,7 +1827,11 @@ ia64*-hpux*)
;;
*-openbsd*)
Index: patches/patch-js_src_vm_SPSProfiler_cpp
===================================================================
RCS file: patches/patch-js_src_vm_SPSProfiler_cpp
diff -N patches/patch-js_src_vm_SPSProfiler_cpp
--- patches/patch-js_src_vm_SPSProfiler_cpp 1 Jun 2013 22:09:42 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-js_src_vm_SPSProfiler_cpp,v 1.1 2013/06/01 22:09:42 landry Exp
$
-https://hg.mozilla.org/mozilla-central/rev/489ab986ea69
-https://bugzilla.mozilla.org/show_bug.cgi?id=846986
---- js/src/vm/SPSProfiler.cpp.orig Sun Jun 2 00:00:42 2013
-+++ js/src/vm/SPSProfiler.cpp Sun Jun 2 00:01:14 2013
-@@ -16,6 +16,8 @@
- #include "vm/SPSProfiler.h"
- #include "vm/StringBuffer.h"
-
-+#include "jsscriptinlines.h"
-+
- using namespace js;
-
- using mozilla::DebugOnly;
Index: patches/patch-media_libsydneyaudio_include_sydney_audio_h
===================================================================
RCS file: patches/patch-media_libsydneyaudio_include_sydney_audio_h
diff -N patches/patch-media_libsydneyaudio_include_sydney_audio_h
--- patches/patch-media_libsydneyaudio_include_sydney_audio_h 1 Sep 2012
13:56:45 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.3 2012/09/01
13:56:45 landry Exp $
---- media/libsydneyaudio/include/sydney_audio.h.orig Wed Aug 15 07:48:04 2012
-+++ media/libsydneyaudio/include/sydney_audio.h Sun Aug 19 13:50:30 2012
-@@ -20,7 +20,7 @@ async-signal safe.
- #if !defined (WIN32)
- #include <sys/param.h>
- #include <inttypes.h>
--#if defined(__FreeBSD__) || defined(ANDROID)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(ANDROID)
- #include <sys/endian.h>
- #endif
- #else
Index: patches/patch-media_libsydneyaudio_src_Makefile_in
===================================================================
RCS file: patches/patch-media_libsydneyaudio_src_Makefile_in
diff -N patches/patch-media_libsydneyaudio_src_Makefile_in
--- patches/patch-media_libsydneyaudio_src_Makefile_in 6 Apr 2013 14:44:52
-0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.7 2013/04/06 14:44:52
landry Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=648726
---- media/libsydneyaudio/src/Makefile.in.orig Wed Feb 20 14:28:19 2013
-+++ media/libsydneyaudio/src/Makefile.in Sun Feb 24 17:33:12 2013
-@@ -70,6 +70,12 @@ CSRCS = \
- $(NULL)
- endif
-
-+ifeq ($(OS_ARCH),OpenBSD)
-+CSRCS = \
-+ sydney_audio_sndio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += winmm.lib
- endif
Index: patches/patch-parser_html_Makefile_in
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-parser_html_Makefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-parser_html_Makefile_in
--- patches/patch-parser_html_Makefile_in 1 Sep 2012 13:56:45 -0000
1.10
+++ patches/patch-parser_html_Makefile_in 22 Jun 2013 08:45:16 -0000
@@ -2,9 +2,9 @@
gcc runs out of memory with optimization.
---- parser/html/Makefile.in.orig Wed Aug 15 07:48:14 2012
-+++ parser/html/Makefile.in Sun Aug 19 13:50:38 2012
-@@ -96,4 +96,7 @@ INCLUDES += \
+--- parser/html/Makefile.in.orig Wed May 29 03:16:18 2013
++++ parser/html/Makefile.in Fri May 31 16:53:35 2013
+@@ -92,4 +92,7 @@ INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)
Index: patches/patch-security_manager_pki_resources_content_exceptionDialog_js
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-security_manager_pki_resources_content_exceptionDialog_js,v
retrieving revision 1.7
diff -u -r1.7 patch-security_manager_pki_resources_content_exceptionDialog_js
--- patches/patch-security_manager_pki_resources_content_exceptionDialog_js
6 Apr 2013 14:44:52 -0000 1.7
+++ patches/patch-security_manager_pki_resources_content_exceptionDialog_js
22 Jun 2013 08:45:16 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v
1.7 2013/04/06 14:44:52 landry Exp $
Focus the 'add exception' button in the unknown ssl cert warning window
---- security/manager/pki/resources/content/exceptionDialog.js.orig Wed Feb
20 14:28:37 2013
-+++ security/manager/pki/resources/content/exceptionDialog.js Sun Feb 24
17:33:12 2013
-@@ -265,6 +265,7 @@ function updateCertStatus() {
+--- security/manager/pki/resources/content/exceptionDialog.js.orig Wed May
29 03:16:20 2013
++++ security/manager/pki/resources/content/exceptionDialog.js Fri May 31
16:53:04 2013
+@@ -263,6 +263,7 @@ function updateCertStatus() {
// In these cases, we do want to enable the "Add Exception" button
gDialog.getButton("extra1").disabled = false;
Index: patches/patch-storage_src_mozStorageConnection_cpp
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp,v
retrieving revision 1.18
diff -u -r1.18 patch-storage_src_mozStorageConnection_cpp
--- patches/patch-storage_src_mozStorageConnection_cpp 30 May 2013 14:17:32
-0000 1.18
+++ patches/patch-storage_src_mozStorageConnection_cpp 22 Jun 2013 08:45:16
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.18 2013/05/30
14:17:32 landry Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
---- storage/src/mozStorageConnection.cpp.orig Tue Apr 2 04:38:29 2013
-+++ storage/src/mozStorageConnection.cpp Thu Apr 11 17:37:12 2013
-@@ -618,6 +618,13 @@ Connection::initializeInternal(nsIFile* aDatabaseFile)
+--- storage/src/mozStorageConnection.cpp.orig Wed May 29 03:16:25 2013
++++ storage/src/mozStorageConnection.cpp Fri May 31 16:53:04 2013
+@@ -601,6 +601,13 @@ Connection::initializeInternal(nsIFile* aDatabaseFile)
return convertResultCode(srv);
}
Index: patches/patch-toolkit_library_Makefile_in
===================================================================
RCS file: patches/patch-toolkit_library_Makefile_in
diff -N patches/patch-toolkit_library_Makefile_in
--- patches/patch-toolkit_library_Makefile_in 17 Jun 2013 19:29:05 -0000
1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-toolkit_library_Makefile_in,v 1.25 2013/06/17 19:29:05
ajacoutot Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=648726
-https://bugzilla.mozilla.org/show_bug.cgi?id=648730
---- toolkit/library/Makefile.in.orig Sat May 11 21:19:54 2013
-+++ toolkit/library/Makefile.in Sun Jun 16 17:10:44 2013
-@@ -522,6 +522,12 @@ OS_LIBS += \
- $(NULL)
- endif
-
-+ifeq ($(OS_ARCH),OpenBSD)
-+ifdef MOZ_SYDNEYAUDIO
-+EXTRA_DSO_LDOPTS += -lsndio
-+endif
-+endif
-+
- ifeq ($(OS_ARCH),Darwin)
- ifdef MOZ_SYDNEYAUDIO
- OS_LIBS += \
-@@ -537,12 +543,6 @@ OS_LIBS += \
- endif
- endif
-
--ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
--ifdef MOZ_SYDNEYAUDIO
--EXTRA_DSO_LDOPTS += -lossaudio
--endif
--endif
--
- ifeq (OpenBSD,$(OS_ARCH))
- ifdef MOZ_CUBEB
- EXTRA_DSO_LDOPTS += -lsndio
-@@ -679,7 +679,7 @@ endif
-
- ifeq ($(OS_ARCH),OpenBSD)
- # Needed by nsAuthGSSAPI
--EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
-+EXTRA_DSO_LDOPTS += `krb5-config --libs`
- endif
-
- ifdef MOZ_DEBUG
Index: patches/patch-widget_gtk2_Makefile_in
===================================================================
RCS file: patches/patch-widget_gtk2_Makefile_in
diff -N patches/patch-widget_gtk2_Makefile_in
--- patches/patch-widget_gtk2_Makefile_in 1 Sep 2012 13:56:45 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-widget_gtk2_Makefile_in,v 1.2 2012/09/01 13:56:45 landry Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=648726
---- widget/gtk2/Makefile.in.orig Wed Aug 15 07:48:37 2012
-+++ widget/gtk2/Makefile.in Sun Aug 19 13:50:41 2012
-@@ -21,6 +21,11 @@ LIBXUL_LIBRARY = 1
- NATIVE_THEME_SUPPORT = 1
-
-
-+ifeq ($(OS_ARCH),OpenBSD)
-+ifdef MOZ_SYDNEYAUDIO
-+EXTRA_DSO_LDOPTS += -lsndio
-+endif
-+endif
-
- CSRCS = \
- mozcontainer.c \
Index: patches/patch-xulrunner_app_Makefile_in
===================================================================
RCS file: patches/patch-xulrunner_app_Makefile_in
diff -N patches/patch-xulrunner_app_Makefile_in
--- patches/patch-xulrunner_app_Makefile_in 1 Sep 2012 13:56:45 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.9 2012/09/01 13:56:45 landry Exp
$
-https://bugzilla.mozilla.org/show_bug.cgi?id=648726
---- xulrunner/app/Makefile.in.orig Wed Aug 15 07:48:39 2012
-+++ xulrunner/app/Makefile.in Sun Aug 19 13:50:41 2012
-@@ -41,6 +41,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- TK_LIBS := -framework Cocoa $(TK_LIBS)
- endif
-
-+ifeq ($(OS_ARCH),OpenBSD)
-+ifdef MOZ_SYDNEYAUDIO
-+LIBS += -lsndio
-+endif
-+endif
-+
- LIBS += \
- $(EXTRA_DSO_LIBS) \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/pkg/PLIST,v
retrieving revision 1.50
diff -u -r1.50 PLIST
--- pkg/PLIST 30 May 2013 14:17:32 -0000 1.50
+++ pkg/PLIST 22 Jun 2013 08:45:16 -0000
@@ -53,7 +53,6 @@
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin
@lib
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozilla-xremote-client
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/omni.ja
