diff options
author | ryoon <ryoon@pkgsrc.org> | 2012-03-10 14:57:29 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2012-03-10 14:57:29 +0000 |
commit | 4be9163a0e16d612a7cb9fbd621638188c7f5300 (patch) | |
tree | 85160b03554d1638a03b569cfd6cf84e6bbb341a /www | |
parent | bccd089a199bcb514a174668f3fe3f747d237bf9 (diff) | |
download | pkgsrc-4be9163a0e16d612a7cb9fbd621638188c7f5300.tar.gz |
Remove necessary backups of the patches.
Diffstat (limited to 'www')
112 files changed, 0 insertions, 2907 deletions
diff --git a/www/seamonkey/patches/patch-aa-toplevel.orig b/www/seamonkey/patches/patch-aa-toplevel.orig deleted file mode 100644 index 2686aee8e3f..00000000000 --- a/www/seamonkey/patches/patch-aa-toplevel.orig +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa-toplevel.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- configure.in.orig 2011-11-07 20:53:31.000000000 +0000 -+++ configure.in -@@ -1950,7 +1950,7 @@ ld.]) - MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' - ;; - --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -1958,6 +1958,9 @@ ld.]) - if test ! "$GNU_CC"; then - DSO_LDOPTS="-Bshareable $DSO_LDOPTS" - fi -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi - ;; - - ia64*-hpux*) -@@ -3198,6 +3201,9 @@ dnl ==================================== - case $target in - *-hpux11.*) - ;; -+*-dragonfly*) -+ AC_CHECK_LIB(c, gethostbyname_r) -+ ;; - *) - AC_CHECK_LIB(c_r, gethostbyname_r) - ;; diff --git a/www/seamonkey/patches/patch-aa.orig b/www/seamonkey/patches/patch-aa.orig deleted file mode 100644 index 274a0b1411e..00000000000 --- a/www/seamonkey/patches/patch-aa.orig +++ /dev/null @@ -1,66 +0,0 @@ -$NetBSD: patch-aa.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/configure.in.orig 2011-11-07 21:07:43.000000000 +0000 -+++ mozilla/configure.in -@@ -2137,7 +2137,7 @@ case "$target" in - MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' - ;; - --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -2145,6 +2145,9 @@ case "$target" in - if test ! "$GNU_CC"; then - DSO_LDOPTS="-Bshareable $DSO_LDOPTS" - fi -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi - ;; - - ia64*-hpux*) -@@ -3312,6 +3315,9 @@ dnl ==================================== - case $target in - *-hpux11.*) - ;; -+*-dragonfly*) -+ AC_CHECK_LIB(c, gethostbyname_r) -+ ;; - *) - AC_CHECK_LIB(c_r, gethostbyname_r) - ;; -@@ -4520,6 +4526,14 @@ if test -n "$YASM"; then - _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` - fi - -+if test -n "${LIBXUL_SDK_DIR}"; then -+ AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.]) -+ NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`" -+ NSPR_LIBS="`pkg-config --libs mozilla-nspr`" -+ NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" -+ NSS_LIBS="`pkg-config --libs mozilla-nss`" -+fi -+ - if test -z "$SKIP_LIBRARY_CHECKS"; then - dnl system JPEG support - dnl ======================================================== -@@ -7439,7 +7453,7 @@ else - *-mingw*) - AC_DEFINE(MOZ_MEMORY_WINDOWS) - AC_MSG_CHECKING([for VC2005/2008++ CRT source]) -- if test "$CC_VERSION" == "14.00.50727.762" -o "$CC_VERSION" == "15.00.30729.01"; then -+ if test "$CC_VERSION" = "14.00.50727.762" -o "$CC_VERSION" = "15.00.30729.01"; then - if test -z "$WIN32_CRT_SRC_DIR" -a -n "$VCINSTALLDIR"; then - WIN32_CRT_SRC_DIR="$VCINSTALLDIR\crt\src" - fi -@@ -9516,6 +9530,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then - AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) - if test "$OS_ARCH" != "WINNT"; then - NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` -+ AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.]) -+ NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}" - $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk - NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags` - $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk diff --git a/www/seamonkey/patches/patch-ab.orig b/www/seamonkey/patches/patch-ab.orig deleted file mode 100644 index 7d02d07cd66..00000000000 --- a/www/seamonkey/patches/patch-ab.orig +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig 2010-05-03 18:21:00.000000000 +0000 -+++ mozilla/nsprpub/pr/include/md/_netbsd.h -@@ -79,7 +79,7 @@ - #define HAVE_DLL - #define USE_DLFCN - #define _PR_HAVE_SOCKADDR_LEN --#define _PR_NO_LARGE_FILES -+#define _PR_HAVE_LARGE_OFF_T - #define _PR_STAT_HAS_ST_ATIMESPEC - #define _PR_POLL_AVAILABLE - #define _PR_USE_POLL -@@ -107,6 +107,8 @@ - #define JB_SP_INDEX 2 - #elif defined(__mips__) - #define JB_SP_INDEX 4 -+#elif defined(__amd64__) -+#define JB_SP_INDEX 6 - #elif defined(__alpha__) - #define JB_SP_INDEX 34 - #elif defined(__arm32__) diff --git a/www/seamonkey/patches/patch-ac.orig b/www/seamonkey/patches/patch-ac.orig deleted file mode 100644 index 9b4b8492569..00000000000 --- a/www/seamonkey/patches/patch-ac.orig +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-ac.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/nsprpub/configure.in.orig 2011-02-03 20:12:03.000000000 +0000 -+++ mozilla/nsprpub/configure.in -@@ -71,7 +71,7 @@ OBJDIR_NAME=. - OBJDIR_SUFFIX=OBJ - NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' - NOSUCHFILE=/no-such-file --LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' -+LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' - LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' - CYGWIN_WRAPPER= - MACOS_SDK_DIR= -@@ -1311,6 +1311,34 @@ tools are selected during the Xcode/Deve - DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' - MDCPUCFG_H=_freebsd.cfg - PR_MD_CSRCS=freebsd.c -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" -+ fi -+ ;; -+ -+*-dragonfly*) -+ if test -z "$USE_NSPR_THREADS"; then -+ USE_PTHREADS=1 -+ fi -+ AC_DEFINE(XP_UNIX) -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+ DLL_SUFFIX=so.1.0 -+ fi -+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -+ DSO_CFLAGS=-fPIC -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ MDCPUCFG_H=_freebsd.cfg -+ PR_MD_CSRCS=freebsd.c -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" -+ fi - ;; - - *-hpux*) -@@ -1925,6 +1953,7 @@ mips-nec-sysv*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(NETBSD) - AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) - if test -z "$USE_NSPR_THREADS"; then - USE_PTHREADS=1 - fi -@@ -2730,7 +2759,7 @@ if test -n "$USE_PTHREADS"; then - if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then - ac_cv_have_dash_pthread=yes - case "$target_os" in -- freebsd*) -+ freebsd* | dragonfly*) - # Freebsd doesn't use -pthread for compiles, it uses them for linking - ;; - *) -@@ -2768,7 +2797,7 @@ if test -n "$USE_PTHREADS"; then - _PTHREAD_LDFLAGS= - fi - ;; -- *-freebsd*) -+ *-freebsd* | *-dragonfly*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) - dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2849,7 +2878,7 @@ case "$target" in - AC_DEFINE(_PR_NEED_PTHREAD_INIT) - fi - ;; --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test -n "$USE_NSPR_THREADS"; then - AC_DEFINE(_PR_LOCAL_THREADS_ONLY) - fi diff --git a/www/seamonkey/patches/patch-ad.orig b/www/seamonkey/patches/patch-ad.orig deleted file mode 100644 index 6a805c503a2..00000000000 --- a/www/seamonkey/patches/patch-ad.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/xpcom/io/nsLocalFileUnix.h.orig 2009-06-29 18:15:32.000000000 +0200 -+++ mozilla/xpcom/io/nsLocalFileUnix.h -@@ -75,7 +75,7 @@ - #endif - - // so we can statfs on freebsd --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || ((defined(__DragonFly__) || defined(__NetBSD__)) && !defined(HAVE_STATVFS)) - #define HAVE_SYS_STATFS_H - #define STATFS statfs - #include <sys/param.h> diff --git a/www/seamonkey/patches/patch-ae.orig b/www/seamonkey/patches/patch-ae.orig deleted file mode 100644 index 1e728ae97ad..00000000000 --- a/www/seamonkey/patches/patch-ae.orig +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ae.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig 2011-09-22 20:20:37.000000000 +0000 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c -@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL; - || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ - || (defined(HPUX10_10) && defined(_REENTRANT)) \ - || (defined(HPUX10_20) && defined(_REENTRANT)) \ -- || defined(OPENBSD) -+ || defined(OPENBSD) || defined(NETBSD) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_GETPROTO_R_INT - #endif -@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL; - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif - -+#if __DragonFly_version >= 200202 -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#endif -+ - /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ - #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) - #define _PR_HAVE_GETPROTO_R -@@ -332,7 +337,7 @@ _pr_QueryNetIfs(void) - } - - #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ -- || defined(NETBSD) || defined(OPENBSD) -+ || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) - - /* - * Use the BSD getifaddrs function. -@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf - */ - hints.ai_socktype = SOCK_STREAM; - -+/* NetBSD >= 2.99.9 has a thread-safe resolver */ -+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900 -+ LOCK_DNS(); -+#endif -+ - rv = GETADDRINFO(hostname, NULL, &hints, &res); - #ifdef AI_ADDRCONFIG - if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) { -@@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf - rv = GETADDRINFO(hostname, NULL, &hints, &res); - } - #endif -+ -+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900 -+ UNLOCK_DNS(); -+#endif -+ - if (rv == 0) - return (PRAddrInfo *) res; - diff --git a/www/seamonkey/patches/patch-af.orig b/www/seamonkey/patches/patch-af.orig deleted file mode 100644 index 8004c7f2a9e..00000000000 --- a/www/seamonkey/patches/patch-af.orig +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-af.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/config/mkdepend/imakemdep.h.orig 2009-06-29 18:14:41.000000000 +0200 -+++ mozilla/config/mkdepend/imakemdep.h -@@ -235,7 +235,7 @@ in this Software without prior written a - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif - #ifdef MACH -@@ -273,7 +273,7 @@ char *cpp_argv[ARGUMENTS] = { - #ifdef unix - "-Uunix", /* remove unix symbol so that filename unix.c okay */ - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__) - # ifdef __i386__ - "-D__i386__", - # endif -@@ -713,6 +713,9 @@ struct symtab predefs[] = { - #ifdef __sgi - {"__sgi", "1"}, - #endif -+#ifdef __DragonFly__ -+ {"__DragonFly__", "1"}, -+#endif - #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, - #endif diff --git a/www/seamonkey/patches/patch-ag.orig b/www/seamonkey/patches/patch-ag.orig deleted file mode 100644 index 9f33759d050..00000000000 --- a/www/seamonkey/patches/patch-ag.orig +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ag.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-08-24 21:32:07.000000000 +0000 -+++ mozilla/nsprpub/pr/include/md/_freebsd.h -@@ -79,7 +79,7 @@ - #define _PR_HAVE_LARGE_OFF_T - - #if defined(_PR_PTHREADS) --#if __FreeBSD_version >= 400008 -+#if defined(__DragonFly__) || __FreeBSD_version >= 400008 - /* - * libc_r before this version of FreeBSD doesn't have poll(). - * Although libc has poll(), it is not thread-safe so we can't -@@ -88,7 +88,7 @@ - #define _PR_POLL_AVAILABLE - #endif - #else --#if __FreeBSD_version >= 300000 -+#if defined(__DragonFly__) || __FreeBSD_version >= 300000 - #define _PR_POLL_AVAILABLE - #define _PR_USE_POLL - #endif -@@ -97,7 +97,7 @@ - #define _PR_HAVE_SYSV_SEMAPHORES - #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY - --#if __FreeBSD_version >= 400014 -+#if defined(__DragonFly__) || __FreeBSD_version >= 400014 - #define _PR_INET6 - #define _PR_HAVE_INET_NTOP - #define _PR_HAVE_GETHOSTBYNAME2 diff --git a/www/seamonkey/patches/patch-ah.orig b/www/seamonkey/patches/patch-ah.orig deleted file mode 100644 index efc847f6fdc..00000000000 --- a/www/seamonkey/patches/patch-ah.orig +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah.orig,v 1.1 2012/03/10 03:26:04 ryoon Exp $ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h -@@ -77,6 +77,13 @@ - #define THUNK_BASED_THIS_ADJUST - #endif - -+#elif defined(__DragonFly__) -+# if defined(__FreeBSD_cc_version) -+# define CFRONT_STYLE_THIS_ADJUST -+# else -+# define THUNK_BASED_THIS_ADJUST -+# endif -+ - #elif defined(__FreeBSD__) - /* 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 diff --git a/www/seamonkey/patches/patch-ai.orig b/www/seamonkey/patches/patch-ai.orig deleted file mode 100644 index 0acafd45884..00000000000 --- a/www/seamonkey/patches/patch-ai.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/dbm/src/mktemp.c.orig 2009-06-29 18:14:43.000000000 +0200 -+++ mozilla/dbm/src/mktemp.c -@@ -90,7 +90,7 @@ mktemp(char *path) - static int - _gettemp(char *path, register int *doopen, int extraFlags) - { --#if !defined(_WINDOWS) || defined(_WIN32) -+#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno) - extern int errno; - #endif - register char *start, *trv; diff --git a/www/seamonkey/patches/patch-aj.orig b/www/seamonkey/patches/patch-aj.orig deleted file mode 100644 index f6891893065..00000000000 --- a/www/seamonkey/patches/patch-aj.orig +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aj.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2010-12-15 01:03:34.000000000 +0000 -+++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp -@@ -405,6 +405,7 @@ nsresult nsProfileLock::LockWithSymlink( - #endif - sigfillset(&act.sa_mask); - -+#ifndef DEBUG - #define CATCH_SIGNAL(signame) \ - PR_BEGIN_MACRO \ - if (sigaction(signame, NULL, &oldact) == 0 && \ -@@ -423,6 +424,7 @@ PR_BEGIN_MACRO - CATCH_SIGNAL(SIGTERM); - - #undef CATCH_SIGNAL -+#endif - } - } - } diff --git a/www/seamonkey/patches/patch-ak.orig b/www/seamonkey/patches/patch-ak.orig deleted file mode 100644 index b183991c172..00000000000 --- a/www/seamonkey/patches/patch-ak.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/js/src/ctypes/libffi/configure.orig 2011-11-04 21:34:01.000000000 +0000 -+++ mozilla/js/src/ctypes/libffi/configure -@@ -11277,7 +11277,7 @@ case "$host" in - powerpc-*-aix* | rs6000-*-aix*) - TARGET=POWERPC_AIX; TARGETDIR=powerpc - ;; -- powerpc-*-freebsd* | powerpc-*-openbsd*) -+ powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*) - TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc - ;; - powerpc*-*-rtems*) diff --git a/www/seamonkey/patches/patch-al.orig b/www/seamonkey/patches/patch-al.orig deleted file mode 100644 index 931aec0b76c..00000000000 --- a/www/seamonkey/patches/patch-al.orig +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/storage/src/mozStorageConnection.cpp.orig 2011-06-15 21:57:54.000000000 +0000 -+++ mozilla/storage/src/mozStorageConnection.cpp -@@ -595,6 +595,11 @@ Connection::initialize(nsIFile *aDatabas - (void)::NS_RegisterMemoryReporter(mMemoryReporters[i]); - } - -+ // XXX tnn: the configure script demands that sqlite3 is compiled with -+ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that, -+ // so instead we enable secure_delete manually here. -+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;")); -+ - return NS_OK; - } - diff --git a/www/seamonkey/patches/patch-am.orig b/www/seamonkey/patches/patch-am.orig deleted file mode 100644 index bd3c0bfbc45..00000000000 --- a/www/seamonkey/patches/patch-am.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-am.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -SHA1_Update conflicts with openssl which may be dynamically loaded -at runtime via libcups or libgssapi so causing a crash due to using -the wrong binding. So rename here to avoid conflict. - ---- mozilla/security/nss/lib/freebl/blapi.h.orig 2009-06-29 18:15:13.000000000 +0200 -+++ mozilla/security/nss/lib/freebl/blapi.h -@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Cont - */ - extern void SHA1_Begin(SHA1Context *cx); - -+#define SHA1_Update NSS_SHA1_Update -+ - /* - ** Update the SHA-1 hash function with more data. - ** "cx" the context diff --git a/www/seamonkey/patches/patch-an.orig b/www/seamonkey/patches/patch-an.orig deleted file mode 100644 index 440d9bed219..00000000000 --- a/www/seamonkey/patches/patch-an.orig +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-an.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -SHA1_Update conflicts with openssl which may be dynamically loaded -at runtime via libcups or libgssapi so causing a crash due to using -the wrong binding. So rename here to avoid conflict. - ---- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2009-06-29 18:15:14.000000000 +0200 -+++ mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s -@@ -1712,9 +1712,9 @@ shaCompress: - .LFE7: - .size shaCompress, .-shaCompress - .align 16 --.globl SHA1_Update -- .type SHA1_Update, @function --SHA1_Update: -+.globl NSS_SHA1_Update -+ .type NSS_SHA1_Update, @function -+NSS_SHA1_Update: - .LFB5: - pushq %rbp - .LCFI5: -@@ -1800,7 +1800,7 @@ SHA1_Update: - call shaCompress - jmp .L245 - .LFE5: -- .size SHA1_Update, .-SHA1_Update -+ .size NSS_SHA1_Update, .-NSS_SHA1_Update - .section .rodata - .align 32 - .type bulk_pad.0, @object -@@ -1902,7 +1902,7 @@ SHA1_End: - subl %r8d, %edx - andl $63, %edx - incl %edx -- call SHA1_Update@PLT -+ call NSS_SHA1_Update@PLT - movq %rbx, %rdi - movq %r12, %rsi - shrq $32, %rdi -@@ -2018,7 +2018,7 @@ SHA1_HashBuf: - movl %r12d, %edx - movq %r13, %rsi - movq %rbx, %rdi -- call SHA1_Update@PLT -+ call NSS_SHA1_Update@PLT - leaq -292(%rbp), %rdx - movq %r14, %rsi - movq %rbx, %rdi diff --git a/www/seamonkey/patches/patch-ao.orig b/www/seamonkey/patches/patch-ao.orig deleted file mode 100644 index a9313240f3b..00000000000 --- a/www/seamonkey/patches/patch-ao.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2009-10-29 23:11:21.000000000 +0100 -+++ mozilla/toolkit/mozapps/installer/packager.mk -@@ -441,8 +441,8 @@ endif - (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(installdir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(bindir) -- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) -- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) -+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) -+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) - ifdef INSTALL_SDK # Here comes the hard part - $(NSINSTALL) -D $(DESTDIR)$(includedir) - (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ diff --git a/www/seamonkey/patches/patch-as.orig b/www/seamonkey/patches/patch-as.orig deleted file mode 100644 index 30f6d33f367..00000000000 --- a/www/seamonkey/patches/patch-as.orig +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-as.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Treat DragonFly like FreeBSD. - ---- mozilla/js/src/configure.in.orig 2011-09-22 20:20:26.000000000 +0000 -+++ mozilla/js/src/configure.in -@@ -784,7 +784,7 @@ EOF - AC_LANG_RESTORE - ]) - -- if test "$ac_cv_have_std__Throw" == "yes"; then -+ if test "$ac_cv_have_std__Throw" = "yes"; then - AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug, - ac_cv_have_dllimport_exception_bug, - [ -@@ -1999,7 +1999,7 @@ case "$target" in - MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' - ;; - --*-freebsd*) -+*-freebsd*|*-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -2846,7 +2846,7 @@ case "$target" in - *-solaris*) - AC_DEFINE(AVMPLUS_UNIX) - ;; --*-freebsd*|*-kfreebsd*) -+*-freebsd*|*-kfreebsd*|*-netbsd*|*-dragonfly*) - AC_DEFINE(AVMPLUS_UNIX) - ;; - *-openbsd*) -@@ -4846,7 +4846,7 @@ if test "$MOZ_MEMORY"; then - *-darwin*) - AC_DEFINE(MOZ_MEMORY_DARWIN) - ;; -- *-*freebsd*) -+ *-*freebsd*|*-*dragonfly*) - AC_DEFINE(MOZ_MEMORY_BSD) - ;; - *-android*|*-linuxandroid*) diff --git a/www/seamonkey/patches/patch-at.orig b/www/seamonkey/patches/patch-at.orig deleted file mode 100644 index 8fec39a2b4b..00000000000 --- a/www/seamonkey/patches/patch-at.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-at.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Avoid silly redefinitions of standard types on NetBSD. - ---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-04 19:20:39.000000000 +0000 -+++ mozilla/gfx/qcms/qcmstypes.h -@@ -10,6 +10,8 @@ - #if defined (__SVR4) && defined (__sun) - /* int_types.h gets included somehow, so avoid redefining the types differently */ - #include <sys/int_types.h> -+#elif defined(__NetBSD__) || defined(__DragonFly__) -+#include <stdint.h> - #elif defined (_AIX) - #include <sys/types.h> - #elif !defined(ANDROID) diff --git a/www/seamonkey/patches/patch-au.orig b/www/seamonkey/patches/patch-au.orig deleted file mode 100644 index 7d9da824aca..00000000000 --- a/www/seamonkey/patches/patch-au.orig +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-au.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -- Fix device name on NetBSD -- SOUND_VERSION just isn't a reliable way to detect features supported by - particular OSS implementation. - ---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2011-08-11 21:41:16.000000000 +0000 -+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c -@@ -55,7 +55,7 @@ - // support only versions newer than 3.6.1 - #define SUPP_OSS_VERSION OSS_VERSION(3,0,1) - --#if (SOUND_VERSION < SUPP_OSS_VERSION) -+#if 0 // (SOUND_VERSION < SUPP_OSS_VERSION) - #error Unsupported OSS Version - #else - -@@ -205,7 +205,12 @@ sa_stream_create_pcm( - return SA_ERROR_SYSTEM; - } - -+#if defined(__NetBSD__) -+ /* XXX should use DEVOSSAUDIO provided by pkgsrc. */ -+ s->output_unit = "/dev/audio"; -+#else - s->output_unit = "/dev/dsp"; -+#endif - s->output_fd = -1; - s->thread_id = 0; - s->playing = 0; diff --git a/www/seamonkey/patches/patch-av.orig b/www/seamonkey/patches/patch-av.orig deleted file mode 100644 index d44ccbe5d27..00000000000 --- a/www/seamonkey/patches/patch-av.orig +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-av.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig 2008-03-22 05:25:35.000000000 +0100 -+++ mozilla/xulrunner/app/nsXULRunnerApp.cpp -@@ -37,6 +37,27 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <sys/resource.h> -+/* -+ * On netbsd-4, ulimit -n is 64 by default; too few for us. -+ */ -+static void netbsd_fixrlimit(void) { -+ struct rlimit rlp; -+ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) { -+ fprintf(stderr, "warning: getrlimit failed\n"); -+ return; -+ } -+ if (rlp.rlim_cur >= 512) -+ return; -+ if (rlp.rlim_max < 512) { -+ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n"); -+ rlp.rlim_cur = rlp.rlim_max; -+ } -+ else -+ rlp.rlim_cur = 512; -+ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1) -+ fprintf(stderr, "warning: setrlimit failed\n"); -+} - #ifdef XP_WIN - #include <windows.h> - #endif -@@ -283,6 +304,7 @@ private: - - int main(int argc, char* argv[]) - { -+ netbsd_fixrlimit(); - if (argc > 1 && (IsArg(argv[1], "h") || - IsArg(argv[1], "help") || - IsArg(argv[1], "?"))) diff --git a/www/seamonkey/patches/patch-aw.orig b/www/seamonkey/patches/patch-aw.orig deleted file mode 100644 index 908808b8333..00000000000 --- a/www/seamonkey/patches/patch-aw.orig +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aw.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/xulrunner/stub/nsXULStub.cpp.orig 2009-08-24 17:53:30.000000000 +0200 -+++ mozilla/xulrunner/stub/nsXULStub.cpp -@@ -44,6 +44,27 @@ - #include "nsILocalFile.h" - - #include <stdarg.h> -+#include <sys/resource.h> -+/* -+ * On netbsd-4, ulimit -n is 64 by default; too few for us. -+ */ -+static void netbsd_fixrlimit(void) { -+ struct rlimit rlp; -+ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) { -+ fprintf(stderr, "warning: getrlimit failed\n"); -+ return; -+ } -+ if (rlp.rlim_cur >= 512) -+ return; -+ if (rlp.rlim_max < 512) { -+ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n"); -+ rlp.rlim_cur = rlp.rlim_max; -+ } -+ else -+ rlp.rlim_cur = 512; -+ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1) -+ fprintf(stderr, "warning: setrlimit failed\n"); -+} - - #ifdef XP_WIN - #include <windows.h> -@@ -205,6 +226,7 @@ main(int argc, char **argv) - char tmpPath[MAXPATHLEN]; - char greDir[MAXPATHLEN]; - PRBool greFound = PR_FALSE; -+ netbsd_fixrlimit(); - - #if defined(XP_MACOSX) - CFBundleRef appBundle = CFBundleGetMainBundle(); diff --git a/www/seamonkey/patches/patch-ax.orig b/www/seamonkey/patches/patch-ax.orig deleted file mode 100644 index 4b5d95b0c61..00000000000 --- a/www/seamonkey/patches/patch-ax.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-12-15 01:03:41.000000000 +0000 -+++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -1137,7 +1137,7 @@ NS_FormatCodeAddressDetails(void *aPC, c - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__) - #include <dlfcn.h> - #endif - diff --git a/www/seamonkey/patches/patch-ay.orig b/www/seamonkey/patches/patch-ay.orig deleted file mode 100644 index 209c3765f49..00000000000 --- a/www/seamonkey/patches/patch-ay.orig +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ay.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/browser/app/nsBrowserApp.cpp.orig 2011-09-22 20:20:17.000000000 +0000 -+++ mozilla/browser/app/nsBrowserApp.cpp -@@ -49,6 +49,27 @@ - #include <stdio.h> - #include <stdarg.h> - #include <string.h> -+#include <sys/resource.h> -+/* -+ * On netbsd-4, ulimit -n is 64 by default; too few for us. -+ */ -+static void netbsd_fixrlimit(void) { -+ struct rlimit rlp; -+ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) { -+ fprintf(stderr, "warning: getrlimit failed\n"); -+ return; -+ } -+ if (rlp.rlim_cur >= 512) -+ return; -+ if (rlp.rlim_max < 512) { -+ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n"); -+ rlp.rlim_cur = rlp.rlim_max; -+ } -+ else -+ rlp.rlim_cur = 512; -+ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1) -+ fprintf(stderr, "warning: setrlimit failed\n"); -+} - - #include "plstr.h" - #include "prprf.h" -@@ -203,6 +224,7 @@ static int do_main(const char *exePath, - int main(int argc, char* argv[]) - { - char exePath[MAXPATHLEN]; -+ netbsd_fixrlimit(); - - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { diff --git a/www/seamonkey/patches/patch-az.orig b/www/seamonkey/patches/patch-az.orig deleted file mode 100644 index 8eab2d80373..00000000000 --- a/www/seamonkey/patches/patch-az.orig +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-az.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2009-11-02 22:43:08.000000000 +0100 -+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c -@@ -1089,12 +1089,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn - _exit(status); - } - --PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred) -+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred) - { - #if defined(_PR_DCETHREADS) - return (PRUint32)&thred->id; /* this is really a sham! */ - #else -- return (PRUint32)thred->id; /* and I don't know what they will do with it */ -+ return thred->id; /* and I don't know what they will do with it */ - #endif - } - diff --git a/www/seamonkey/patches/patch-ba.orig b/www/seamonkey/patches/patch-ba.orig deleted file mode 100644 index 32ea8b2d3b5..00000000000 --- a/www/seamonkey/patches/patch-ba.orig +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ba.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -pthread_t may be 64-bit, avoid casting it. - ---- mozilla/nsprpub/pr/include/private/pprthred.h.orig 2009-11-02 22:43:08.000000000 +0100 -+++ mozilla/nsprpub/pr/include/private/pprthred.h -@@ -51,6 +51,8 @@ - #include <os2.h> - #endif - -+#include <pthread.h> -+ - PR_BEGIN_EXTERN_C - - /*--------------------------------------------------------------------------- -@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void); - ** Get the id of the named thread. Each thread is assigned a unique id - ** when it is created or attached. - */ --NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread); -+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread); - - /* - ** Set the procedure that is called when a thread is dumped. The procedure diff --git a/www/seamonkey/patches/patch-bd.orig b/www/seamonkey/patches/patch-bd.orig deleted file mode 100644 index 7f7c004ac59..00000000000 --- a/www/seamonkey/patches/patch-bd.orig +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bd.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/js/src/ctypes/CTypes.cpp.orig 2010-11-04 19:20:39.000000000 +0000 -+++ mozilla/js/src/ctypes/CTypes.cpp -@@ -36,6 +36,22 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#if defined(__NetBSD__) -+#include <stdint.h> -+/* XXX why do we have those funky __ #defines in stdint.h? */ -+#warning this is a retarded workaround -+#define uint8_t uint8_t -+#define uint16_t uint16_t -+#define uint32_t uint32_t -+#define uint64_t uint64_t -+#define int8_t int8_t -+#define int16_t int16_t -+#define int32_t int32_t -+#define int64_t int64_t -+#define intptr_t intptr_t -+#define uintptr_t uintptr_t -+#endif -+ - #include "CTypes.h" - #include "Library.h" - #include "jsnum.h" diff --git a/www/seamonkey/patches/patch-be.orig b/www/seamonkey/patches/patch-be.orig deleted file mode 100644 index 7a2784f9cbf..00000000000 --- a/www/seamonkey/patches/patch-be.orig +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-be.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Disable all sound support for now since it causes -crashes and doesn't work correctly anyway ... - ---- mozilla/widget/src/gtk2/nsSound.cpp.orig 2010-08-06 01:09:23.000000000 +0000 -+++ mozilla/widget/src/gtk2/nsSound.cpp -@@ -138,6 +138,8 @@ nsSound::Init() - - mInited = PR_TRUE; - -+ return NS_OK; -+ - if (!elib) { - elib = PR_LoadLibrary("libesd.so.0"); - } diff --git a/www/seamonkey/patches/patch-bf.orig b/www/seamonkey/patches/patch-bf.orig deleted file mode 100644 index 153fc83eedc..00000000000 --- a/www/seamonkey/patches/patch-bf.orig +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bf.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/js/src/jsnativestack.cpp.orig 2011-08-11 21:41:05.000000000 +0000 -+++ mozilla/js/src/jsnativestack.cpp -@@ -50,7 +50,7 @@ - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) - # include <pthread.h> - --# if defined(__FreeBSD__) || defined(__OpenBSD__) -+# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - # include <pthread_np.h> - # endif - -@@ -145,7 +145,7 @@ GetNativeStackBaseImpl() - pthread_attr_init(&sattr); - # if defined(__OpenBSD__) - stack_t ss; --# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) -+# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */ - /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */ - pthread_attr_get_np(thread, &sattr); - # else diff --git a/www/seamonkey/patches/patch-bg.orig b/www/seamonkey/patches/patch-bg.orig deleted file mode 100644 index d5434bb4fd8..00000000000 --- a/www/seamonkey/patches/patch-bg.orig +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bg.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/storage/src/SQLiteMutex.h.orig 2010-05-28 13:22:58.000000000 +0000 -+++ mozilla/storage/src/SQLiteMutex.h -@@ -141,15 +141,19 @@ public: - void assertCurrentThreadOwns() - { - NS_ASSERTION(mMutex, "No mutex associated with this wrapper!"); -+#if 0 /* XXX tnn: this breaks the debug build. */ - NS_ASSERTION(sqlite3_mutex_held(mMutex), - "Mutex is not held, but we expect it to be!"); -+#endif - } - - void assertNotCurrentThreadOwns() - { - NS_ASSERTION(mMutex, "No mutex associated with this wrapper!"); -+#if 0 /* XXX tnn: this breaks the debug build. */ - NS_ASSERTION(sqlite3_mutex_notheld(mMutex), - "Mutex is held, but we expect it to not be!"); -+#endif - } - #endif // ifndef DEBUG - diff --git a/www/seamonkey/patches/patch-bi.orig b/www/seamonkey/patches/patch-bi.orig deleted file mode 100644 index 1ffb440a8ba..00000000000 --- a/www/seamonkey/patches/patch-bi.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bi.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/gfx/angle/src/compiler/osinclude.h.orig 2010-12-15 01:02:57.000000000 +0000 -+++ mozilla/gfx/angle/src/compiler/osinclude.h -@@ -16,7 +16,7 @@ - #define ANGLE_OS_WIN - #elif defined(__APPLE__) || defined(__linux__) || \ - defined(__FreeBSD__) || defined(__OpenBSD__) || \ -- defined(__sun) -+ defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) - #define ANGLE_OS_POSIX - #else - #error Unsupported platform. diff --git a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h.orig b/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h.orig deleted file mode 100644 index efc8871d46e..00000000000 --- a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-directory_c-sdk_ldap_include_portable.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- ldap/sdks/c-sdk/ldap/include/portable.h.orig 2011-07-06 08:51:23.000000000 +0000 -+++ ldap/sdks/c-sdk/ldap/include/portable.h -@@ -122,8 +122,11 @@ - * some systems don't have the BSD re_comp and re_exec routines - */ - #ifndef NEED_BSDREGEX --#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+#if ( defined( SYSV ) || defined( NETBSD ) || defined(DRAGONFLY) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) - #define NEED_BSDREGEX -+/* there are conflicting prototypes in unistd.h on DragonFly */ -+#define re_comp ldap_compat_re_comp -+#define re_exec ldap_compat_re_exec - #endif - #endif - diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc.orig deleted file mode 100644 index d347c9b939e..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc.orig +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/debug_util_posix.cc -@@ -11,10 +11,10 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> --#ifndef ANDROID -+#ifdef __linux__ - #include <execinfo.h> --#include <sys/sysctl.h> - #endif -+#include <sys/sysctl.h> - - #include "base/basictypes.h" - #include "base/eintr_wrapper.h" -@@ -119,7 +119,7 @@ StackTrace::StackTrace() { - const int kMaxCallers = 256; - - void* callers[kMaxCallers]; --#ifndef ANDROID -+#ifdef __GLIBC__ - int count = backtrace(callers, kMaxCallers); - #else - int count = 0; -@@ -138,7 +138,7 @@ StackTrace::StackTrace() { - - void StackTrace::PrintBacktrace() { - fflush(stderr); --#ifndef ANDROID -+#ifdef __GLIBC__ - backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); - #endif - } diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h.orig deleted file mode 100644 index 75275bee4da..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -15,8 +15,9 @@ - #elif defined(ANDROID) - #include <sys/stat.h> - #elif defined(OS_POSIX) --#include <fts.h> -+#include <sys/types.h> - #include <sys/stat.h> -+#include <fts.h> - #endif - - #include <stdio.h> diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc.orig deleted file mode 100644 index fda75b781c6..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc.orig +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_posix.cc -@@ -30,6 +30,9 @@ - #include "base/string_util.h" - #include "base/time.h" - -+#ifndef __linux__ -+#define stat64 stat -+#endif - namespace file_util { - - #if defined(GOOGLE_CHROME_BUILD) diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc.orig deleted file mode 100644 index 51a07505988..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc.orig +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include <linux/stat.h> - #endif -+#include <sys/stat.h> /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc.orig deleted file mode 100644 index 0add37527e7..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc.orig +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,6 +9,8 @@ - - #if defined(OS_MACOSX) - #include <mach/mach.h> -+#elif defined(OS_NETBSD) -+#include <lwp.h> - #elif defined(OS_LINUX) - #include <sys/syscall.h> - #include <unistd.h> -@@ -33,6 +35,10 @@ PlatformThreadId PlatformThread::Current - // into the kernel. - #if defined(OS_MACOSX) - return mach_thread_self(); -+#elif defined(OS_NETBSD) -+ return _lwp_self(); -+#elif defined(OS_DRAGONFLY) -+ return lwp_gettid(); - #elif defined(OS_LINUX) - return syscall(__NR_gettid); - #endif diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc.orig deleted file mode 100644 index 03bd81f9989..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc.orig +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2011-11-04 21:34:00.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/sys_info_posix.cc -@@ -18,6 +18,11 @@ - #include <mach/mach_init.h> - #endif - -+#if defined(OS_NETBSD) -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#endif -+ - #include "base/logging.h" - #include "base/string_util.h" - -@@ -26,7 +31,11 @@ namespace base { - int SysInfo::NumberOfProcessors() { - // It seems that sysconf returns the number of "logical" processors on both - // mac and linux. So we get the number of "online logical" processors. -+#ifdef _SC_NPROCESSORS_ONLN - static long res = sysconf(_SC_NPROCESSORS_ONLN); -+#else -+ static long res = 1; -+#endif - if (res == -1) { - NOTREACHED(); - return 1; -@@ -52,6 +61,20 @@ int64 SysInfo::AmountOfPhysicalMemory() - } - - return static_cast<int64>(hostinfo.max_mem); -+#elif defined(OS_NETBSD) -+ int mib[2]; -+ int rc; -+ int64_t memSize; -+ size_t len = sizeof(memSize); -+ -+ mib[0] = CTL_HW; -+ mib[1] = HW_PHYSMEM64; -+ rc = sysctl( mib, 2, &memSize, &len, NULL, 0 ); -+ if (-1 != rc) { -+ return memSize; -+ } -+ return 0; -+ - #else - long pages = sysconf(_SC_PHYS_PAGES); - long page_size = sysconf(_SC_PAGE_SIZE); diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h.orig b/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h.orig deleted file mode 100644 index 20c2d0a7f8c..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__) - #include "base/third_party/nspr/prcpucfg_linux.h" - #else - #error Provide a prcpucfg.h appropriate for your platform diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h.orig b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h.orig deleted file mode 100644 index 72c1d9aed74..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h.orig +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/build/build_config.h.orig 2011-08-11 21:41:01.000000000 +0000 -+++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,6 +19,10 @@ - #define OS_MACOSX 1 - #elif defined(__linux__) || defined(ANDROID) - #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 -+#elif defined(__DragonFly__) -+#define OS_DRAGONFLY 1 - #elif defined(_WIN32) - #define OS_WIN 1 - #else -@@ -27,7 +31,7 @@ - - // For access to standard POSIX features, use OS_POSIX instead of a more - // specific macro. --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) - #define OS_POSIX 1 - #endif - -@@ -60,6 +64,9 @@ - #elif defined(__ppc__) || defined(__powerpc__) - #define ARCH_CPU_PPC 1 - #define ARCH_CPU_32_BITS 1 -+#elif defined(__sparc64__) -+#define ARCH_CPU_SPARC 1 -+#define ARCH_CPU_64_BITS 1 - #else - #error Please add support for your architecture in build/build_config.h - #endif diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h.orig b/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h.orig deleted file mode 100644 index f19352c1c47..00000000000 --- a/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h -@@ -92,7 +92,7 @@ class Channel::ChannelImpl : public Mess - }; - - // This is a control message buffer large enough to hold kMaxReadFDs --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_NETBSD) - // TODO(agl): OSX appears to have non-constant CMSG macros! - char input_cmsg_buf_[1024]; - #else diff --git a/www/seamonkey/patches/patch-ma-toplevel.orig b/www/seamonkey/patches/patch-ma-toplevel.orig deleted file mode 100644 index 0b888adba4e..00000000000 --- a/www/seamonkey/patches/patch-ma-toplevel.orig +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ma-toplevel.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- config/autoconf.mk.in.orig 2011-07-06 08:40:27.000000000 +0000 -+++ config/autoconf.mk.in -@@ -60,14 +60,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZILLA_PKG_NAME) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZILLA_PKG_NAME) -+sdkdir = $(libdir)/$(MOZILLA_PKG_NAME)-sdk - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist diff --git a/www/seamonkey/patches/patch-ma.orig b/www/seamonkey/patches/patch-ma.orig deleted file mode 100644 index 4a1822c049e..00000000000 --- a/www/seamonkey/patches/patch-ma.orig +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ma.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/config/autoconf.mk.in.orig 2009-06-29 18:14:41.000000000 +0200 -+++ mozilla/config/autoconf.mk.in -@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZILLA_PKG_NAME) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZILLA_PKG_NAME) -+sdkdir = $(libdir)/$(MOZILLA_PKG_NAME)-sdk - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ diff --git a/www/seamonkey/patches/patch-mb.orig b/www/seamonkey/patches/patch-mb.orig deleted file mode 100644 index fdc4faae41e..00000000000 --- a/www/seamonkey/patches/patch-mb.orig +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-mb.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-06-15 21:58:01.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -97,7 +97,7 @@ endif - endif - endif - --ifneq (,$(filter NetBSD OpenBSD BSD_OS GNU,$(OS_ARCH))) -+ifneq (,$(filter BSD_OS GNU,$(OS_ARCH))) - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -@@ -106,7 +106,7 @@ endif - # New code for Linux, et. al., with gcc - # Migrate other platforms here after testing - # --ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) -+ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH))) - # Linux/x86-64 - ifeq (x86_64,$(OS_TEST)) - CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -@@ -124,12 +124,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin - endif - endif - # --# OpenBSD/amd64 --# --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) --CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp --endif --# - # Neutrino/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_TARGET),NTO) -@@ -212,7 +206,7 @@ endif - # NetBSD/ARM - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter arm% sa110,$(OS_TEST))) -+ifneq (,$(filter arm%,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp - endif - endif -@@ -269,7 +263,7 @@ endif - # NetBSD/m68k - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) -+ifneq (,$(filter m68k,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp - endif - endif -@@ -359,9 +353,10 @@ endif - # - # NetBSD/PPC - # --ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) -+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDpowerpc) - CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp - ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s -+AS := $(CC) -c -x assembler-with-cpp - endif - - # -@@ -433,6 +428,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif - # -+# NetBSD/SPARC64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64) -+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s -+endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) diff --git a/www/seamonkey/patches/patch-md.orig b/www/seamonkey/patches/patch-md.orig deleted file mode 100644 index c9b00c2aec9..00000000000 --- a/www/seamonkey/patches/patch-md.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-md.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -???. from www/firefox/patch-ax. - ---- mozilla/security/coreconf/SunOS5.mk.orig 2009-06-29 18:15:11.000000000 +0200 -+++ mozilla/security/coreconf/SunOS5.mk -@@ -156,6 +156,10 @@ endif - endif - DSO_LDOPTS += -z combreloc -z defs -z ignore - -+ifdef LIBRUNPATH -+DSO_LDOPTS += -R$(LIBRUNPATH) -+endif -+ - # -KPIC generates position independent code for use in shared libraries. - # (Similarly for -fPIC in case of gcc.) - ifdef NS_USE_GCC diff --git a/www/seamonkey/patches/patch-me.orig b/www/seamonkey/patches/patch-me.orig deleted file mode 100644 index aec96d725b8..00000000000 --- a/www/seamonkey/patches/patch-me.orig +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-me.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Add DragonFly support. -Disable assembly routines in freebl on Linux (PR pkg/46056) - ---- mozilla/security/nss/lib/freebl/Makefile.orig 2010-03-17 18:33:57.000000000 +0000 -+++ mozilla/security/nss/lib/freebl/Makefile -@@ -154,7 +154,9 @@ ifeq ($(USE_N32),1) - endif - endif - --ifeq ($(OS_TARGET),Linux) -+# pkgsrc PR pkg/46056 -+#ifeq ($(OS_TARGET),Linux) -+ifeq (true, false) - ifeq ($(CPU_ARCH),x86_64) - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s - ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack -@@ -224,7 +226,7 @@ endif - # to bind the blapi function references in FREEBLVector vector - # (ldvector.c) to the blapi functions defined in the freebl - # shared libraries. --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) - MKSHLIB += -Wl,-Bsymbolic - endif - diff --git a/www/seamonkey/patches/patch-mf.orig b/www/seamonkey/patches/patch-mf.orig deleted file mode 100644 index 0fd205e32c7..00000000000 --- a/www/seamonkey/patches/patch-mf.orig +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mf.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Add DragonFly support. -Make sure nss libraries have a run path defined. - ---- mozilla/security/coreconf/config.mk.orig 2011-11-04 21:34:14.000000000 +0000 -+++ mozilla/security/coreconf/config.mk -@@ -63,7 +63,7 @@ endif - ####################################################################### - - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- AIX RISCOS WINNT WIN95 WINCE Linux -+ AIX RISCOS WINNT WIN95 WINCE Linux DragonFly - - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk -@@ -207,3 +207,4 @@ endif - DEFINES += -DUSE_UTIL_DIRECTLY - USE_UTIL_DIRECTLY = 1 - -+EXTRA_SHARED_LIBS += -Wl,-R${PREFIX}/lib/${MOZILLA_PKG_NAME} diff --git a/www/seamonkey/patches/patch-mg.orig b/www/seamonkey/patches/patch-mg.orig deleted file mode 100644 index 4c7a116c8f4..00000000000 --- a/www/seamonkey/patches/patch-mg.orig +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-mg.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Add DragonFly support. - ---- mozilla/security/coreconf/DragonFly.mk.orig 2009-06-30 22:20:24.000000000 +0200 -+++ mozilla/security/coreconf/DragonFly.mk -@@ -0,0 +1,83 @@ -+# -+# 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 Netscape are -+# Copyright (C) 1994-2000 Netscape Communications Corporation. All -+# Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the -+# terms of the GNU General Public License Version 2 or later (the -+# "GPL"), in which case the provisions of the GPL are applicable -+# instead of those above. If you wish to allow use of your -+# version of this file only under the terms of the GPL and not to -+# allow others to use your version of this file under the MPL, -+# indicate your decision by deleting the provisions above and -+# replace them with the notice and other provisions required by -+# the GPL. If you do not delete the provisions above, a recipient -+# may use your version of this file under either the MPL or the -+# GPL. -+# -+# Config stuff for DragonFly -+# -+ -+include $(CORE_DEPTH)/coreconf/UNIX.mk -+ -+DEFAULT_COMPILER = gcc -+CC = gcc -+CCC = g++ -+RANLIB = ranlib -+ -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+else -+CPU_ARCH = x86 -+endif -+ -+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -+ -+DSO_CFLAGS = -fPIC -+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) -+ -+# -+# The default implementation strategy for FreeBSD is pthreads. -+# -+ifndef CLASSIC_NSPR -+USE_PTHREADS = 1 -+DEFINES += -D_THREAD_SAFE -D_REENTRANT -+OS_LIBS += -pthread -+DSO_LDOPTS += -pthread -+endif -+ -+ARCH = freebsd -+ -+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+DLL_SUFFIX = so -+ -+ifdef LIBRUNPATH -+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) -+endif -+ -+MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifdef MAPFILE -+# Add LD options to restrict exported symbols to those in the map file -+endif -+# Change PROCESS to put the mapfile in the correct format for this platform -+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ -+ -+G++INCLUDES = -I/usr/include/g++ -+ -+INCLUDES += -I/usr/X11R6/include diff --git a/www/seamonkey/patches/patch-mh.orig b/www/seamonkey/patches/patch-mh.orig deleted file mode 100644 index 02c04fd84c8..00000000000 --- a/www/seamonkey/patches/patch-mh.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mh.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/security/nss/lib/Makefile.orig 2011-03-18 23:34:05.000000000 +0000 -+++ mozilla/security/nss/lib/Makefile -@@ -70,7 +70,7 @@ endif - - ifndef MOZILLA_CLIENT - ifeq ($(OS_ARCH),Linux) --SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS. -+#SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS. - endif - endif - diff --git a/www/seamonkey/patches/patch-mi.orig b/www/seamonkey/patches/patch-mi.orig deleted file mode 100644 index 824065c64c0..00000000000 --- a/www/seamonkey/patches/patch-mi.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mi.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Add DragonFly support. - ---- mozilla/config/config.mk.orig 2009-06-29 18:14:41.000000000 +0200 -+++ mozilla/config/config.mk -@@ -133,7 +133,7 @@ endif - # 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 DragonFly 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. diff --git a/www/seamonkey/patches/patch-mj.orig b/www/seamonkey/patches/patch-mj.orig deleted file mode 100644 index f82c0f43a9e..00000000000 --- a/www/seamonkey/patches/patch-mj.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mj.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Add DragonFly support. - ---- mozilla/security/coreconf/arch.mk.orig 2009-06-29 18:15:11.000000000 +0200 -+++ mozilla/security/coreconf/arch.mk -@@ -146,7 +146,7 @@ endif - # IRIX 6.5-ALPHA-1289139620. - # - --ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH))) -+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH))) - OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') - endif - diff --git a/www/seamonkey/patches/patch-mk.orig b/www/seamonkey/patches/patch-mk.orig deleted file mode 100644 index 46fc1675f6a..00000000000 --- a/www/seamonkey/patches/patch-mk.orig +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mk.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Treat DragonFly like FreeBSD. - ---- mozilla/config/rules.mk.orig 2009-06-29 18:14:41.000000000 +0200 -+++ mozilla/config/rules.mk -@@ -592,6 +592,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+ifdef IS_COMPONENT -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif -+endif -+ - ifeq ($(OS_ARCH),NetBSD) - ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) - ifeq ($(MODULE),layout) diff --git a/www/seamonkey/patches/patch-ml.orig b/www/seamonkey/patches/patch-ml.orig deleted file mode 100644 index a74e5fc37e9..00000000000 --- a/www/seamonkey/patches/patch-ml.orig +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ml.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Treat DragonFly like FreeBSD. - ---- mozilla/js/src/Makefile.in.orig 2009-06-29 18:14:51.000000000 +0200 -+++ mozilla/js/src/Makefile.in -@@ -429,6 +429,9 @@ endif # WINNT - ifeq ($(OS_ARCH),FreeBSD) - EXTRA_LIBS += -pthread - endif -+ifeq ($(OS_ARCH),DragonFly) -+EXTRA_LIBS += -pthread -+endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 - DASH_R += -n32 diff --git a/www/seamonkey/patches/patch-mm.orig b/www/seamonkey/patches/patch-mm.orig deleted file mode 100644 index 9da53d63536..00000000000 --- a/www/seamonkey/patches/patch-mm.orig +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-mm.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - ---- mozilla/toolkit/library/Makefile.in.orig 2011-06-15 21:58:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in -@@ -216,6 +216,13 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle - endif - endif - -+ifeq ($(OS_ARCH),NetBSD) -+EXTRA_DSO_LDOPTS += -lossaudio -+endif -+ifdef PKGSRC_PULSEAUDIO -+EXTRA_DSO_LDOPTS += -lpulse -+endif -+ - ifeq ($(OS_ARCH),WINNT) - OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp) - ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) diff --git a/www/seamonkey/patches/patch-mn.orig b/www/seamonkey/patches/patch-mn.orig deleted file mode 100644 index aab526aab2e..00000000000 --- a/www/seamonkey/patches/patch-mn.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mn.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ - -Make sure we link correctly with sqlite3 from pkgsrc. - ---- mozilla/security/nss/lib/softoken/config.mk.orig 2010-08-24 21:32:09.000000000 +0000 -+++ mozilla/security/nss/lib/softoken/config.mk -@@ -80,7 +80,7 @@ else - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib \ -- -l$(SQLITE_LIB_NAME) \ -+ `pkg-config --libs sqlite3` \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -L$(NSPR_LIB_DIR) \ diff --git a/www/seamonkey/patches/patch-mozilla_browser_confvars.sh.orig b/www/seamonkey/patches/patch-mozilla_browser_confvars.sh.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_browser_confvars.sh.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4.orig b/www/seamonkey/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4.orig b/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp.orig b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h.orig b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h.orig b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp.orig b/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4.orig b/www/seamonkey/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_js_src_configure.orig b/www/seamonkey/patches/patch-mozilla_js_src_configure.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_configure.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h.orig b/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp.orig b/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h.orig b/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h.orig b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h.orig deleted file mode 100644 index f864784508c..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h.orig +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-mozilla_media_libvpx_vpx_config.h.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/media/libvpx/vpx_config.h.orig 2011-11-07 21:08:15.000000000 +0000 -+++ mozilla/media/libvpx/vpx_config.h -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__DragonFly__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__DragonFly__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.h" - diff --git a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c.orig b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c.orig deleted file mode 100644 index 9a0c01d9181..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c.orig +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-mozilla_media_libvpx_vpx_config_c.c.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/media/libvpx/vpx_config_c.c.orig 2011-11-07 21:08:15.000000000 +0000 -+++ mozilla/media/libvpx/vpx_config_c.c -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__DragonFly__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__DragonFly__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.c" - diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c.orig b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in.orig b/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py.orig b/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py.orig deleted file mode 100644 index 7349dc489d2..00000000000 --- a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-mozilla_xpcom_idl-parser_header.py.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xpcom/idl-parser/header.py.orig 2011-12-22 00:35:28.000000000 +0000 -+++ mozilla/xpcom/idl-parser/header.py -@@ -521,6 +521,12 @@ if __name__ == '__main__': - outfd.close() - - if options.depfile is not None: -+ dirname = os.path.dirname(options.depfile) -+ if dirname: -+ try: -+ os.makedirs(dirname) -+ except: -+ pass - depfd = open(options.depfile, 'w') - deps = [dep.replace('\\', '/') for dep in idl.deps] - diff --git a/www/seamonkey/patches/patch-mozilla_xulrunner_app_Makefile.in.orig b/www/seamonkey/patches/patch-mozilla_xulrunner_app_Makefile.in.orig deleted file mode 100644 index e69de29bb2d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_xulrunner_app_Makefile.in.orig +++ /dev/null diff --git a/www/seamonkey/patches/patch-mp.orig b/www/seamonkey/patches/patch-mp.orig deleted file mode 100644 index 8551661eceb..00000000000 --- a/www/seamonkey/patches/patch-mp.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-mp.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2010-07-21 00:52:30.000000000 +0000 -+++ mozilla/media/libsydneyaudio/src/Makefile.in -@@ -97,6 +97,12 @@ ifeq ($(OS_ARCH),WINNT) - OS_LIBS += winmm.lib - endif - -+ifdef PKGSRC_PULSEAUDIO -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../include diff --git a/www/seamonkey/patches/patch-pa.orig b/www/seamonkey/patches/patch-pa.orig deleted file mode 100644 index 9893b5d6497..00000000000 --- a/www/seamonkey/patches/patch-pa.orig +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-pa.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig 2010-11-04 19:20:39.000000000 +0000 -+++ mozilla/xulrunner/installer/mozilla-js.pc.in -@@ -6,5 +6,5 @@ Name: JavaScript - Description: The Mozilla JavaScript Library - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib %MOZ_JS_LINK% -+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK% - Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE diff --git a/www/seamonkey/patches/patch-pb.orig b/www/seamonkey/patches/patch-pb.orig deleted file mode 100644 index bd78c5df84a..00000000000 --- a/www/seamonkey/patches/patch-pb.orig +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-pb.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xulrunner/installer/libxul.pc.in.orig 2010-11-04 19:20:39.000000000 +0000 -+++ mozilla/xulrunner/installer/libxul.pc.in -@@ -7,5 +7,5 @@ Name: libxul - Description: The Mozilla Runtime and Embedding Engine - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% -+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK% - Cflags: -I${includedir} %WCHAR_CFLAGS% diff --git a/www/seamonkey/patches/patch-pc.orig b/www/seamonkey/patches/patch-pc.orig deleted file mode 100644 index 4f4290567e9..00000000000 --- a/www/seamonkey/patches/patch-pc.orig +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-pc.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig 2010-04-21 09:07:48.000000000 +0000 -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in -@@ -6,5 +6,6 @@ idldir=%idldir% - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue -ldl -+# XXXtnn -ldl removed -+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% diff --git a/www/seamonkey/patches/patch-pd.orig b/www/seamonkey/patches/patch-pd.orig deleted file mode 100644 index dd2b114fa5f..00000000000 --- a/www/seamonkey/patches/patch-pd.orig +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-pd.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig 2009-10-29 23:11:24.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-nss.pc.in -@@ -6,5 +6,5 @@ Name: NSS - Description: Mozilla Network Security Services - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3 -+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3 - Cflags: -I${includedir} diff --git a/www/seamonkey/patches/patch-pg.orig b/www/seamonkey/patches/patch-pg.orig deleted file mode 100644 index 2303cbac68e..00000000000 --- a/www/seamonkey/patches/patch-pg.orig +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-pg.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig 2009-10-29 23:11:24.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-nspr.pc.in -@@ -5,7 +5,5 @@ includedir=%includedir% - Name: NSPR - Description: The Netscape Portable Runtime - Version: %NSPR_VERSION% --Libs: %FULL_NSPR_LIBS% --Cflags: %FULL_NSPR_CFLAGS% -- -- -+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread -+Cflags: -I${includedir} diff --git a/www/seamonkey/patches/patch-rc.orig b/www/seamonkey/patches/patch-rc.orig deleted file mode 100644 index 740d4671f0a..00000000000 --- a/www/seamonkey/patches/patch-rc.orig +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-rc.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2011-01-22 00:24:21.000000000 +0000 -+++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd -@@ -1,4 +1,4 @@ --<!ENTITY brandShortName "Mozilla Developer Preview"> --<!ENTITY brandFullName "Mozilla Developer Preview"> -+<!ENTITY brandShortName "Browser"> -+<!ENTITY brandFullName "Browser"> - <!ENTITY vendorShortName "mozilla.org"> - <!ENTITY trademarkInfo.part1 " "> diff --git a/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh.orig b/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh.orig deleted file mode 100644 index 8bb44e0f035..00000000000 --- a/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh.orig +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -This tries to dlopen libsoftokn3.so which is linked against sqlite3, -so we need a directory containing libsqlite3.so in the search path, -beside the directory containing libsoftokn3.so itself. - ---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig 2011-06-15 21:57:52.000000000 +0000 -+++ mozilla/security/nss/cmd/shlibsign/sign.sh -@@ -26,7 +26,7 @@ WIN*) - export LIBPATH - SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH - export SHLIB_PATH -- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH -+ LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH - export DYLD_LIBRARY_PATH diff --git a/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk.orig b/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk.orig deleted file mode 100644 index d1837b9f04f..00000000000 --- a/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk.orig +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-toolkit_toolkit-tiers.mk.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - ---- mozilla/toolkit/toolkit-tiers.mk.orig 2011-06-15 21:57:56.000000000 +0000 -+++ mozilla/toolkit/toolkit-tiers.mk -@@ -90,7 +90,7 @@ ifndef MOZ_NATIVE_BZ2 - tier_platform_dirs += modules/libbz2 - endif - tier_platform_dirs += modules/libmar --tier_platform_dirs += other-licenses/bsdiff -+#tier_platform_dirs += other-licenses/bsdiff - endif - - tier_platform_dirs += gfx/qcms diff --git a/www/seamonkey/patches/patch-xa.orig b/www/seamonkey/patches/patch-xa.orig deleted file mode 100644 index b66951419ba..00000000000 --- a/www/seamonkey/patches/patch-xa.orig +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-xa.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2009-07-09 10:12:51.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s -@@ -0,0 +1,112 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 1998 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ .global NS_InvokeByIndex_P -+ .type NS_InvokeByIndex_P, #function -+/* -+ NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+/* -+ * Note: To simplify stack handling we allocate an extra stack -+ * frame here. In principle invoke_copy_to_stack() could -+ * save the parameters our caller's frame and we could -+ * reclaim the stackframe and do a tail call to the -+ * function. However, this gets complicated.... -+ * -+ * The vtable consist of be: -+ * -+ * struct { -+ * short __delta; -+ * short __index; -+ * union { -+ * P __pfn; -+ * short __delta2; -+ * } __pfn_or_delta2; -+ * }; -+ * -+ * See gcc/cp/cp-tree.h -+ */ -+ -+NS_InvokeByIndex_P: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %f2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+ ldx [%i0],%l1 ! *this --> address of vtable -+ ldx [%l0 + %l1],%l0 ! this->vtable[index] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size NS_InvokeByIndex_P, .-NS_InvokeByIndex_P diff --git a/www/seamonkey/patches/patch-xb.orig b/www/seamonkey/patches/patch-xb.orig deleted file mode 100644 index 336e86f56a0..00000000000 --- a/www/seamonkey/patches/patch-xb.orig +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-xb.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2009-07-09 10:12:51.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp -@@ -0,0 +1,84 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 1998 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc64__) && !defined(_LP64) -+#error "This code is for Sparc64 only" -+#endif -+ -+extern "C" PRUint32 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/seamonkey/patches/patch-xc.orig b/www/seamonkey/patches/patch-xc.orig deleted file mode 100644 index 3f6d4455c38..00000000000 --- a/www/seamonkey/patches/patch-xc.orig +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-xc.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2009-07-09 10:12:51.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s -@@ -0,0 +1,66 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 1999 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ */ -+ -+ .global SharedStub -+ -+/* -+ in the frame for the function that called SharedStub are the -+ rest of the parameters we need -+ -+*/ -+ -+SharedStub: -+! we don't create a new frame yet, but work within the frame of the calling -+! function to give ourselves the other parameters we want -+ -+ mov %o0, %o1 ! shuffle the index up to 2nd place -+ mov %i0, %o0 ! the original 'this' -+ add %fp, 0x7ff + 136, %o2 ! previous stack top adjusted to the first argument slot (beyond 'this') -+ -+! save off the original incoming parameters that arrived in -+! registers, the ABI guarantees the space for us to do this -+ stx %i1, [%fp + 0x7ff + 136] -+ stx %i2, [%fp + 0x7ff + 144] -+ stx %i3, [%fp + 0x7ff + 152] -+ stx %i4, [%fp + 0x7ff + 160] -+ stx %i5, [%fp + 0x7ff + 168] -+! now we can build our own stack frame -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+! our function now appears to have been called -+! as SharedStub(nsISupports* that, PRUint32 index, PRUint32* args) -+! so we can just copy these through -+ -+ mov %i0, %o0 -+ mov %i1, %o1 -+ mov %i2, %o2 -+ call PrepareAndDispatch -+ nop -+ mov %o0,%i0 ! propagate return value -+ b .LL1 -+ nop -+.LL1: -+ ret -+ restore -+ -+ .size SharedStub, .-SharedStub -+ .type SharedStub, #function diff --git a/www/seamonkey/patches/patch-xd.orig b/www/seamonkey/patches/patch-xd.orig deleted file mode 100644 index 315cf3130e5..00000000000 --- a/www/seamonkey/patches/patch-xd.orig +++ /dev/null @@ -1,126 +0,0 @@ -$NetBSD: patch-xd.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2009-07-09 10:12:51.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp -@@ -0,0 +1,119 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 1999 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+#include "xptiprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (!dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ diff --git a/www/seamonkey/patches/patch-xe.orig b/www/seamonkey/patches/patch-xe.orig deleted file mode 100644 index 2f3f4598a57..00000000000 --- a/www/seamonkey/patches/patch-xe.orig +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-xe.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp -@@ -132,6 +132,15 @@ extern "C" { - } - } - -+/* -+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF -+ */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif -+ - XPTC_PUBLIC_API(nsresult) - XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR - PRUint32 result; - - __asm__ __volatile__( -- "movl %4, sp@-\n\t" -- "movl %3, sp@-\n\t" -- "jbsr _invoke_count_words\n\t" /* count words */ -- "addql #8, sp\n\t" -- "lsll #2, d0\n\t" /* *= 4 */ -- "movl sp, a2\n\t" /* save original sp */ -- "subl d0, sp\n\t" /* make room for params */ -- "movl sp, a0\n\t" -- "movl %4, sp@-\n\t" -- "movl %3, sp@-\n\t" -- "movl a0, sp@-\n\t" -- "jbsr _invoke_copy_to_stack\n\t" /* copy params */ -- "addl #12, sp\n\t" -- "movl %1, a0\n\t" -- "movl a0@, a1\n\t" -- "movl %2, d0\n\t" /* function index */ -- "movl a0, d1\n\t" -- "movw a1@(8,d0:l:8), a0\n\t" -- "addl a0, d1\n\t" -- "movl a1@(12,d0:l:8), a1\n\t" -- "movl d1, sp@-\n\t" -- "jbsr a1@\n\t" -- "movl a2, sp\n\t" /* restore original sp */ -- "movl d0, %0\n\t" -+ "movl %4, %%sp@-\n\t" -+ "movl %3, %%sp@-\n\t" -+ "jbsr "SYMBOLPREFIX"invoke_count_words\n\t" /* count words */ -+ "addql #8, %%sp\n\t" -+ "lsll #2, %%d0\n\t" /* *= 4 */ -+ "movl %%sp, %%a2\n\t" /* save original sp */ -+ "subl %%d0, %%sp\n\t" /* make room for params */ -+ "movl %%sp, %%a0\n\t" -+ "movl %4, %%sp@-\n\t" -+ "movl %3, %%sp@-\n\t" -+ "movl %%a0, %%sp@-\n\t" -+ "jbsr "SYMBOLPREFIX"invoke_copy_to_stack\n\t" /* copy params */ -+ "addl #12, %%sp\n\t" -+ "movl %1, %%a0\n\t" -+ "movl %%a0@, %%a1\n\t" -+ "movl %2, %%d0\n\t" /* function index */ -+ "movl %%a0, %%d1\n\t" -+ "movw %%a1@(8,%%d0:l:8), %%a0\n\t" -+ "addl %%a0, %%d1\n\t" -+ "movl %%a1@(12,%%d0:l:8), %%a1\n\t" -+ "movl %%d1, %%sp@-\n\t" -+ "jbsr %%a1@\n\t" -+ "movl %%a2, %%sp\n\t" /* restore original sp */ -+ "movl %%d0, %0\n\t" - : "=g" (result) /* %0 */ - : "g" (that), /* %1 */ - "g" (methodIndex), /* %2 */ diff --git a/www/seamonkey/patches/patch-xf.orig b/www/seamonkey/patches/patch-xf.orig deleted file mode 100644 index 7716bd65e7c..00000000000 --- a/www/seamonkey/patches/patch-xf.orig +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-xf.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp -@@ -123,17 +123,27 @@ extern "C" { - } - } - -+/* -+ * Beware: use % instead of %% for register identifiers in a preprocessor macro -+ * SYMBOL PREFIX must be "_" for aout and "" for ELF -+ */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \ --"_Stub"#n"__14nsXPTCStubBase:\n\t" \ -- "link a6,#0 \n\t" \ -- "lea a6@(12), a0 \n\t" /* pointer to args */ \ -- "movl a0, sp@- \n\t" \ -- "movl #"#n", sp@- \n\t" /* method index */ \ -- "movl a6@(8), sp@- \n\t" /* this */ \ -- "jbsr _PrepareAndDispatch \n\t" \ -- "unlk a6 \n\t" \ -+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \ -+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \ -+ "link %a6,#0 \n\t" \ -+ "lea %a6@(12), %a0 \n\t" /* pointer to args */ \ -+ "movl %a0, %sp@- \n\t" \ -+ "movl #"#n", %sp@- \n\t" /* method index */ \ -+ "movl %a6@(8), %sp@- \n\t" /* this */ \ -+ "jbsr "SYMBOLPREFIX"PrepareAndDispatch\n\t" \ -+ "unlk %a6 \n\t" \ - "rts \n\t" \ - ); - diff --git a/www/seamonkey/patches/patch-xg.orig b/www/seamonkey/patches/patch-xg.orig deleted file mode 100644 index 92cdde18a21..00000000000 --- a/www/seamonkey/patches/patch-xg.orig +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-xg.orig,v 1.1 2012/03/10 03:26:06 ryoon Exp $ - -NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp -@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self, - * so they are contiguous with values passed on the stack, and then calls - * PrepareAndDispatch() to do the dirty work. - */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif - - #define STUB_ENTRY(n) \ - __asm__( \ -- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \ --"_Stub"#n"__14nsXPTCStubBase:\n\t" \ -+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \ -+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \ - "stmfd sp!, {r1, r2, r3} \n\t" \ - "mov ip, sp \n\t" \ - "stmfd sp!, {fp, ip, lr, pc} \n\t" \ - "sub fp, ip, #4 \n\t" \ - "mov r1, #"#n" \n\t" /* = methodIndex */ \ - "add r2, sp, #16 \n\t" \ -- "bl _PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ -+ "bl "SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ - "ldmea fp, {fp, sp, lr} \n\t" \ - "add sp, sp, #12 \n\t" \ - "mov pc, lr \n\t" \ diff --git a/www/seamonkey/patches/patch-xj.orig b/www/seamonkey/patches/patch-xj.orig deleted file mode 100644 index a09212e76d3..00000000000 --- a/www/seamonkey/patches/patch-xj.orig +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-xj.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - -NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp -@@ -41,6 +41,7 @@ - // Implement shared vtbl methods. - - #include "xptcprivate.h" -+#include "xptiprivate.h" - - // The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral - // parameters and the first 8 floating point parameters in registers -@@ -71,7 +72,6 @@ PrepareAndDispatch(nsXPTCStubBase* self, - { - nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; - nsXPTCMiniVariant* dispatchParams = NULL; -- nsIInterfaceInfo* iface_info = NULL; - const nsXPTMethodInfo* info; - PRUint32 paramCount; - PRUint32 i; -@@ -79,12 +79,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, - - NS_ASSERTION(self,"no self"); - -- self->GetInterfaceInfo(&iface_info); -- NS_ASSERTION(iface_info,"no interface info"); -- if (! iface_info) -- return NS_ERROR_UNEXPECTED; -- -- iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); - NS_ASSERTION(info,"no method info"); - if (! info) - return NS_ERROR_UNEXPECTED; -@@ -119,8 +114,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack - dp->val.d = *(double*) ap; - ap += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - continue; - } -@@ -130,8 +127,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - else { - dp->val.f = *(float*) ap; - ap += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - continue; - } -@@ -179,9 +178,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - } - } - -- result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -- -- NS_RELEASE(iface_info); -+ result = self->mOuter->CallMethod((PRUint16) methodIndex, -+ info, -+ dispatchParams); - - if (dispatchParams != paramBuffer) - delete [] dispatchParams; -@@ -195,7 +194,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - // however, it's quick, dirty, and'll break when the ABI changes on - // us, which is what we want ;-). - --#define STUB_ENTRY(n) \ -+#if __GXX_ABI_VERSION < 100 -+// gcc-2 version -+# define STUB_ENTRY(n) \ - __asm__ ( \ - ".section \".text\" \n\t" \ - ".align 2 \n\t" \ -@@ -206,6 +207,46 @@ __asm__ ( - "li 11,"#n" \n\t" \ - "b SharedStub@local \n" \ - ); -+#else -+// gcc-3 version -+// -+// As G++3 ABI contains the length of the functionname in the mangled -+// name, it is difficult to get a generic assembler mechanism like -+// in the G++ 2.95 case. -+// Create names would be like: -+// _ZN14nsXPTCStubBase5Stub1Ev -+// _ZN14nsXPTCStubBase6Stub12Ev -+// _ZN14nsXPTCStubBase7Stub123Ev -+// _ZN14nsXPTCStubBase8Stub1234Ev -+// etc. -+// Use assembler directives to get the names right... -+ -+# define STUB_ENTRY(n) \ -+__asm__ ( \ -+ ".align 2 \n\t" \ -+ ".if "#n" < 10 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 1000 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ -+ \ -+ ".else \n\t" \ -+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ -+ ".endif \n\t" \ -+ \ -+ "li 11,"#n" \n\t" \ -+ "b SharedStub@local \n" \ -+); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/www/seamonkey/patches/patch-xk.orig b/www/seamonkey/patches/patch-xk.orig deleted file mode 100644 index 3476d34a09f..00000000000 --- a/www/seamonkey/patches/patch-xk.orig +++ /dev/null @@ -1,156 +0,0 @@ -$NetBSD: patch-xk.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - -NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s -@@ -1,43 +1,43 @@ --# -*- Mode: Asm -*- --# --# ***** 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 mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# --# 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 ***** -+// -*- Mode: Asm -*- -+// -+// ***** 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 mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// -+// 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 ***** - - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 -@@ -60,23 +60,23 @@ - .type SharedStub,@function - - SharedStub: -- stwu sp,-112(sp) # room for -- # linkage (8), -- # gprData (32), -- # fprData (64), -- # stack alignment(8) -+ stwu sp,-112(sp) // room for -+ // linkage (8), -+ // gprData (32), -+ // fprData (64), -+ // stack alignment(8) - mflr r0 -- stw r0,116(sp) # save LR backchain -+ stw r0,116(sp) // save LR backchain - -- stw r4,12(sp) # save GP registers -- stw r5,16(sp) # (n.b. that we don't save r3 -- stw r6,20(sp) # because PrepareAndDispatch() is savvy) -+ stw r4,12(sp) // save GP registers -+ stw r5,16(sp) // (n.b. that we don't save r3 -+ stw r6,20(sp) // because PrepareAndDispatch() is savvy) - stw r7,24(sp) - stw r8,28(sp) - stw r9,32(sp) - stw r10,36(sp) - -- stfd f1,40(sp) # save FP registers -+ stfd f1,40(sp) // save FP registers - stfd f2,48(sp) - stfd f3,56(sp) - stfd f4,64(sp) -@@ -85,21 +85,21 @@ SharedStub: - stfd f7,88(sp) - stfd f8,96(sp) - -- # r3 has the 'self' pointer already -+ // r3 has the 'self' pointer already - -- mr r4,r11 # r4 <= methodIndex selector, passed -- # via r11 in the nsXPTCStubBase::StubXX() call -+ mr r4,r11 // r4 <= methodIndex selector, passed -+ // via r11 in the nsXPTCStubBase::StubXX() call - -- addi r5,sp,120 # r5 <= pointer to callers args area, -- # beyond r3-r10/f1-f8 mapped range -+ addi r5,sp,120 // r5 <= pointer to callers args area, -+ // beyond r3-r10/f1-f8 mapped range - -- addi r6,sp,8 # r6 <= gprData -- addi r7,sp,40 # r7 <= fprData -+ addi r6,sp,8 // r6 <= gprData -+ addi r7,sp,40 // r7 <= fprData - -- bl PrepareAndDispatch@local # Go! -+ bl PrepareAndDispatch@local // Go! - -- lwz r0,116(sp) # restore LR -+ lwz r0,116(sp) // restore LR - mtlr r0 -- la sp,112(sp) # clean up the stack -+ la sp,112(sp) // clean up the stack - blr - diff --git a/www/seamonkey/patches/patch-xl.orig b/www/seamonkey/patches/patch-xl.orig deleted file mode 100644 index 007be401d9b..00000000000 --- a/www/seamonkey/patches/patch-xl.orig +++ /dev/null @@ -1,200 +0,0 @@ -$NetBSD: patch-xl.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - -NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s -@@ -1,43 +1,43 @@ --# -*- Mode: Asm -*- --# --# ***** 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 mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# --# 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 ***** -+// -*- Mode: Asm -*- -+// -+// ***** 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 mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// -+// 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 ***** - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 - .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14 -@@ -55,41 +55,41 @@ - - .section ".text" - .align 2 -- .globl XPTC_InvokeByIndex -- .type XPTC_InvokeByIndex,@function -+ .globl NS_InvokeByIndex_P -+ .type NS_InvokeByIndex_P,@function - --# --# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, --# PRUint32 paramCount, nsXPTCVariant* params) --# -- --XPTC_InvokeByIndex: -- stwu sp,-32(sp) # setup standard stack frame -- mflr r0 # save LR -- stw r3,8(sp) # r3 <= that -- stw r4,12(sp) # r4 <= methodIndex -+// -+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+// PRUint32 paramCount, nsXPTCVariant* params) -+// -+ -+NS_InvokeByIndex_P: -+ stwu sp,-32(sp) // setup standard stack frame -+ mflr r0 // save LR -+ stw r3,8(sp) // r3 <= that -+ stw r4,12(sp) // r4 <= methodIndex - stw r30,16(sp) - stw r31,20(sp) - -- stw r0,36(sp) # store LR backchain -+ stw r0,36(sp) // store LR backchain - mr r31,sp - -- rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f -- addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96 -- lwz r9,0(sp) # r9 = backchain -+ rlwinm r10,r5,3,0,27 // r10 = (ParamCount * 2 * 4) & ~0x0f -+ addi r0,r10,96 // reserve stack for GPR and FPR register save area r0 = r10 + 96 -+ lwz r9,0(sp) // r9 = backchain - neg r0,r0 -- stwux r9,sp,r0 # reserve stack sapce and save SP backchain -+ stwux r9,sp,r0 // reserve stack sapce and save SP backchain - -- addi r3,sp,8 # r3 <= args -- mr r4,r5 # r4 <= paramCount -- mr r5,r6 # r5 <= params -- add r6,r3,r10 # r6 <= gpregs ( == args + r10 ) -- mr r30,r6 # store in r30 for use later... -- addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 ) -+ addi r3,sp,8 // r3 <= args -+ mr r4,r5 // r4 <= paramCount -+ mr r5,r6 // r5 <= params -+ add r6,r3,r10 // r6 <= gpregs ( == args + r10 ) -+ mr r30,r6 // store in r30 for use later... -+ addi r7,r6,32 // r7 <= fpregs ( == gpregs + 32 ) - -- bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs) -+ bl invoke_copy_to_stack@local // (args, paramCount, params, gpregs, fpregs) - -- lfd f1,32(r30) # load FP registers with method parameters -+ lfd f1,32(r30) // load FP registers with method parameters - lfd f2,40(r30) - lfd f3,48(r30) - lfd f4,56(r30) -@@ -98,18 +98,13 @@ XPTC_InvokeByIndex: - lfd f7,80(r30) - lfd f8,88(r30) - -- lwz r3,8(r31) # r3 <= that -- lwz r4,12(r31) # r4 <= methodIndex -- lwz r5,0(r3) # r5 <= vtable ( == *that ) -- slwi r4,r4,3 # convert to offset ( *= 8 ) -- addi r4,r4,8 # skip first two vtable entries -- add r4,r4,r5 -- lhz r0,0(r4) # virtual base offset -- extsh r0,r0 -- add r3,r3,r0 -- lwz r0,4(r4) # r0 <= methodpointer ( == vtable + offset ) -+ lwz r3,8(r31) // r3 <= that -+ lwz r4,12(r31) // r4 <= methodIndex -+ lwz r5,0(r3) // r5 <= vtable ( == *that ) -+ slwi r4,r4,2 // convert to offset ( *= 4 ) -+ lwzx r0,r4,r5 // r0 <= methodpointer ( == vtable + offset ) - -- lwz r4,4(r30) # load GP regs with method parameters -+ lwz r4,4(r30) // load GP regs with method parameters - lwz r5,8(r30) - lwz r6,12(r30) - lwz r7,16(r30) -@@ -117,13 +112,13 @@ XPTC_InvokeByIndex: - lwz r9,24(r30) - lwz r10,28(r30) - -- mtlr r0 # copy methodpointer to LR -- blrl # call method -+ mtlr r0 // copy methodpointer to LR -+ blrl // call method - -- lwz r30,16(r31) # restore r30 & r31 -+ lwz r30,16(r31) // restore r30 & r31 - lwz r31,20(r31) - -- lwz r11,0(sp) # clean up the stack -+ lwz r11,0(sp) // clean up the stack - lwz r0,4(r11) - mtlr r0 - mr sp,r11 diff --git a/www/seamonkey/patches/patch-xm.orig b/www/seamonkey/patches/patch-xm.orig deleted file mode 100644 index 399652da49f..00000000000 --- a/www/seamonkey/patches/patch-xm.orig +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-xm.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - -NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp -@@ -40,9 +40,9 @@ - - // Platform specific code to invoke XPCOM methods on native objects - --// The purpose of XPTC_InvokeByIndex() is to map a platform -+// The purpose of NS_InvokeByIndex_P() is to map a platform - // indepenpent call to the platform ABI. To do that, --// XPTC_InvokeByIndex() has to determine the method to call via vtable -+// NS_InvokeByIndex_P() has to determine the method to call via vtable - // access. The parameters for the method are read from the - // nsXPTCVariant* and prepared for the native ABI. For the Linux/PPC - // ABI this means that the first 8 integral and floating point -@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d, - if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack - *((double*) d) = s->val.d; - d += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - } - else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d, - else { - *((float*) d) = s->val.f; - d += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - } - else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 -@@ -142,6 +146,6 @@ invoke_copy_to_stack(PRUint32* d, - } - - extern "C" --XPTC_PUBLIC_API(nsresult) --XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+EXPORT_XPCOM_API(nsresult) -+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, - PRUint32 paramCount, nsXPTCVariant* params); diff --git a/www/seamonkey/patches/patch-xn.orig b/www/seamonkey/patches/patch-xn.orig deleted file mode 100644 index 42765e2e06e..00000000000 --- a/www/seamonkey/patches/patch-xn.orig +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-xn.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2010-03-31 05:56:51.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s 2010-03-31 06:28:51.000000000 -0400 -@@ -42,8 +42,46 @@ - - /* This code is for MIPS using the O32 ABI. */ - --#include <sys/regdef.h> --#include <sys/asm.h> -+#ifdef __NetBSD__ -+# include <machine/regdef.h> -+# include <machine/asm.h> -+# ifndef fp -+# define fp s8 -+# endif -+# ifndef PTRLOG -+# if SZREG == 4 -+# define PTRLOG 2 -+# else -+# define PTRLOG 3 -+# endif -+# endif -+# ifndef SETUP_GP -+# if defined(__mips_o32) -+# define SETUP_GP \ -+ .set push; \ -+ .set noreorder; \ -+ .cpload t9; \ -+ .set pop -+# define SAVE_GP(x) \ -+ .cprestore x -+# else -+# define SETUP_GP -+# define SAVE_GP(x) -+# endif -+# endif -+# ifndef ALSZ -+# if defined(__mips_n32) || defined(__mips_n64) -+# define ALSZ 15 -+# define ALMASK ~15 -+# else -+# define ALSZ 7 -+# define ALMASK ~7 -+# endif -+# endif -+#else -+# include <sys/regdef.h> -+# include <sys/asm.h> -+#endif - - # NARGSAVE is the argument space in the callers frame, including extra - # 'shadowed' space for the argument registers. The minimum of 4 diff --git a/www/seamonkey/patches/patch-xo.orig b/www/seamonkey/patches/patch-xo.orig deleted file mode 100644 index 8c424e4c199..00000000000 --- a/www/seamonkey/patches/patch-xo.orig +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-xo.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2010-03-31 06:23:31.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s 2010-03-31 06:28:23.000000000 -0400 -@@ -26,8 +26,46 @@ - - /* This code is for MIPS using the O32 ABI. */ - --#include <sys/regdef.h> --#include <sys/asm.h> -+#ifdef __NetBSD__ -+# include <machine/regdef.h> -+# include <machine/asm.h> -+# ifndef fp -+# define fp s8 -+# endif -+# ifndef PTRLOG -+# if SZREG == 4 -+# define PTRLOG 2 -+# else -+# define PTRLOG 3 -+# endif -+# endif -+# ifndef SETUP_GP -+# if defined(__mips_o32) -+# define SETUP_GP \ -+ .set push; \ -+ .set noreorder; \ -+ .cpload t9; \ -+ .set pop -+# define SAVE_GP(x) \ -+ .cprestore x -+# else -+# define SETUP_GP -+# define SAVE_GP(x) -+# endif -+# endif -+# ifndef ALSZ -+# if defined(__mips_n32) || defined(__mips_n64) -+# define ALSZ 15 -+# define ALMASK ~15 -+# else -+# define ALSZ 7 -+# define ALMASK ~7 -+# endif -+# endif -+#else -+# include <sys/regdef.h> -+# include <sys/asm.h> -+#endif - - # NARGSAVE is the argument space in the callers frame, including extra - # 'shadowed' space for the argument registers. The minimum of 4 diff --git a/www/seamonkey/patches/patch-za.orig b/www/seamonkey/patches/patch-za.orig deleted file mode 100644 index e44cfe0be7d..00000000000 --- a/www/seamonkey/patches/patch-za.orig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-za.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - ---- suite/app/Makefile.in.orig 2011-09-28 23:11:01.000000000 +0000 -+++ suite/app/Makefile.in -@@ -91,6 +91,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - TK_LIBS := -framework Cocoa $(TK_LIBS) - endif - -+ifeq ($(OS_ARCH),NetBSD) -+LIBS += -lossaudio -+endif -+ - APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS) - - LIBS += \ diff --git a/www/seamonkey/patches/patch-zc.orig b/www/seamonkey/patches/patch-zc.orig deleted file mode 100644 index 1ac6886c0df..00000000000 --- a/www/seamonkey/patches/patch-zc.orig +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-zc.orig,v 1.1 2012/03/10 03:26:07 ryoon Exp $ - ---- suite/app/nsSuiteApp.cpp.orig 2009-10-25 15:29:07.000000000 +0100 -+++ suite/app/nsSuiteApp.cpp -@@ -44,6 +44,27 @@ - - #include <stdio.h> - #include <stdarg.h> -+#include <sys/resource.h> -+/* -+ * On netbsd-4, ulimit -n is 64 by default; too few for us. -+ */ -+static void netbsd_fixrlimit(void) { -+ struct rlimit rlp; -+ if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) { -+ fprintf(stderr, "warning: getrlimit failed\n"); -+ return; -+ } -+ if (rlp.rlim_cur >= 512) -+ return; -+ if (rlp.rlim_max < 512) { -+ fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n"); -+ rlp.rlim_cur = rlp.rlim_max; -+ } -+ else -+ rlp.rlim_cur = 512; -+ if (setrlimit(RLIMIT_NOFILE, &rlp) == -1) -+ fprintf(stderr, "warning: setrlimit failed\n"); -+} - - #include "nsCOMPtr.h" - #include "nsILocalFile.h" -@@ -83,6 +104,7 @@ public: - - int main(int argc, char* argv[]) - { -+ netbsd_fixrlimit(); - ScopedLogging log; - - nsCOMPtr<nsILocalFile> appini; |