[Midnightbsd-cvs] mports: www/firefox: Firefox 2.0.0.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 19 23:07:12 EDT 2007
Log Message:
-----------
Firefox 2.0.0.7
Modified Files:
--------------
mports/www/firefox:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-message (r1.1 -> r1.2)
Added Files:
-----------
mports/www/firefox/files:
firefox.desktop.in (r1.3)
moz_pis_S50cleanhome (r1.3)
patch-Double.cpp (r1.3)
patch-MidnightBSD.mk (r1.1)
patch-MidnightBSD0.1-RELEASE.mk (r1.1)
patch-MidnightBSD0.1.1-RELEASE.mk (r1.1)
patch-MidnightBSD0.2-CURRENT.mk (r1.1)
patch-MidnightBSD0.2.mk (r1.1)
patch-browser_app_mozilla.in (r1.3)
patch-build_unix_run-mozilla.sh (r1.3)
patch-config-config.mk (r1.1)
patch-config-mkdepend-imakemdep.h (r1.3)
patch-config-rules.mk (r1.3)
patch-config.guess (r1.1)
patch-config.sub (r1.1)
patch-config_autoconf.mk.in (r1.3)
patch-config_mkdepend_Makefile.in (r1.3)
patch-configure (r1.3)
patch-embedding_base_nsEmbedAPI.cpp (r1.1)
patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp (r1.3)
patch-extensions_typeaheadfind_src_nsTypeAheadFind.h (r1.3)
patch-js_src_Makefile.in (r1.3)
patch-js_src_jsnum.c (r1.3)
patch-js_src_liveconnect_nsISecureLiveconnect.h (r1.1)
patch-libm (r1.3)
patch-modules_libpref_src_init_all.js (r1.3)
patch-mozilla::xpcom::io::nsLocalFileUnix.h (r1.1)
patch-mozilla::xpcom::reflect::xptcall::src::md::unix-Makefile.in (r1.1)
patch-nopangoxft (r1.3)
patch-security-coreconf-FreeBSD.mk (r1.3)
patch-security-coreconf-arch.mk (r1.1)
patch-security_manager_ssl_src_nsNSSComponent.cpp (r1.3)
patch-storage_build_Makefile.in (r1.3)
patch-sysnss (r1.3)
patch-toolkit_xre_nsXREDirProvider.cpp (r1.3)
patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp (r1.3)
patch-xpcom-build-malloc.c (r1.1)
patch-xpcom-glue-standalone-Makefile.in (r1.1)
patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc (r1.3)
patch-xpcom-reflect-xptcall-src-md-unix-xptc_platforms_unixish_x86.h (r1.1)
patch-xptcall-alpha (r1.3)
patch-xptcall-sparc64 (r1.3)
-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/www/firefox/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/firefox/pkg-message -Lwww/firefox/pkg-message -u -r1.1 -r1.2
--- www/firefox/pkg-message
+++ www/firefox/pkg-message
@@ -1,4 +1,3 @@
-======================================================================
SMB issues:
Network group, machine, and share browsing does not work correctly.
@@ -12,13 +11,6 @@
The SSH sever on remote_host must allow pub key authentication.
-======================================================================
-
-Any bug reports should be addressed to the maintainers at:
- gnome at FreeBSD.org
-You may also Cc: freebsd-ports at FreeBSD.org. Please do not send
-bug reports to any other addresses.
-
Please include the following information with any bug report:
* Output from 'uname -a'.
* Date/time stamp from www/firefox/Makefile.
@@ -26,7 +18,4 @@
running firefox
* How can you reproduce the problem?
-Thank you for your help in testing and reporting bugs, and we hope you
-enjoy using Firefox.
-The Maintainers (gnome@)
-======================================================================
+- email ports at MidnightBSD.org
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/firefox/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/firefox/Makefile -Lwww/firefox/Makefile -u -r1.2 -r1.3
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -3,12 +3,14 @@
# Whom: Alan Eldridge <alane at FreeBSD.org>
#
# $MidnightBSD$
-# $FreeBSD: ports/www/firefox/Makefile,v 1.174 2007/03/22 11:40:32 pav Exp $
-# $MCom: ports-stable/www/firefox/Makefile,v 1.21 2006/10/25 01:20:12 ahze Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.183 2007/10/10 00:15:32 marcus Exp $
+# $MCom: ports/www/firefox/Makefile,v 1.39 2007/05/31 12:16:54 ahze Exp $
#
PORTNAME= firefox
-DISTVERSION= 2.0.0.3
+DISTVERSION= 2.0.0.7
+PORTREVISION= 1
+PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -25,11 +27,14 @@
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
+CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd6.0 \
+ --target=${ARCH}-portbld-freebsd6.0
EXTRA_CFLAGS= -O2
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GCC= 3.4+
+WANT_PERL= yes
GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm
GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons
@@ -39,9 +44,8 @@
--enable-system-cairo \
--enable-official-branding \
--enable-canvas \
- --with-system-nss \
- --enable-svg --enable-svg-renderer=cairo
-
+ --with-system-nss
+
SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
@@ -50,15 +54,13 @@
.include <bsd.port.pre.mk>
-.if (${ARCH} == "amd64")
-CONFIGURE_ARGS+= x86_64-midnightbsd-freebsd
-.else
-CONFIGURE_ARGS+= ${ARCH}-midnightbsd-freebsd
-.endif
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-CONFIGURE_ENV+= CXXFLAGS=-lc
+.if ${ARCH} == "sparc64"
+IGNORE= does not run
+.endif
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo
post-extract::
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
@@ -70,7 +72,6 @@
${WRKSRC}/storage/build/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/security/manager/ssl/src/Makefile.in
- @${CP} ${WRKSRC}/security/coreconf/FreeBSD.mk ${WRKSRC}/security/coreconf/MidnightBSD.mk
.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
embedding/minimo
@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
@@ -82,7 +83,6 @@
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
- ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/firefox/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/firefox/distinfo -Lwww/firefox/distinfo -u -r1.1 -r1.2
--- www/firefox/distinfo
+++ www/firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0.0.3-source.tar.bz2) = 24398e3d98673a2a92a01a8f771ca12a
-SHA256 (firefox-2.0.0.3-source.tar.bz2) = 02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007
-SIZE (firefox-2.0.0.3-source.tar.bz2) = 37135441
+MD5 (firefox-2.0.0.7-source.tar.bz2) = ec14cf833d75d07190c4095345d688bd
+SHA256 (firefox-2.0.0.7-source.tar.bz2) = 6f4577dc5905b307202ba5047e0877379340f984e124eb135f38a3018ab78ec1
+SIZE (firefox-2.0.0.7-source.tar.bz2) = 37394798
--- /dev/null
+++ www/firefox/files/patch-config-config.mk
@@ -0,0 +1,11 @@
+--- config/config.mk.orig Fri Oct 19 20:51:11 2007
++++ config/config.mk Fri Oct 19 20:51:29 2007
+@@ -119,7 +119,7 @@
+ # but save the version to allow multiple versions of the same base
+ # platform to be built in the same tree.
+ #
+-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
++ifneq (,$(filter MidnightBSD FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+ OS_RELEASE := $(basename $(OS_RELEASE))
+
+ # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
--- /dev/null
+++ www/firefox/files/patch-MidnightBSD0.1.1-RELEASE.mk
@@ -0,0 +1,85 @@
+--- security/coreconf/MidnightBSD0.1.1-RELEASE.mk.orig Fri Oct 19 20:26:33 2007
++++ security/coreconf/MidnightBSD0.1.1-RELEASE.mk Fri Oct 19 20:26:17 2007
+@@ -0,0 +1,82 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++CC = gcc
++CCC = g++
++RANLIB = ranlib
++
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
++CPU_ARCH = x86
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX = so
++else
++DLL_SUFFIX = so.1.0
++endif
++
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++INCLUDES += -I/usr/local/include
--- /dev/null
+++ www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-xptc_platforms_unixish_x86.h
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Fri Oct 19 02:53:22 2007
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Fri Oct 19 02:54:01 2007
+@@ -77,7 +77,7 @@
+ #define THUNK_BASED_THIS_ADJUST
+ #endif
+
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__MidnightBSD__)
+ /* System versions of gcc on FreeBSD don't use thunks. On 3.x, the system
+ * compiler is gcc 2.7.2.3, which doesn't use thunks by default. On 4.x and
+ * 5.x, /usr/src/contrib/gcc/config/freebsd.h explicitly undef's
--- /dev/null
+++ www/firefox/files/patch-embedding_base_nsEmbedAPI.cpp
@@ -0,0 +1,16 @@
+--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400
++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400
+@@ -53,7 +53,12 @@ static PRBool sRegistryIniti
+ static PRUint32 sInitCounter = 0;
+
+ #define HACK_AROUND_THREADING_ISSUES
+-//#define HACK_AROUND_NONREENTRANT_INITXPCOM
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#if __FreeBSD_version < 700042
++#define HACK_AROUND_NONREENTRANT_INITXPCOM
++#endif
++#endif
+
+ #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
+ // XXX hack class to clean up XPCOM when this module is unloaded
--- /dev/null
+++ www/firefox/files/patch-security-coreconf-arch.mk
@@ -0,0 +1,11 @@
+--- security/coreconf/arch.mk.orig Fri Oct 19 21:10:25 2007
++++ security/coreconf/arch.mk Fri Oct 19 21:10:35 2007
+@@ -146,7 +146,7 @@
+ # IRIX 6.5-ALPHA-1289139620.
+ #
+
+-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
++ifeq (,$(filter-out Linux MidnightBSD FreeBSD IRIX,$(OS_ARCH)))
+ OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
+ endif
+
--- /dev/null
+++ www/firefox/files/patch-MidnightBSD0.1-RELEASE.mk
@@ -0,0 +1,85 @@
+--- security/coreconf/MidnightBSD0.1-RELEASE.mk.orig Fri Oct 19 20:26:28 2007
++++ security/coreconf/MidnightBSD0.1-RELEASE.mk Fri Oct 19 20:26:23 2007
+@@ -0,0 +1,82 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++CC = gcc
++CCC = g++
++RANLIB = ranlib
++
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
++CPU_ARCH = x86
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX = so
++else
++DLL_SUFFIX = so.1.0
++endif
++
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++INCLUDES += -I/usr/local/include
--- /dev/null
+++ www/firefox/files/patch-config.guess
@@ -0,0 +1,12 @@
+--- build/autoconf/config.guess.orig Fri Oct 19 01:01:44 2007
++++ build/autoconf/config.guess Fri Oct 19 01:04:40 2007
+@@ -744,6 +744,9 @@
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
++ *:MidnightBSD:*:*)
++ echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
++ exit 0 ;;
+ *:FreeBSD:*:*)
+ # Determine whether the default compiler uses glibc.
+ eval $set_cc_for_build
--- /dev/null
+++ www/firefox/files/patch-config.sub
@@ -0,0 +1,11 @@
+--- build/autoconf/config.sub.orig Fri Oct 19 01:01:52 2007
++++ build/autoconf/config.sub Fri Oct 19 01:05:46 2007
+@@ -1131,7 +1131,7 @@
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
++ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -midnightbsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--- /dev/null
+++ www/firefox/files/patch-xpcom-build-malloc.c
@@ -0,0 +1,11 @@
+--- xpcom/build/malloc.c.orig Fri Oct 19 02:38:36 2007
++++ xpcom/build/malloc.c Fri Oct 19 02:39:51 2007
+@@ -918,7 +918,7 @@
+
+
+ #ifdef LACKS_UNISTD_H
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__MidnightBSD__)
+ #if __STD_C
+ extern Void_t* sbrk(ptrdiff_t);
+ #else
--- /dev/null
+++ www/firefox/files/patch-js_src_liveconnect_nsISecureLiveconnect.h
@@ -0,0 +1,14 @@
+--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400
++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400
+@@ -51,7 +51,11 @@
+ #include "nsIFactory.h"
+ #include "jni.h"
+
++#if JS_BYTES_PER_WORD == 8
++typedef jlong jsobject;
++#else
+ typedef jint jsobject;
++#endif
+
+ class nsISecureLiveconnect : public nsISupports {
+ public:
--- /dev/null
+++ www/firefox/files/patch-MidnightBSD0.2-CURRENT.mk
@@ -0,0 +1,85 @@
+--- security/coreconf/MidnightBSD0.2-CURRENT.mk.orig Fri Oct 19 20:26:43 2007
++++ security/coreconf/MidnightBSD0.2-CURRENT.mk Fri Oct 19 13:00:39 2007
+@@ -0,0 +1,82 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++CC = gcc
++CCC = g++
++RANLIB = ranlib
++
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
++CPU_ARCH = x86
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX = so
++else
++DLL_SUFFIX = so.1.0
++endif
++
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++INCLUDES += -I/usr/local/include
--- /dev/null
+++ www/firefox/files/patch-mozilla::xpcom::io::nsLocalFileUnix.h
@@ -0,0 +1,11 @@
+--- xpcom/io/nsLocalFileUnix.h.orig Fri Oct 19 02:48:03 2007
++++ xpcom/io/nsLocalFileUnix.h Fri Oct 19 02:48:42 2007
+@@ -73,7 +73,7 @@
+ #endif
+
+ // so we can statfs on freebsd
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #define HAVE_SYS_STATFS_H
+ #define STATFS statfs
+ #include <sys/param.h>
--- /dev/null
+++ www/firefox/files/patch-MidnightBSD.mk
@@ -0,0 +1,85 @@
+--- security/coreconf/MidnightBSD.mk.orig Fri Oct 19 20:26:11 2007
++++ security/coreconf/MidnightBSD.mk Fri Oct 19 11:45:37 2007
+@@ -0,0 +1,82 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++CC = gcc
++CCC = g++
++RANLIB = ranlib
++
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
++CPU_ARCH = x86
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX = so
++else
++DLL_SUFFIX = so.1.0
++endif
++
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++INCLUDES += -I/usr/local/include
--- /dev/null
+++ www/firefox/files/patch-xpcom-glue-standalone-Makefile.in
@@ -0,0 +1,11 @@
+--- xpcom/glue/standalone/Makefile.in.orig Fri Oct 19 02:43:00 2007
++++ xpcom/glue/standalone/Makefile.in Fri Oct 19 02:43:24 2007
+@@ -59,7 +59,7 @@
+ ifeq (WINNT,$(OS_ARCH))
+ LINKSRC = nsGlueLinkingWin.cpp
+ endif
+-ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
++ifneq (,$(filter AIX DragonFly FreeBSD MidnightBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
+ LINKSRC = nsGlueLinkingDlopen.cpp
+ endif
+ ifeq (OS2,$(OS_ARCH))
--- /dev/null
+++ www/firefox/files/patch-mozilla::xpcom::reflect::xptcall::src::md::unix-Makefile.in
@@ -0,0 +1,59 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Tue Nov 28 00:29:22 2006
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Fri Oct 19 02:51:31 2007
+@@ -62,10 +62,13 @@
+ #
+ # Lots of Unixish x86 flavors
+ #
+-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
++ifneq (,$(filter FreeBSD MidnightBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -82,7 +85,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD MidnightBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -129,9 +132,15 @@
+ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -322,6 +331,15 @@
+ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
+ CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
++endif
++#
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),MidnightBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
++endif
+ endif
+ #
+ # Solaris/SPARC
--- /dev/null
+++ www/firefox/files/patch-MidnightBSD0.2.mk
@@ -0,0 +1,85 @@
+--- security/coreconf/MidnightBSD0.2.mk.orig Fri Oct 19 22:38:06 2007
++++ security/coreconf/MidnightBSD0.2.mk Fri Oct 19 22:37:47 2007
+@@ -0,0 +1,82 @@
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = gcc
++CC = gcc
++CCC = g++
++RANLIB = ranlib
++
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
++CPU_ARCH = x86
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX = so
++else
++DLL_SUFFIX = so.1.0
++endif
++
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++INCLUDES += -I/usr/local/include
More information about the Midnightbsd-cvs
mailing list