[Glibc-bsd-commits] r1737 - trunk/web/patches

Petr Salinger ps-guest at alioth.debian.org
Tue Nov 21 15:59:25 CET 2006


Author: ps-guest
Date: 2006-11-21 15:59:25 +0100 (Tue, 21 Nov 2006)
New Revision: 1737

Added:
   trunk/web/patches/icedove.diff
   trunk/web/patches/iceweasel.diff
   trunk/web/patches/vlc.diff
Removed:
   trunk/web/patches/firefox_1.99.diff
Log:
* some patches: iceweasel, icedove, vlc



Deleted: trunk/web/patches/firefox_1.99.diff
===================================================================
--- trunk/web/patches/firefox_1.99.diff	2006-11-20 09:23:06 UTC (rev 1736)
+++ trunk/web/patches/firefox_1.99.diff	2006-11-21 14:59:25 UTC (rev 1737)
@@ -1,748 +0,0 @@
-
-* apply this patch
-* update *all* config.sub/config.guess
-* autoconf; cd nsprpub; autoconf
-
-
-diff -u firefox-1.99+2.0b2+dfsg/security/nss/lib/freebl/unix_rand.c firefox-1.99+2.0b2+dfsg/security/nss/lib/freebl/unix_rand.c
---- firefox-1.99+2.0b2+dfsg/security/nss/lib/freebl/unix_rand.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg/security/coreconf/Linux.mk firefox-1.99+2.0b2+dfsg/security/coreconf/Linux.mk
---- firefox-1.99+2.0b2+dfsg/security/coreconf/Linux.mk
-+++ firefox-1.99+2.0b2+dfsg/security/coreconf/Linux.mk
-@@ -52,94 +52,65 @@
- 
- DEFAULT_COMPILER = gcc
- 
--ifeq ($(OS_TEST),m68k)
--	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
--	CPU_ARCH	= m68k
-+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),ppc64)
--	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH	= ppc
- ifeq ($(USE_64),1)
- 	ARCHFLAG	= -m64
- endif
- else
--ifeq ($(OS_TEST),ppc)
--	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
--	CPU_ARCH	= ppc
--else
- 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
-+        OS_REL_CFLAGS   += -D_ALPHA_
- else
- ifeq ($(OS_TEST),x86_64)
- ifeq ($(USE_64),1)
--	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH	= x86_64
- else
--	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-+	OS_REL_CFLAGS	+= -Di386
- 	CPU_ARCH	= x86
- 	ARCHFLAG	= -m32
- endif
- else
--ifeq ($(OS_TEST),sparc)
--	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
--	CPU_ARCH        = sparc
--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
- endif
- endif
-+
- endif
- endif
- endif
-+
- endif
- endif
-+
- endif
- endif
- endif
-@@ -147,7 +118,7 @@
- 
- 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 MAPFILE
-@@ -165,15 +136,18 @@
- OS_PTHREAD = -lpthread 
- endif
- 
--OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
- OS_LIBS			= $(OS_PTHREAD) -ldl -lc
- 
-+ifeq ($(KERNEL),linux)
-+       OS_CFLAGS += -DLINUX -Dlinux
-+endif
-+ 
-+
- ifdef USE_PTHREADS
- 	DEFINES		+= -D_REENTRANT
- endif
- 
--ARCH			= linux
--
- DSO_CFLAGS		= -fPIC
- DSO_LDOPTS		= -shared $(ARCHFLAG)
- DSO_LDFLAGS		=
-diff -u firefox-1.99+2.0b2+dfsg/configure.in firefox-1.99+2.0b2+dfsg/configure.in
---- firefox-1.99+2.0b2+dfsg/configure.in
-+++ firefox-1.99+2.0b2+dfsg/configure.in
-@@ -825,6 +825,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 ;;
-@@ -837,6 +838,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 ;;
-@@ -1291,7 +1293,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}"
-@@ -2253,7 +2255,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*)
-@@ -2886,7 +2888,7 @@
- 			fi
- 			;;
- 
--	    *-*-linux*) 
-+	    *-*-linux*|*-*-kfreebsd*-gnu) 
- 			AC_DEFINE(_REENTRANT) 
- 			;;
- 
-diff -u firefox-1.99+2.0b2+dfsg/xpcom/reflect/xptcall/src/md/unix/Makefile.in firefox-1.99+2.0b2+dfsg/xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- firefox-1.99+2.0b2+dfsg/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/security/nss/lib/ssl/sslmutex.h
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/security/nss/lib/ssl/sslmutex.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/security/coreconf/Linux2.6.mk
-+++ firefox-1.99+2.0b2+dfsg/security/coreconf/Linux2.6.mk
-@@ -39,7 +39,10 @@
- 
- DSO_LDOPTS      += -Wl,-z,defs
- 
-+ifeq ($(KERNEL), linux)
- OS_REL_CFLAGS   += -DLINUX2_1
-+endif
-+
- MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
- 
- ifdef MAPFILE
-only in patch2:
-unchanged:
---- firefox-1.99+2.0b2+dfsg.orig/security/coreconf/config.mk
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/security/coreconf/arch.mk
-+++ firefox-1.99+2.0b2+dfsg/security/coreconf/arch.mk
-@@ -155,6 +155,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.99+2.0b2+dfsg.orig/directory/c-sdk/ldap/include/portable.h
-+++ firefox-1.99+2.0b2+dfsg/directory/c-sdk/ldap/include/portable.h
-@@ -131,7 +131,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
-@@ -160,7 +160,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(HPUX) || defined(__GNU__) || defined(__GLIBC__)
- #define HAVE_SNPRINTF
- #endif
- #endif
-@@ -180,7 +180,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>
-@@ -267,15 +267,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 )
-@@ -315,7 +314,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))
-only in patch2:
-unchanged:
---- firefox-1.99+2.0b2+dfsg.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+++ firefox-1.99+2.0b2+dfsg/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-@@ -233,7 +233,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.99+2.0b2+dfsg.orig/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+++ firefox-1.99+2.0b2+dfsg/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-@@ -184,7 +184,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
- 
-@@ -302,7 +302,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.99+2.0b2+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-+++ firefox-1.99+2.0b2+dfsg/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?? */
-only in patch2:
-unchanged:
---- firefox-1.99+2.0b2+dfsg.orig/nsprpub/configure.in
-+++ firefox-1.99+2.0b2+dfsg/nsprpub/configure.in
-@@ -1382,7 +1382,7 @@
- 	esac
-     ;;
- 
--*-linux*)
-+*-linux*|*-gnu*|*-k*bsd*-gnu)
-     if test -z "$USE_NSPR_THREADS"; then
-         USE_PTHREADS=1
-         IMPL_STRATEGY=_PTH
-@@ -1390,7 +1390,11 @@
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(_GNU_SOURCE)
-     AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
--    AC_DEFINE(LINUX)
-+    case "${target_os}" in
-+     linux*)
-+         AC_DEFINE(LINUX)
-+         ;;
-+     esac
-     CFLAGS="$CFLAGS -Wall"
-     CXXFLAGS="$CXXFLAGS -Wall"
-     MDCPUCFG_H=_linux.cfg
-@@ -2465,7 +2469,7 @@
-             _PTHREAD_LDFLAGS=-pthread
-         fi
-         ;;
--    *-linux*)
-+    *-linux*|*-gnu*|*-k*bsd*-gnu)
-         AC_DEFINE(_REENTRANT)
-         ;;
-     esac
-@@ -2549,7 +2553,7 @@
-         fi
-     fi
-     ;;
--*-linux*)
-+*-linux*|*-gnu*|*-k*bsd*-gnu)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
-only in patch2:
-unchanged:
---- firefox-1.99+2.0b2+dfsg.orig/nsprpub/config/nsinstall.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/include/md/_pth.h
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/include/md/prosdep.h
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/include/md/_linux.cfg
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/include/md/_unixos.h
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/include/md/_linux.h
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/misc/prnetdb.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/md/prosdep.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/md/unix/uxproces.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/md/unix/unix.c
-+++ firefox-1.99+2.0b2+dfsg/nsprpub/pr/src/md/unix/unix.c
-@@ -68,7 +68,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.99+2.0b2+dfsg.orig/nsprpub/pr/src/md/unix/uxrng.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/pthreads/ptio.c
-+++ firefox-1.99+2.0b2+dfsg/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.99+2.0b2+dfsg.orig/nsprpub/pr/src/linking/prlink.c
-+++ firefox-1.99+2.0b2+dfsg/nsprpub/pr/src/linking/prlink.c
-@@ -1605,7 +1605,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.99+2.0b2+dfsg.orig/nsprpub/pr/tests/Makefile.in
-+++ firefox-1.99+2.0b2+dfsg/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
- 

