[Glibc-bsd-commits] r1661 - in trunk/web/patches: . debian-only
upstream-only
Petr Salinger
ps-guest at costa.debian.org
Mon Sep 25 18:55:29 UTC 2006
Author: ps-guest
Date: 2006-09-25 18:55:28 +0000 (Mon, 25 Sep 2006)
New Revision: 1661
Removed:
trunk/web/patches/boehm-gc.diff
trunk/web/patches/debian-only/ifupdown.diff
trunk/web/patches/debian-only/libgc_6.7.diff
trunk/web/patches/debian-only/xorg-server.diff
trunk/web/patches/pciutils.diff
trunk/web/patches/tofrodos.diff
trunk/web/patches/upstream-only/gcc.java_kfreebsd-gnu.diff
trunk/web/patches/xawtv.diff
Log:
* drop some obsolete patches
Deleted: trunk/web/patches/boehm-gc.diff
===================================================================
--- trunk/web/patches/boehm-gc.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/boehm-gc.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,301 +0,0 @@
-diff -Nur gcc-20040724.old/boehm-gc/include/private/gcconfig.h gcc-20040724/boehm-gc/include/private/gcconfig.h
---- gcc-20040724.old/boehm-gc/include/private/gcconfig.h 2004-04-06 20:05:05.000000000 +0200
-+++ gcc-20040724/boehm-gc/include/private/gcconfig.h 2004-08-06 01:53:05.000000000 +0200
-@@ -44,6 +44,14 @@
- # endif
- # endif
-
-+/* And one for Glibc: */
-+#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-+# include <features.h>
-+#endif
-+#ifdef __GLIBC__
-+# define GLIBC
-+#endif
-+
- /* And one for NetBSD: */
- # if defined(__NetBSD__)
- # define NETBSD
-@@ -58,6 +66,9 @@
- # if defined(__FreeBSD__)
- # define FREEBSD
- # endif
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+# define KFREEBSD
-+# endif
-
- /* Determine the machine type: */
- # if defined(__arm__) || defined(__thumb__)
-@@ -299,7 +310,7 @@
- # define OPENBSD
- # define mach_type_known
- # endif
--# if defined(FREEBSD) && (defined(i386) || defined(__i386__))
-+# if defined(KFREEBSD) && (defined(i386) || defined(__i386__))
- # define I386
- # define mach_type_known
- # endif
-@@ -1162,13 +1173,25 @@
- # endif
- # define SIG_SUSPEND SIGUSR1
- # define SIG_THR_RESTART SIGUSR2
-+ extern char etext[];
-+ extern char * GC_FreeBSDGetDataStart();
-+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-+# endif
-+# if defined(GLIBC) && defined(KFREEBSD)
-+# define OS_TYPE "GNU/kFreeBSD"
-+# if !defined(GC_LINUX_THREADS) && !defined(REDIRECT_MALLOC)
-+# define MPROTECT_VDB
-+# endif
-+# define SIG_SUSPEND 57 /* arbitrary signal number <= 128 */
-+# define SIG_THR_RESTART 58 /* arbitrary signal number <= 128 */
-+# define SEARCH_FOR_DATA_START
-+# define DATAEND (sbrk (0))
-+# endif
-+# ifdef KFREEBSD
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
- # endif
-- extern char etext[];
-- extern char * GC_FreeBSDGetDataStart();
--# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
- # endif
- # ifdef NETBSD
- # define OS_TYPE "NETBSD"
-diff -Nur gcc-20040724.old/boehm-gc/configure gcc-20040724/boehm-gc/configure
---- gcc-20040724.old/boehm-gc/configure 2004-06-17 21:32:41.000000000 +0200
-+++ gcc-20040724/boehm-gc/configure 2004-08-06 01:53:05.000000000 +0200
-@@ -5337,6 +5337,12 @@
- _ACEOF
-
- ;;
-+ *-*-gnu* | *-*-k*bsd*-gnu)
-+ cat >>confdefs.h <<\_ACEOF
-+#define _REENTRANT 1
-+_ACEOF
-+
-+ ;;
- *-*-aix*)
- cat >>confdefs.h <<\_ACEOF
- #define GC_AIX_THREADS 1
-diff -Nur gcc-20040724.old/boehm-gc/configure.ac gcc-20040724/boehm-gc/configure.ac
---- gcc-20040724.old/boehm-gc/configure.ac 2004-06-16 09:34:42.000000000 +0200
-+++ gcc-20040724/boehm-gc/configure.ac 2004-08-06 01:53:05.000000000 +0200
-@@ -138,6 +138,9 @@
- AC_DEFINE(GC_LINUX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
-+ *-*-gnu* | *-*-k*bsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
- *-*-aix*)
- AC_DEFINE(GC_AIX_THREADS)
- AC_DEFINE(_REENTRANT)
-diff -Nur gcc-20040724.old/boehm-gc/dbg_mlc.c gcc-20040724/boehm-gc/dbg_mlc.c
---- gcc-20040724.old/boehm-gc/dbg_mlc.c 2003-07-28 06:18:20.000000000 +0200
-+++ gcc-20040724/boehm-gc/dbg_mlc.c 2004-08-06 01:53:05.000000000 +0200
-@@ -59,7 +59,7 @@
-
- # include <stdlib.h>
-
--# if defined(LINUX) || defined(SUNOS4) || defined(SUNOS5) \
-+# if defined(LINUX) || defined(GLIBC) || defined(SUNOS4) || defined(SUNOS5) \
- || defined(HPUX) || defined(IRIX5) || defined(OSF1)
- # define RANDOM() random()
- # else
-diff -Nur gcc-20040724.old/boehm-gc/dyn_load.c gcc-20040724/boehm-gc/dyn_load.c
---- gcc-20040724.old/boehm-gc/dyn_load.c 2003-07-30 19:42:28.000000000 +0200
-+++ gcc-20040724/boehm-gc/dyn_load.c 2004-08-06 01:53:05.000000000 +0200
-@@ -26,7 +26,8 @@
- * None of this is safe with dlclose and incremental collection.
- * But then not much of anything is safe in the presence of dlclose.
- */
--#if defined(__linux__) && !defined(_GNU_SOURCE)
-+#if (defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) \
-+ && !defined(_GNU_SOURCE)
- /* Can't test LINUX, since this must be define before other includes */
- # define _GNU_SOURCE
- #endif
-@@ -56,7 +57,7 @@
- !(defined(ALPHA) && defined(OSF1)) && \
- !defined(HPUX) && !(defined(LINUX) && defined(__ELF__)) && \
- !defined(RS6000) && !defined(SCO_ELF) && !defined(DGUX) && \
-- !(defined(FREEBSD) && defined(__ELF__)) && \
-+ !(defined(KFREEBSD) && defined(__ELF__)) && \
- !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
- !defined(DARWIN)
- --> We only know how to find data segments of dynamic libraries for the
-@@ -81,7 +82,7 @@
- #endif
-
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-- (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-+ (defined(KFREEBSD) && defined(__ELF__)) || defined(DGUX) || \
- (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
- # include <stddef.h>
- # include <elf.h>
-@@ -265,7 +266,7 @@
- # endif /* SUNOS */
-
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-- (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-+ (defined(KFREEBSD) && defined(__ELF__)) || defined(DGUX) || \
- (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-
-
-@@ -360,7 +361,7 @@
- /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
- /* versions. Thanks to Jakub Jelinek for most of the code. */
-
--# if defined(LINUX) /* Are others OK here, too? */ \
-+# if defined(GLIBC) \
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-
-@@ -434,7 +435,7 @@
-
- #define HAVE_REGISTER_MAIN_STATIC_DATA
-
--# else /* !LINUX || version(glibc) < 2.2.4 */
-+# else /* !GLIBC || version(glibc) < 2.2.4 */
-
- /* Dynamic loading code for Linux running ELF. Somewhat tested on
- * Linux/x86, untested but hopefully should work on Linux/Alpha.
-diff -Nur gcc-20040724.old/boehm-gc/include/gc.h gcc-20040724/boehm-gc/include/gc.h
---- gcc-20040724.old/boehm-gc/include/gc.h 2003-07-31 06:52:36.000000000 +0200
-+++ gcc-20040724/boehm-gc/include/gc.h 2004-08-06 01:53:05.000000000 +0200
-@@ -466,7 +466,7 @@
- # define GC_RETURN_ADDR (GC_word)__return_address
- #endif
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
- && !defined(__ia64__)
-@@ -490,7 +490,8 @@
- /* This may also be desirable if it is possible but expensive to */
- /* retrieve the call chain. */
- #if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
-- || defined(__FreeBSD__)) & !defined(GC_CAN_SAVE_CALL_STACKS)
-+ || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
-+ ) & !defined(GC_CAN_SAVE_CALL_STACKS)
- # define GC_ADD_CALLER
- # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
- /* gcc knows how to retrieve return address, but we don't know */
-diff -Nur gcc-20040724.old/boehm-gc/os_dep.c gcc-20040724/boehm-gc/os_dep.c
---- gcc-20040724.old/boehm-gc/os_dep.c 2004-07-07 06:31:15.000000000 +0200
-+++ gcc-20040724/boehm-gc/os_dep.c 2004-08-06 01:53:05.000000000 +0200
-@@ -80,7 +80,7 @@
- # define NEED_FIND_LIMIT
- # endif
-
--#if defined(FREEBSD) && defined(I386)
-+#if defined(KFREEBSD) && defined(I386)
- # include <machine/trap.h>
- # if !defined(PCR)
- # define NEED_FIND_LIMIT
-@@ -121,7 +121,7 @@
- # include <fcntl.h>
- #endif
-
--#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX)
-+#if defined(SUNOS5SIGS) || defined(LINUX) || defined(GLIBC)
- # ifdef SUNOS5SIGS
- # include <sys/siginfo.h>
- # endif
-@@ -311,7 +311,7 @@
- /* for recent Linux versions. This seems to be the easiest way to */
- /* cover all versions. */
-
--# ifdef LINUX
-+# if defined(LINUX) || defined(GLIBC)
- /* Some Linux distributions arrange to define __data_start. Some */
- /* define data_start as a weak symbol. The latter is technically */
- /* broken, since the user program may define data_start, in which */
-@@ -321,7 +321,7 @@
- extern int __data_start[];
- # pragma weak data_start
- extern int data_start[];
--# endif /* LINUX */
-+# endif /* LINUX || GLIBC */
- extern int _end[];
-
- ptr_t GC_data_start;
-@@ -330,7 +330,7 @@
- {
- extern ptr_t GC_find_limit();
-
--# ifdef LINUX
-+# if defined(LINUX) || defined(GLIBC)
- /* Try the easy approaches first: */
- if ((ptr_t)__data_start != 0) {
- GC_data_start = (ptr_t)(__data_start);
-@@ -340,7 +340,7 @@
- GC_data_start = (ptr_t)(data_start);
- return;
- }
--# endif /* LINUX */
-+# endif /* LINUX || GLIBC */
- GC_data_start = GC_find_limit((ptr_t)(_end), FALSE);
- }
- #endif
-@@ -2175,13 +2175,13 @@
- #endif /* SUNOS4 || FREEBSD */
-
- #if defined(SUNOS5SIGS) || defined(OSF1) || defined(LINUX) \
-- || defined(HURD)
-+ || defined(GLIBC)
- # ifdef __STDC__
- typedef void (* SIG_PF)(int);
- # else
- typedef void (* SIG_PF)();
- # endif
--#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD */
-+#endif /* SUNOS5SIGS || OSF1 || LINUX || GLIBC */
-
- #if defined(MSWIN32)
- typedef LPTOP_LEVEL_EXCEPTION_FILTER SIG_PF;
-@@ -2301,7 +2301,7 @@
-
- /*ARGSUSED*/
- #if !defined(DARWIN)
--# if defined (SUNOS4) || defined(FREEBSD)
-+# if defined (SUNOS4) || defined(KFREEBSD)
- void GC_write_fault_handler(sig, code, scp, addr)
- int sig, code;
- struct sigcontext *scp;
-@@ -2312,11 +2312,11 @@
- || (FC_CODE(code) == FC_OBJERR \
- && FC_ERRNO(code) == FC_PROT))
- # endif
--# ifdef FREEBSD
-+# ifdef KFREEBSD
- # define SIG_OK (sig == SIGBUS)
- # define CODE_OK (code == BUS_PAGE_FAULT)
- # endif
--# endif /* SUNOS4 || FREEBSD */
-+# endif /* SUNOS4 || KFREEBSD */
-
- # if defined(IRIX5) || defined(OSF1) || defined(HURD)
- # include <errno.h>
-@@ -3831,7 +3831,7 @@
- /* I suspect the following works for most X86 *nix variants, so */
- /* long as the frame pointer is explicitly stored. In the case of gcc, */
- /* compiler flags (e.g. -fomit-frame-pointer) determine whether it is. */
--#if defined(I386) && defined(LINUX) && defined(SAVE_CALL_CHAIN)
-+#if defined(I386) && (defined(LINUX) || defined(GLIBC)) && defined(SAVE_CALL_CHAIN)
- # include <features.h>
-
- struct frame {
-@@ -3842,7 +3842,7 @@
- #endif
-
- #if defined(SPARC)
--# if defined(LINUX)
-+# if defined(LINUX) || defined(GLIBC)
- # include <features.h>
-
- struct frame {
Deleted: trunk/web/patches/debian-only/ifupdown.diff
===================================================================
--- trunk/web/patches/debian-only/ifupdown.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/debian-only/ifupdown.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,32 +0,0 @@
-
-Author: Brian M. Carlson
-Status: in BTS
-
---- ifupdown.nw.orig 2005-11-19 04:23:38 +0000
-+++ ifupdown.nw 2005-11-19 04:27:52 +0000
-@@ -3789,7 +3789,7 @@
- #include "archlinux.h"
-
- unsigned int mylinuxver() {
-- static int maj = -1, rev, min;
-+ static int maj = -1, rev = 0, min = 0;
-
- if (maj == -1) {
- struct utsname u;
-@@ -3797,9 +3797,13 @@
- uname(&u);
- maj = atoi(u.release);
- pch = strchr(u.release, '.');
-- rev = atoi(pch+1);
-- pch = strchr(pch+1, '.');
-- min = atoi(pch+1);
-+ if (pch) {
-+ rev = atoi(pch+1);
-+ pch = strchr(pch+1, '.');
-+ if (pch) {
-+ min = atoi(pch+1);
-+ }
-+ }
- }
-
- return mylinux(maj,rev,min);
Deleted: trunk/web/patches/debian-only/libgc_6.7.diff
===================================================================
--- trunk/web/patches/debian-only/libgc_6.7.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/debian-only/libgc_6.7.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,149 +0,0 @@
-
-
-
-Status: in BTS #366864, rerun of autoconf is needed; accepted by upstream for gc 6.8
-
-
-Note: applies almost cleanly also against gc 6.6 and boehm-gc in gcc-4.1
-
-
-diff -ur gc6.7/configure.in gc6.7/configure.in
---- gc6.7/configure.in 2006-02-17 05:07:50.000000000 +0100
-+++ gc6.7/configure.in 2006-05-11 18:58:59.000000000 +0200
-@@ -110,6 +110,17 @@
- INCLUDES="$INCLUDES -pthread"
- THREADDLLIBS=-pthread
- ;;
-+ *-*-kfreebsd*-gnu)
-+ AC_DEFINE(GC_FREEBSD_THREADS)
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ AC_DEFINE(_REENTRANT)
-+ if test "${enable_parallel_mark}" = yes; then
-+ AC_DEFINE(PARALLEL_MARK)
-+ fi
-+ AC_DEFINE(THREAD_LOCAL_ALLOC)
-+ AC_DEFINE(USE_COMPILER_TLS)
-+ ;;
- *-*-netbsd*)
- AC_MSG_WARN("Only on NetBSD 2.0 or later.")
- AC_DEFINE(GC_NETBSD_THREADS)
-diff -ur gc6.7/dyn_load.c gc6.7/dyn_load.c
---- gc6.7/dyn_load.c 2006-02-16 22:13:55.000000000 +0100
-+++ gc6.7/dyn_load.c 2006-05-11 18:29:02.000000000 +0200
-@@ -26,7 +26,7 @@
- * None of this is safe with dlclose and incremental collection.
- * But then not much of anything is safe in the presence of dlclose.
- */
--#if defined(__linux__) && !defined(_GNU_SOURCE)
-+#if (defined(__linux__) || defined(__GLIBC__)) && !defined(_GNU_SOURCE)
- /* Can't test LINUX, since this must be define before other includes */
- # define _GNU_SOURCE
- #endif
-@@ -381,7 +381,7 @@
- /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
- /* versions. Thanks to Jakub Jelinek for most of the code. */
-
--# if defined(LINUX) /* Are others OK here, too? */ \
-+# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-
-diff -ur gc6.7/include/gc.h gc6.7/include/gc.h
---- gc6.7/include/gc.h 2006-02-18 02:03:40.000000000 +0100
-+++ gc6.7/include/gc.h 2006-05-11 18:29:02.000000000 +0200
-@@ -469,7 +469,7 @@
- # define GC_RETURN_ADDR (GC_word)__return_address
- #endif
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
- && !defined(__ia64__)
-diff -ur gc6.7/include/private/gcconfig.h gc6.7/include/private/gcconfig.h
---- gc6.7/include/private/gcconfig.h 2006-02-17 05:34:18.000000000 +0100
-+++ gc6.7/include/private/gcconfig.h 2006-05-11 18:37:53.000000000 +0200
-@@ -55,7 +55,7 @@
- # endif
-
- /* And one for FreeBSD: */
--# if defined(__FreeBSD__) && !defined(FREEBSD)
-+# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
- # define FREEBSD
- # endif
-
-@@ -1249,8 +1249,15 @@
- # ifndef GC_FREEBSD_THREADS
- # define MPROTECT_VDB
- # endif
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
-+# ifdef __GLIBC__
-+# define SIG_SUSPEND (32+6)
-+# define SIG_THR_RESTART (32+5)
-+ extern int _end[];
-+# define DATAEND (_end)
-+# else
-+# define SIG_SUSPEND SIGUSR1
-+# define SIG_THR_RESTART SIGUSR2
-+# endif
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
-@@ -1993,6 +2000,28 @@
- # define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
- # endif
- # endif
-+# ifdef FREEBSD
-+# define OS_TYPE "FREEBSD"
-+# ifndef GC_FREEBSD_THREADS
-+# define MPROTECT_VDB
-+# endif
-+# ifdef __GLIBC__
-+# define SIG_SUSPEND (32+6)
-+# define SIG_THR_RESTART (32+5)
-+ extern int _end[];
-+# define DATAEND (_end)
-+# else
-+# define SIG_SUSPEND SIGUSR1
-+# define SIG_THR_RESTART SIGUSR2
-+# endif
-+# define FREEBSD_STACKBOTTOM
-+# ifdef __ELF__
-+# define DYNAMIC_LOADING
-+# endif
-+ extern char etext[];
-+ extern char * GC_FreeBSDGetDataStart();
-+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-+# endif
- # ifdef NETBSD
- # define OS_TYPE "NETBSD"
- # ifdef __ELF__
-@@ -2064,7 +2093,7 @@
- # define SUNOS5SIGS
- # endif
-
--# if defined(FREEBSD) && (__FreeBSD__ >= 4)
-+# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
- # define SUNOS5SIGS
- # endif
-
-@@ -2132,7 +2161,7 @@
- # define CACHE_LINE_SIZE 32 /* Wild guess */
- # endif
-
--# ifdef LINUX
-+# if defined(LINUX) || defined(__GLIBC__)
- # define REGISTER_LIBRARIES_EARLY
- /* We sometimes use dl_iterate_phdr, which may acquire an internal */
- /* lock. This isn't safe after the world has stopped. So we must */
-@@ -2216,7 +2245,7 @@
- #if defined(SPARC)
- # define CAN_SAVE_CALL_ARGS
- #endif
--#if (defined(I386) || defined(X86_64)) && defined(LINUX)
-+#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
- /* SAVE_CALL_CHAIN is supported if the code is compiled to save */
- /* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
- # define CAN_SAVE_CALL_ARGS
Deleted: trunk/web/patches/debian-only/xorg-server.diff
===================================================================
--- trunk/web/patches/debian-only/xorg-server.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/debian-only/xorg-server.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,66 +0,0 @@
-
-Debian: in BTS
-Upstream: Fixed in CVS as of 2006-06-03
-
-diff -ur -x .pc -x configure -x config.guess -x config.sub -x stampdir xorg-server-1.0.2.old/configure.ac xorg-server-1.0.2/configure.ac
---- xorg-server-1.0.2.old/configure.ac 2006-04-19 15:48:17.000000000 +0200
-+++ xorg-server-1.0.2/configure.ac 2006-04-19 14:53:03.000000000 +0200
-@@ -224,7 +224,10 @@
- dnl it would be nice to autodetect these *CONS_SUPPORTs
- case $host_os in
- *freebsd*)
-- AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
-+ case $host_os in
-+ kfreebsd*-gnu) ;;
-+ *) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;
-+ esac
- AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
- AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
- AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
-@@ -928,7 +931,7 @@
- ;;
- esac
- ;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
- XORG_OS="freebsd"
- XORG_OS_SUBDIR="bsd"
- XORG_OS_KBD="BSD"
-@@ -1026,7 +1029,7 @@
- ;;
- powerpc*)
- case $host_os in
-- linux*|freebsd*|netbsd*|openbsd*)
-+ linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
- ;;
- *)
- xorg_bus_ppcpci="yes"
-@@ -1039,7 +1042,7 @@
- ;;
- x86_64*|amd64*)
- case $host_os in
-- freebsd*)
-+ freebsd*|kfreebsd*-gnu)
- # FreeBSD uses the system pci interface
- ;;
- *)
-@@ -1264,7 +1267,7 @@
- cygwin*) ;;
- solaris*) ;;
- darwin*) ;;
-- *bsd*) ;;
-+ freebsd*|netbsd*|openbsd*) ;;
- *)
- AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source])
- AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source])
---- xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.h.old 2006-04-19 16:14:19.000000000 +0200
-+++ xorg-server-1.0.2/hw/xfree86/os-support/bus/Pci.h 2006-04-19 16:14:30.000000000 +0200
-@@ -334,7 +334,7 @@
- # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
- # endif
- #elif defined(__amd64__) || defined(__amd64)
--# if defined(__FreeBSD__)
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- # define ARCH_PCI_INIT freebsdPciInit
- # else
- # define ARCH_PCI_INIT ix86PciInit
Deleted: trunk/web/patches/pciutils.diff
===================================================================
--- trunk/web/patches/pciutils.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/pciutils.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,44 +0,0 @@
-diff -uNr pciutils-2.1.11.debian/lib/configure pciutils-2.1.11/lib/configure
---- pciutils-2.1.11.debian/lib/configure 2005-01-26 13:40:17.000000000 +0100
-+++ pciutils-2.1.11/lib/configure 2005-01-26 13:20:27.000000000 +0100
-@@ -12,7 +12,7 @@
- echo_n "Configuring libpci for your system..."
- sharedir=${1:-/usr/share}
- version=${2:-0.0}
--sys=`uname -s`
-+sys=`uname -s | tr -d 'GNU/k'`
- rel=`uname -r`
- if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
- then
-diff -uNr pciutils-2.1.11.debian/lib/fbsd-device.c pciutils-2.1.11/lib/fbsd-device.c
---- pciutils-2.1.11.debian/lib/fbsd-device.c 1999-07-20 16:01:31.000000000 +0200
-+++ pciutils-2.1.11/lib/fbsd-device.c 2005-01-26 13:36:50.000000000 +0100
-@@ -14,9 +14,26 @@
- #include <fcntl.h>
- #include <string.h>
- #include <unistd.h>
-+#include <osreldate.h>
-+#include <stdint.h>
-
--#include <pci/pcivar.h>
--#include <pci/pci_ioctl.h>
-+#ifdef __FreeBSD_kernel_version
-+# ifndef __FreeBSD_version
-+# define __FreeBSD_version __FreeBSD_kernel_version
-+# endif
-+#endif
-+
-+#if __FreeBSD_version < 500000
-+# include <pci/pcivar.h>
-+#else
-+# include <dev/pci/pcivar.h>
-+#endif
-+
-+#if __FreeBSD_version < 430000
-+# include <pci/pci_ioctl.h>
-+#else
-+# include <sys/pciio.h>
-+#endif
-
- #include "internal.h"
-
Deleted: trunk/web/patches/tofrodos.diff
===================================================================
--- trunk/web/patches/tofrodos.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/tofrodos.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,17 +0,0 @@
-
-Author: rmh
-Status: in BTS
-
-diff -ur tofrodos-1.7.6.old/src/config.h tofrodos-1.7.6/src/config.h
---- tofrodos-1.7.6.old/src/config.h 2005-03-15 16:01:02.000000000 +0100
-+++ tofrodos-1.7.6/src/config.h 2006-02-04 20:19:32.000000000 +0100
-@@ -95,7 +95,7 @@
- #endif
-
- /* define the systems */
--#if defined(__linux__) /* (predefined) */
-+#if defined(__linux__) || defined(__GLIBC__) /* (predefined) */
- #if !defined(LINUX)
- #define LINUX
- #endif
-
Deleted: trunk/web/patches/upstream-only/gcc.java_kfreebsd-gnu.diff
===================================================================
--- trunk/web/patches/upstream-only/gcc.java_kfreebsd-gnu.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/upstream-only/gcc.java_kfreebsd-gnu.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,272 +0,0 @@
-
-shlibs changes submitted to http://gcc.gnu.org/ml/java-patches/2006-q2/msg00193.html
-boehm-gc changes submitted to http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2006-May/001308.html, accepted
-boehm-gc changes submitted to http://gcc.gnu.org/ml/java-patches/2006-q2/msg00320.html
-
-
-
-
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/configure gcj-4.1-4.1.0/src/boehm-gc/configure
---- gcj-4.1-4.1.0/src/boehm-gc/configure 2006-02-28 09:39:11.000000000 +0100
-+++ gcj-4.1-4.1.0/src/boehm-gc/configure 2006-05-12 08:34:57.000000000 +0200
-@@ -5434,6 +5423,32 @@
-
- THREADLIBS="-lpthread -lrt"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ cat >>confdefs.h <<\_ACEOF
-+#define GC_FREEBSD_THREADS 1
-+_ACEOF
-+
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ cat >>confdefs.h <<\_ACEOF
-+#define _REENTRANT 1
-+_ACEOF
-+
-+ if test "${enable_parallel_mark}" = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define PARALLEL_MARK 1
-+_ACEOF
-+
-+ fi
-+ cat >>confdefs.h <<\_ACEOF
-+#define THREAD_LOCAL_ALLOC 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define USE_COMPILER_TLS 1
-+_ACEOF
-+
-+ ;;
- *-*-freebsd*)
- { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/configure.ac gcj-4.1-4.1.0/src/boehm-gc/configure.ac
---- gcj-4.1-4.1.0/src/boehm-gc/configure.ac 2006-02-07 02:05:55.000000000 +0100
-+++ gcj-4.1-4.1.0/src/boehm-gc/configure.ac 2006-05-12 08:35:43.000000000 +0200
-@@ -150,6 +150,17 @@
- AC_DEFINE(THREAD_LOCAL_ALLOC,1)
- THREADLIBS="-lpthread -lrt"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ AC_DEFINE(GC_FREEBSD_THREADS)
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ AC_DEFINE(_REENTRANT)
-+ if test "${enable_parallel_mark}" = yes; then
-+ AC_DEFINE(PARALLEL_MARK)
-+ fi
-+ AC_DEFINE(THREAD_LOCAL_ALLOC)
-+ AC_DEFINE(USE_COMPILER_TLS, 1,[use tls for boehm])
-+ ;;
- *-*-freebsd*)
- AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
- AC_DEFINE(GC_FREEBSD_THREADS,1,[support FreeBSD threads])
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c
---- gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c 2005-02-26 16:40:07.000000000 +0100
-+++ gcj-4.1-4.1.0/src/boehm-gc/dyn_load.c 2006-05-12 08:33:17.000000000 +0200
-@@ -26,7 +26,7 @@
- * None of this is safe with dlclose and incremental collection.
- * But then not much of anything is safe in the presence of dlclose.
- */
--#if defined(__linux__) && !defined(_GNU_SOURCE)
-+#if (defined(__linux__) || defined(__GLIBC__)) && !defined(_GNU_SOURCE)
- /* Can't test LINUX, since this must be define before other includes */
- # define _GNU_SOURCE
- #endif
-@@ -373,7 +373,7 @@
- /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
- /* versions. Thanks to Jakub Jelinek for most of the code. */
-
--# if defined(LINUX) /* Are others OK here, too? */ \
-+# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/gc.h gcj-4.1-4.1.0/src/boehm-gc/include/gc.h
---- gcj-4.1-4.1.0/src/boehm-gc/include/gc.h 2005-01-02 04:35:57.000000000 +0100
-+++ gcj-4.1-4.1.0/src/boehm-gc/include/gc.h 2006-05-12 08:33:17.000000000 +0200
-@@ -497,7 +497,7 @@
- # define GC_RETURN_ADDR (GC_word)__return_address
- #endif
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
- && !defined(__ia64__)
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in
---- gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in 2006-02-07 02:05:55.000000000 +0100
-+++ gcj-4.1-4.1.0/src/boehm-gc/include/gc_config.h.in 2006-05-12 08:35:50.000000000 +0200
-@@ -148,6 +148,9 @@
- /* define GC_local_malloc() & GC_local_malloc_atomic() */
- #undef THREAD_LOCAL_ALLOC
-
-+/* use tls for boehm */
-+#undef USE_COMPILER_TLS
-+
- /* use MMAP instead of sbrk to get new memory */
- #undef USE_MMAP
-
-diff -ur gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h
---- gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h 2005-09-06 16:22:01.000000000 +0200
-+++ gcj-4.1-4.1.0/src/boehm-gc/include/private/gcconfig.h 2006-05-12 08:34:42.000000000 +0200
-@@ -55,7 +55,7 @@
- # endif
-
- /* And one for FreeBSD: */
--# if defined(__FreeBSD__)
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- # define FREEBSD
- # endif
-
-@@ -1223,8 +1223,15 @@
- # ifndef GC_FREEBSD_THREADS
- # define MPROTECT_VDB
- # endif
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
-+# ifdef __GLIBC__
-+# define SIG_SUSPEND (32+6)
-+# define SIG_THR_RESTART (32+5)
-+ extern int _end[];
-+# define DATAEND (_end)
-+# else
-+# define SIG_SUSPEND SIGUSR1
-+# define SIG_THR_RESTART SIGUSR2
-+# endif
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
-@@ -1923,6 +1930,28 @@
- # define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
- # endif
- # endif
-+# ifdef FREEBSD
-+# define OS_TYPE "FREEBSD"
-+# ifndef GC_FREEBSD_THREADS
-+# define MPROTECT_VDB
-+# endif
-+# ifdef __GLIBC__
-+# define SIG_SUSPEND (32+6)
-+# define SIG_THR_RESTART (32+5)
-+ extern int _end[];
-+# define DATAEND (_end)
-+# else
-+# define SIG_SUSPEND SIGUSR1
-+# define SIG_THR_RESTART SIGUSR2
-+# endif
-+# define FREEBSD_STACKBOTTOM
-+# ifdef __ELF__
-+# define DYNAMIC_LOADING
-+# endif
-+ extern char etext[];
-+ extern char * GC_FreeBSDGetDataStart();
-+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-+# endif
- # ifdef NETBSD
- # define OS_TYPE "NETBSD"
- # ifdef __ELF__
-@@ -1994,7 +2023,7 @@
- # define SUNOS5SIGS
- # endif
-
--# if defined(FREEBSD) && (__FreeBSD__ >= 4)
-+# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
- # define SUNOS5SIGS
- # endif
-
-@@ -2057,7 +2086,7 @@
- # define CACHE_LINE_SIZE 32 /* Wild guess */
- # endif
-
--# ifdef LINUX
-+# if defined(LINUX) || defined(__GLIBC__)
- # define REGISTER_LIBRARIES_EARLY
- /* We sometimes use dl_iterate_phdr, which may acquire an internal */
- /* lock. This isn't safe after the world has stopped. So we must */
-@@ -2137,7 +2166,7 @@
- #if defined(SPARC)
- # define CAN_SAVE_CALL_ARGS
- #endif
--#if (defined(I386) || defined(X86_64)) && defined(LINUX)
-+#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
- /* SAVE_CALL_CHAIN is supported if the code is compiled to save */
- /* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
- # define CAN_SAVE_CALL_ARGS
-diff -ur gcj-4.1-4.1.0/src/libjava/configure gcj-4.1-4.1.0/src/libjava/configure
---- gcj-4.1-4.1.0/src/libjava/configure 2006-05-12 13:35:06.000000000 +0200
-+++ gcj-4.1-4.1.0/src/libjava/configure 2006-05-12 11:00:31.000000000 +0200
-@@ -4351,7 +4341,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4
---- gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 2006-05-12 13:35:07.000000000 +0200
-+++ gcj-4.1-4.1.0/src/libjava/libltdl/acinclude.m4 2006-05-12 11:07:03.000000000 +0200
-@@ -1413,7 +1413,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1-4.1.0/src/libjava/libltdl/configure gcj-4.1-4.1.0/src/libjava/libltdl/configure
---- gcj-4.1-4.1.0/src/libjava/libltdl/configure 2006-05-12 13:35:21.000000000 +0200
-+++ gcj-4.1-4.1.0/src/libjava/libltdl/configure 2006-05-12 11:07:15.000000000 +0200
-@@ -8380,7 +8380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -12021,7 +12021,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15097,7 +15097,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17380,7 +17380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1-4.1.0/src/libjava/shlibpath.m4 gcj-4.1-4.1.0/src/libjava/shlibpath.m4
---- gcj-4.1-4.1.0/src/libjava/shlibpath.m4 2006-01-07 19:14:24.000000000 +0100
-+++ gcj-4.1-4.1.0/src/libjava/shlibpath.m4 2006-05-12 08:36:28.000000000 +0200
-@@ -361,7 +361,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
Deleted: trunk/web/patches/xawtv.diff
===================================================================
--- trunk/web/patches/xawtv.diff 2006-09-22 20:21:21 UTC (rev 1660)
+++ trunk/web/patches/xawtv.diff 2006-09-25 18:55:28 UTC (rev 1661)
@@ -1,207 +0,0 @@
-
-Author: petr
-Status: in BTS
-Note: also packages ffmpeg, libquicktime, zvbi have patches in BTS
-
-diff -u xawtv-3.95/debian/control xawtv-3.95/debian/control
---- xawtv-3.95/debian/control
-+++ xawtv-3.95/debian/control
-@@ -1,14 +1,14 @@
- Source: xawtv
- Section: graphics
- Priority: extra
--Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libncurses5-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxt-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, x-dev, liblircclient-dev, xutils, xbase-clients, libaa1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, libgl1-mesa-dev, libxft-dev, po-debconf, libpng12-dev, libglib1.2-dev, libfs-dev
-+Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libncurses5-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxt-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, x-dev, liblircclient-dev, xutils, xbase-clients, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, libgl1-mesa-dev, libxft-dev, po-debconf, libpng12-dev, libglib1.2-dev, libfs-dev
- Maintainer: Debian QA Group <packages at qa.debian.org>
- Standards-Version: 3.7.2
-
- Package: xawtv
- Section: x11
- Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, v4l-conf, xutils, scantv, xawtv-plugins (=${Source-Version}), pia
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${videoconf}, xutils, scantv, xawtv-plugins (=${Source-Version}), pia
- Suggests: xawtv-plugin-qt (=${Source-Version}), tv-fonts
- Description: X11 TV application
- TV application for X11. Supports video4linux
-@@ -23,7 +23,7 @@
- playback movie files which are recorded from TV.
-
- Package: fbtv
--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}, v4l-conf, xawtv-plugins (=${Source-Version})
- Suggests: xawtv
- Description: linux console (fbcon) TV application
-@@ -59,15 +59,16 @@
-
- Package: radio
- Section: sound
--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}
- Description: ncurses-based radio application
- This is a ncurses-based radio application. It
- supports the video4linux API.
-
- Package: v4l-conf
--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}
-+Replaces: xawtv (<= 3.95-1)
- Conflicts: suidmanager (<< 0.50)
- Description: tool to configure video4linux drivers
- This is a small tool to configure a video4linux
-diff -u xawtv-3.95/debian/patches/00list xawtv-3.95/debian/patches/00list
---- xawtv-3.95/debian/patches/00list
-+++ xawtv-3.95/debian/patches/00list
-@@ -5,0 +6 @@
-+06_kfreebsd
-diff -u xawtv-3.95/debian/rules xawtv-3.95/debian/rules
---- xawtv-3.95/debian/rules
-+++ xawtv-3.95/debian/rules
-@@ -1,6 +1,7 @@
- #!/usr/bin/make -f
-
- #export DH_VERBOSE=1
-+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
- export CFLAGS = -Wall -g
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-@@ -25,7 +26,7 @@
- clean: unpatch
- dh_testdir
- dh_testroot
-- rm -f build-stamp
-+ rm -f build-stamp debian/xawtv-plugins.install.kfreebsd*
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
-@@ -39,7 +40,11 @@
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-- dh_install
-+ grep -v v4l debian/xawtv-plugins.install > debian/xawtv-plugins.install.kfreebsd-i386
-+ echo "debian/tmp/usr/lib/xawtv/drv0-bsd.so" >> debian/xawtv-plugins.install.kfreebsd-i386
-+ cp debian/xawtv-plugins.install.kfreebsd-i386 debian/xawtv-plugins.install.kfreebsd-amd64
-+
-+ dh_install -s
-
- # fix v4l-conf suid-root lintian warning
- mkdir -p debian/v4l-conf/usr/share/lintian/overrides
-@@ -59,11 +64,15 @@
- dh_strip
- dh_compress
- dh_fixperms -Xv4l-conf
-- dh_installdeb
-- dh_shlibdeps
-- dh_gencontrol
-- dh_md5sums
-- dh_builddeb
-+ dh_installdeb -s
-+ dh_shlibdeps -s
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+ dh_gencontrol -s -- -Vvideoconf="v4l-conf"
-+else
-+ dh_gencontrol -s
-+endif
-+ dh_md5sums -s
-+ dh_builddeb -s
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install
-diff -u xawtv-3.95/debian/v4l-conf.install xawtv-3.95/debian/v4l-conf.install
---- xawtv-3.95/debian/v4l-conf.install
-+++ xawtv-3.95/debian/v4l-conf.install
-@@ -3,0 +4,2 @@
-+debian/tmp/usr/bin/v4l-info
-+debian/tmp/usr/share/man/man1/v4l-info.1
-diff -u xawtv-3.95/debian/xawtv.install xawtv-3.95/debian/xawtv.install
---- xawtv-3.95/debian/xawtv.install
-+++ xawtv-3.95/debian/xawtv.install
-@@ -4,7 +4,6 @@
- debian/tmp/usr/bin/rootv
- debian/tmp/usr/bin/ntsc-cc
- debian/tmp/usr/bin/subtitles
--debian/tmp/usr/bin/v4l-info
- debian/tmp/usr/share/man/man1/v4lctl.1
- debian/tmp/usr/share/man/*/man1/v4lctl.1
- debian/tmp/usr/share/man/man1/xawtv.1
-@@ -16,7 +15,6 @@
- debian/tmp/usr/share/man/man1/ntsc-cc.1
- debian/tmp/usr/share/man/man1/subtitles.1
- debian/tmp/usr/share/man/*/man1/subtitles.1
--debian/tmp/usr/share/man/man1/v4l-info.1
- debian/tmp/usr/share/man/man5/xawtvrc.5
- debian/tmp/usr/share/man/*/man5/xawtvrc.5
- debian/tmp/etc/X11/app-defaults/Xawtv
-only in patch2:
-unchanged:
---- xawtv-3.95.orig/debian/patches/06_kfreebsd.dpatch
-+++ xawtv-3.95/debian/patches/06_kfreebsd.dpatch
-@@ -0,0 +1,65 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: add support for GNU/kFreeBSD
-+
-+ at DPATCH@
-+diff -urN xawtv-3.95/configure.ac xawtv-3.95/configure.ac
-+--- xawtv-3.95/configure.ac 2004-08-18 17:48:09.000000000 +0200
-++++ xawtv-3.95/configure.ac 2006-08-21 16:29:26.000000000 +0200
-+@@ -77,6 +77,9 @@
-+ LDLIBS="$LDLIBS -L/usr/local/lib"
-+ FOUND_OS="bsd"
-+ ;;
-++ GNU/kFreeBSD)
-++ FOUND_OS="bsd"
-++ ;;
-+ *)
-+ AC_MSG_CHECKING(if xawtv will build on `uname -s`)
-+ AC_MSG_RESULT(maybe)
-+diff -urN xawtv-3.95/configure xawtv-3.95/configure
-+--- xawtv-3.95/configure 2005-09-30 12:10:03.000000000 +0200
-++++ xawtv-3.95/configure 2006-08-21 16:29:47.000000000 +0200
-+@@ -3084,6 +3084,9 @@
-+ LDLIBS="$LDLIBS -L/usr/local/lib"
-+ FOUND_OS="bsd"
-+ ;;
-++ GNU/kFreeBSD)
-++ FOUND_OS="bsd"
-++ ;;
-+ *)
-+ echo "$as_me:$LINENO: checking if xawtv will build on \`uname -s\`" >&5
-+ echo $ECHO_N "checking if xawtv will build on \`uname -s\`... $ECHO_C" >&6
-+diff -urN xawtv-3.95/libng/devices.c xawtv-3.95/libng/devices.c
-+--- xawtv-3.95/libng/devices.c 2004-03-25 11:35:36.000000000 +0100
-++++ xawtv-3.95/libng/devices.c 2006-08-21 16:30:31.000000000 +0200
-+@@ -9,7 +9,7 @@
-+ /*
-+ * default devices names
-+ */
-+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+ struct ng_device_config ng_dev = {
-+ video: "/dev/bktr0",
-+ radio: NULL,
-+diff -urN xawtv-3.95/vbistuff/ntsc-cc.c xawtv-3.95/vbistuff/ntsc-cc.c
-+--- xawtv-3.95/vbistuff/ntsc-cc.c 2005-01-10 13:36:13.000000000 +0100
-++++ xawtv-3.95/vbistuff/ntsc-cc.c 2006-08-21 16:33:43.000000000 +0200
-+@@ -471,7 +471,7 @@
-+ return 0;
-+ }
-+
-+-static int RAW(int data)
-++static int print_raw(int data)
-+ {
-+ int b1, b2;
-+ if (data == -1)
-+@@ -697,7 +697,7 @@
-+ x+1,128-buf[2048 * rawline+x*2+2]/2);
-+ }
-+ #endif
-+- RAW(decode(&buf[2048 * rawline]));
-++ print_raw(decode(&buf[2048 * rawline]));
-+ #ifndef X_DISPLAY_MISSING
-+ if (debugwin) {
-+ XFlush(dpy);
More information about the Glibc-bsd-commits
mailing list