Date: Fri, 12 Aug 2011 11:23:03 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159709: [PATCH] www/firefox: misc changes Message-ID: <201108121123.p7CBN3gP008759@red.freebsd.org> Resent-Message-ID: <201108121130.p7CBU9g2089702@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159709
>Category: ports
>Synopsis: [PATCH] www/firefox: 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 noop SMB option
- fix double colon
- remove checks for OS versions that we doesn't supporting
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa firefox.orig/Makefile firefox/Makefile
--- firefox.orig/Makefile 2011-07-04 21:28:33.000000000 +0400
+++ firefox/Makefile 2011-08-12 13:51:55.000000000 +0400
@@ -39,7 +39,6 @@
USE_BZIP2= yes
USE_GMAKE= yes
USE_GL= gl
-MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
FIREFOX_ICON= ${MOZILLA}.png
@@ -53,8 +52,7 @@
--with-system-libevent=${LOCALBASE}
OPTIONS= DBUS "Enable D-BUS support" on \
- PGO "Enable Profile-Guided Optimization" off \
- SMB "Enable smb:// URI support using gnomevfs" off
+ PGO "Enable Profile-Guided Optimization" off
.include <bsd.port.pre.mk>
@@ -104,7 +102,7 @@
@sleep 10
.endif
-post-extract::
+post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
diff -ruNa firefox.orig/files/patch-js_src_jsnum.cpp firefox/files/patch-js_src_jsnum.cpp
--- firefox.orig/files/patch-js_src_jsnum.cpp 2010-08-29 19:17:43.000000000 +0400
+++ firefox/files/patch-js_src_jsnum.cpp 2011-08-12 13:57:27.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 firefox.orig/files/patch-nsprpub-pr-include-md_freebsd.h firefox/files/patch-nsprpub-pr-include-md_freebsd.h
--- firefox.orig/files/patch-nsprpub-pr-include-md_freebsd.h 2011-03-22 18:24:49.000000000 +0300
+++ firefox/files/patch-nsprpub-pr-include-md_freebsd.h 2011-08-12 13:57:56.000000000 +0400
@@ -15,7 +15,7 @@
#define _PR_IPV6_V6ONLY_PROBE
#endif
-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
++#if (__FreeBSD_version >= 700016)
+#if defined(_PR_PTHREADS)
+#define _PR_HAVE_GETPROTO_R
+#define _PR_HAVE_5_ARG_GETPROTO_R
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108121123.p7CBN3gP008759>