Added: trunk/web/patches/icedove.diff
===================================================================
--- trunk/web/patches/icedove.diff	2006-11-20 09:23:06 UTC (rev 1736)
+++ trunk/web/patches/icedove.diff	2006-11-21 14:59:25 UTC (rev 1737)
@@ -0,0 +1,1084 @@
+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,35 @@
++ 
++ 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

Copied: trunk/web/patches/iceweasel.diff (from rev 1736, trunk/web/patches/firefox_1.99.diff)

Added: trunk/web/patches/vlc.diff
===================================================================
--- trunk/web/patches/vlc.diff	2006-11-20 09:23:06 UTC (rev 1736)
+++ trunk/web/patches/vlc.diff	2006-11-21 14:59:25 UTC (rev 1737)
@@ -0,0 +1,189 @@
+only in patch2:
+unchanged:
+--- vlc-0.8.6-svn20061012.debian.orig/extras/x264/configure
++++ vlc-0.8.6-svn20061012.debian/extras/x264/configure
+@@ -96,6 +96,11 @@
+     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+     LDFLAGS="$LDFLAGS -lm"
+     ;;
++  kfreebsd*-gnu)
++    SYS="FREEBSD"
++    CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
++    LDFLAGS="$LDFLAGS -lm"
++    ;;
+   cygwin*)
+     SYS="CYGWIN"
+     CFLAGS="$CFLAGS -mno-cygwin"
+only in patch2:
+unchanged:
+--- vlc-0.8.6-svn20061012.debian.orig/modules/misc/network/ipv6.c
++++ vlc-0.8.6-svn20061012.debian/modules/misc/network/ipv6.c
+@@ -61,6 +61,7 @@
+ # else
+ #  define MCAST_JOIN_SOURCE_GROUP 46
+ # endif
++#if !(defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+ struct group_source_req
+ {
+        uint32_t           gsr_interface;  /* interface index */
+@@ -68,6 +69,7 @@
+        struct sockaddr_storage gsr_source;     /* source address */
+ };
+ #endif
++#endif
+ 
+ /*****************************************************************************
+  * Local prototypes
+diff -u vlc-0.8.6-svn20061012.debian/debian/control vlc-0.8.6-svn20061012.debian/debian/control
+--- vlc-0.8.6-svn20061012.debian/debian/control
++++ vlc-0.8.6-svn20061012.debian/debian/control
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+ Uploaders: Clément Stenac <zorglub at debian.org>
+-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev
++Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev
+ Standards-Version: 3.7.2
+ XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
+ 
+diff -u vlc-0.8.6-svn20061012.debian/debian/rules vlc-0.8.6-svn20061012.debian/debian/rules
+--- vlc-0.8.6-svn20061012.debian/debian/rules
++++ vlc-0.8.6-svn20061012.debian/debian/rules
+@@ -10,6 +10,8 @@
+ # from having to guess our platform (since we know it already)
+ 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) 
++
+ confflags = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
+ 
+ #
+@@ -28,7 +30,6 @@
+ 	--disable-qt \
+ 	--enable-mad \
+ 	--enable-arts \
+-	--enable-alsa \
+ 	--enable-lirc \
+ 	--enable-a52 \
+ 	--enable-aa \
+@@ -37,7 +38,6 @@
+ 	--disable-kde \
+ 	--enable-mp4 \
+ 	--enable-dvb \
+-	--enable-dv \
+ 	--disable-satellite \
+ 	--enable-ogg \
+ 	--enable-vorbis \
+@@ -50,8 +50,6 @@
+ 	--enable-skins2 \
+ 	--enable-freetype \
+ 	--enable-mkv \
+-	--enable-v4l \
+-	--enable-pvr \
+ 	--enable-speex \
+ 	--enable-caca \
+ 	--enable-live555 \
+@@ -77,12 +75,16 @@
+ 	--enable-notify \
+ 	$(NULL)
+ 
++ifeq ($(DEB_HOST_ARCH_OS),linux)
++vlc_confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
++endif
++
+ # These ones are currently shipped with VLC
+ vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
+ vlc_confflags += --enable-x264 --with-x264-tree=extras/x264
+ 
+-# Glide and svgalib are only for x86
+-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
++# Glide and svgalib are only for x86 on Linux
++ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+ vlc_confflags += --enable-glide
+ vlc_confflags += --enable-svgalib
+ endif
+@@ -158,6 +160,7 @@
+ clean:
+ 	dh_testdir
+ 	dh_testroot
++	cp debian/vlc-nox.install.kfreebsd-i386 debian/vlc-nox.install.kfreebsd-amd64
+ 	rm -f configure-stamp build-stamp
+ 	# Check that we have an x264 tree in here (can be a symlink)
+ 	test -d extras/x264
+@@ -228,7 +231,7 @@
+ 	ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
+ 	ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
+ 	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
+-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
++ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+ 	ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
+ 	ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
+ endif
+only in patch2:
+unchanged:
+--- vlc-0.8.6-svn20061012.debian.orig/debian/vlc-nox.install.kfreebsd-i386
++++ vlc-0.8.6-svn20061012.debian/debian/vlc-nox.install.kfreebsd-i386
+@@ -0,0 +1,63 @@
++usr/bin/vlc
++usr/share/doc
++usr/share/locale
++usr/share/vlc/http
++usr/share/vlc/osdmenu
++usr/lib/vlc/access/libvcd_plugin.so
++usr/lib/vlc/access/libvcdx_plugin.so
++usr/lib/vlc/access/libaccess_*.so
++usr/lib/vlc/access/libdvdnav_plugin.so
++usr/lib/vlc/access/libdvdread_plugin.so
++usr/lib/vlc/access/libcdda_plugin.so
++usr/lib/vlc/access_filter
++usr/lib/vlc/access_output
++usr/lib/vlc/audio_filter
++usr/lib/vlc/audio_mixer
++usr/lib/vlc/audio_output/libaout_file_plugin.so
++usr/lib/vlc/audio_output/liboss_plugin.so
++usr/lib/vlc/codec/libcmml_plugin.so
++usr/lib/vlc/codec/libffmpeg_plugin.so
++usr/lib/vlc/codec/libspudec_plugin.so
++usr/lib/vlc/codec/liba52_plugin.so
++usr/lib/vlc/codec/libcinepak_plugin.so
++usr/lib/vlc/codec/libdts_plugin.so
++usr/lib/vlc/codec/libflacdec_plugin.so
++usr/lib/vlc/codec/liblpcm_plugin.so
++usr/lib/vlc/codec/libaraw_plugin.so
++usr/lib/vlc/codec/libvorbis_plugin.so
++usr/lib/vlc/codec/libspeex_plugin.so
++usr/lib/vlc/codec/libadpcm_plugin.so
++usr/lib/vlc/codec/libmpeg_audio_plugin.so
++usr/lib/vlc/codec/liblibmpeg2_plugin.so
++usr/lib/vlc/codec/librawvideo_plugin.so
++usr/lib/vlc/codec/libsubsdec_plugin.so
++usr/lib/vlc/codec/libdvbsub_plugin.so
++usr/lib/vlc/codec/libtwolame_plugin.so
++usr/lib/vlc/codec/libpng_plugin.so
++usr/lib/vlc/codec/libsvcdsub_plugin.so
++usr/lib/vlc/codec/libcvdsub_plugin.so
++usr/lib/vlc/codec/libfake_plugin.so
++usr/lib/vlc/control
++usr/lib/vlc/demux
++usr/lib/vlc/gui/libncurses_plugin.so
++usr/lib/vlc/misc/libscreensaver_plugin.so
++usr/lib/vlc/misc/libdummy_plugin.so
++usr/lib/vlc/misc/libmemcpy_plugin.so
++usr/lib/vlc/misc/libipv4_plugin.so
++usr/lib/vlc/misc/libipv6_plugin.so
++usr/lib/vlc/misc/libexport_plugin.so
++usr/lib/vlc/misc/libxtag_plugin.so
++usr/lib/vlc/misc/libxml_plugin.so
++usr/lib/vlc/misc/libfreetype_plugin.so
++usr/lib/vlc/misc/liblogger_plugin.so
++usr/lib/vlc/misc/libvod_rtsp_plugin.so
++usr/lib/vlc/misc/libgnutls_plugin.so
++usr/lib/vlc/misc/libgrowl_plugin.so
++usr/lib/vlc/mux
++usr/lib/vlc/packetizer
++usr/lib/vlc/services_discovery
++usr/lib/vlc/stream_out
++usr/lib/vlc/video_chroma
++usr/lib/vlc/video_filter
++usr/lib/vlc/video_output/libimage_plugin.so
++usr/lib/vlc/visualization/libvisual_plugin.so




More information about the Glibc-bsd-commits mailing list