[Glibc-bsd-commits] r1931 - in trunk/web/patches: . debian-only
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Thu May 17 10:53:01 UTC 2007
Author: ps-guest
Date: 2007-05-17 10:53:01 +0000 (Thu, 17 May 2007)
New Revision: 1931
Removed:
trunk/web/patches/acpica-unix.diff
trunk/web/patches/avahi.diff
trunk/web/patches/debian-only/postfix.diff
trunk/web/patches/firefox_1.5.diff
trunk/web/patches/iceape.diff
trunk/web/patches/icedove.diff
trunk/web/patches/jack-audio-connection-kit.diff
trunk/web/patches/kdebase.diff
trunk/web/patches/libtool.diff
trunk/web/patches/mplayer.diff
trunk/web/patches/qt4-x11.diff
trunk/web/patches/samba.bash
trunk/web/patches/vpnc.diff
trunk/web/patches/xterm.diff
trunk/web/patches/xulrunner.diff
Log:
* drop obsolete patches
Deleted: trunk/web/patches/acpica-unix.diff
===================================================================
--- trunk/web/patches/acpica-unix.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/acpica-unix.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,28 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u acpica-unix-20050930/debian/control acpica-unix-20050930/debian/control
---- acpica-unix-20050930/debian/control
-+++ acpica-unix-20050930/debian/control
-@@ -6,7 +6,7 @@
- Standards-Version: 3.6.2
-
- Package: iasl
--Architecture: i386 ia64 amd64
-+Architecture: i386 ia64 amd64 kfreebsd-i386
- Depends: ${shlibs:Depends}
- Description: Intel ASL compiler/decompiler
- iASL compiles ASL (ACPI Source Language) into AML (ACPI Machine
-only in patch2:
-unchanged:
---- acpica-unix-20050930.orig/include/platform/acenv.h
-+++ acpica-unix-20050930/include/platform/acenv.h
-@@ -211,7 +211,7 @@
- #elif defined(MSDOS) /* Must appear after WIN32 and WIN64 check */
- #include "acdos16.h"
-
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include "acfreebsd.h"
-
- #elif defined(__NetBSD__)
Deleted: trunk/web/patches/avahi.diff
===================================================================
--- trunk/web/patches/avahi.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/avahi.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,39 +0,0 @@
-diff -u avahi-0.6.14/debian/control avahi-0.6.14/debian/control
---- avahi-0.6.14/debian/control
-+++ avahi-0.6.14/debian/control
-@@ -42,7 +42,7 @@
-
- Package: avahi-autoipd
- Section: net
--Architecture: any
-+Architecture: i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
- Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
- Recommends: dhclient, iproute
- Conflicts: zeroconf
-diff -u avahi-0.6.14/debian/rules avahi-0.6.14/debian/rules
---- avahi-0.6.14/debian/rules
-+++ avahi-0.6.14/debian/rules
-@@ -9,6 +9,8 @@
- include /usr/share/cdbs/1/rules/utils.mk
- common-binary-post-install-arch:: list-missing
-
-+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-+
- # Ensure at build time that the library has no dependencies on undefined
- # symbols, and speed up loading.
- LDFLAGS += -Wl,-z,defs -Wl,-O1
-@@ -16,6 +18,9 @@
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \
- --disable-mono --disable-monodoc
-
-+ifneq (linux,$(DEB_HOST_ARCH_OS))
-+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd
-+endif
-
- DEB_INSTALL_DOCS_ALL += docs/README docs/NEWS
-
-@@ -40,2 +45,4 @@
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
- mv $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/avahi-autoipd \
- $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd
-+endif
Deleted: trunk/web/patches/debian-only/postfix.diff
===================================================================
--- trunk/web/patches/debian-only/postfix.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/debian-only/postfix.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,79 +0,0 @@
-
-Previous patch (patches/postfix.diff) obsoleted by 30hurd.patch which is now in
-Debian's postfix source.
-
-Changed a little bit to make IPv6 compile on GNU/kFreeBSD.
-
-
-Robin Elfrink
-
-
-diff -u postfix-2.3.6/debian/rules postfix-2.3.6/debian/rules
---- postfix-2.3.6/debian/rules
-+++ postfix-2.3.6/debian/rules
-@@ -198,7 +198,7 @@
- $(checkdir)
- dh_clean build
- test ! -d ${base} || rm -rf ${base}
-- $(MAKE) tidy
-+ -$(MAKE) tidy
-
- clean: clean-preunpatch unpatch
- rm -rf debian/{files*,vars,*substvars,*.debhelper}
-diff -u postfix-2.3.6/debian/patches/30hurd.dpatch postfix-2.3.6/debian/patches/30hurd.dpatch
---- postfix-2.3.6/debian/patches/30hurd.dpatch
-+++ postfix-2.3.6/debian/patches/30hurd.dpatch
-@@ -8,7 +8,7 @@
- diff -Nur postfix-2.2.9_old/makedefs postfix-2.2.9/makedefs
- --- postfix-2.2.9_old/makedefs 2006-01-03 22:50:25.000000000 +0100
- +++ postfix-2.2.9/makedefs 2006-03-11 13:12:49.000000000 +0100
--@@ -259,6 +259,38 @@
-+@@ -259,6 +259,42 @@
- 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
- esac
- ;;
-@@ -41,8 +41,12 @@
- + }
- + done
- + done
--+ # currently no IPv6 support on Hurd
--+ CCARGS="$CCARGS -DNO_IPV6"
-++ case "`uname -s`" in
-++ GNU)
-++ # currently no IPv6 support on Hurd
-++ CCARGS="$CCARGS -DNO_IPV6"
-++ ;;
-++ esac
- + ;;
- IRIX*.5.*) SYSTYPE=IRIX5
- # Use the native compiler by default
-@@ -50,7 +54,7 @@
- diff -Nur postfix-2.2.9_old/src/util/sys_defs.h postfix-2.2.9/src/util/sys_defs.h
- --- postfix-2.2.9_old/src/util/sys_defs.h 2006-01-03 22:52:17.000000000 +0100
- +++ postfix-2.2.9/src/util/sys_defs.h 2006-03-11 14:29:44.000000000 +0100
--@@ -687,6 +687,62 @@
-+@@ -687,6 +687,70 @@
- #endif
-
- /*
-@@ -99,10 +103,18 @@
- +#endif
- +#define SOCKADDR_SIZE socklen_t
- +#define SOCKOPT_SIZE socklen_t
-++#ifdef __FreeBSD_kernel__
-++# define HAS_DUPLEX_PIPE
-++# define HAS_ISSETUGID
-++#endif
- +#ifndef NO_IPV6
- +# define HAS_IPV6
--+# define HAS_PROCNET_IFINET6
--+# define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
-++# ifdef __FreeBSD_kernel__
-++# define HAVE_GETIFADDRS
-++# else
-++# define HAS_PROCNET_IFINET6
-++# define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
-++# endif
- +#endif
- +#define CANT_USE_SEND_RECV_MSG
- +#define DEF_SMTP_CACHE_DEMAND 0
Deleted: trunk/web/patches/firefox_1.5.diff
===================================================================
--- trunk/web/patches/firefox_1.5.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/firefox_1.5.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,769 +0,0 @@
-
-* apply this patch
-* update *all* config.sub/config.guess
-* autoconf; cd nsprpub; autoconf
-
-diff -u firefox-1.5.dfsg+1.5.0.7/nsprpub/configure.in firefox-1.5.dfsg+1.5.0.7/nsprpub/configure.in
---- firefox-1.5.dfsg+1.5.0.7/nsprpub/configure.in
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/configure.in
-@@ -1370,7 +1370,7 @@
- esac
- ;;
-
--*-linux*)
-+*-linux*|*-gnu*|*-k*bsd*-gnu)
- if test -z "$USE_NSPR_THREADS"; then
- USE_PTHREADS=1
- IMPL_STRATEGY=_PTH
-@@ -1381,7 +1381,11 @@
- AC_DEFINE(_SVID_SOURCE)
- AC_DEFINE(_LARGEFILE64_SOURCE)
- AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-- AC_DEFINE(LINUX)
-+ case "${target_os}" in
-+ linux*)
-+ AC_DEFINE(LINUX)
-+ ;;
-+ esac
- CFLAGS="$CFLAGS -ansi -Wall"
- CXXFLAGS="$CXXFLAGS -ansi -Wall"
- MDCPUCFG_H=_linux.cfg
-@@ -2456,7 +2460,7 @@
- _PTHREAD_LDFLAGS=-pthread
- fi
- ;;
-- *-linux*)
-+ *-linux*|*-gnu*|*-k*bsd*-gnu)
- AC_DEFINE(_REENTRANT)
- ;;
- esac
-@@ -2540,7 +2544,7 @@
- fi
- fi
- ;;
--*-linux*)
-+*-linux*|*-gnu*|*-k*bsd*-gnu)
- if test -n "$USE_NSPR_THREADS"; then
- AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
- fi
-diff -u firefox-1.5.dfsg+1.5.0.7/security/nss/lib/freebl/unix_rand.c firefox-1.5.dfsg+1.5.0.7/security/nss/lib/freebl/unix_rand.c
---- firefox-1.5.dfsg+1.5.0.7/security/nss/lib/freebl/unix_rand.c
-+++ firefox-1.5.dfsg+1.5.0.7/security/nss/lib/freebl/unix_rand.c
-@@ -81,7 +81,8 @@
- }
-
- #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
-- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
-+ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-+ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
- #include <sys/times.h>
-
- #define getdtablesize() sysconf(_SC_OPEN_MAX)
-diff -u firefox-1.5.dfsg+1.5.0.7/security/coreconf/Linux.mk firefox-1.5.dfsg+1.5.0.7/security/coreconf/Linux.mk
---- firefox-1.5.dfsg+1.5.0.7/security/coreconf/Linux.mk
-+++ firefox-1.5.dfsg+1.5.0.7/security/coreconf/Linux.mk
-@@ -52,75 +52,42 @@
-
- DEFAULT_COMPILER = gcc
-
--ifeq ($(OS_TEST),m68k)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = m68k
--else
--ifeq ($(OS_TEST),ppc64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = ppc64
--else
--ifeq ($(OS_TEST),ppc)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = ppc
-+CPU_ARCH = $(OS_TEST)
-+
-+ifeq ($(KERNEL),linux)
-+ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
-+ ARCH = linux
- else
-+ OS_REL_CFLAGS = -D_XOPEN_SOURCE
-+ ARCH = gnu
-+
-+endif
-+
-+
- ifeq ($(OS_TEST),alpha)
-- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = alpha
--else
--ifeq ($(OS_TEST),ia64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = ia64
--else
--ifeq ($(OS_TEST),x86_64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = x86_64
--else
--ifeq ($(OS_TEST),sparc)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = sparc
-+ OS_REL_CFLAGS += -D_ALPHA_
- else
- ifeq ($(OS_TEST),sparc64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = sparc
- else
- ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = arm
- else
- ifeq ($(OS_TEST),parisc)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = hppa
- else
- ifeq ($(OS_TEST),parisc64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = hppa
- else
--ifeq ($(OS_TEST),s390)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = s390
--else
- ifeq ($(OS_TEST),s390x)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = s390x
- else
- ifeq ($(OS_TEST),mips64)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = mips
--else
--ifeq ($(OS_TEST),mips)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = mips
- else
- ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-+ OS_REL_CFLAGS += -Di386
- CPU_ARCH = x86
--else
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = $(OS_TEST)
--endif
--endif
--endif
- endif
- endif
- endif
-@@ -129,16 +96,11 @@
- endif
- endif
- endif
--endif
--endif
--endif
--endif
--endif
-
-
- LIBC_TAG = _glibc
-
--ifeq ($(OS_RELEASE),2.0)
-+ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
- OS_REL_CFLAGS += -DLINUX2_0
- MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
- ifdef BUILD_OPT
-@@ -155,20 +117,22 @@
- OS_PTHREAD = -lpthread
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-+ifeq ($(KERNEL),linux)
-+OS_CFLAGS += -DLINUX -Dlinux
-+endif
- OS_LIBS = $(OS_PTHREAD) -ldl -lc
-
- ifdef USE_PTHREADS
- DEFINES += -D_REENTRANT
- endif
-
--ARCH = linux
-
- DSO_CFLAGS = -fPIC
- DSO_LDOPTS = -shared
- DSO_LDFLAGS =
-
--# INCLUDES += -I/usr/include -Y/usr/include/linux
-+# INCLUDES += -I/usr/include
- G++INCLUDES = -I/usr/include/g++
-
- #
-diff -u firefox-1.5.dfsg+1.5.0.7/configure.in firefox-1.5.dfsg+1.5.0.7/configure.in
---- firefox-1.5.dfsg+1.5.0.7/configure.in
-+++ firefox-1.5.dfsg+1.5.0.7/configure.in
-@@ -809,6 +809,7 @@
- OS_TEST="${target_cpu}"
- case "${target_os}" in
- linux*) OS_ARCH=Linux ;;
-+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- mingw*) OS_ARCH=WINNT ;;
- wince*) OS_ARCH=WINCE ;;
-@@ -821,6 +822,7 @@
- OS_TEST="${host_cpu}"
- case "${host_os}" in
- linux*) OS_ARCH=Linux ;;
-+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- mingw*) OS_ARCH=WINNT ;;
- wince*) OS_ARCH=WINCE ;;
-@@ -1265,7 +1267,7 @@
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
- ;;
-
--*-linux*)
-+*-linux*|*-kfreebsd*-gnu)
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
- HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-@@ -2173,7 +2175,7 @@
- dnl = Flags to strip unused symbols from .so components
- dnl ========================================================
- case "$target" in
-- *-linux*)
-+ *-linux*|*-kfreebsd*-gnu)
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
- ;;
- *-solaris*)
-@@ -2739,7 +2741,7 @@
- fi
- ;;
-
-- *-*-linux*)
-+ *-*-linux*|*-*-kfreebsd*-gnu)
- AC_DEFINE(_REENTRANT)
- ;;
-
-diff -u firefox-1.5.dfsg+1.5.0.7/xpcom/reflect/xptcall/src/md/unix/Makefile.in firefox-1.5.dfsg+1.5.0.7/xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- firefox-1.5.dfsg+1.5.0.7/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ firefox-1.5.dfsg+1.5.0.7/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,7 +70,7 @@
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
- #
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
- # Linux/x86-64
- ifeq (x86_64,$(OS_TEST))
- CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/config/nsinstall.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/config/nsinstall.c
-@@ -98,7 +98,7 @@
- }
- #endif /* NEXTSTEP */
-
--#ifdef LINUX
-+#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
- #include <getopt.h>
- #endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/include/md/_linux.cfg
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/include/md/_linux.cfg
-@@ -35,6 +35,11 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
-+/*
-+ * This file is used by not only Linux but also other glibc systems
-+ * such as GNU/Hurd and GNU/k*BSD.
-+ */
-+
- #ifndef nspr_cpucfg___
- #define nspr_cpucfg___
-
-@@ -42,11 +47,15 @@
- #define XP_UNIX
- #endif
-
--#ifndef LINUX
-+#if !defined(LINUX) && defined(__linux__)
- #define LINUX
- #endif
-
-+#ifdef __FreeBSD_kernel__
-+#define PR_AF_INET6 28 /* same as AF_INET6 */
-+#else
- #define PR_AF_INET6 10 /* same as AF_INET6 */
-+#endif
-
- #ifdef __powerpc64__
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/include/md/_linux.h
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/include/md/_linux.h
-@@ -41,6 +41,15 @@
- #include "prthread.h"
-
- /*
-+ * This file is used by not only Linux but also other glibc systems
-+ * such as GNU/Hurd and GNU/k*BSD.
-+ */
-+
-+#ifdef __FreeBSD_kernel__
-+#define _PR_HAVE_SOCKADDR_LEN
-+#endif
-+
-+/*
- * Internal configuration macros
- */
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/include/md/_pth.h
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/include/md/_pth.h
-@@ -143,10 +143,15 @@
- (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
- #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-- || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
-+ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(HPUX) || defined(FREEBSD) \
- || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
- || defined(VMS) || defined(NTO) || defined(DARWIN) \
- || defined(UNIXWARE) || defined(RISCOS)
-+#ifdef __GNU__
-+/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-+#error Using Hurd pthreads
-+#endif
- #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0
- #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0
- #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-@@ -195,7 +200,8 @@
- /*
- * These platforms don't have sigtimedwait()
- */
--#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
-+#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-+ || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
- || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
- || defined(DARWIN)
-@@ -235,7 +241,8 @@
- #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
- #endif /* defined(_PR_DCETHREADS) */
-
--#elif defined(LINUX) || defined(FREEBSD)
-+#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD)
- #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -291,7 +298,8 @@
- onemillisec.tv_nsec = 1000000L; \
- nanosleep(&onemillisec,NULL); \
- PR_END_MACRO
--#elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
-+#elif defined(HPUX) || defined(SOLARIS) \
-+ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
- || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- || defined(BSDI) || defined(NTO) || defined(DARWIN) \
- || defined(UNIXWARE) || defined(RISCOS)
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/include/md/_unixos.h
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/include/md/_unixos.h
-@@ -46,7 +46,8 @@
- * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
- * not be redefined.
- */
--#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
-+#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-+ && !defined(DARWIN) && !defined(NEXTSTEP)
- #ifndef FD_SETSIZE
- #define FD_SETSIZE 4096
- #endif
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/include/md/prosdep.h
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/include/md/prosdep.h
-@@ -90,7 +90,7 @@
- #elif defined(IRIX)
- #include "md/_irix.h"
-
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
- #include "md/_linux.h"
-
- #elif defined(OSF1)
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/linking/Makefile.in
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/linking/Makefile.in
-@@ -63,7 +63,7 @@
- INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
- # For Dl_info and dladdr.
--ifeq ($(OS_TARGET),Linux)
-+ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
- DEFINES += -D_GNU_SOURCE
- endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/linking/prlink.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/linking/prlink.c
-@@ -1374,7 +1374,8 @@
- PR_IMPLEMENT(char *)
- PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
- {
--#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-+#if defined(SOLARIS) || defined(FREEBSD) \
-+ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
- Dl_info dli;
- char *result;
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/md/prosdep.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/md/prosdep.c
-@@ -63,7 +63,8 @@
-
- /* Get page size */
- #ifdef XP_UNIX
--#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
-+#if defined SUNOS4 || defined BSDI || defined AIX \
-+ || defined LINUX || defined __GNU__ || defined __GLIBC__ \
- || defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined DARWIN || defined NEXTSTEP
- _pr_pageSize = getpagesize();
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/md/unix/unix.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/md/unix/unix.c
-@@ -65,7 +65,7 @@
- * PRInt32* pointer to a _PRSockLen_t* pointer.
- */
- #if defined(HAVE_SOCKLEN_T) \
-- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+ || (defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
- || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/md/unix/uxproces.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/md/unix/uxproces.c
-@@ -92,7 +92,8 @@
- * that can share the virtual address space and file descriptors.
- */
- #if (defined(IRIX) && !defined(_PR_PTHREADS)) \
-- || (defined(LINUX) && defined(_PR_PTHREADS))
-+ || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
-+ && defined(_PR_PTHREADS))
- #define _PR_SHARE_CLONES
- #endif
-
-@@ -106,7 +107,8 @@
- */
-
- #if defined(_PR_GLOBAL_THREADS_ONLY) \
-- || (defined(_PR_PTHREADS) && !defined(LINUX))
-+ || (defined(_PR_PTHREADS) \
-+ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
- #define _PR_NATIVE_THREADS
- #endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/md/unix/uxrng.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/md/unix/uxrng.c
-@@ -138,7 +138,8 @@
- return 0;
- }
-
--#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD))
-+#elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-+ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/misc/prnetdb.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/misc/prnetdb.c
-@@ -108,7 +108,7 @@
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
-
--#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+#if (defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
- #endif
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/src/pthreads/ptio.c
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/src/pthreads/ptio.c
-@@ -205,7 +205,8 @@
- #define _PRSelectFdSetArg_t void *
- #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
- || defined(OSF1) || defined(SOLARIS) \
-- || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
-+ || defined(HPUX10_30) || defined(HPUX11) \
-+ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
- || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
- || defined(UNIXWARE) || defined(RISCOS)
-@@ -289,7 +290,7 @@
- * most current systems.
- */
- #if defined(HAVE_SOCKLEN_T) \
-- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+ || (defined(__GLIBC__) && __GLIBC__ >= 2)
- typedef socklen_t pt_SockLen;
- #elif (defined(AIX) && !defined(AIX4_1)) \
- || defined(VMS)
-@@ -3230,7 +3231,8 @@
- };
-
- #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-- || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
-+ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
- || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
- || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
- #define _PR_FCNTL_FLAGS O_NONBLOCK
-@@ -4727,7 +4729,8 @@
-
- #include <sys/types.h>
- #include <sys/time.h>
--#if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX)
-+#if !defined(SUNOS4) && !defined(HPUX) \
-+ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
- #include <sys/select.h>
- #endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/nsprpub/pr/tests/Makefile.in
-+++ firefox-1.5.dfsg+1.5.0.7/nsprpub/pr/tests/Makefile.in
-@@ -376,14 +376,10 @@
- EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
- endif
-
--ifeq ($(OS_ARCH), Linux)
-- ifeq ($(OS_RELEASE), 1.2)
-- EXTRA_LIBS = -ldl
-- else
-- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-- ifeq ($(USE_PTHREADS),1)
-- EXTRA_LIBS = -lpthread
-- endif
-+ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
-+ LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-+ ifeq ($(USE_PTHREADS),1)
-+ EXTRA_LIBS = -lpthread
- endif
- endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/security/nss/lib/ssl/sslmutex.c
-+++ firefox-1.5.dfsg+1.5.0.7/security/nss/lib/ssl/sslmutex.c
-@@ -89,7 +89,7 @@
- return SECSuccess;
- }
-
--#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-+#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-
- #include <unistd.h>
- #include <fcntl.h>
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/security/nss/lib/ssl/sslmutex.h
-+++ firefox-1.5.dfsg+1.5.0.7/security/nss/lib/ssl/sslmutex.h
-@@ -79,7 +79,7 @@
-
- typedef int sslPID;
-
--#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-+#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-
- #include <sys/types.h>
- #include "prtypes.h"
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/security/coreconf/Linux2.6.mk
-+++ firefox-1.5.dfsg+1.5.0.7/security/coreconf/Linux2.6.mk
-@@ -37,7 +37,10 @@
-
- include $(CORE_DEPTH)/coreconf/Linux.mk
-
-+ifeq ($(KERNEL), linux)
- OS_REL_CFLAGS += -DLINUX2_1
-+endif
-+
- MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
- ifdef BUILD_OPT
- OPTIMIZER = -O2
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/security/coreconf/arch.mk
-+++ firefox-1.5.dfsg+1.5.0.7/security/coreconf/arch.mk
-@@ -154,6 +154,14 @@
- ifneq ($(words $(OS_RELEASE)),1)
- OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
- endif
-+ KERNEL = linux
-+endif
-+
-+# This check must be last. Since all uses of OS_ARCH that follow affect only
-+# userland, we can merge other Glibc systems with Linux here.
-+ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
-+OS_ARCH = Linux
-+OS_RELEASE = 2.6
- endif
-
- #
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/security/coreconf/config.mk
-+++ firefox-1.5.dfsg+1.5.0.7/security/coreconf/config.mk
-@@ -63,7 +63,7 @@
- #######################################################################
-
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-- OpenVMS AIX
-+ OpenVMS AIX GNU GNU_%
-
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/directory/c-sdk/ldap/include/portable.h
-+++ firefox-1.5.dfsg+1.5.0.7/directory/c-sdk/ldap/include/portable.h
-@@ -116,7 +116,7 @@
- * some systems don't have the BSD re_comp and re_exec routines
- */
- #ifndef NEED_BSDREGEX
--#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-+#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi)
- #define NEED_BSDREGEX
- #endif
- #endif
-@@ -145,7 +145,7 @@
- * Is snprintf() part of the standard C runtime library?
- */
- #if !defined(HAVE_SNPRINTF)
--#if defined(SOLARIS) || defined(LINUX) || defined(HPUX)
-+#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX)
- #define HAVE_SNPRINTF
- #endif
- #endif
-@@ -165,7 +165,7 @@
- * for select()
- */
- #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
--#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS)
-+#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS)
- #include <sys/time.h>
- #else
- #include <sys/select.h>
-@@ -252,15 +252,14 @@
- #define HAVE_GETGRNAM_R
- #endif
-
--#if defined(SNI) || defined(LINUX1_2)
-+#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__)
- int strcasecmp(const char *, const char *);
- #ifdef SNI
- int strncasecmp(const char *, const char *, int);
--#endif /* SNI */
--#ifdef LINUX1_2
-+#else /* SNI */
- int strncasecmp(const char *, const char *, size_t);
--#endif /* LINUX1_2 */
--#endif /* SNI || LINUX1_2 */
-+#endif
-+#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */
-
- #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN)
- #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-@@ -276,7 +275,7 @@
- defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
- defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \
- ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
-+ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \
- defined(FREEBSD) || defined(OPENBSD) || \
- (defined(AIX) && !defined(USE_REENTRANT_LIBC))
- #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-@@ -300,7 +299,7 @@
- #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e )
- #endif
- #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \
-- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \
-+ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \
- defined(SCOOS) || defined(BSDI) || defined(NCR) || \
- defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \
- (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-@@ -320,7 +319,7 @@
- #endif
- #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
- defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \
-- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
- #define STRTOK( s1, s2, l ) strtok( s1, s2 )
- #else
- #define HAVE_STRTOK_R
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+++ firefox-1.5.dfsg+1.5.0.7/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-@@ -168,7 +168,7 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
- endif
-
--ifeq ($(OS_ARCH), Linux)
-+ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
-
-@@ -286,7 +286,7 @@
- ifdef SO_FILES_TO_REMOVE
- -$(RM) $(SO_FILES_TO_REMOVE)
- endif
--ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-+ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
- $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
- else
- ifeq ($(OS_ARCH),OS2)
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+++ firefox-1.5.dfsg+1.5.0.7/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-@@ -218,7 +218,7 @@
-
- #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
- defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
-- defined(OPENBSD) || defined(NETBSD)
-+ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
- #define EDEADLOCK -1
- #endif
-
-only in patch2:
-unchanged:
---- firefox-1.5.dfsg+1.5.0.7.orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-+++ firefox-1.5.dfsg+1.5.0.7/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-@@ -67,7 +67,7 @@
- *
- */
-
--#if defined(LINUX)
-+#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
-
- #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
- /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
Deleted: trunk/web/patches/iceape.diff
===================================================================
--- trunk/web/patches/iceape.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/iceape.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,1119 +0,0 @@
-
-* apply this patch
-* update *all* config.sub/config.guess by
- cp /usr/share/misc/config.{sub,guess} build/autoconf/
- cp /usr/share/misc/config.{sub,guess} nsprpub/build/autoconf/
- cp /usr/share/misc/config.{sub,guess} directory/c-sdk/config/autoconf/
-
-
-diff -urN iceape-1.0.6/debian/patches/00list iceape_1.0.6.kbsd/debian/patches/00list
---- iceape-1.0.6/debian/patches/00list 2006-12-02 23:07:06.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/00list 2006-12-02 21:42:31.000000000 +0100
-@@ -5,6 +5,7 @@
- 10_pangoxft
- 15_passwdmgr
- 18_arm_xpcom_unused_attribute
-+18_kbsd_nspr
- 18_m68k_xpcom
- 20_broken_perl
- 20_visibility
-@@ -12,7 +13,7 @@
- 25_gnome_helpers_with_params
- 25_passwdmgr_crash
- 25_xrender_bug_workaround
--28_ppc64_build
-+#28_ppc64_build
- 30_embedding_tests
- 30_killAll
- 32_print_command
-@@ -21,10 +22,11 @@
- 38_arm_xpcom_optim
- 38_hppa_xpcom
- 38_ia64_align
-+38_kbsd
- 38_mips64_build
- 38_mips_xpcom
- 38_sparc64_unichar_alignment
--38_unsupported_arch_build
-+#38_unsupported_arch_build
- 60_distclean
- 65_mouse_buttons
- 68_mips_performance
-diff -urN iceape-1.0.6/debian/patches/18_kbsd_nspr.dpatch iceape_1.0.6.kbsd/debian/patches/18_kbsd_nspr.dpatch
---- iceape-1.0.6/debian/patches/18_kbsd_nspr.dpatch 1970-01-01 01:00:00.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/18_kbsd_nspr.dpatch 2006-12-02 21:41:08.000000000 +0100
-@@ -0,0 +1,417 @@
-+#!/bin/sh -e
-+## 18_kbsd_nspr.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support for nspr
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=261649
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=355999
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -urN mozilla/nsprpub/config/nsinstall.c mozilla/nsprpub/config/nsinstall.c
-+--- mozilla/nsprpub/config/nsinstall.c 2004-04-28 02:33:11.000000000 +0200
-++++ mozilla/nsprpub/config/nsinstall.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -98,7 +98,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
-+--- mozilla/nsprpub/pr/include/md/_linux.cfg 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.cfg 2006-11-20 22:10:27.000000000 +0100
-+@@ -35,6 +35,11 @@
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-++/*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-+ #ifndef nspr_cpucfg___
-+ #define nspr_cpucfg___
-+
-+@@ -42,11 +47,15 @@
-+ #define XP_UNIX
-+ #endif
-+
-+-#ifndef LINUX
-++#if !defined(LINUX) && defined(__linux__)
-+ #define LINUX
-+ #endif
-+
-++#ifdef __FreeBSD_kernel__
-++#define PR_AF_INET6 28 /* same as AF_INET6 */
-++#else
-+ #define PR_AF_INET6 10 /* same as AF_INET6 */
-++#endif
-+
-+ #ifdef __powerpc64__
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
-+--- mozilla/nsprpub/pr/include/md/_linux.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -41,6 +41,15 @@
-+ #include "prthread.h"
-+
-+ /*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-++#ifdef __FreeBSD_kernel__
-++#define _PR_HAVE_SOCKADDR_LEN
-++#endif
-++
-++/*
-+ * Internal configuration macros
-+ */
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_pth.h mozilla/nsprpub/pr/include/md/_pth.h
-+--- mozilla/nsprpub/pr/include/md/_pth.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_pth.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -143,10 +143,15 @@
-+ (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+ #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-+- || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(HPUX) || defined(FREEBSD) \
-+ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-+ || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-++#ifdef __GNU__
-++/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-++#error Using Hurd pthreads
-++#endif
-+ #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0
-+ #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+@@ -195,7 +200,8 @@
-+ /*
-+ * These platforms don't have sigtimedwait()
-+ */
-+-#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
-++#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-++ || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
-+ || defined(DARWIN)
-+@@ -235,7 +241,8 @@
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #endif /* defined(_PR_DCETHREADS) */
-+
-+-#elif defined(LINUX) || defined(FREEBSD)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(FREEBSD)
-+ #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #elif defined(NTO)
-+@@ -291,7 +298,8 @@
-+ onemillisec.tv_nsec = 1000000L; \
-+ nanosleep(&onemillisec,NULL); \
-+ PR_END_MACRO
-+-#elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
-++#elif defined(HPUX) || defined(SOLARIS) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+diff -urN mozilla/nsprpub/pr/include/md/_unixos.h mozilla/nsprpub/pr/include/md/_unixos.h
-+--- mozilla/nsprpub/pr/include/md/_unixos.h 2005-01-17 23:13:36.000000000 +0100
-++++ mozilla/nsprpub/pr/include/md/_unixos.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -46,7 +46,8 @@
-+ * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
-+ * not be redefined.
-+ */
-+-#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
-++#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-++ && !defined(DARWIN) && !defined(NEXTSTEP)
-+ #ifndef FD_SETSIZE
-+ #define FD_SETSIZE 4096
-+ #endif
-+diff -urN mozilla/nsprpub/pr/include/md/prosdep.h mozilla/nsprpub/pr/include/md/prosdep.h
-+--- mozilla/nsprpub/pr/include/md/prosdep.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/prosdep.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -90,7 +90,7 @@
-+ #elif defined(IRIX)
-+ #include "md/_irix.h"
-+
-+-#elif defined(LINUX)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include "md/_linux.h"
-+
-+ #elif defined(OSF1)
-+diff -urN mozilla/nsprpub/pr/src/linking/Makefile.in mozilla/nsprpub/pr/src/linking/Makefile.in
-+--- mozilla/nsprpub/pr/src/linking/Makefile.in 2006-01-05 16:40:18.000000000 +0100
-++++ mozilla/nsprpub/pr/src/linking/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-+
-+ # For Dl_info and dladdr.
-+-ifeq ($(OS_TARGET),Linux)
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
-+ DEFINES += -D_GNU_SOURCE
-+ endif
-+
-+diff -urN mozilla/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
-+--- mozilla/nsprpub/pr/src/linking/prlink.c 2005-08-18 19:24:29.000000000 +0200
-++++ mozilla/nsprpub/pr/src/linking/prlink.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -1374,7 +1374,8 @@
-+ PR_IMPLEMENT(char *)
-+ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
-+ {
-+-#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-++#if defined(SOLARIS) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ Dl_info dli;
-+ char *result;
-+
-+diff -urN mozilla/nsprpub/pr/src/md/prosdep.c mozilla/nsprpub/pr/src/md/prosdep.c
-+--- mozilla/nsprpub/pr/src/md/prosdep.c 2004-04-28 02:33:56.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/prosdep.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,8 @@
-+
-+ /* Get page size */
-+ #ifdef XP_UNIX
-+-#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
-++#if defined SUNOS4 || defined BSDI || defined AIX \
-++ || defined LINUX || defined __GNU__ || defined __GLIBC__ \
-+ || defined FREEBSD || defined NETBSD || defined OPENBSD \
-+ || defined DARWIN || defined NEXTSTEP
-+ _pr_pageSize = getpagesize();
-+diff -urN mozilla/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
-+--- mozilla/nsprpub/pr/src/md/unix/unix.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -65,7 +65,7 @@
-+ * PRInt32* pointer to a _PRSockLen_t* pointer.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PRSockLen_t socklen_t
-+ #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-+ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxproces.c mozilla/nsprpub/pr/src/md/unix/uxproces.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxproces.c 2004-12-15 06:52:40.000000000 +0100
-++++ mozilla/nsprpub/pr/src/md/unix/uxproces.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -92,7 +92,8 @@
-+ * that can share the virtual address space and file descriptors.
-+ */
-+ #if (defined(IRIX) && !defined(_PR_PTHREADS)) \
-+- || (defined(LINUX) && defined(_PR_PTHREADS))
-++ || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
-++ && defined(_PR_PTHREADS))
-+ #define _PR_SHARE_CLONES
-+ #endif
-+
-+@@ -106,7 +107,8 @@
-+ */
-+
-+ #if defined(_PR_GLOBAL_THREADS_ONLY) \
-+- || (defined(_PR_PTHREADS) && !defined(LINUX))
-++ || (defined(_PR_PTHREADS) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
-+ #define _PR_NATIVE_THREADS
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxrng.c mozilla/nsprpub/pr/src/md/unix/uxrng.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -138,7 +138,8 @@
-+ return 0;
-+ }
-+
-+-#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD))
-++#elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-++ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/nsprpub/pr/src/misc/prnetdb.c mozilla/nsprpub/pr/src/misc/prnetdb.c
-+--- mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -108,7 +108,7 @@
-+ #define _PR_HAVE_GETPROTO_R_INT
-+ #endif
-+
-+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++#if (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PR_HAVE_GETPROTO_R
-+ #define _PR_HAVE_5_ARG_GETPROTO_R
-+ #endif
-+diff -urN mozilla/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
-+--- mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -205,7 +205,8 @@
-+ #define _PRSelectFdSetArg_t void *
-+ #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(OSF1) || defined(SOLARIS) \
-+- || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
-++ || defined(HPUX10_30) || defined(HPUX11) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+@@ -289,7 +290,7 @@
-+ * most current systems.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ typedef socklen_t pt_SockLen;
-+ #elif (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(VMS)
-+@@ -3230,7 +3231,8 @@
-+ };
-+
-+ #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-+- || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-+ || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
-+ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-+ #define _PR_FCNTL_FLAGS O_NONBLOCK
-+@@ -4727,7 +4729,8 @@
-+
-+ #include <sys/types.h>
-+ #include <sys/time.h>
-+-#if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX)
-++#if !defined(SUNOS4) && !defined(HPUX) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
-+ #include <sys/select.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/tests/Makefile.in mozilla/nsprpub/pr/tests/Makefile.in
-+--- mozilla/nsprpub/pr/tests/Makefile.in 2004-04-28 02:34:16.000000000 +0200
-++++ mozilla/nsprpub/pr/tests/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -376,14 +376,10 @@
-+ EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-+- ifeq ($(OS_RELEASE), 1.2)
-+- EXTRA_LIBS = -ldl
-+- else
-+- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-+- ifeq ($(USE_PTHREADS),1)
-+- EXTRA_LIBS = -lpthread
-+- endif
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
-++ LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-++ ifeq ($(USE_PTHREADS),1)
-++ EXTRA_LIBS = -lpthread
-+ endif
-+ endif
-+
-+diff -urN mozilla/nsprpub/configure.in mozilla/nsprpub/configure.in
-+--- mozilla/nsprpub/configure.in 2006-02-23 00:03:11.000000000 +0100
-++++ mozilla/nsprpub/configure.in 2006-11-20 22:10:26.000000000 +0100
-+@@ -1370,7 +1370,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1381,7 +1381,11 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -2456,7 +2460,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2540,7 +2544,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -urN mozilla/nsprpub/configure mozilla/nsprpub/configure
-+--- mozilla/nsprpub/configure 2006-02-23 00:03:10.000000000 +0100
-++++ mozilla/nsprpub/configure 2006-11-20 22:19:53.000000000 +0100
-+@@ -3820,7 +3820,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3849,10 +3849,14 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -5496,7 +5500,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5633,7 +5637,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
-+
-diff -urN iceape-1.0.6/debian/patches/38_kbsd.dpatch iceape_1.0.6.kbsd/debian/patches/38_kbsd.dpatch
---- iceape-1.0.6/debian/patches/38_kbsd.dpatch 1970-01-01 01:00:00.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/38_kbsd.dpatch 2006-12-02 21:41:09.000000000 +0100
-@@ -0,0 +1,584 @@
-+#!/bin/sh -e
-+## 38_kbsd.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=356011
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c
-+--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100
-++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100
-+@@ -106,7 +106,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100
-+@@ -161,7 +161,7 @@
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+@@ -237,7 +237,7 @@
-+ ifeq ($(OS_ARCH), AIX)
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ $(LINK_LIB) $(EXTRA_LIBS)
-+diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in
-+--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100
-+@@ -560,6 +560,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -1260,7 +1261,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1271,8 +1272,12 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-+- AC_DEFINE(linux)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ AC_DEFINE(linux)
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -2186,7 +2191,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2262,7 +2267,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure
-+--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100
-+@@ -2753,6 +2753,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -3766,7 +3767,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3795,14 +3796,18 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ cat >> confdefs.h <<\EOF
-+ #define linux 1
-+ EOF
-+
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -5281,7 +5286,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5404,7 +5409,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
-+diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h
-+--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -116,7 +116,7 @@
-+ * some systems don't have the BSD re_comp and re_exec routines
-+ */
-+ #ifndef NEED_BSDREGEX
-+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi)
-+ #define NEED_BSDREGEX
-+ #endif
-+ #endif
-+@@ -145,7 +145,7 @@
-+ * Is snprintf() part of the standard C runtime library?
-+ */
-+ #if !defined(HAVE_SNPRINTF)
-+-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX)
-++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX)
-+ #define HAVE_SNPRINTF
-+ #endif
-+ #endif
-+@@ -165,7 +165,7 @@
-+ * for select()
-+ */
-+ #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
-+-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS)
-++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS)
-+ #include <sys/time.h>
-+ #else
-+ #include <sys/select.h>
-+@@ -252,15 +252,14 @@
-+ #define HAVE_GETGRNAM_R
-+ #endif
-+
-+-#if defined(SNI) || defined(LINUX1_2)
-++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__)
-+ int strcasecmp(const char *, const char *);
-+ #ifdef SNI
-+ int strncasecmp(const char *, const char *, int);
-+-#endif /* SNI */
-+-#ifdef LINUX1_2
-++#else /* SNI */
-+ int strncasecmp(const char *, const char *, size_t);
-+-#endif /* LINUX1_2 */
-+-#endif /* SNI || LINUX1_2 */
-++#endif
-++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */
-+
-+ #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN)
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -276,7 +275,7 @@
-+ defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
-+ defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \
-+ ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-+- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
-++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \
-+ defined(FREEBSD) || defined(OPENBSD) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -300,7 +299,7 @@
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e )
-+ #endif
-+ #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \
-+- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \
-++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || \
-+ defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+@@ -320,7 +319,7 @@
-+ #endif
-+ #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \
-+- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define STRTOK( s1, s2, l ) strtok( s1, s2 )
-+ #else
-+ #define HAVE_STRTOK_R
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -168,7 +168,7 @@
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-+ endif
-+
-+@@ -286,7 +286,7 @@
-+ ifdef SO_FILES_TO_REMOVE
-+ -$(RM) $(SO_FILES_TO_REMOVE)
-+ endif
-+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ ifeq ($(OS_ARCH),OS2)
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -218,7 +218,7 @@
-+
-+ #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
-+ defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
-+- defined(OPENBSD) || defined(NETBSD)
-++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
-+ #define EDEADLOCK -1
-+ #endif
-+
-+diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
-+--- mozilla/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
-++++ mozilla/security/coreconf/Linux.mk 2006-11-20 22:16:26.000000000 +0100
-+@@ -52,59 +52,34 @@
-+
-+ DEFAULT_COMPILER = gcc
-+
-+-ifeq ($(OS_TEST),m68k)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = m68k
-+-else
-+-ifeq ($(OS_TEST),ppc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ppc
-++CPU_ARCH = $(OS_TEST)
-++
-++ifeq ($(KERNEL),linux)
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
-++ ARCH = linux
-+ else
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE
-++ ARCH = gnu
-++endif
-++
-++
-+ ifeq ($(OS_TEST),alpha)
-+- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = alpha
-+-else
-+-ifeq ($(OS_TEST),ia64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ia64
-+-else
-+-ifeq ($(OS_TEST),x86_64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = x86_64
-+-else
-+-ifeq ($(OS_TEST),sparc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = sparc
-++ OS_REL_CFLAGS += -D_ALPHA_
-+ else
-+ ifeq ($(OS_TEST),sparc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = sparc
-+ else
-+ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = arm
-+ else
-+ ifeq ($(OS_TEST),parisc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+ ifeq ($(OS_TEST),parisc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+-ifeq ($(OS_TEST),s390)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390
-+-else
-+-ifeq ($(OS_TEST),s390x)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390x
-+-else
-+-ifeq ($(OS_TEST),mips)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = mips
-++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+-else
-+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-++ OS_REL_CFLAGS += -Di386
-+ CPU_ARCH = x86
-+ endif
-+ endif
-+@@ -112,18 +88,11 @@
-+ endif
-+ endif
-+ endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+
-+
-+ LIBC_TAG = _glibc
-+
-+-ifeq ($(OS_RELEASE),2.0)
-++ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
-+ OS_REL_CFLAGS += -DLINUX2_0
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+@@ -140,20 +109,22 @@
-+ OS_PTHREAD = -lpthread
-+ endif
-+
-+-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++ifeq ($(KERNEL),linux)
-++OS_CFLAGS += -DLINUX -Dlinux
-++endif
-+ OS_LIBS = $(OS_PTHREAD) -ldl -lc
-+
-+ ifdef USE_PTHREADS
-+ DEFINES += -D_REENTRANT
-+ endif
-+
-+-ARCH = linux
-+
-+ DSO_CFLAGS = -fPIC
-+ DSO_LDOPTS = -shared
-+ DSO_LDFLAGS =
-+
-+-# INCLUDES += -I/usr/include -Y/usr/include/linux
-++# INCLUDES += -I/usr/include
-+ G++INCLUDES = -I/usr/include/g++
-+
-+ #
-+diff -urN mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux2.6.mk
-+--- mozilla/security/coreconf/Linux2.6.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/Linux2.6.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -37,7 +37,10 @@
-+
-+ include $(CORE_DEPTH)/coreconf/Linux.mk
-+
-++ifeq ($(KERNEL), linux)
-+ OS_REL_CFLAGS += -DLINUX2_1
-++endif
-++
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+ OPTIMIZER = -O2
-+diff -urN mozilla/security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
-+--- mozilla/security/coreconf/arch.mk 2005-10-11 01:30:12.000000000 +0200
-++++ mozilla/security/coreconf/arch.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -154,6 +154,14 @@
-+ ifneq ($(words $(OS_RELEASE)),1)
-+ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
-+ endif
-++ KERNEL = linux
-++endif
-++
-++# This check must be last. Since all uses of OS_ARCH that follow affect only
-++# userland, we can merge other Glibc systems with Linux here.
-++ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
-++OS_ARCH = Linux
-++OS_RELEASE = 2.6
-+ endif
-+
-+ #
-+diff -urN mozilla/security/coreconf/config.mk mozilla/security/coreconf/config.mk
-+--- mozilla/security/coreconf/config.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/config.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ #######################################################################
-+
-+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-+- OpenVMS AIX
-++ OpenVMS AIX GNU GNU_%
-+
-+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
-+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-+diff -urN mozilla/security/nss/lib/freebl/unix_rand.c mozilla/security/nss/lib/freebl/unix_rand.c
-+--- mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 01:22:50.000000000 +0200
-++++ mozilla/security/nss/lib/freebl/unix_rand.c 2006-11-20 22:10:26.000000000 +0100
-+@@ -81,7 +81,8 @@
-+ }
-+
-+ #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
-+- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
-++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
-+ #include <sys/times.h>
-+
-+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.c mozilla/security/nss/lib/ssl/sslmutex.c
-+--- mozilla/security/nss/lib/ssl/sslmutex.c 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -89,7 +89,7 @@
-+ return SECSuccess;
-+ }
-+
-+-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <unistd.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.h mozilla/security/nss/lib/ssl/sslmutex.h
-+--- mozilla/security/nss/lib/ssl/sslmutex.h 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -79,7 +79,7 @@
-+
-+ typedef int sslPID;
-+
-+-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <sys/types.h>
-+ #include "prtypes.h"
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -70,7 +70,7 @@
-+ # New code for Linux, et. al., with gcc
-+ # Migrate other platforms here after testing
-+ #
-+-ifneq (,$(filter Linux,$(OS_ARCH)))
-++ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ # Linux/x86-64
-+ ifeq (x86_64,$(OS_TEST))
-+ CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -67,7 +67,7 @@
-+ *
-+ */
-+
-+-#if defined(LINUX)
-++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
-+
-+ #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
-+ /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
-+diff -urN mozilla/configure.in mozilla/configure.in
-+--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -812,6 +812,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -1261,7 +1262,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -2169,7 +2170,7 @@
-+ dnl = Flags to strip unused symbols from .so components
-+ dnl ========================================================
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -2735,7 +2736,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+
-+diff -urN mozilla/configure mozilla/configure
-+--- mozilla/configure 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure 2006-11-20 22:19:49.000000000 +0100
-+@@ -5036,6 +4934,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -5523,7 +5422,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -6792,7 +6691,7 @@
-+ esac
-+
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -9498,7 +9400,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-diff -urN iceape-1.0.6/debian/patches/38_mips64_build.dpatch iceape_1.0.6.kbsd/debian/patches/38_mips64_build.dpatch
---- iceape-1.0.6/debian/patches/38_mips64_build.dpatch 2006-12-02 23:07:06.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/38_mips64_build.dpatch 2006-12-02 21:41:45.000000000 +0100
-@@ -10,18 +10,17 @@
- ==================================================================
- --- xulrunner/security/coreconf/Linux.mk (revision 44)
- +++ xulrunner/security/coreconf/Linux.mk (local)
--@@ -100,6 +100,10 @@
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = s390x
-+@@ -78,6 +78,9 @@
-+ ifeq ($(OS_TEST),parisc64)
-+ CPU_ARCH = hppa
- else
- +ifeq ($(OS_TEST),mips64)
--+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- + CPU_ARCH = mips
- +else
-- ifeq ($(OS_TEST),mips)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = mips
--@@ -119,6 +123,7 @@
-+ ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+ OS_REL_CFLAGS += -Di386
-+ CPU_ARCH = x86
-+@@ -87,6 +90,7 @@
- endif
- endif
- endif
-diff -urN iceape-1.0.6/debian/patches/80_uname.dpatch iceape_1.0.6.kbsd/debian/patches/80_uname.dpatch
---- iceape-1.0.6/debian/patches/80_uname.dpatch 2006-12-02 23:07:06.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/80_uname.dpatch 2006-12-02 23:01:15.000000000 +0100
-@@ -13,7 +13,7 @@
-
- --- xulrunner/configure.in 2006-08-09 10:26:00.000000000 +0200
- +++ xulrunner/configure.in 2006-08-09 10:31:25.000000000 +0200
--@@ -818,10 +818,17 @@
-+@@ -818,10 +818,18 @@
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
- esac
- else
-@@ -26,6 +26,7 @@
- + OS_TEST="${host_cpu}"
- + case "${host_os}" in
- + linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- + mingw*) OS_ARCH=WINNT ;;
- + wince*) OS_ARCH=WINCE ;;
-diff -urN iceape-1.0.6/debian/patches/99_configure.dpatch iceape_1.0.6.kbsd/debian/patches/99_configure.dpatch
---- iceape-1.0.6/debian/patches/99_configure.dpatch 2006-12-02 23:07:06.000000000 +0100
-+++ iceape_1.0.6.kbsd/debian/patches/99_configure.dpatch 2006-12-02 23:04:31.000000000 +0100
-@@ -1538,7 +1538,7 @@
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
--@@ -5042,10 +4946,17 @@
-+@@ -5042,10 +4946,18 @@
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
- esac
- else
-@@ -1551,6 +1551,7 @@
- + OS_TEST="${host_cpu}"
- + case "${host_os}" in
- + linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- + mingw*) OS_ARCH=WINNT ;;
- + wince*) OS_ARCH=WINCE ;;
Deleted: trunk/web/patches/icedove.diff
===================================================================
--- trunk/web/patches/icedove.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/icedove.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,1084 +0,0 @@
-diff -u icedove-1.5.0.8/debian/control icedove-1.5.0.8/debian/control
---- icedove-1.5.0.8/debian/control
-+++ icedove-1.5.0.8/debian/control
-@@ -2,7 +2,7 @@
- Section: mail
- Priority: optional
- Maintainer: Alexander Sack <asac at debian.org>
--Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev, libidl-dev (>= 0.8.0 ), libx11-dev, libxt-dev, libxinerama-dev, zlib1g-dev, docbook-to-man, zip, dpatch, m4, bzip2, unzip, autoconf2.13, libpng12-dev, libjpeg62-dev, libmng-dev, sharutils, libcairo2-dev, libgnome2-dev, libgnomeui-dev, libxft-dev, libfreetype6-dev, libxrender-dev
-+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev, libidl-dev (>= 0.8.0 ), libx11-dev, libxt-dev, libxinerama-dev, zlib1g-dev, docbook-to-man, zip, dpatch, m4, bzip2, unzip, autoconf2.13, libpng12-dev, libjpeg62-dev, libmng-dev, sharutils, libcairo2-dev, libgnome2-dev, libgnomeui-dev, libxft-dev, libfreetype6-dev, libxrender-dev, autotools-dev
- Standards-Version: 3.6.1
-
- Package: icedove
-diff -u icedove-1.5.0.8/debian/rules icedove-1.5.0.8/debian/rules
---- icedove-1.5.0.8/debian/rules
-+++ icedove-1.5.0.8/debian/rules
-@@ -88,6 +88,9 @@
- extract-stamp: build-dir
- tar xjf archives/$(TBIRD_BZ2_ARCHIVE) -C build-dir/
- cp build-dir/mozilla/nsprpub/config/nspr.m4 build-dir/mozilla/nsprpub/config/icedove-nspr.m4
-+ cp /usr/share/misc/config.{sub,guess} build-dir/mozilla/build/autoconf/
-+ cp /usr/share/misc/config.{sub,guess} build-dir/mozilla/nsprpub/build/autoconf/
-+ cp /usr/share/misc/config.{sub,guess} build-dir/mozilla/directory/c-sdk/config/autoconf/
- touch extract-stamp
-
- dopatch: extract patch-stamp
-diff -u icedove-1.5.0.8/debian/patches/00list icedove-1.5.0.8/debian/patches/00list
---- icedove-1.5.0.8/debian/patches/00list
-+++ icedove-1.5.0.8/debian/patches/00list
-@@ -13,10 +13,12 @@
- 50_arch_mips_preemptive
- 50_arch_parisc_Makefile_fix
- 50_arch_parisc_fix
-+50_kbsd_nspr
-+50_kbsd
-+50_kbsd_csdk
- 70_gtk-settings-patch
- 70_exclude_sep_extensions_autobuild
- 70_single_typeaheadfind_package.dpatch
--90_ppc64-build-fix
- 91_fontsfix_359763
- 91_replytolist
- 91_gnome_path_fix
-only in patch2:
-unchanged:
---- icedove-1.5.0.8.orig/debian/patches/50_kbsd.dpatch
-+++ icedove-1.5.0.8/debian/patches/50_kbsd.dpatch
-@@ -0,0 +1,439 @@
-+#!/bin/sh -e
-+## 50_kbsd.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=356011
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h
-+--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -116,7 +116,7 @@
-+ * some systems don't have the BSD re_comp and re_exec routines
-+ */
-+ #ifndef NEED_BSDREGEX
-+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi)
-+ #define NEED_BSDREGEX
-+ #endif
-+ #endif
-+@@ -145,7 +145,7 @@
-+ * Is snprintf() part of the standard C runtime library?
-+ */
-+ #if !defined(HAVE_SNPRINTF)
-+-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX)
-++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX)
-+ #define HAVE_SNPRINTF
-+ #endif
-+ #endif
-+@@ -165,7 +165,7 @@
-+ * for select()
-+ */
-+ #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
-+-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS)
-++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS)
-+ #include <sys/time.h>
-+ #else
-+ #include <sys/select.h>
-+@@ -252,15 +252,14 @@
-+ #define HAVE_GETGRNAM_R
-+ #endif
-+
-+-#if defined(SNI) || defined(LINUX1_2)
-++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__)
-+ int strcasecmp(const char *, const char *);
-+ #ifdef SNI
-+ int strncasecmp(const char *, const char *, int);
-+-#endif /* SNI */
-+-#ifdef LINUX1_2
-++#else /* SNI */
-+ int strncasecmp(const char *, const char *, size_t);
-+-#endif /* LINUX1_2 */
-+-#endif /* SNI || LINUX1_2 */
-++#endif
-++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */
-+
-+ #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN)
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -276,7 +275,7 @@
-+ defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
-+ defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \
-+ ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-+- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
-++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \
-+ defined(FREEBSD) || defined(OPENBSD) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -300,7 +299,7 @@
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e )
-+ #endif
-+ #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \
-+- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \
-++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || \
-+ defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+@@ -320,7 +319,7 @@
-+ #endif
-+ #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \
-+- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define STRTOK( s1, s2, l ) strtok( s1, s2 )
-+ #else
-+ #define HAVE_STRTOK_R
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -168,7 +168,7 @@
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-+ endif
-+
-+@@ -286,7 +286,7 @@
-+ ifdef SO_FILES_TO_REMOVE
-+ -$(RM) $(SO_FILES_TO_REMOVE)
-+ endif
-+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ ifeq ($(OS_ARCH),OS2)
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -218,7 +218,7 @@
-+
-+ #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
-+ defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
-+- defined(OPENBSD) || defined(NETBSD)
-++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
-+ #define EDEADLOCK -1
-+ #endif
-+
-+diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
-+--- mozilla/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
-++++ mozilla/security/coreconf/Linux.mk 2006-11-20 22:16:26.000000000 +0100
-+@@ -52,59 +52,34 @@
-+
-+ DEFAULT_COMPILER = gcc
-+
-+-ifeq ($(OS_TEST),m68k)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = m68k
-+-else
-+-ifeq ($(OS_TEST),ppc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ppc
-++CPU_ARCH = $(OS_TEST)
-++
-++ifeq ($(KERNEL),linux)
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
-++ ARCH = linux
-+ else
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE
-++ ARCH = gnu
-++endif
-++
-++
-+ ifeq ($(OS_TEST),alpha)
-+- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = alpha
-+-else
-+-ifeq ($(OS_TEST),ia64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ia64
-+-else
-+-ifeq ($(OS_TEST),x86_64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = x86_64
-+-else
-+-ifeq ($(OS_TEST),sparc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = sparc
-++ OS_REL_CFLAGS += -D_ALPHA_
-+ else
-+ ifeq ($(OS_TEST),sparc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = sparc
-+ else
-+ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = arm
-+ else
-+ ifeq ($(OS_TEST),parisc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+ ifeq ($(OS_TEST),parisc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+-ifeq ($(OS_TEST),s390)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390
-+-else
-+-ifeq ($(OS_TEST),s390x)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390x
-+-else
-+-ifeq ($(OS_TEST),mips)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = mips
-++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+-else
-+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-++ OS_REL_CFLAGS += -Di386
-+ CPU_ARCH = x86
-+ endif
-+ endif
-+@@ -112,18 +88,11 @@
-+ endif
-+ endif
-+ endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+
-+
-+ LIBC_TAG = _glibc
-+
-+-ifeq ($(OS_RELEASE),2.0)
-++ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
-+ OS_REL_CFLAGS += -DLINUX2_0
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+@@ -140,20 +109,22 @@
-+ OS_PTHREAD = -lpthread
-+ endif
-+
-+-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++ifeq ($(KERNEL),linux)
-++OS_CFLAGS += -DLINUX -Dlinux
-++endif
-+ OS_LIBS = $(OS_PTHREAD) -ldl -lc
-+
-+ ifdef USE_PTHREADS
-+ DEFINES += -D_REENTRANT
-+ endif
-+
-+-ARCH = linux
-+
-+ DSO_CFLAGS = -fPIC
-+ DSO_LDOPTS = -shared
-+ DSO_LDFLAGS =
-+
-+-# INCLUDES += -I/usr/include -Y/usr/include/linux
-++# INCLUDES += -I/usr/include
-+ G++INCLUDES = -I/usr/include/g++
-+
-+ #
-+diff -urN mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux2.6.mk
-+--- mozilla/security/coreconf/Linux2.6.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/Linux2.6.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -37,7 +37,10 @@
-+
-+ include $(CORE_DEPTH)/coreconf/Linux.mk
-+
-++ifeq ($(KERNEL), linux)
-+ OS_REL_CFLAGS += -DLINUX2_1
-++endif
-++
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+ OPTIMIZER = -O2
-+diff -urN mozilla/security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
-+--- mozilla/security/coreconf/arch.mk 2005-10-11 01:30:12.000000000 +0200
-++++ mozilla/security/coreconf/arch.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -154,6 +154,14 @@
-+ ifneq ($(words $(OS_RELEASE)),1)
-+ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
-+ endif
-++ KERNEL = linux
-++endif
-++
-++# This check must be last. Since all uses of OS_ARCH that follow affect only
-++# userland, we can merge other Glibc systems with Linux here.
-++ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
-++OS_ARCH = Linux
-++OS_RELEASE = 2.6
-+ endif
-+
-+ #
-+diff -urN mozilla/security/coreconf/config.mk mozilla/security/coreconf/config.mk
-+--- mozilla/security/coreconf/config.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/config.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ #######################################################################
-+
-+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-+- OpenVMS AIX
-++ OpenVMS AIX GNU GNU_%
-+
-+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
-+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-+diff -urN mozilla/security/nss/lib/freebl/unix_rand.c mozilla/security/nss/lib/freebl/unix_rand.c
-+--- mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 01:22:50.000000000 +0200
-++++ mozilla/security/nss/lib/freebl/unix_rand.c 2006-11-20 22:10:26.000000000 +0100
-+@@ -81,7 +81,8 @@
-+ }
-+
-+ #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
-+- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
-++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
-+ #include <sys/times.h>
-+
-+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.c mozilla/security/nss/lib/ssl/sslmutex.c
-+--- mozilla/security/nss/lib/ssl/sslmutex.c 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -89,7 +89,7 @@
-+ return SECSuccess;
-+ }
-+
-+-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <unistd.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.h mozilla/security/nss/lib/ssl/sslmutex.h
-+--- mozilla/security/nss/lib/ssl/sslmutex.h 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -79,7 +79,7 @@
-+
-+ typedef int sslPID;
-+
-+-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <sys/types.h>
-+ #include "prtypes.h"
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -70,7 +70,7 @@
-+ # New code for Linux, et. al., with gcc
-+ # Migrate other platforms here after testing
-+ #
-+-ifneq (,$(filter Linux,$(OS_ARCH)))
-++ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ # Linux/x86-64
-+ ifeq (x86_64,$(OS_TEST))
-+ CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -67,7 +67,7 @@
-+ *
-+ */
-+
-+-#if defined(LINUX)
-++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
-+
-+ #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
-+ /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
-+diff -urN mozilla/configure.in mozilla/configure.in
-+--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -812,6 +812,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -1261,7 +1262,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -2169,7 +2170,7 @@
-+ dnl = Flags to strip unused symbols from .so components
-+ dnl ========================================================
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -2735,7 +2736,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+
-+diff -urN mozilla/configure mozilla/configure
-+--- mozilla/configure 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure 2006-11-20 22:19:49.000000000 +0100
-+@@ -5036,6 +4934,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -5523,7 +5422,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -6792,7 +6691,7 @@
-+ esac
-+
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -9498,7 +9400,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-only in patch2:
-unchanged:
---- icedove-1.5.0.8.orig/debian/patches/50_kbsd_nspr.dpatch
-+++ icedove-1.5.0.8/debian/patches/50_kbsd_nspr.dpatch
-@@ -0,0 +1,417 @@
-+#!/bin/sh -e
-+## 50_kbsd_nspr.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support for nspr
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=261649
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=355999
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -urN mozilla/nsprpub/config/nsinstall.c mozilla/nsprpub/config/nsinstall.c
-+--- mozilla/nsprpub/config/nsinstall.c 2004-04-28 02:33:11.000000000 +0200
-++++ mozilla/nsprpub/config/nsinstall.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -98,7 +98,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
-+--- mozilla/nsprpub/pr/include/md/_linux.cfg 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.cfg 2006-11-20 22:10:27.000000000 +0100
-+@@ -35,6 +35,11 @@
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-++/*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-+ #ifndef nspr_cpucfg___
-+ #define nspr_cpucfg___
-+
-+@@ -42,11 +47,15 @@
-+ #define XP_UNIX
-+ #endif
-+
-+-#ifndef LINUX
-++#if !defined(LINUX) && defined(__linux__)
-+ #define LINUX
-+ #endif
-+
-++#ifdef __FreeBSD_kernel__
-++#define PR_AF_INET6 28 /* same as AF_INET6 */
-++#else
-+ #define PR_AF_INET6 10 /* same as AF_INET6 */
-++#endif
-+
-+ #ifdef __powerpc64__
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
-+--- mozilla/nsprpub/pr/include/md/_linux.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -41,6 +41,15 @@
-+ #include "prthread.h"
-+
-+ /*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-++#ifdef __FreeBSD_kernel__
-++#define _PR_HAVE_SOCKADDR_LEN
-++#endif
-++
-++/*
-+ * Internal configuration macros
-+ */
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_pth.h mozilla/nsprpub/pr/include/md/_pth.h
-+--- mozilla/nsprpub/pr/include/md/_pth.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_pth.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -143,10 +143,15 @@
-+ (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+ #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-+- || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(HPUX) || defined(FREEBSD) \
-+ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-+ || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-++#ifdef __GNU__
-++/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-++#error Using Hurd pthreads
-++#endif
-+ #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0
-+ #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+@@ -195,7 +200,8 @@
-+ /*
-+ * These platforms don't have sigtimedwait()
-+ */
-+-#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
-++#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-++ || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
-+ || defined(DARWIN)
-+@@ -235,7 +241,8 @@
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #endif /* defined(_PR_DCETHREADS) */
-+
-+-#elif defined(LINUX) || defined(FREEBSD)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(FREEBSD)
-+ #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #elif defined(NTO)
-+@@ -291,7 +298,8 @@
-+ onemillisec.tv_nsec = 1000000L; \
-+ nanosleep(&onemillisec,NULL); \
-+ PR_END_MACRO
-+-#elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
-++#elif defined(HPUX) || defined(SOLARIS) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+diff -urN mozilla/nsprpub/pr/include/md/_unixos.h mozilla/nsprpub/pr/include/md/_unixos.h
-+--- mozilla/nsprpub/pr/include/md/_unixos.h 2005-01-17 23:13:36.000000000 +0100
-++++ mozilla/nsprpub/pr/include/md/_unixos.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -46,7 +46,8 @@
-+ * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
-+ * not be redefined.
-+ */
-+-#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
-++#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-++ && !defined(DARWIN) && !defined(NEXTSTEP)
-+ #ifndef FD_SETSIZE
-+ #define FD_SETSIZE 4096
-+ #endif
-+diff -urN mozilla/nsprpub/pr/include/md/prosdep.h mozilla/nsprpub/pr/include/md/prosdep.h
-+--- mozilla/nsprpub/pr/include/md/prosdep.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/prosdep.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -90,7 +90,7 @@
-+ #elif defined(IRIX)
-+ #include "md/_irix.h"
-+
-+-#elif defined(LINUX)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include "md/_linux.h"
-+
-+ #elif defined(OSF1)
-+diff -urN mozilla/nsprpub/pr/src/linking/Makefile.in mozilla/nsprpub/pr/src/linking/Makefile.in
-+--- mozilla/nsprpub/pr/src/linking/Makefile.in 2006-01-05 16:40:18.000000000 +0100
-++++ mozilla/nsprpub/pr/src/linking/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-+
-+ # For Dl_info and dladdr.
-+-ifeq ($(OS_TARGET),Linux)
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
-+ DEFINES += -D_GNU_SOURCE
-+ endif
-+
-+diff -urN mozilla/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
-+--- mozilla/nsprpub/pr/src/linking/prlink.c 2005-08-18 19:24:29.000000000 +0200
-++++ mozilla/nsprpub/pr/src/linking/prlink.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -1374,7 +1374,8 @@
-+ PR_IMPLEMENT(char *)
-+ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
-+ {
-+-#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-++#if defined(SOLARIS) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ Dl_info dli;
-+ char *result;
-+
-+diff -urN mozilla/nsprpub/pr/src/md/prosdep.c mozilla/nsprpub/pr/src/md/prosdep.c
-+--- mozilla/nsprpub/pr/src/md/prosdep.c 2004-04-28 02:33:56.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/prosdep.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,8 @@
-+
-+ /* Get page size */
-+ #ifdef XP_UNIX
-+-#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
-++#if defined SUNOS4 || defined BSDI || defined AIX \
-++ || defined LINUX || defined __GNU__ || defined __GLIBC__ \
-+ || defined FREEBSD || defined NETBSD || defined OPENBSD \
-+ || defined DARWIN || defined NEXTSTEP
-+ _pr_pageSize = getpagesize();
-+diff -urN mozilla/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
-+--- mozilla/nsprpub/pr/src/md/unix/unix.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -65,7 +65,7 @@
-+ * PRInt32* pointer to a _PRSockLen_t* pointer.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PRSockLen_t socklen_t
-+ #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-+ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxproces.c mozilla/nsprpub/pr/src/md/unix/uxproces.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxproces.c 2004-12-15 06:52:40.000000000 +0100
-++++ mozilla/nsprpub/pr/src/md/unix/uxproces.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -92,7 +92,8 @@
-+ * that can share the virtual address space and file descriptors.
-+ */
-+ #if (defined(IRIX) && !defined(_PR_PTHREADS)) \
-+- || (defined(LINUX) && defined(_PR_PTHREADS))
-++ || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
-++ && defined(_PR_PTHREADS))
-+ #define _PR_SHARE_CLONES
-+ #endif
-+
-+@@ -106,7 +107,8 @@
-+ */
-+
-+ #if defined(_PR_GLOBAL_THREADS_ONLY) \
-+- || (defined(_PR_PTHREADS) && !defined(LINUX))
-++ || (defined(_PR_PTHREADS) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
-+ #define _PR_NATIVE_THREADS
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxrng.c mozilla/nsprpub/pr/src/md/unix/uxrng.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -138,7 +138,8 @@
-+ return 0;
-+ }
-+
-+-#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD))
-++#elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-++ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/nsprpub/pr/src/misc/prnetdb.c mozilla/nsprpub/pr/src/misc/prnetdb.c
-+--- mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -108,7 +108,7 @@
-+ #define _PR_HAVE_GETPROTO_R_INT
-+ #endif
-+
-+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++#if (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PR_HAVE_GETPROTO_R
-+ #define _PR_HAVE_5_ARG_GETPROTO_R
-+ #endif
-+diff -urN mozilla/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
-+--- mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -205,7 +205,8 @@
-+ #define _PRSelectFdSetArg_t void *
-+ #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(OSF1) || defined(SOLARIS) \
-+- || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
-++ || defined(HPUX10_30) || defined(HPUX11) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+@@ -289,7 +290,7 @@
-+ * most current systems.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ typedef socklen_t pt_SockLen;
-+ #elif (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(VMS)
-+@@ -3230,7 +3231,8 @@
-+ };
-+
-+ #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-+- || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-+ || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
-+ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-+ #define _PR_FCNTL_FLAGS O_NONBLOCK
-+@@ -4727,7 +4729,8 @@
-+
-+ #include <sys/types.h>
-+ #include <sys/time.h>
-+-#if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX)
-++#if !defined(SUNOS4) && !defined(HPUX) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
-+ #include <sys/select.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/tests/Makefile.in mozilla/nsprpub/pr/tests/Makefile.in
-+--- mozilla/nsprpub/pr/tests/Makefile.in 2004-04-28 02:34:16.000000000 +0200
-++++ mozilla/nsprpub/pr/tests/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -376,14 +376,10 @@
-+ EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-+- ifeq ($(OS_RELEASE), 1.2)
-+- EXTRA_LIBS = -ldl
-+- else
-+- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-+- ifeq ($(USE_PTHREADS),1)
-+- EXTRA_LIBS = -lpthread
-+- endif
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
-++ LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-++ ifeq ($(USE_PTHREADS),1)
-++ EXTRA_LIBS = -lpthread
-+ endif
-+ endif
-+
-+diff -urN mozilla/nsprpub/configure.in mozilla/nsprpub/configure.in
-+--- mozilla/nsprpub/configure.in 2006-02-23 00:03:11.000000000 +0100
-++++ mozilla/nsprpub/configure.in 2006-11-20 22:10:26.000000000 +0100
-+@@ -1370,7 +1370,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1381,7 +1381,11 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -2456,7 +2460,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2540,7 +2544,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -urN mozilla/nsprpub/configure mozilla/nsprpub/configure
-+--- mozilla/nsprpub/configure 2006-02-23 00:03:10.000000000 +0100
-++++ mozilla/nsprpub/configure 2006-11-20 22:19:53.000000000 +0100
-+@@ -3820,7 +3820,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3849,10 +3849,14 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -5496,7 +5500,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5633,7 +5637,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
-+
-only in patch2:
-unchanged:
---- icedove-1.5.0.8.orig/debian/patches/50_kbsd_csdk.dpatch
-+++ icedove-1.5.0.8/debian/patches/50_kbsd_csdk.dpatch
-@@ -0,0 +1,171 @@
-+#!/bin/sh -e
-+## 50_kbsd_csdk.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support, not yet submitted
-+## DP: not needed for xulrunner/web browser, but needed for mail client
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c
-+--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100
-++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100
-+@@ -106,7 +106,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100
-+@@ -161,7 +161,7 @@
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+@@ -237,7 +237,7 @@
-+ ifeq ($(OS_ARCH), AIX)
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ $(LINK_LIB) $(EXTRA_LIBS)
-+diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in
-+--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100
-+@@ -560,6 +560,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -1260,7 +1261,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1271,8 +1272,12 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-+- AC_DEFINE(linux)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ AC_DEFINE(linux)
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -2186,7 +2191,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2262,7 +2267,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure
-+--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100
-+@@ -2753,6 +2753,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -3766,7 +3767,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3795,14 +3796,18 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ cat >> confdefs.h <<\EOF
-+ #define linux 1
-+ EOF
-+
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -5281,7 +5286,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5404,7 +5409,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
Deleted: trunk/web/patches/jack-audio-connection-kit.diff
===================================================================
--- trunk/web/patches/jack-audio-connection-kit.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/jack-audio-connection-kit.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,52 +0,0 @@
-
-in BTS #423895
-currently obsolete libjack-dev prevents building of arts, kdelibs, ...
-
-diff -u jack-audio-connection-kit-0.103.0/debian/control jack-audio-connection-kit-0.103.0/debian/control
---- jack-audio-connection-kit-0.103.0/debian/control
-+++ jack-audio-connection-kit-0.103.0/debian/control
-@@ -6,7 +6,8 @@
- Build-Depends: cdbs (>= 0.4.26-2), type-handling (>= 0.2.5), debhelper (>= 4.1.0), patchutils (>= 0.2.25), dh-buildinfo,
- libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libsndfile1-dev, doxygen,
- libcap-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], autotools-dev, libreadline5-dev,
-- libraw1394-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libfreebob0-dev, chrpath
-+ libraw1394-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-+ libfreebob0-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], chrpath
- Build-Conflicts: libcap2-dev
- Standards-Version: 3.7.2
-
-only in patch2:
-unchanged:
---- jack-audio-connection-kit-0.103.0.orig/debian/patches/09_kbsd.patch
-+++ jack-audio-connection-kit-0.103.0/debian/patches/09_kbsd.patch
-@@ -0,0 +1,30 @@
-+diff -ur config/os/generic/time.h config/os/generic/time.h
-+--- config/os/generic/time.h 2006-05-26 04:45:16.000000000 +0200
-++++ config/os/generic/time.h 2007-05-14 23:02:22.000000000 +0200
-+@@ -24,7 +24,9 @@
-+
-+ #include <jack/internal.h>
-+
-+-inline jack_time_t
-++extern jack_time_t jack_get_microseconds_from_system();
-++
-++static inline jack_time_t
-+ jack_get_microseconds (void) {
-+ return jack_get_microseconds_from_system ();
-+ }
-+diff -ur libjack/midiport.c libjack/midiport.c
-+--- libjack/midiport.c 2007-01-17 01:48:45.000000000 +0100
-++++ libjack/midiport.c 2007-05-14 22:49:46.000000000 +0200
-+@@ -77,8 +77,11 @@
-+ (jack_midi_port_info_private_t *) port_buffer;
-+
-+ if (event_idx >= info->event_count)
-++#if defined(ENODATA)
-+ return ENODATA;
-+-
-++#else
-++ return ENOENT;
-++#endif
-+ port_event = (jack_midi_port_internal_event_t *) (info + 1);
-+ port_event += event_idx;
-+ event->time = port_event->time;
Deleted: trunk/web/patches/kdebase.diff
===================================================================
--- trunk/web/patches/kdebase.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/kdebase.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,88 +0,0 @@
-
-Status: in BTS #339937
-
-diff -u kdebase-3.5.4/debian/control kdebase-3.5.4/debian/control
---- kdebase-3.5.4/debian/control
-+++ kdebase-3.5.4/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
--Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.4), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2), libhal-storage-dev (>= 0.5.5.1-2), libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
-+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.4), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
- Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
- Build-Conflicts: nvidia-glx
- Standards-Version: 3.7.2
-diff -u kdebase-3.5.4/debian/rules kdebase-3.5.4/debian/rules
---- kdebase-3.5.4/debian/rules
-+++ kdebase-3.5.4/debian/rules
-@@ -33,11 +33,23 @@
- #shlibs_ver = 4:3.5.0-1
- #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-+
-+common-install-prehook-arch::
-+ grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-i386
-+ grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-amd64
-+ grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-i386
-+ grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-amd64
-+
-+clean::
-+ rm -f debian/kcontrol.install.kfreebsd* debian/kdebase-kio-plugins.install.kfreebs*
-+
- binary-install/kdebase-bin::
- install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
- install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver
-
- binary-install/kdebase-data::
-+# oui.db is not really arch independent, it is linux specific
-+ install -p -D -m644 kcontrol/view1394/oui.db debian/kdebase-data/usr/share/apps/kcmview1394/oui.db
- install -p -D -m644 debian/debian-kde_default.png debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png
- install -p -D -m644 debian/debian-kde_default.png.desktop debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png.desktop
-
-diff -u kdebase-3.5.4/debian/kdebase-data.install kdebase-3.5.4/debian/kdebase-data.install
---- kdebase-3.5.4/debian/kdebase-data.install
-+++ kdebase-3.5.4/debian/kdebase-data.install
-@@ -31,7 +31,6 @@
- debian/tmp/usr/share/apps/kcmkeys/win4.kksrc
- debian/tmp/usr/share/apps/kcmkeys/wm3.kksrc
- debian/tmp/usr/share/apps/kcmlocale/pics/background.png
--debian/tmp/usr/share/apps/kcmview1394/oui.db
- debian/tmp/usr/share/apps/kconf_update/convertShortcuts.pl
- debian/tmp/usr/share/apps/kconf_update/kaccel.upd
- debian/tmp/usr/share/apps/kconf_update/kcmdisplayrc.upd
-only in patch2:
-unchanged:
---- kdebase-3.5.4.orig/debian/patches/27_kfreebsd_sysguard.diff
-+++ kdebase-3.5.4/debian/patches/27_kfreebsd_sysguard.diff
-@@ -0,0 +1,30 @@
-+--- kde/configure.in 2005-08-29 01:43:19.000000000 +0200
-++++ kde.patched/configure.in 2005-08-29 01:43:55.000000000 +0200
-+@@ -1816,6 +1816,7 @@
-+ case "$host" in
-+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
-+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
-+--- kde/configure 2005-08-29 01:42:54.000000000 +0200
-++++ kde.patched/configure 2005-08-29 01:44:36.000000000 +0200
-+@@ -52915,6 +52915,7 @@
-+ case "$host" in
-+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
-+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
-+--- kde/ksysguard/configure.in.in 2005-08-29 09:59:21.000000000 +0200
-++++ kde.patched/ksysguard/configure.in.in 2005-08-29 10:00:05.000000000 +0200
-+@@ -3,6 +3,7 @@
-+ case "$host" in
-+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
-+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
-+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
Deleted: trunk/web/patches/libtool.diff
===================================================================
--- trunk/web/patches/libtool.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/libtool.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,55 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u libtool-1.5.22/debian/control libtool-1.5.22/debian/control
---- libtool-1.5.22/debian/control
-+++ libtool-1.5.22/debian/control
-@@ -1,5 +1,5 @@
- Source: libtool
--Build-Depends: debhelper (>= 4.0), texi2html, texinfo, file, g77 | fortran77-compiler, gcj [!mips !mipsel !netbsd-i386 !hurd-i386 !kfreebsd-i386], automake1.9, autoconf, autotools-dev, dpatch
-+Build-Depends: debhelper (>= 4.0), texi2html, texinfo, file, g77 | fortran77-compiler, gcj [!mips !mipsel !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], automake1.9, autoconf, autotools-dev, dpatch
- Section: devel
- Priority: optional
- Maintainer: Kurt Roeckx <kurt at roeckx.be>
-diff -u libtool-1.5.22/debian/patches/00list libtool-1.5.22/debian/patches/00list
---- libtool-1.5.22/debian/patches/00list
-+++ libtool-1.5.22/debian/patches/00list
-@@ -6 +6 @@
--
-+anon_versioning_kfreebsd.dpatch
---- libtool-1.5.22.orig/debian/patches/anon_versioning_kfreebsd.dpatch
-+++ libtool-1.5.22/debian/patches/anon_versioning_kfreebsd.dpatch
-@@ -0,0 +1,33 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+## anon_versioning_kfreebsd.dpatch by Aurelien Jarno <aurel32 at debian.org>
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: No description.
-+
-+ at DPATCH@
-+--- ./libtool.m4.orig 2006-02-28 13:43:10.000000000 +0100
-++++ ./libtool.m4 2006-03-07 22:05:08.000000000 +0100
-+@@ -5589,6 +5589,23 @@
-+ fi
-+ ;;
-+
-++ kfreebsd*-gnu)
-++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-++ tmp_addflag=
-++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-++
-++ if test $supports_anon_versioning = yes; then
-++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-++ $echo "local: *; };" >> $output_objdir/$libname.ver~
-++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-++ fi
-++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-++ else
-++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-++ fi
-++ ;;
-++
-+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
Deleted: trunk/web/patches/mplayer.diff
===================================================================
--- trunk/web/patches/mplayer.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/mplayer.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,247 +0,0 @@
-
-Author: petr
-Status: in BTS
-
-diff -u mplayer-1.0~rc1/debian/rules mplayer-1.0~rc1/debian/rules
---- mplayer-1.0~rc1/debian/rules
-+++ mplayer-1.0~rc1/debian/rules
-@@ -63,10 +63,12 @@
-
- destdir := $(shell pwd)/debian/$(package)
-
--arch := $(shell dpkg --print-architecture)
-+arch := $(shell dpkg-architecture -qDEB_HOST_ARCH)
- #FIXME: How shall this be used? MPlayer has a non-autoconf configure script.
- DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
- # Choose whether we want binary codec support (default on unknown archs: no).
- with_real_and_xanim = false
-@@ -84,6 +86,12 @@
- with_real_and_xanim = true
- #this does not compile, though : with_win32 = true
- endif
-+ifeq ($(arch),kfreebsd-i386)
-+ with_real_and_xanim = true
-+endif
-+ifeq ($(arch),kfreebsd-amd64)
-+ with_real_and_xanim = true
-+endif
- ifeq ($(arch),powerpc)
- with_real_and_xanim = true
- endif
-@@ -114,6 +122,13 @@
- DEB_BUILD_CONFIGURE += --enable-debug=3
- endif
-
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+ DEB_BUILD_CONFIGURE += --enable-tv-v4l2 --enable-xmga --enable-mga --enable-3dfx --enable-tdfxfb --enable-fbdev
-+endif
-+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-+ DEB_BUILD_CONFIGURE += --enable-tv-bsdbt848 --disable-directfb
-+endif
-+
-
- USE_EXT_FFMPEG = no
- #DEB_BUILD_CONFIGURE += --enable-libavutil_so --enable-libavformat_so --enable-libavcodec_so --enable-libpostproc_so
-@@ -133,9 +148,7 @@
- # Add commands to configure the package here.
- ./configure --prefix=/usr --confdir=/etc/mplayer \
- --datadir=/usr/share/mplayer --with-codecsdir=/usr/lib/codecs \
-- --enable-xmga --enable-mga --enable-3dfx --enable-tdfxfb \
-- --enable-fbdev --enable-xvmc \
-- --enable-tv-v4l2 --enable-sdl --enable-ossaudio \
-+ --enable-xvmc --enable-sdl --enable-ossaudio \
- --enable-lirc --enable-gui --enable-freetype --enable-menu \
- --enable-largefiles $(DEB_BUILD_CONFIGURE)
- #
-diff -u mplayer-1.0~rc1/debian/control.in mplayer-1.0~rc1/debian/control.in
---- mplayer-1.0~rc1/debian/control.in
-+++ mplayer-1.0~rc1/debian/control.in
-@@ -7,8 +7,9 @@
- Build-Depends-Indep: @DOCDEP@
- Build-Depends: debhelper (>= 4), make (>= 3.80), pkg-config, po-debconf,
- libsdl1.2-dev | libsdl1.1-dev, svgalibg1-dev [i386],
-- libmad0-dev, libpng-dev, libncurses5-dev, zlib1g-dev, libtheora-dev
-- (>= 0.0.0.alpha3-1), libesd0-dev, libasound2-dev (>= 1.0.6-3),
-+ libmad0-dev, libpng-dev, libncurses5-dev, zlib1g-dev,
-+ libtheora-dev (>= 0.0.0.alpha3-1), libesd0-dev,
-+ libasound2-dev (>= 1.0.6-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libvorbis-dev, liblircclient-dev, libfreetype6-dev, libdvdread3-dev,
- libcdparanoia0-dev, libfontconfig1-dev, libjpeg62-dev, libungif4-dev,
- libgtk2.0-dev, libdirectfb-dev, libcaca-dev, @XLIBS@, @EXTRA_BUILDDEP@
-diff -u mplayer-1.0~rc1/debian/control mplayer-1.0~rc1/debian/control
---- mplayer-1.0~rc1/debian/control
-+++ mplayer-1.0~rc1/debian/control
-@@ -7,8 +7,9 @@
- Build-Depends-Indep:
- Build-Depends: debhelper (>= 4), make (>= 3.80), pkg-config, po-debconf,
- libsdl1.2-dev | libsdl1.1-dev, svgalibg1-dev [i386],
-- libmad0-dev, libpng-dev, libncurses5-dev, zlib1g-dev, libtheora-dev
-- (>= 0.0.0.alpha3-1), libesd0-dev, libasound2-dev (>= 1.0.6-3),
-+ libmad0-dev, libpng-dev, libncurses5-dev, zlib1g-dev,
-+ libtheora-dev (>= 0.0.0.alpha3-1), libesd0-dev,
-+ libasound2-dev (>= 1.0.6-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libvorbis-dev, liblircclient-dev, libfreetype6-dev, libdvdread3-dev,
- libcdparanoia0-dev, libfontconfig1-dev, libjpeg62-dev, libungif4-dev,
- libgtk2.0-dev, libdirectfb-dev, libcaca-dev, libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, libxvmc-dev, libxxf86dga-dev, libxxf86vm-dev, x-dev,
-diff -u mplayer-1.0~rc1/configure mplayer-1.0~rc1/configure
---- mplayer-1.0~rc1/configure
-+++ mplayer-1.0~rc1/configure
-@@ -102,7 +102,7 @@
- irix() { issystem "IRIX" ; return "$?" ; }
- aix() { issystem "AIX" ; return "$?" ; }
- cygwin() { issystem "CYGWIN" ; return "$?" ; }
--freebsd() { issystem "FreeBSD" ; return "$?" ; }
-+freebsd() { issystem "FreeBSD" || issystem "GNU/kFreeBSD"; return "$?" ; }
- netbsd() { issystem "NetBSD" ; return "$?" ; }
- bsdos() { issystem "BSD/OS" ; return "$?" ; }
- openbsd() { issystem "OpenBSD" ; return "$?" ; }
-@@ -567,6 +567,9 @@
- IRIX*)
- system_name=IRIX
- ;;
-+ GNU/kFreeBSD)
-+ system_name=FreeBSD
-+ ;;
- HP-UX*)
- system_name=HP-UX
- ;;
-@@ -627,6 +630,7 @@
- case "`echo $system_name | tr A-Z a-z`" in
- linux) system_name=Linux ;;
- freebsd) system_name=FreeBSD ;;
-+ gnu/kfreebsd) system_name=FreeBSD ;;
- netbsd) system_name=NetBSD ;;
- bsd/os) system_name=BSD/OS ;;
- openbsd) system_name=OpenBSD ;;
-@@ -8177,7 +8181,7 @@
- #elif defined(__OpenBSD__)
- #define DEFAULT_CDROM_DEVICE "/dev/rcd0a"
- #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #define DEFAULT_CDROM_DEVICE "/dev/acd0"
- #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
- #else
-only in patch2:
-unchanged:
---- mplayer-1.0~rc1.orig/libdha/pci.c
-+++ mplayer-1.0~rc1/libdha/pci.c
-@@ -62,7 +62,7 @@
- /* OS depended stuff */
- #if defined (linux)
- #include "sysdep/pci_linux.c"
--#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
- #include "sysdep/pci_freebsd.c"
- #elif defined (__386BSD__)
- #include "sysdep/pci_386bsd.c"
-only in patch2:
-unchanged:
---- mplayer-1.0~rc1.orig/cpudetect.c
-+++ mplayer-1.0~rc1/cpudetect.c
-@@ -20,7 +20,7 @@
- #include <machine/cpu.h>
- #endif
-
--#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-@@ -182,7 +182,7 @@
- #endif
-
- /* FIXME: Does SSE2 need more OS support, too? */
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
- if (caps->hasSSE)
- check_os_katmai_support();
- if (!caps->hasSSE)
-@@ -346,7 +346,7 @@
- * support for user space apps that do SSE.
- */
-
--#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #define SSE_SYSCTL_NAME "hw.instruction_sse"
- #elif defined(__APPLE__)
- #define SSE_SYSCTL_NAME "hw.optional.sse"
-@@ -357,7 +357,7 @@
- #ifdef ARCH_X86_64
- gCpuCaps.hasSSE=1;
- gCpuCaps.hasSSE2=1;
--#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__)
- int has_sse=0, ret;
- size_t len=sizeof(has_sse);
-
-only in patch2:
-unchanged:
---- mplayer-1.0~rc1.orig/stream/stream_vcd.c
-+++ mplayer-1.0~rc1/stream/stream_vcd.c
-@@ -13,7 +13,7 @@
- #include <sys/ioctl.h>
- #include <errno.h>
-
--#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <sys/cdrio.h>
- #include "vcd_read_fbsd.h"
- #elif defined(__NetBSD__) || defined (__OpenBSD__)
-@@ -71,7 +71,7 @@
- struct stream_priv_s* p = (struct stream_priv_s*)opts;
- int ret,ret2,f;
- mp_vcd_priv_t* vcd;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- int bsize = VCD_SECTOR_SIZE;
- #endif
-
-@@ -119,7 +119,7 @@
- }
- mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2);
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
- mp_msg(MSGT_OPEN,MSGL_WARN,"Error in CDRIOCSETBLOCKSIZE");
- }
-only in patch2:
-unchanged:
---- mplayer-1.0~rc1.orig/stream/stream_cddb.c
-+++ mplayer-1.0~rc1/stream/stream_cddb.c
-@@ -41,7 +41,7 @@
-
- #if defined(__linux__)
- #include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/cdio.h>
- #elif defined(WIN32)
- #include <ddk/ntddcdrm.h>
-@@ -133,7 +133,7 @@
- return toc.LastTrack;
- }
-
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- int
- read_toc(const char *dev) {
- int drive;
-only in patch2:
-unchanged:
---- mplayer-1.0~rc1.orig/stream/tvi_bsdbt848.c
-+++ mplayer-1.0~rc1/stream/tvi_bsdbt848.c
-@@ -44,7 +44,7 @@
- #elif defined(__DragonFly__)
- #include <dev/video/meteor/ioctl_meteor.h>
- #include <dev/video/bktr/ioctl_bt848.h>
--#elif __FreeBSD_version >= 502100
-+#elif (__FreeBSD_version >= 502100) || defined(__FreeBSD_kernel__)
- #include <dev/bktr/ioctl_meteor.h>
- #include <dev/bktr/ioctl_bt848.h>
- #else
Deleted: trunk/web/patches/qt4-x11.diff
===================================================================
--- trunk/web/patches/qt4-x11.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/qt4-x11.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,186 +0,0 @@
-diff -u qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
---- qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
-+++ qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
-@@ -2,19 +2,78 @@
--## 14_kfreebsd_build_fix.dpatch by Brian Nelson <pyro at debian.org> by way
--## of Petr Salinger <Petr.Salinger at t-systems.cz>
-+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
- ##
- ## All lines beginning with `## DP:' are a description of the patch.
--## DP: Fixes FTBFS on GNU/kFreeBSD
-+## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC
-
- @DPATCH@
--diff -urNad qt4-x11-4.0.1~/src/corelib/global/qglobal.h qt4-x11-4.0.1/src/corelib/global/qglobal.h
----- qt4-x11-4.0.1~/src/corelib/global/qglobal.h 2005-08-16 11:41:07.000000000 +0300
--+++ qt4-x11-4.0.1/src/corelib/global/qglobal.h 2005-12-13 18:19:47.000000000 +0200
--@@ -100,7 +100,7 @@
-- # define Q_OS_ULTRIX
-- #elif defined(sinix)
-+diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/global/qglobal.h
-+--- qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-10-20 17:35:14.000000000 +0200
-++++ qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-12-06 23:06:11.000000000 +0100
-+@@ -101,6 +102,12 @@
- # define Q_OS_RELIANT
---#elif defined(__linux__) || defined(__linux)
--+#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
-+ #elif defined(__linux__) || defined(__linux)
- # define Q_OS_LINUX
-++# define Q_OS_GLIBC
-++#elif defined(__GNU_HURD__) || defined(__GNU__)
-++# define Q_OS_HURD
-++# define Q_OS_GLIBC
-++#elif defined(__GLIBC__)
-++# define Q_OS_GLIBC
- #elif defined(__FreeBSD__) || defined(__DragonFly__)
- # define Q_OS_FREEBSD
-+ # define Q_OS_BSD4
-+@@ -121,8 +128,6 @@
-+ # define Q_OS_AIX
-+ #elif defined(__Lynx__)
-+ # define Q_OS_LYNX
-+-#elif defined(__GNU_HURD__)
-+-# define Q_OS_HURD
-+ #elif defined(__DGUX__)
-+ # define Q_OS_DGUX
-+ #elif defined(__QNXNTO__)
-+diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp
-+--- qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-10-20 17:35:15.000000000 +0200
-++++ qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-12-07 09:01:45.000000000 +0100
-+@@ -248,11 +248,11 @@
-+
-+ #if defined(Q_OS_UNIX)
-+
-+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
-++#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
-+ # define USE_MMAP
-+ # include <sys/types.h>
-+ # include <sys/mman.h>
-+-#endif // Q_OS_FREEBSD || Q_OS_LINUX
-++#endif // Q_OS_FREEBSD || Q_OS_GLIBC
-+
-+ static long qt_find_pattern(const char *s, ulong s_len,
-+ const char *pattern, ulong p_len)
-+diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp
-+--- qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-10-20 17:35:15.000000000 +0200
-++++ qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-12-07 09:01:22.000000000 +0100
-+@@ -47,7 +47,7 @@
-+ #include <stdlib.h>
-+ #include <qdebug.h>
-+
-+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
-+ # include <fenv.h>
-+ #endif
-+
-+@@ -5639,7 +5639,7 @@
-+ _control87(MCW_EM, MCW_EM);
-+ #endif
-+
-+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
-+ fenv_t envp;
-+ feholdexcept(&envp);
-+ #endif
-+@@ -5655,7 +5655,7 @@
-+ #endif //_M_X64
-+ #endif //Q_OS_WIN
-+
-+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
-+ fesetenv(&envp);
-+ #endif
-+
-diff -u qt4-x11-4.2.1/debian/patches/00list qt4-x11-4.2.1/debian/patches/00list
---- qt4-x11-4.2.1/debian/patches/00list
-+++ qt4-x11-4.2.1/debian/patches/00list
-@@ -11 +11 @@
--21_hurd_detection
-+90_kfreebsd_mkspecs
-reverted:
---- qt4-x11-4.2.1/debian/patches/21_hurd_detection.dpatch
-+++ qt4-x11-4.2.1.orig/debian/patches/21_hurd_detection.dpatch
-@@ -1,27 +0,0 @@
--#! /bin/sh /usr/share/dpatch/dpatch-run
--## 20_hurd_detection.dpatch by Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
--##
--## All lines beginning with `## DP:' are a description of the patch.
--## DP: Enable GNU/Hurd detection
--
-- at DPATCH@
--diff -Nur qt4-x11-4.1.3~/src/corelib/global/qglobal.h qt4-x11-4.1.3~/src/corelib/global/qglobal.h
----- qt4-x11-4.1.3~/src/corelib/global/qglobal.h 2006-07-21 11:51:19.000000000 +0000
--+++ qt4-x11-4.1.3/src/corelib/global/qglobal.h 2006-07-21 11:58:25.000000000 +0000
--@@ -69,6 +69,7 @@
-- LYNX - LynxOS
-- BSD4 - Any BSD 4.4 system
-- UNIX - Any UNIX BSD/SYSV system
--+ HURD - Hurd
-- */
--
-- #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
--@@ -136,6 +137,8 @@
-- # define Q_OS_UNIXWARE
-- #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
-- # define Q_OS_UNIXWARE
--+#elif defined(__GNU__) /* To avoid confusion, like for mkspecs files */
--+# define Q_OS_HURD
-- #elif defined(__MAKEDEPEND__)
-- #else
-- # error "Qt has not been ported to this OS - talk to qt-bugs at trolltech.com"
-diff -u qt4-x11-4.2.1/debian/rules qt4-x11-4.2.1/debian/rules
---- qt4-x11-4.2.1/debian/rules
-+++ qt4-x11-4.2.1/debian/rules
-@@ -26,6 +26,13 @@
- EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
- endif
-
-+ifeq ($(DEB_HOST_ARCH_OS),linux)
-+ PLATFORM_ARG = linux-g++
-+else
-+ PLATFORM_ARG = glibc-g++
-+endif
-+
-+
- common-configure-arch::
- ./configure -confirm-license \
- -prefix "/usr" \
-@@ -35,7 +42,7 @@
- -plugindir "/usr/lib/qt4/plugins" \
- -translationdir "/usr/share/qt4/translations" \
- -sysconfdir "/etc/qt4" \
-- -platform linux-g++ \
-+ -platform $(PLATFORM_ARG) \
- -debug-and-release \
- -fast \
- -no-rpath \
-only in patch2:
-unchanged:
---- qt4-x11-4.2.1.orig/debian/patches/90_kfreebsd_mkspecs.dpatch
-+++ qt4-x11-4.2.1/debian/patches/90_kfreebsd_mkspecs.dpatch
-@@ -0,0 +1,25 @@
-+#! /bin/sh -e
-+## 90_kfreebsd_mkspecs.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
-+## DP: we cannot use directly linux-g++ due to src/corelib/io/io.pri
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+case "$1" in
-+ -patch)
-+ rm -rvf mkspecs/glibc-g++
-+ cp -av mkspecs/linux-g++ mkspecs/glibc-g++
-+ ;;
-+ -unpatch)
-+ rm -rvf mkspecs/glibc-g++
-+ ;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
Deleted: trunk/web/patches/samba.bash
===================================================================
--- trunk/web/patches/samba.bash 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/samba.bash 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,311 +0,0 @@
-#!/bin/bash
-set -e
-cp debian/control{,.in}
-cat $0 | patch -p1
-which type-handling
-fakeroot debian/rules clean
-exit 0
-
-diff -ur samba-3.0.9.old/debian/control.in samba-3.0.9/debian/control.in
---- samba-3.0.9.old/debian/control.in 2004-12-09 17:22:38.000000000 +0100
-+++ samba-3.0.9/debian/control.in 2004-12-11 01:23:02.000000000 +0100
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Eloy A. Paris <peloy at debian.org>
- Uploaders: Steve Langasek <vorlon at debian.org>
--Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7)
-+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1)
- Standards-Version: 3.5.10
-
- Package: samba
-@@ -100,7 +100,7 @@
- Package: smbfs
- Section: otherosfs
- Priority: optional
--Architecture: any
-+Architecture: @smbfs@
- Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
- Suggests: smbclient
- Replaces: smbfsx
-diff -ur samba-3.0.9.old/debian/rules samba-3.0.9/debian/rules
---- samba-3.0.9.old/debian/rules 2004-12-09 17:22:26.000000000 +0100
-+++ samba-3.0.9/debian/rules 2004-12-11 01:23:02.000000000 +0100
-@@ -19,9 +19,13 @@
- # cross-building, etc.
- DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-+DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-
- export DEB_HOST_GNU_TYPE
- export DEB_BUILD_GNU_TYPE
-+export DEB_HOST_GNU_SYSTEM
-+export DEB_BUILD_GNU_SYSTEM
-
-
- # Support the DEB_BUILD_OPTIONS variable
-@@ -41,26 +45,7 @@
-
- DESTDIR=`pwd`/debian/tmp
-
--patch: patch-stamp
--patch-stamp:
-- dh_testdir
-- if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
-- touch patch-stamp
--
--unpatch:
-- dh_testdir
-- if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
-- rm -f patch-stamp
--
--configure: patch-stamp configure-stamp
--configure-stamp:
-- dh_testdir
--
-- if [ -f debian/config.cache ]; then \
-- cp -f debian/config.cache source/config.cache; \
-- fi
--
-- [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \
-+conf_args= \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --cache-file=./config.cache \
-@@ -74,7 +59,6 @@
- --with-piddir=/var/run/samba \
- --localstatedir=/var \
- --with-netatalk \
-- --with-smbmount \
- --with-pam \
- --with-syslog \
- --with-utmp \
-@@ -84,11 +68,43 @@
- --with-winbind \
- --with-msdfs \
- --with-automount \
-- --with-acl-support \
- --with-tdbsam \
- --with-ldap \
-+ --with-python=python2.3
-+
-+ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
-+conf_args += \
-+ --with-smbmount \
- --with-quotas \
-- --with-python=python2.3)
-+ --with-acl-support
-+mount_cifs = yes
-+smbfs = yes
-+else
-+conf_args += --without-quotas
-+mount_cifs = no
-+smbfs = no
-+endif
-+
-+patch: patch-stamp
-+patch-stamp:
-+ dh_testdir
-+ if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
-+ touch patch-stamp
-+
-+unpatch:
-+ dh_testdir
-+ if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
-+ rm -f patch-stamp
-+
-+configure: patch-stamp configure-stamp
-+configure-stamp:
-+ dh_testdir
-+
-+ if [ -f debian/config.cache ]; then \
-+ cp -f debian/config.cache source/config.cache; \
-+ fi
-+
-+ [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
-
- touch configure-stamp
-
-@@ -98,7 +114,9 @@
-
- $(MAKE) -C source headers
- $(MAKE) -C source all nsswitch/libnss_wins.so python_ext
-+ifeq ($(mount_cifs),yes)
- $(MAKE) -C source client/mount.cifs
-+endif
-
- touch build-stamp
-
-@@ -117,6 +135,11 @@
- source/bin/libsmbclient.a source/bin/mount.cifs \
- source/include/stamp-h
-
-+ sed \
-+ -e "s/@libacl@/`type-handling any linux-gnu`/g" \
-+ -e "s/@smbfs@/`type-handling any linux-gnu`/g" \
-+ < debian/control.in > debian/control
-+
- dh_clean
-
- install: DH_OPTIONS=
-@@ -167,6 +190,7 @@
- # right location in the libpam-smbpass package.
- install -m 0644 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/
-
-+ifeq ($(smbfs),yes)
- # Create the symlinks that will allow us to do "mount -t smbfs ..."
- # and "mount -t smb ...". Note that the source/script/installbin.sh
- # tries to create the first symlink, but we have commented
-@@ -176,10 +200,13 @@
- ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
-+endif
-
-+ifeq ($(mount_cifs),yes)
- # Install mount.cifs and its man page
- install -m 0755 source/client/mount.cifs $(DESTDIR)/sbin/
- install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/
-+endif
-
- # For CUPS to support printing to samba printers, it's necessary
- # to make the following symlink (according to
-@@ -215,11 +242,11 @@
-
- # Install the Python modules
- #
-- # Hmmm... need to figure this out. We have lib.linux-i686-2.2
-- # and lib.linux-i686-2.3 directories. Using only the stuff from
-+ # Hmmm... need to figure this out. We have lib.*-i686-2.2
-+ # and lib.*-i686-2.3 directories. Using only the stuff from
- # the 2.3 directory for now. peloy.-
- #cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
-- cp source/build/lib.linux-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
-+ cp source/build/lib.*-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
- cp source/python/samba/* $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
-
- dh_movefiles
-@@ -258,7 +285,7 @@
-
- # Build architecture-dependent files here.
- # Pass -a to all debhelper commands in this target to reduce clutter.
--binary-arch: DH_OPTIONS=-a
-+binary-arch: DH_OPTIONS=-s
- binary-arch: build install
- dh_testdir
- dh_testroot
-@@ -297,6 +324,7 @@
- # Why this is executable, I have NO idea...
- chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
-
-+ifeq ($(smbfs),yes)
- # You may want to make some executables suid here.
- # The smbmnt and smbumount binaries should be setuid-root. This
- # has security implications because these programs haven't had
-@@ -304,6 +332,7 @@
- # the setuid bit set. In fact, it is a security hole.
- chmod u+s debian/smbfs/usr/bin/smbmnt
- chmod u+s debian/smbfs/usr/bin/smbumount
-+endif
-
- # Set some reasonable default perms for the samba logdir.
- chmod 0750 debian/samba/var/log/samba/
-diff -ur samba-3.0.9.old/source/configure.in samba-3.0.9/source/configure.in
---- samba-3.0.9.old/source/configure.in 2004-11-16 04:03:30.000000000 +0100
-+++ samba-3.0.9/source/configure.in 2004-12-11 01:24:06.000000000 +0100
-@@ -549,49 +549,13 @@
- fi
- ;;
-
--# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+# Systems with LFS support.
- #
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- AC_MSG_CHECKING([for LFS support])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-- AC_TRY_RUN([
--#include <unistd.h>
--#include <sys/utsname.h>
--#include <string.h>
--#include <stdlib.h>
--main() {
--#if _LFS64_LARGEFILE == 1
-- struct utsname uts;
-- char *release;
-- int major, minor;
--
-- /* Ensure this is glibc 2.2 or higher */
--#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-- int libc_major = __GLIBC__;
-- int libc_minor = __GLIBC_MINOR__;
--
-- if (libc_major < 2)
-- exit(1);
-- if (libc_minor < 2)
-- exit(1);
--#endif
--
-- /* Ensure this is kernel 2.4 or higher */
--
-- uname(&uts);
-- release = strdup(uts.release);
-- major = atoi(strsep(&release, "."));
-- minor = atoi(strsep(&release, "."));
--
-- if (major > 2 || (major == 2 && minor > 3))
-- exit(0);
-- exit(1);
--#else
-- exit(1);
--#endif
--}
--], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-+ LINUX_LFS_SUPPORT=yes
- CPPFLAGS="$old_CPPFLAGS"
- if test x$LINUX_LFS_SUPPORT = xyes ; then
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-@@ -1015,7 +979,7 @@
- #
- #
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- # glibc <= 2.3.2 has a broken getgrouplist
- AC_TRY_RUN([
- #include <unistd.h>
-@@ -1147,7 +1111,10 @@
-
- # and these are for particular systems
- case "$host_os" in
-- *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux])
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
-+ case "$host_os" in linux*)
-+ AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
-+ esac
- BLDSHARED="true"
- if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
- LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -4021,7 +3988,7 @@
- AC_MSG_RESULT(yes);
-
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
- AC_TRY_LINK([#include <sys/sendfile.h>],
- [\
-@@ -4255,10 +4222,10 @@
- WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
-
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- ;;
-- *freebsd5*)
-+ freebsd5*)
- # FreeBSD winbind client is implemented as a wrapper around
- # the Linux version.
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
Deleted: trunk/web/patches/vpnc.diff
===================================================================
--- trunk/web/patches/vpnc.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/vpnc.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,158 +0,0 @@
-diff -u vpnc-0.3.3+SVN20051028/debian/control vpnc-0.3.3+SVN20051028/debian/control
---- vpnc-0.3.3+SVN20051028/debian/control
-+++ vpnc-0.3.3+SVN20051028/debian/control
-@@ -7,7 +7,7 @@
-
- Package: vpnc
- Architecture: any
--Depends: iproute, ${shlibs:Depends}, ${misc:Depends}
-+Depends: iproute | libc0.1, ${shlibs:Depends}, ${misc:Depends}
- Suggests: resolvconf
- Description: Cisco-compatible VPN client
- vpnc is a VPN client compatible with cisco3000 VPN Concentrator (also
-diff -u vpnc-0.3.3+SVN20051028/debian/patches/04_debianitis.dpatch vpnc-0.3.3+SVN20051028/debian/patches/04_debianitis.dpatch
---- vpnc-0.3.3+SVN20051028/debian/patches/04_debianitis.dpatch
-+++ vpnc-0.3.3+SVN20051028/debian/patches/04_debianitis.dpatch
-@@ -213,7 +213,7 @@
- if [ -n "$CISCO_BANNER" ]; then
- echo "Connect Banner:"
- echo "$CISCO_BANNER" | while read LINE ; do echo "|" "$LINE" ; done
--@@ -222,6 +282,15 @@
-+@@ -222,6 +282,19 @@
-
- do_ifconfig
- set_vpngateway_route
-@@ -221,8 +221,12 @@
- + # -- Debian specific
- + if test "$TARGET_NETWORKS" ; then
- + for network in $TARGET_NETWORKS ; do
--+ ip route del $network 2>/dev/null
--+ ip route add $network dev $TUNDEV
-++ $IPROUTE route $route_syntax_del $network 2>/dev/null
-++ if [ "$OS" = "Linux" ]; then
-++ $IPROUTE route add $network dev $TUNDEV
-++ else
-++ $IPROUTE route add -net $network $route_syntax_gw "$INTERNAL_IP4_ADDRESS"
-++ fi
- + done
- + else
- +
-diff -u vpnc-0.3.3+SVN20051028/debian/patches/00list vpnc-0.3.3+SVN20051028/debian/patches/00list
---- vpnc-0.3.3+SVN20051028/debian/patches/00list
-+++ vpnc-0.3.3+SVN20051028/debian/patches/00list
-@@ -9,0 +10 @@
-+09_kbsd
-only in patch2:
-unchanged:
---- vpnc-0.3.3+SVN20051028.orig/debian/patches/09_kbsd.dpatch
-+++ vpnc-0.3.3+SVN20051028/debian/patches/09_kbsd.dpatch
-@@ -0,0 +1,109 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+## 09_kbsd.dpatch
-+## DP: GNU/kFreeBSD support
-+
-+ at DPATCH@
-+only in patch2:
-+unchanged:
-+--- vpnc-0.3.3+SVN20051028.orig/vpnc-script
-++++ vpnc-0.3.3+SVN20051028/vpnc-script
-+@@ -60,6 +60,10 @@
-+ if [ ! -e /dev/tun ]; then
-+ kldload if_tun
-+ fi
-++ elif [ "$OS" = "GNU/kFreeBSD" ]; then
-++ if [ ! -e /dev/tun ]; then
-++ kldload if_tun
-++ fi
-+ elif [ "$OS" = "NetBSD" ]; then
-+ :
-+ elif [ "$OS" = "OpenBSD" ]; then
-+@@ -79,18 +83,18 @@
-+ }
-+
-+ set_vpngateway_route() {
-+- $IPROUTE route add `ip route get "$VPNGATEWAY" | fix_ip_get_output`
-++ $IPROUTE route add `$IPROUTE route get "$VPNGATEWAY" | fix_ip_get_output`
-+ $IPROUTE route flush cache
-+ }
-+
-+ del_vpngateway_route() {
-+- $IPROUTE route del "$VPNGATEWAY"
-++ $IPROUTE route $route_syntax_del "$VPNGATEWAY"
-+ $IPROUTE route flush cache
-+ }
-+
-+ set_default_route() {
-+ $IPROUTE route | grep '^default' | fix_ip_get_output > "$DEFAULT_ROUTE_FILE"
-+- $IPROUTE route del default
-++ $IPROUTE route $route_syntax_del default
-+ $IPROUTE route add default dev "$TUNDEV"
-+ $IPROUTE route flush cache
-+ }
-+@@ -104,7 +108,7 @@
-+ }
-+
-+ reset_default_route() {
-+- $IPROUTE route del default > /dev/null 2>&1
-++ $IPROUTE route $route_syntax_del default > /dev/null 2>&1
-+ $IPROUTE route add `cat "$DEFAULT_ROUTE_FILE"`
-+ $IPROUTE route flush cache
-+ }
-+@@ -115,7 +119,7 @@
-+ #NETWORK="$1"
-+ #NETMASK="$2"
-+ #NETMASKLEN="$3"
-+- #$IPROUTE route del "$NETWORK/$NETMASKLEN" dev "$TUNDEV"
-++ #$IPROUTE route $route_syntax_del "$NETWORK/$NETMASKLEN" dev "$TUNDEV"
-+ #$IPROUTE route flush cache
-+ }
-+ else
-+only in patch2:
-+unchanged:
-+--- vpnc-0.3.3+SVN20051028.orig/sysdep-bsd.c
-++++ vpnc-0.3.3+SVN20051028/sysdep-bsd.c
-+@@ -122,12 +122,12 @@
-+
-+ #else
-+
-+-int tun_write(int fd, char *buf, int len)
-++int tun_write(int fd, unsigned char *buf, int len)
-+ {
-+ return write(fd, buf, len);
-+ }
-+
-+-int tun_read(int fd, char *buf, int len)
-++int tun_read(int fd, unsigned char *buf, int len)
-+ {
-+ return read(fd, buf, len);
-+ }
-+@@ -153,6 +153,8 @@
-+ exit(status);
-+ }
-+
-++#ifndef __GLIBC__
-++
-+ int getline(char **line, size_t * length, FILE * stream)
-+ {
-+ char *tmpline;
-+@@ -175,3 +177,5 @@
-+ (*line)[len] = '\0';
-+ return len;
-+ }
-++
-++#endif
-+only in patch2:
-+unchanged:
-+--- vpnc-0.3.3+SVN20051028.orig/Makefile
-++++ vpnc-0.3.3+SVN20051028/Makefile
-+@@ -33,6 +33,10 @@
-+ CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
-+ SYSDEP=sysdep-bsd.o
-+ endif
-++ifeq ($(shell uname -s), GNU/kFreeBSD)
-++CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN -D_GNU_SOURCE
-++SYSDEP=sysdep-bsd.o
-++endif
-+ ifeq ($(shell uname -s), NetBSD)
-+ CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
-+ SYSDEP=sysdep-bsd.o
Deleted: trunk/web/patches/xterm.diff
===================================================================
--- trunk/web/patches/xterm.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/xterm.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,11 +0,0 @@
---- xterm-208.old/aclocal.m4 2006-01-04 03:10:19.000000000 +0100
-+++ xterm-208/aclocal.m4 2006-02-12 12:52:49.000000000 +0100
-@@ -2043,7 +2043,7 @@
- irix[[56]].*) #(vi
- CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- ;;
--linux*|gnu*) #(vi
-+linux*|gnu*|*-gnu) #(vi
- CF_GNU_SOURCE
- ;;
- mirbsd*) #(vi
Deleted: trunk/web/patches/xulrunner.diff
===================================================================
--- trunk/web/patches/xulrunner.diff 2007-05-16 10:51:07 UTC (rev 1930)
+++ trunk/web/patches/xulrunner.diff 2007-05-17 10:53:01 UTC (rev 1931)
@@ -1,1132 +0,0 @@
-
-Author: rmh, petr
-Status: builds fine, in BTS
-
-diff -u xulrunner-1.8.0.8/debian/patches/00list xulrunner-1.8.0.8/debian/patches/00list
---- xulrunner-1.8.0.8/debian/patches/00list
-+++ xulrunner-1.8.0.8/debian/patches/00list
-@@ -24,6 +24,7 @@
- 15_passwdmgr
- 15_pyxpcom_deadcode
- 18_arm_xpcom_unused_attribute
-+18_kbsd_nspr
- 18_m68k_xpcom
- 20_about:plugins
- 20_broken_perl
-@@ -34,7 +35,7 @@
- 25_passwdmgr_crash
- 25_xpidl
- 25_xrender_bug_workaround
--28_ppc64_build
-+#28_ppc64_build
- 30_distclean
- 30_embedding_tests
- 30_killAll
-@@ -45,10 +46,11 @@
- 38_arm_xpcom_optim
- 38_hppa_xpcom
- 38_ia64_align
-+38_kbsd
- 38_mips64_build
- 38_mips_xpcom
- 38_sparc64_unichar_alignment
--38_unsupported_arch_build
-+#38_unsupported_arch_build
- 60_config_install
- 60_js_binary
- 60_nspr_m4
-diff -u xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
---- xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
-@@ -10,18 +10,17 @@
- ==================================================================
- --- xulrunner/security/coreconf/Linux.mk (revision 44)
- +++ xulrunner/security/coreconf/Linux.mk (local)
--@@ -100,6 +100,10 @@
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = s390x
-+@@ -78,6 +78,9 @@
-+ ifeq ($(OS_TEST),parisc64)
-+ CPU_ARCH = hppa
- else
- +ifeq ($(OS_TEST),mips64)
--+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- + CPU_ARCH = mips
- +else
-- ifeq ($(OS_TEST),mips)
-- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-- CPU_ARCH = mips
--@@ -119,6 +123,7 @@
-+ ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+ OS_REL_CFLAGS += -Di386
-+ CPU_ARCH = x86
-+@@ -87,6 +90,7 @@
- endif
- endif
- endif
-diff -u xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
---- xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
-@@ -629,9 +629,9 @@
- --- xulrunner/security/coreconf/Linux2.6.mk (revision 8)
- +++ xulrunner/security/coreconf/Linux2.6.mk (local)
- @@ -38,7 +38,7 @@
-- include $(CORE_DEPTH)/coreconf/Linux.mk
--
- OS_REL_CFLAGS += -DLINUX2_1
-+ endif
-+
- -MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
- +MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME)
- ifdef BUILD_OPT
-diff -u xulrunner-1.8.0.8/debian/patches/99_configure.dpatch xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
---- xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
-@@ -1694,7 +1694,7 @@
-
- MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat'
--@@ -5042,10 +4911,17 @@
-+@@ -5042,10 +4911,18 @@
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
- esac
- else
-@@ -1707,6 +1707,7 @@
- + OS_TEST="${host_cpu}"
- + case "${host_os}" in
- + linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- + mingw*) OS_ARCH=WINNT ;;
- + wince*) OS_ARCH=WINCE ;;
-diff -u xulrunner-1.8.0.8/debian/patches/80_uname.dpatch xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
---- xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
-@@ -13,7 +13,7 @@
-
- --- xulrunner/configure.in 2006-08-09 10:26:00.000000000 +0200
- +++ xulrunner/configure.in 2006-08-09 10:31:25.000000000 +0200
--@@ -818,10 +818,17 @@
-+@@ -818,10 +818,18 @@
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
- esac
- else
-@@ -26,6 +26,7 @@
- + OS_TEST="${host_cpu}"
- + case "${host_os}" in
- + linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- + mingw*) OS_ARCH=WINNT ;;
- + wince*) OS_ARCH=WINCE ;;
-only in patch2:
-unchanged:
---- xulrunner-1.8.0.8.orig/debian/patches/18_kbsd_nspr.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/18_kbsd_nspr.dpatch
-@@ -0,0 +1,417 @@
-+#!/bin/sh -e
-+## 18_kbsd_nspr.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support for nspr
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=261649
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=355999
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -urN mozilla/nsprpub/config/nsinstall.c mozilla/nsprpub/config/nsinstall.c
-+--- mozilla/nsprpub/config/nsinstall.c 2004-04-28 02:33:11.000000000 +0200
-++++ mozilla/nsprpub/config/nsinstall.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -98,7 +98,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
-+--- mozilla/nsprpub/pr/include/md/_linux.cfg 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.cfg 2006-11-20 22:10:27.000000000 +0100
-+@@ -35,6 +35,11 @@
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-++/*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-+ #ifndef nspr_cpucfg___
-+ #define nspr_cpucfg___
-+
-+@@ -42,11 +47,15 @@
-+ #define XP_UNIX
-+ #endif
-+
-+-#ifndef LINUX
-++#if !defined(LINUX) && defined(__linux__)
-+ #define LINUX
-+ #endif
-+
-++#ifdef __FreeBSD_kernel__
-++#define PR_AF_INET6 28 /* same as AF_INET6 */
-++#else
-+ #define PR_AF_INET6 10 /* same as AF_INET6 */
-++#endif
-+
-+ #ifdef __powerpc64__
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
-+--- mozilla/nsprpub/pr/include/md/_linux.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_linux.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -41,6 +41,15 @@
-+ #include "prthread.h"
-+
-+ /*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-++#ifdef __FreeBSD_kernel__
-++#define _PR_HAVE_SOCKADDR_LEN
-++#endif
-++
-++/*
-+ * Internal configuration macros
-+ */
-+
-+diff -urN mozilla/nsprpub/pr/include/md/_pth.h mozilla/nsprpub/pr/include/md/_pth.h
-+--- mozilla/nsprpub/pr/include/md/_pth.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/_pth.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -143,10 +143,15 @@
-+ (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+ #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-+- || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(HPUX) || defined(FREEBSD) \
-+ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-+ || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-++#ifdef __GNU__
-++/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-++#error Using Hurd pthreads
-++#endif
-+ #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0
-+ #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0
-+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
-+@@ -195,7 +200,8 @@
-+ /*
-+ * These platforms don't have sigtimedwait()
-+ */
-+-#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
-++#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-++ || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
-+ || defined(DARWIN)
-+@@ -235,7 +241,8 @@
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #endif /* defined(_PR_DCETHREADS) */
-+
-+-#elif defined(LINUX) || defined(FREEBSD)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(FREEBSD)
-+ #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
-+ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
-+ #elif defined(NTO)
-+@@ -291,7 +298,8 @@
-+ onemillisec.tv_nsec = 1000000L; \
-+ nanosleep(&onemillisec,NULL); \
-+ PR_END_MACRO
-+-#elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
-++#elif defined(HPUX) || defined(SOLARIS) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+diff -urN mozilla/nsprpub/pr/include/md/_unixos.h mozilla/nsprpub/pr/include/md/_unixos.h
-+--- mozilla/nsprpub/pr/include/md/_unixos.h 2005-01-17 23:13:36.000000000 +0100
-++++ mozilla/nsprpub/pr/include/md/_unixos.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -46,7 +46,8 @@
-+ * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
-+ * not be redefined.
-+ */
-+-#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
-++#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-++ && !defined(DARWIN) && !defined(NEXTSTEP)
-+ #ifndef FD_SETSIZE
-+ #define FD_SETSIZE 4096
-+ #endif
-+diff -urN mozilla/nsprpub/pr/include/md/prosdep.h mozilla/nsprpub/pr/include/md/prosdep.h
-+--- mozilla/nsprpub/pr/include/md/prosdep.h 2005-08-18 19:24:28.000000000 +0200
-++++ mozilla/nsprpub/pr/include/md/prosdep.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -90,7 +90,7 @@
-+ #elif defined(IRIX)
-+ #include "md/_irix.h"
-+
-+-#elif defined(LINUX)
-++#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ #include "md/_linux.h"
-+
-+ #elif defined(OSF1)
-+diff -urN mozilla/nsprpub/pr/src/linking/Makefile.in mozilla/nsprpub/pr/src/linking/Makefile.in
-+--- mozilla/nsprpub/pr/src/linking/Makefile.in 2006-01-05 16:40:18.000000000 +0100
-++++ mozilla/nsprpub/pr/src/linking/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-+
-+ # For Dl_info and dladdr.
-+-ifeq ($(OS_TARGET),Linux)
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
-+ DEFINES += -D_GNU_SOURCE
-+ endif
-+
-+diff -urN mozilla/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
-+--- mozilla/nsprpub/pr/src/linking/prlink.c 2005-08-18 19:24:29.000000000 +0200
-++++ mozilla/nsprpub/pr/src/linking/prlink.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -1374,7 +1374,8 @@
-+ PR_IMPLEMENT(char *)
-+ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
-+ {
-+-#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-++#if defined(SOLARIS) || defined(FREEBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+ Dl_info dli;
-+ char *result;
-+
-+diff -urN mozilla/nsprpub/pr/src/md/prosdep.c mozilla/nsprpub/pr/src/md/prosdep.c
-+--- mozilla/nsprpub/pr/src/md/prosdep.c 2004-04-28 02:33:56.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/prosdep.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,8 @@
-+
-+ /* Get page size */
-+ #ifdef XP_UNIX
-+-#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
-++#if defined SUNOS4 || defined BSDI || defined AIX \
-++ || defined LINUX || defined __GNU__ || defined __GLIBC__ \
-+ || defined FREEBSD || defined NETBSD || defined OPENBSD \
-+ || defined DARWIN || defined NEXTSTEP
-+ _pr_pageSize = getpagesize();
-+diff -urN mozilla/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
-+--- mozilla/nsprpub/pr/src/md/unix/unix.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -65,7 +65,7 @@
-+ * PRInt32* pointer to a _PRSockLen_t* pointer.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PRSockLen_t socklen_t
-+ #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-+ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxproces.c mozilla/nsprpub/pr/src/md/unix/uxproces.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxproces.c 2004-12-15 06:52:40.000000000 +0100
-++++ mozilla/nsprpub/pr/src/md/unix/uxproces.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -92,7 +92,8 @@
-+ * that can share the virtual address space and file descriptors.
-+ */
-+ #if (defined(IRIX) && !defined(_PR_PTHREADS)) \
-+- || (defined(LINUX) && defined(_PR_PTHREADS))
-++ || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
-++ && defined(_PR_PTHREADS))
-+ #define _PR_SHARE_CLONES
-+ #endif
-+
-+@@ -106,7 +107,8 @@
-+ */
-+
-+ #if defined(_PR_GLOBAL_THREADS_ONLY) \
-+- || (defined(_PR_PTHREADS) && !defined(LINUX))
-++ || (defined(_PR_PTHREADS) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
-+ #define _PR_NATIVE_THREADS
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/src/md/unix/uxrng.c mozilla/nsprpub/pr/src/md/unix/uxrng.c
-+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c 2005-08-18 19:24:37.000000000 +0200
-++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -138,7 +138,8 @@
-+ return 0;
-+ }
-+
-+-#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD))
-++#elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-++ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/nsprpub/pr/src/misc/prnetdb.c mozilla/nsprpub/pr/src/misc/prnetdb.c
-+--- mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -108,7 +108,7 @@
-+ #define _PR_HAVE_GETPROTO_R_INT
-+ #endif
-+
-+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++#if (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ #define _PR_HAVE_GETPROTO_R
-+ #define _PR_HAVE_5_ARG_GETPROTO_R
-+ #endif
-+diff -urN mozilla/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
-+--- mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-08-18 19:24:38.000000000 +0200
-++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -205,7 +205,8 @@
-+ #define _PRSelectFdSetArg_t void *
-+ #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(OSF1) || defined(SOLARIS) \
-+- || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
-++ || defined(HPUX10_30) || defined(HPUX11) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
-+ || defined(UNIXWARE) || defined(RISCOS)
-+@@ -289,7 +290,7 @@
-+ * most current systems.
-+ */
-+ #if defined(HAVE_SOCKLEN_T) \
-+- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-++ || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+ typedef socklen_t pt_SockLen;
-+ #elif (defined(AIX) && !defined(AIX4_1)) \
-+ || defined(VMS)
-+@@ -3230,7 +3231,8 @@
-+ };
-+
-+ #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-+- || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
-++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-++ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-+ || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
-+ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-+ #define _PR_FCNTL_FLAGS O_NONBLOCK
-+@@ -4727,7 +4729,8 @@
-+
-+ #include <sys/types.h>
-+ #include <sys/time.h>
-+-#if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX)
-++#if !defined(SUNOS4) && !defined(HPUX) \
-++ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
-+ #include <sys/select.h>
-+ #endif
-+
-+diff -urN mozilla/nsprpub/pr/tests/Makefile.in mozilla/nsprpub/pr/tests/Makefile.in
-+--- mozilla/nsprpub/pr/tests/Makefile.in 2004-04-28 02:34:16.000000000 +0200
-++++ mozilla/nsprpub/pr/tests/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -376,14 +376,10 @@
-+ EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-+- ifeq ($(OS_RELEASE), 1.2)
-+- EXTRA_LIBS = -ldl
-+- else
-+- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-+- ifeq ($(USE_PTHREADS),1)
-+- EXTRA_LIBS = -lpthread
-+- endif
-++ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
-++ LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-++ ifeq ($(USE_PTHREADS),1)
-++ EXTRA_LIBS = -lpthread
-+ endif
-+ endif
-+
-+diff -urN mozilla/nsprpub/configure.in mozilla/nsprpub/configure.in
-+--- mozilla/nsprpub/configure.in 2006-02-23 00:03:11.000000000 +0100
-++++ mozilla/nsprpub/configure.in 2006-11-20 22:10:26.000000000 +0100
-+@@ -1370,7 +1370,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1381,7 +1381,11 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -2456,7 +2460,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2540,7 +2544,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -urN mozilla/nsprpub/configure mozilla/nsprpub/configure
-+--- mozilla/nsprpub/configure 2006-02-23 00:03:10.000000000 +0100
-++++ mozilla/nsprpub/configure 2006-11-20 22:19:53.000000000 +0100
-+@@ -3820,7 +3820,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3849,10 +3849,14 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -5496,7 +5500,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5633,7 +5637,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
-+
-only in patch2:
-unchanged:
---- xulrunner-1.8.0.8.orig/debian/patches/38_kbsd.dpatch
-+++ xulrunner-1.8.0.8/debian/patches/38_kbsd.dpatch
-@@ -0,0 +1,584 @@
-+#!/bin/sh -e
-+## 38_kbsd.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: GNU/kFreeBSD support
-+## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=356011
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-+
-+case "$1" in
-+ -patch) patch $patch_opts -p1 < $0;;
-+ -unpatch) patch $patch_opts -p1 -R < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c
-+--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100
-++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100
-+@@ -106,7 +106,7 @@
-+ }
-+ #endif /* NEXTSTEP */
-+
-+-#ifdef LINUX
-++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__)
-+ #include <getopt.h>
-+ #endif
-+
-+diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100
-+@@ -161,7 +161,7 @@
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
-+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
-+ endif
-+@@ -237,7 +237,7 @@
-+ ifeq ($(OS_ARCH), AIX)
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ $(LINK_LIB) $(EXTRA_LIBS)
-+diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in
-+--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100
-+@@ -560,6 +560,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -1260,7 +1261,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1271,8 +1272,12 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-+- AC_DEFINE(linux)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ AC_DEFINE(linux)
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -2186,7 +2191,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2262,7 +2267,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure
-+--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100
-++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100
-+@@ -2753,6 +2753,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ darwin*) OS_ARCH=Darwin ;;
-+@@ -3766,7 +3767,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3795,14 +3796,18 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
-+
-+- cat >> confdefs.h <<\EOF
-++ cat >> confdefs.h <<\EOF
-+ #define linux 1
-+ EOF
-+
-++ ;;
-++ esac
-+ LD='$(CC)'
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+@@ -5281,7 +5286,7 @@
-+ _PTHREAD_LDFLAGS=
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
-+@@ -5404,7 +5409,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
-+diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h
-+--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -116,7 +116,7 @@
-+ * some systems don't have the BSD re_comp and re_exec routines
-+ */
-+ #ifndef NEED_BSDREGEX
-+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi)
-+ #define NEED_BSDREGEX
-+ #endif
-+ #endif
-+@@ -145,7 +145,7 @@
-+ * Is snprintf() part of the standard C runtime library?
-+ */
-+ #if !defined(HAVE_SNPRINTF)
-+-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX)
-++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX)
-+ #define HAVE_SNPRINTF
-+ #endif
-+ #endif
-+@@ -165,7 +165,7 @@
-+ * for select()
-+ */
-+ #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
-+-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS)
-++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS)
-+ #include <sys/time.h>
-+ #else
-+ #include <sys/select.h>
-+@@ -252,15 +252,14 @@
-+ #define HAVE_GETGRNAM_R
-+ #endif
-+
-+-#if defined(SNI) || defined(LINUX1_2)
-++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__)
-+ int strcasecmp(const char *, const char *);
-+ #ifdef SNI
-+ int strncasecmp(const char *, const char *, int);
-+-#endif /* SNI */
-+-#ifdef LINUX1_2
-++#else /* SNI */
-+ int strncasecmp(const char *, const char *, size_t);
-+-#endif /* LINUX1_2 */
-+-#endif /* SNI || LINUX1_2 */
-++#endif
-++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */
-+
-+ #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN)
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -276,7 +275,7 @@
-+ defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
-+ defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \
-+ ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-+- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
-++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \
-+ defined(FREEBSD) || defined(OPENBSD) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
-+@@ -300,7 +299,7 @@
-+ #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e )
-+ #endif
-+ #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \
-+- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \
-++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || \
-+ defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \
-+ (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+@@ -320,7 +319,7 @@
-+ #endif
-+ #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
-+ defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \
-+- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+ #define STRTOK( s1, s2, l ) strtok( s1, s2 )
-+ #else
-+ #define HAVE_STRTOK_R
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -168,7 +168,7 @@
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
-+ endif
-+
-+-ifeq ($(OS_ARCH), Linux)
-++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-+ endif
-+
-+@@ -286,7 +286,7 @@
-+ ifdef SO_FILES_TO_REMOVE
-+ -$(RM) $(SO_FILES_TO_REMOVE)
-+ endif
-+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
-+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
-+ else
-+ ifeq ($(OS_ARCH),OS2)
-+diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -218,7 +218,7 @@
-+
-+ #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
-+ defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
-+- defined(OPENBSD) || defined(NETBSD)
-++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
-+ #define EDEADLOCK -1
-+ #endif
-+
-+diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
-+--- mozilla/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
-++++ mozilla/security/coreconf/Linux.mk 2006-11-20 22:16:26.000000000 +0100
-+@@ -52,59 +52,34 @@
-+
-+ DEFAULT_COMPILER = gcc
-+
-+-ifeq ($(OS_TEST),m68k)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = m68k
-+-else
-+-ifeq ($(OS_TEST),ppc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ppc
-++CPU_ARCH = $(OS_TEST)
-++
-++ifeq ($(KERNEL),linux)
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
-++ ARCH = linux
-+ else
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE
-++ ARCH = gnu
-++endif
-++
-++
-+ ifeq ($(OS_TEST),alpha)
-+- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = alpha
-+-else
-+-ifeq ($(OS_TEST),ia64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ia64
-+-else
-+-ifeq ($(OS_TEST),x86_64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = x86_64
-+-else
-+-ifeq ($(OS_TEST),sparc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = sparc
-++ OS_REL_CFLAGS += -D_ALPHA_
-+ else
-+ ifeq ($(OS_TEST),sparc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = sparc
-+ else
-+ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = arm
-+ else
-+ ifeq ($(OS_TEST),parisc)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+ ifeq ($(OS_TEST),parisc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = hppa
-+ else
-+-ifeq ($(OS_TEST),s390)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390
-+-else
-+-ifeq ($(OS_TEST),s390x)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = s390x
-+-else
-+-ifeq ($(OS_TEST),mips)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = mips
-++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+-else
-+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-++ OS_REL_CFLAGS += -Di386
-+ CPU_ARCH = x86
-+ endif
-+ endif
-+@@ -112,18 +88,11 @@
-+ endif
-+ endif
-+ endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+-endif
-+
-+
-+ LIBC_TAG = _glibc
-+
-+-ifeq ($(OS_RELEASE),2.0)
-++ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
-+ OS_REL_CFLAGS += -DLINUX2_0
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+@@ -140,20 +109,22 @@
-+ OS_PTHREAD = -lpthread
-+ endif
-+
-+-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-++ifeq ($(KERNEL),linux)
-++OS_CFLAGS += -DLINUX -Dlinux
-++endif
-+ OS_LIBS = $(OS_PTHREAD) -ldl -lc
-+
-+ ifdef USE_PTHREADS
-+ DEFINES += -D_REENTRANT
-+ endif
-+
-+-ARCH = linux
-+
-+ DSO_CFLAGS = -fPIC
-+ DSO_LDOPTS = -shared
-+ DSO_LDFLAGS =
-+
-+-# INCLUDES += -I/usr/include -Y/usr/include/linux
-++# INCLUDES += -I/usr/include
-+ G++INCLUDES = -I/usr/include/g++
-+
-+ #
-+diff -urN mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux2.6.mk
-+--- mozilla/security/coreconf/Linux2.6.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/Linux2.6.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -37,7 +37,10 @@
-+
-+ include $(CORE_DEPTH)/coreconf/Linux.mk
-+
-++ifeq ($(KERNEL), linux)
-+ OS_REL_CFLAGS += -DLINUX2_1
-++endif
-++
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+ ifdef BUILD_OPT
-+ OPTIMIZER = -O2
-+diff -urN mozilla/security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
-+--- mozilla/security/coreconf/arch.mk 2005-10-11 01:30:12.000000000 +0200
-++++ mozilla/security/coreconf/arch.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -154,6 +154,14 @@
-+ ifneq ($(words $(OS_RELEASE)),1)
-+ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
-+ endif
-++ KERNEL = linux
-++endif
-++
-++# This check must be last. Since all uses of OS_ARCH that follow affect only
-++# userland, we can merge other Glibc systems with Linux here.
-++ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
-++OS_ARCH = Linux
-++OS_RELEASE = 2.6
-+ endif
-+
-+ #
-+diff -urN mozilla/security/coreconf/config.mk mozilla/security/coreconf/config.mk
-+--- mozilla/security/coreconf/config.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/config.mk 2006-11-20 22:10:27.000000000 +0100
-+@@ -63,7 +63,7 @@
-+ #######################################################################
-+
-+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-+- OpenVMS AIX
-++ OpenVMS AIX GNU GNU_%
-+
-+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
-+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-+diff -urN mozilla/security/nss/lib/freebl/unix_rand.c mozilla/security/nss/lib/freebl/unix_rand.c
-+--- mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 01:22:50.000000000 +0200
-++++ mozilla/security/nss/lib/freebl/unix_rand.c 2006-11-20 22:10:26.000000000 +0100
-+@@ -81,7 +81,8 @@
-+ }
-+
-+ #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
-+- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
-++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
-+ #include <sys/times.h>
-+
-+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.c mozilla/security/nss/lib/ssl/sslmutex.c
-+--- mozilla/security/nss/lib/ssl/sslmutex.c 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.c 2006-11-20 22:10:27.000000000 +0100
-+@@ -89,7 +89,7 @@
-+ return SECSuccess;
-+ }
-+
-+-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <unistd.h>
-+ #include <fcntl.h>
-+diff -urN mozilla/security/nss/lib/ssl/sslmutex.h mozilla/security/nss/lib/ssl/sslmutex.h
-+--- mozilla/security/nss/lib/ssl/sslmutex.h 2004-04-28 01:04:39.000000000 +0200
-++++ mozilla/security/nss/lib/ssl/sslmutex.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -79,7 +79,7 @@
-+
-+ typedef int sslPID;
-+
-+-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
-++#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
-+
-+ #include <sys/types.h>
-+ #include "prtypes.h"
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -70,7 +70,7 @@
-+ # New code for Linux, et. al., with gcc
-+ # Migrate other platforms here after testing
-+ #
-+-ifneq (,$(filter Linux,$(OS_ARCH)))
-++ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ # Linux/x86-64
-+ ifeq (x86_64,$(OS_TEST))
-+ CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100
-++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100
-+@@ -67,7 +67,7 @@
-+ *
-+ */
-+
-+-#if defined(LINUX)
-++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
-+
-+ #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
-+ /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
-+diff -urN mozilla/configure.in mozilla/configure.in
-+--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100
-+@@ -812,6 +812,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -1261,7 +1262,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -2169,7 +2170,7 @@
-+ dnl = Flags to strip unused symbols from .so components
-+ dnl ========================================================
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -2735,7 +2736,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+
-+diff -urN mozilla/configure mozilla/configure
-+--- mozilla/configure 2006-11-20 22:20:44.000000000 +0100
-++++ mozilla/configure 2006-11-20 22:19:49.000000000 +0100
-+@@ -5036,6 +4934,7 @@
-+ OS_TEST="${target_cpu}"
-+ case "${target_os}" in
-+ linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
-+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
-+ mingw*) OS_ARCH=WINNT ;;
-+ wince*) OS_ARCH=WINCE ;;
-+@@ -5523,7 +5422,7 @@
-+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-kfreebsd*-gnu)
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+@@ -6792,7 +6691,7 @@
-+ esac
-+
-+ case "$target" in
-+- *-linux*)
-++ *-linux*|*-kfreebsd*-gnu)
-+ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
-+ ;;
-+ *-solaris*)
-+@@ -9498,7 +9400,7 @@
-+ fi
-+ ;;
-+
-+- *-*-linux*)
-++ *-*-linux*|*-*-kfreebsd*-gnu)
-+ cat >> confdefs.h <<\EOF
-+ #define _REENTRANT 1
-+ EOF
More information about the Glibc-bsd-commits
mailing list