[Glibc-bsd-commits] r3615 - trunk/web/patches
Robert Millan
rmh at alioth.debian.org
Mon Jul 18 22:38:07 UTC 2011
Author: rmh
Date: 2011-07-18 22:37:59 +0000 (Mon, 18 Jul 2011)
New Revision: 3615
Removed:
trunk/web/patches/dtmfdial.diff
trunk/web/patches/freeglut.diff
trunk/web/patches/freesweep.diff
trunk/web/patches/freetds.diff
trunk/web/patches/fribidi.diff
trunk/web/patches/g2.diff
trunk/web/patches/gcc-defaults.diff
trunk/web/patches/gcc.diff
trunk/web/patches/gdm_2.6.0.8-1.diff
trunk/web/patches/gimp-gap.diff
trunk/web/patches/glew.diff
trunk/web/patches/glib2.0.diff
trunk/web/patches/glib2.0.kfreebsd-amd64.diff
trunk/web/patches/gnat.diff
trunk/web/patches/gnome-libs.diff
trunk/web/patches/gnome-main-menu.diff
trunk/web/patches/gnupg.bash
trunk/web/patches/gnustep-back.diff
trunk/web/patches/goldedplus.diff
trunk/web/patches/gpsim.diff
trunk/web/patches/gpsk31.diff
trunk/web/patches/gs-esp.diff
trunk/web/patches/gtick.diff
trunk/web/patches/gtk+2.0-directfb.diff
trunk/web/patches/gtkguitune.diff
trunk/web/patches/gtoaster.diff
Log:
Remove a few obsolete patches
Deleted: trunk/web/patches/dtmfdial.diff
===================================================================
--- trunk/web/patches/dtmfdial.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/dtmfdial.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,18 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- dtmfdial-0.2.orig/dial.c
-+++ dtmfdial-0.2/dial.c
-@@ -10,7 +10,12 @@
- #include <malloc.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
-
- #define DEBUG(x)
-
Deleted: trunk/web/patches/freeglut.diff
===================================================================
--- trunk/web/patches/freeglut.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/freeglut.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,178 +0,0 @@
-Status: in BTS
-Author: aurel32
-
-diff -u freeglut-2.4.0/debian/control freeglut-2.4.0/debian/control
---- freeglut-2.4.0/debian/control
-+++ freeglut-2.4.0/debian/control
-@@ -2,7 +2,7 @@
- Section: graphics
- Priority: optional
- Maintainer: Jamie Wilkinson <jaq at debian.org>
--Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxt-dev, libxext-dev, xlibmesa-gl-dev | mesag-dev | libgl-dev, libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, automake1.8, autoconf, libtool
-+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxt-dev, libxext-dev, xlibmesa-gl-dev | mesag-dev | libgl-dev, libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, libusbhid-dev [kfreebsd-i386], automake1.8, autoconf, libtool
- Standards-Version: 3.6.1
-
- Package: freeglut3
---- freeglut-2.4.0.orig/src/Makefile.am
-+++ freeglut-2.4.0/src/Makefile.am
-@@ -41,7 +41,7 @@
- #
- # Additional linker flags
- #
--lib at LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
-+lib at LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM) $(LIBUSBHID)
- lib at LIBRARY@_la_LDFLAGS = -version-info 11:0:8
- lib at LIBRARY@_la_CFLAGS = $(X_CFLAGS)
-
---- freeglut-2.4.0.orig/src/freeglut_joystick.c
-+++ freeglut-2.4.0/src/freeglut_joystick.c
-@@ -76,11 +76,11 @@
- # include <fcntl.h>
- # endif
- # include <errno.h>
--# if defined(__FreeBSD__) || defined(__NetBSD__)
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- /* XXX The below hack is done until freeglut's autoconf is updated. */
- # define HAVE_USB_JS 1
-
--# if defined(__FreeBSD__) && __FreeBSD_version >= 500000
-+# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (__FreeBSD_version >= 500000 || __FreeBSD_kernel_version >= 500000)
- # include <sys/joystick.h>
- # else
- /*
-@@ -131,7 +131,7 @@
-
- /* BSD defines from "jsBSD.cxx" around lines 42-270 */
-
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-
- # ifdef HAVE_USB_JS
- # if defined(__NetBSD__)
-@@ -142,13 +142,11 @@
- # else
- # include <usb.h>
- # endif
--# elif defined(__FreeBSD__)
--# if __FreeBSD_version < 500000
--# include <libusbhid.h>
--# else
--/* XXX The below hack is done until freeglut's autoconf is updated. */
--# define HAVE_USBHID_H 1
-+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+# ifdef HAVE_USBHID_H
- # include <usbhid.h>
-+# else
-+# include <libusbhid.h>
- # endif
- # endif
- # include <dev/usb/usb.h>
-@@ -393,7 +391,7 @@
-
-
- #if TARGET_HOST_UNIX_X11
--# if defined(__FreeBSD__) || defined(__NetBSD__)
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- struct os_specific_s *os;
- # endif
-
-@@ -461,7 +459,7 @@
- int status;
- #endif
-
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- int len;
- #endif
-
-@@ -598,7 +596,7 @@
- #endif
-
- #if TARGET_HOST_UNIX_X11
--# if defined(__FreeBSD__) || defined(__NetBSD__)
-+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- if ( joy->os->is_analog )
- {
- int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
-@@ -656,9 +654,9 @@
- if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
- {
- if (d)
-- joy->os->cache_buttons |= (1 << usage - 1);
-+ joy->os->cache_buttons |= (1 << (usage - 1));
- else
-- joy->os->cache_buttons &= ~(1 << usage - 1);
-+ joy->os->cache_buttons &= ~(1 << (usage - 1));
- }
- }
- }
-@@ -744,7 +742,7 @@
- }
-
- if ( buttons )
--# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
- *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */
- # else
- *buttons = joy->js.buttons;
-@@ -1054,12 +1052,12 @@
- CFTypeRef topLevelElement;
- #endif
- #if TARGET_HOST_UNIX_X11
--# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
- char *cp;
- # endif
- # ifdef JS_NEW
- unsigned char u;
--# else
-+# elif defined(__linux__)
- int counter;
- # endif
- #endif
-@@ -1285,7 +1283,7 @@
- #endif
-
- #if TARGET_HOST_UNIX_X11
--#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
- for( i = 0; i < _JS_MAX_AXES; i++ )
- joy->os->cache_axes[ i ] = 0.0f;
-
-@@ -1549,7 +1547,7 @@
- #endif
-
- #if TARGET_HOST_UNIX_X11
--# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
- fgJoystick[ ident ]->id = ident;
- fgJoystick[ ident ]->error = GL_FALSE;
-
-@@ -1619,7 +1617,7 @@
- #endif
-
- #if TARGET_HOST_UNIX_X11
--#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
- if( fgJoystick[ident]->os )
- {
- if( ! fgJoystick[ ident ]->error )
-only in patch2:
-unchanged:
---- freeglut-2.4.0.orig/configure.ac
-+++ freeglut-2.4.0/configure.ac
-@@ -24,9 +24,13 @@
- [$X_LIBS -lXext -lX11])
- AC_SUBST([LIBXXF86VM])
-
-+AC_CHECK_LIB([usbhid], [hid_init],
-+ [LIBUSBHID=-lusbhid], [LIBUSBHID=])
-+AC_SUBST(LIBUSBHID)
-+
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
-+AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h usbhid.h libusbhid.h])
- AC_HEADER_TIME
-
- save_CFLAGS="$CFLAGS"
Deleted: trunk/web/patches/freesweep.diff
===================================================================
--- trunk/web/patches/freesweep.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/freesweep.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,38 +0,0 @@
-Status: in BTS
-Author: aurel32
-
-diff -u freesweep-0.88/debian/rules freesweep-0.88/debian/rules
---- freesweep-0.88/debian/rules
-+++ freesweep-0.88/debian/rules
-@@ -20,9 +20,10 @@
- build-stamp:
- dh_testdir
-
-+ cp /usr/share/misc/config.{sub,guess} .
- $(MAKE) config.h.in
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-prefsdir=/etc \
-- --with-scoresdir=/var/games --disable-debug-log
-+ --with-scoresdir=/var/games --disable-debug-log --with-ncurses=/usr
- $(MAKE)
-
- touch build-stamp
-@@ -31,6 +32,7 @@
- dh_testdir
- dh_testroot
- rm -f build-stamp
-+ rm -f config.{guess,sub}
-
- -$(MAKE) clean
-
-diff -u freesweep-0.88/debian/control freesweep-0.88/debian/control
---- freesweep-0.88/debian/control
-+++ freesweep-0.88/debian/control
-@@ -3,7 +3,7 @@
- Section: games
- Priority: optional
- Standards-Version: 3.5.5
--Build-Depends: debhelper (>= 3.0.0), libncurses5-dev, autoconf
-+Build-Depends: debhelper (>= 3.0.0), libncurses5-dev, autoconf, autotools-dev
-
- Package: freesweep
- Architecture: any
Deleted: trunk/web/patches/freetds.diff
===================================================================
--- trunk/web/patches/freetds.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/freetds.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,15 +0,0 @@
-Author: aurel32
-Status: workaround until libtool.m4 get fixed
-
-diff -u freetds-0.63/debian/rules freetds-0.63/debian/rules
---- freetds-0.63/debian/rules
-+++ freetds-0.63/debian/rules
-@@ -104,7 +104,7 @@
- dh_compress -a
- dh_fixperms -a
- chmod a+x ./debian/dh_makeshlibs
-- ./debian/dh_makeshlibs -a -Xtdsodbc
-+ dh_makeshlibs -a -Xtdsodbc
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
Deleted: trunk/web/patches/fribidi.diff
===================================================================
--- trunk/web/patches/fribidi.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/fribidi.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,24 +0,0 @@
- Comments:
- + currently enable automatic libtoolize and remove acinclude.m4
- since looks like a copy of an old libtool.m4
-
---- fribidi-0.10.4/Makefile.old 2005-03-19 16:28:14.000000000 +0100
-+++ fribidi-0.10.4/Makefile 2005-03-19 16:28:47.000000000 +0100
-@@ -17,11 +17,12 @@
- build: build-stamp
- build-stamp: unpack-stamp
- install -d build/fribidi
--# cd $(TARDIR) && aclocal
--# cd $(TARDIR) && autoheader
--# cd $(TARDIR) && libtoolize -c --force
--# cd $(TARDIR) && automake -i --foreign
--# cd $(TARDIR) && autoconf
-+ rm $(TARDIR)/acinclude.m4
-+ cd $(TARDIR) && aclocal
-+ cd $(TARDIR) && autoheader
-+ cd $(TARDIR) && libtoolize -c --force
-+ cd $(TARDIR) && automake -i --foreign
-+ cd $(TARDIR) && autoconf
-
- cd build/fribidi && ../../$(TARDIR)/configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
- cd build/fribidi && make $(MAKE_DEFINES)
Deleted: trunk/web/patches/g2.diff
===================================================================
--- trunk/web/patches/g2.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/g2.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,15 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u g2-0.70/configure.in g2-0.70/configure.in
---- g2-0.70/configure.in
-+++ g2-0.70/configure.in
-@@ -13,7 +13,7 @@
- #
- AC_CANONICAL_HOST
- case "$host" in
-- *-linux*)
-+ *-linux* | *-k*bsd*-gnu)
- LD_SHARED='ld'
- LD_SHARED_FLAGS='-shared -soname libg2.so.0'
- LD_SHARED_OPT='-lc'
Deleted: trunk/web/patches/gcc-defaults.diff
===================================================================
--- trunk/web/patches/gcc-defaults.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gcc-defaults.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,15 +0,0 @@
-diff -Nru gcc-defaults-1.50.orig/debian/rules gcc-defaults-1.50/debian/rules
---- gcc-defaults-1.50.orig/debian/rules 2007-01-02 13:42:03.000000000 +0100
-+++ gcc-defaults-1.50/debian/rules 2007-01-06 14:37:56.000000000 +0100
-@@ -162,6 +162,11 @@
- OS_NAME := kFreeBSD
- endif
-
-+ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
-+ OS_NAME := kFreeBSD
-+ no_packages += gnat
-+endif
-+
- ifeq ($(DEB_HOST_ARCH),m32r)
- no_packages += gnat
- endif
Deleted: trunk/web/patches/gcc.diff
===================================================================
--- trunk/web/patches/gcc.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gcc.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,67 +0,0 @@
-diff -u gcc-4.1-4.1.2/debian/patches/kbsd-gnu.dpatch gcc-4.1-4.1.2/debian/patches/kbsd-gnu.dpatch
---- gcc-4.1-4.1.2/debian/patches/kbsd-gnu.dpatch
-+++ gcc-4.1-4.1.2/debian/patches/kbsd-gnu.dpatch
-@@ -79,8 +79,8 @@
- + { "dynamic_linker64", DYNAMIC_LINKER64 }
- +
- #undef LINK_SPEC
---#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
--+#define LINK_SPEC "%{!m32:-m %(link_emulation64)} %{m32:-m %(link_emulation)} \
-+-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=both \
-++#define LINK_SPEC "%{!m32:-m %(link_emulation64)} %{m32:-m %(link_emulation)} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
-diff -u gcc-4.1-4.1.2/debian/patches/kbsd-gnu-java.dpatch gcc-4.1-4.1.2/debian/patches/kbsd-gnu-java.dpatch
---- gcc-4.1-4.1.2/debian/patches/kbsd-gnu-java.dpatch
-+++ gcc-4.1-4.1.2/debian/patches/kbsd-gnu-java.dpatch
-@@ -226,18 +226,6 @@
- /* 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
-@@ -289,30 +277,6 @@
- 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
--diff -ur gcj-4.1-4.1.1/src/libjava/configure.host gcj-4.1-4.1.1/src/libjava/configure.host
----- gcj-4.1-4.1.1/src/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
--+++ gcj-4.1-4.1.1/src/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
--@@ -326,7 +326,7 @@
-- esac
--
-- case "${host}" in
--- *linux*)
--+ *linux*|*-k*bsd*-gnu)
-- use_libgcj_bc=yes
-- ;;
-- *)
- diff -ur gcj-4.1-4.1.0/src/boehm-gc/os_dep.c.orig gcj-4.1-4.1.0/src/boehm-gc/os_dep.c
- --- gcj-4.1-4.1.0/src/boehm-gc/os_dep.c.orig 2006-02-28 09:39:11.000000000 +0100
- +++ gcj-4.1-4.1.0/src/boehm-gc/os_dep.c 2006-05-12 08:34:57.000000000 +0200
Deleted: trunk/web/patches/gdm_2.6.0.8-1.diff
===================================================================
--- trunk/web/patches/gdm_2.6.0.8-1.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gdm_2.6.0.8-1.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,41 +0,0 @@
-diff -u gdm-2.6.0.8/debian/control gdm-2.6.0.8/debian/control
---- gdm-2.6.0.8/debian/control
-+++ gdm-2.6.0.8/debian/control
-@@ -2,7 +2,7 @@
- Section: gnome
- Priority: optional
- Maintainer: Ryan Murray <rmurray at debian.org>
--Build-Depends: libpam0g-dev, libgnomeui-dev (>= 1.96.0), librsvg2-dev, libglade2-dev, libwrap0-dev, debhelper, gettext, intltool, scrollkeeper, libselinux1-dev, libattr1-dev, xlibs-static-dev, libxt-dev
-+Build-Depends: libpam0g-dev, libgnomeui-dev (>= 1.96.0), librsvg2-dev, libglade2-dev, libwrap0-dev, debhelper, gettext, intltool, scrollkeeper, libselinux1-dev [!kfreebsd-i386 !hurd-i386], libattr1-dev [!kfreebsd-i386 !hurd-i386], xlibs-static-dev, libxt-dev
- Standards-Version: 3.6.1
-
- Package: gdm
-diff -u gdm-2.6.0.8/debian/rules gdm-2.6.0.8/debian/rules
---- gdm-2.6.0.8/debian/rules
-+++ gdm-2.6.0.8/debian/rules
-@@ -8,10 +8,24 @@
- # This is the debhelper compatability version to use.
- export DH_COMPAT=4
-
-+export DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-+# Take account of old dpkg-architecture output.
-+ifeq ($(DEB_HOST_ARCH_OS),)
-+ DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
-+ ifeq ($(DEB_HOST_ARCH_OS),gnu)
-+ DEB_HOST_ARCH_OS := hurd
-+ endif
-+endif
-+
-+conf_args = --disable-dependency-tracking --with-tags= --prefix=/usr --libexecdir=\$${prefix}/lib --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${prefix}/lib/gdm --localstatedir=/var/lib
-+ifeq ($(DEB_HOST_ARCH_OS),linux)
-+conf_args += --with-selinux
-+endif
-+
- configure: configure-stamp
- configure-stamp:
- dh_testdir
-- ./configure --disable-dependency-tracking --with-tags= --prefix=/usr --libexecdir=\$${prefix}/lib --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${prefix}/lib/gdm --localstatedir=/var/lib --with-selinux
-+ ./configure $(conf_args)
-
- touch configure-stamp
-
Deleted: trunk/web/patches/gimp-gap.diff
===================================================================
--- trunk/web/patches/gimp-gap.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gimp-gap.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,48 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- gimp-gap-2.0.2.orig/libwavplayclient/wpc_msg.c
-+++ gimp-gap-2.0.2/libwavplayclient/wpc_msg.c
-@@ -13,7 +13,12 @@
- #include <sys/msg.h>
- #include <sys/ioctl.h>
- #include <assert.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
- #include <wavplay.h>
- #include <wavfile.h>
-
---- gimp-gap-2.0.2.orig/libwavplayclient/client.c
-+++ gimp-gap-2.0.2/libwavplayclient/client.c
-@@ -58,7 +58,12 @@
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <assert.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
-
- #include <glib.h>
-
---- gimp-gap-2.0.2.orig/libwavplayclient/msg.c
-+++ gimp-gap-2.0.2/libwavplayclient/msg.c
-@@ -55,7 +55,12 @@
- #include <sys/msg.h>
- #include <sys/ioctl.h>
- #include <assert.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
- #include "wavplay.h"
-
- /*
Deleted: trunk/web/patches/glew.diff
===================================================================
--- trunk/web/patches/glew.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/glew.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,27 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- glew-1.3.1.orig/config/Makefile.kfreebsd
-+++ glew-1.3.1/config/Makefile.kfreebsd
-@@ -0,0 +1,21 @@
-+NAME = $(GLEW_NAME)
-+CC = cc
-+LD = ld
-+ifneq (undefined, $(origin GLEW_MX))
-+CFLAGS.EXTRA = -DGLEW_MX
-+endif
-+PICFLAG = -fPIC
-+LDFLAGS.SO = -shared -soname $(LIB.SONAME)
-+LDFLAGS.EXTRA = -L/usr/X11R6/lib
-+LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
-+LDFLAGS.STATIC = -Wl,-Bstatic
-+LDFLAGS.DYNAMIC = -Wl,-Bdynamic
-+NAME = GLEW
-+WARN = -Wall -W
-+POPT = -O2
-+BIN.SUFFIX =
-+LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
-+LIB.DEVLNK = lib$(NAME).so
-+LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
-+LIB.STATIC = lib$(NAME).a
-+SHARED_OBJ_EXT = pic_o
Deleted: trunk/web/patches/glib2.0.diff
===================================================================
--- trunk/web/patches/glib2.0.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/glib2.0.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,19 +0,0 @@
-
-Status: dirty workaround for http://www.freebsd.org/cgi/query-pr.cgi?pr=76485
-
-diff -Nur glib2.0-2.4.8.old/debian/patches/001_hack.diff glib2.0-2.4.8/debian/patches/001_hack.diff
---- glib2.0-2.4.8.old/debian/patches/001_hack.diff 1970-01-01 01:00:00.000000000 +0100
-+++ glib2.0-2.4.8/debian/patches/001_hack.diff 2005-01-20 01:22:19.000000000 +0100
-@@ -0,0 +1,12 @@
-+diff -ur glib-2.4.8.old/gthread/gthread-posix.c glib-2.4.8/gthread/gthread-posix.c
-+--- glib-2.4.8.old/gthread/gthread-posix.c 2002-11-04 21:09:47.000000000 +0100
-++++ glib-2.4.8/gthread/gthread-posix.c 2005-01-20 01:21:59.000000000 +0100
-+@@ -133,7 +133,7 @@
-+ struct sched_param sched;
-+ int policy;
-+ posix_check_cmd (pthread_getschedparam (pthread_self(), &policy, &sched));
-+- priority_normal_value = sched.sched_priority;
-++ priority_normal_value = 0;
-+ }
-+ # else /* G_THREADS_IMPL_DCE */
-+ posix_check_cmd (priority_normal_value =
Deleted: trunk/web/patches/glib2.0.kfreebsd-amd64.diff
===================================================================
--- trunk/web/patches/glib2.0.kfreebsd-amd64.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/glib2.0.kfreebsd-amd64.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,32 +0,0 @@
-Status: in BTS, needed for kfreebsd-amd64 only
-Author: aurel32
-
---- glib2.0-2.8.6.orig/debian/patches/001_anon_versioning_kfreebsd.patch
-+++ glib2.0-2.8.6/debian/patches/001_anon_versioning_kfreebsd.patch
-@@ -0,0 +1,26 @@
-+--- glib-2.8.6/configure 2006-01-18 17:44:49.000000000 +0100
-++++ glib-2.8.6-deb/configure 2006-03-08 00:18:27.000000000 +0100
-+@@ -10865,6 +10865,23 @@
-+ fi
-+ ;;
-+
-++ kfreebsd*-gnu)
-++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-++ tmp_addflag=
-++ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-++
-++ if test $supports_anon_versioning = yes; then
-++ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-++ $echo "local: *; };" >> $output_objdir/$libname.ver~
-++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-++ fi
-++ link_all_deplibs=no
-++ else
-++ ld_shlibs=no
-++ fi
-++ ;;
-++
-+ solaris* | sysv5*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs=no
Deleted: trunk/web/patches/gnat.diff
===================================================================
--- trunk/web/patches/gnat.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gnat.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,1258 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gnat-3.15p/debian/rules gnat-3.15p/debian/rules
---- gnat-3.15p/debian/rules
-+++ gnat-3.15p/debian/rules
-@@ -55,6 +55,7 @@
- fi
-
- config-stamp: patch-stamp
-+ cp -f /usr/share/misc/config.{guess,sub} .
- CC=gnatgcc ./configure --prefix=/usr --host=$(OS) --target=$(OS)
- cd ada && touch treeprs.ads a-einfo.h a-sinfo.h nmake.adb nmake.ads
- : # Prevent running autoheader, which isn't necessary
-@@ -293,6 +294,7 @@
- -$(MAKE) distclean
- rm -f install
- rm -f *.so *.so.*
-+ rm -f config.{guess,sub}
- dh_clean
-
- install: DH_OPTIONS=
-diff -u gnat-3.15p/debian/control gnat-3.15p/debian/control
---- gnat-3.15p/debian/control
-+++ gnat-3.15p/debian/control
-@@ -4,11 +4,11 @@
- Section: devel
- Priority: optional
- Standards-Version: 3.6.2
--Build-Depends: gnat (>=3.14), gnat (<<3.16), debhelper (>=4.1)
-+Build-Depends: gnat (>=3.14), gnat (<<3.16), debhelper (>=4.1), autotools-dev
-
- Package: gnat
--Architecture: i386 sparc powerpc
--Depends: libc6-dev, binutils, libgnat-3.15p-1 (=${Source-Version}), libgnatprj-3.15p (=${Source-Version})
-+Architecture: i386 kfreebsd-i386 sparc powerpc
-+Depends: libc6-dev | lic0.1-dev | libc-dev, binutils, libgnat-3.15p-1 (=${Source-Version}), libgnatprj-3.15p (=${Source-Version})
- Recommends: ada-reference-manual, ada-mode, gnat-gps, ${gnat-gdb}
- Suggests: gnat-doc, gnat-glade, gnade-dev, adabrowse, asis-programs, gch, libflorist-3.15p-1-dev, libgtkada2-dev, libcharles0-dev, libxmlada1-dev, libaunit-dev, libopentoken-dev, libaws-dev, libadabindx-dev, libtexttools-dev
- Conflicts: gnat-3.2, gnat-3.3, gnat-3.4, gnat-4.0, gnat-4.1
-@@ -38,16 +38,16 @@
- FSF version is available in packages gnat-3.3, gnat-3.4 and gnat-4.0.
-
- Package: libgnat-3.15p-1
--Architecture: i386 sparc powerpc
-+Architecture: i386 kfreebsd-i386 sparc powerpc
- Section: libs
--Depends: libc6, libgnatprj-3.15p (=${Source-Version})
-+Depends: libc6 | libc0.1-dev | libc-dev, libgnatprj-3.15p (=${Source-Version})
- Description: The GNU Ada 95 compiler runtime libraries
- This package contains the libraries needed to run applications compiled with
- GNAT, the GNU Ada 95 compiler. If you want to develop or compile Ada
- applications, you will need to use the `gnat' package.
-
- Package: libgnatprj-dev
--Architecture: i386 sparc powerpc
-+Architecture: i386 kfreebsd-i386 sparc powerpc
- Section: libdevel
- Depends: libgnatprj-3.15p (=${Source-Version}), gnat (=${Source-Version})
- Description: GNU Ada Project Manager development files
-@@ -61,7 +61,7 @@
- that understand GNAT project files.
-
- Package: libgnatprj-3.15p
--Architecture: i386 sparc powerpc
-+Architecture: i386 kfreebsd-i386 sparc powerpc
- Section: libs
- Depends: libgnat-3.15p-1 (=${Source-Version}), libgnatvsn-3.15p (=${Source-Version})
- Description: GNU Ada Project Manager
-@@ -75,7 +75,7 @@
- This package contains the run-time shared library.
-
- Package: libgnatvsn-dev
--Architecture: i386 sparc powerpc
-+Architecture: i386 kfreebsd-i386 sparc powerpc
- Section: libdevel
- Depends: gnat $(=${Source-Version}), libgnatvsn-3.15p (=${Source-Version})
- Description: GNU Ada compiler version library - development files
-@@ -86,7 +86,7 @@
- This package contains the development files and static library.
-
- Package: libgnatvsn-3.15p
--Architecture: i386 sparc powerpc
-+Architecture: i386 kfreebsd-i386 sparc powerpc
- Section: libs
- Depends: libgnat-3.15p-1 (=${Source-Version})
- Description: GNU Ada compiler version library
-diff -u gnat-3.15p/debian/00-makefile.patch gnat-3.15p/debian/00-makefile.patch
---- gnat-3.15p/debian/00-makefile.patch
-+++ gnat-3.15p/debian/00-makefile.patch
-@@ -1,7 +1,7 @@
- Fix the build process so we build the static and shared libraries
- properly.
-
--Add support for powerpc-*-linux and sparc-*-linux.
-+Add support for powerpc-*-linux, sparc-*-linux and i486-*-kfreebsd-gnu
-
- Add support for symbolic tracebacks.
-
-@@ -61,7 +61,7 @@
-
- ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
- LIBGNAT_TARGET_PAIRS = \
--@@ -820,6 +818,44 @@
-+@@ -820,6 +818,67 @@
- endif
- endif
-
-@@ -103,10 +103,33 @@
- + EXTRA_GNATRTL_NONTASKING_OBJS=convert_addresses.o
- +endif
- +
-++ifeq ($(strip $(filter-out %86 kfreebsd%,$(arch) $(osys))),)
-++ LIBGNAT_TARGET_PAIRS = \
-++ a-intnam.ads<45intnam.ads \
-++ g-soccon.ads<35soccon.ads \
-++ a-numaux.adb<86numaux.adb \
-++ a-numaux.ads<86numaux.ads \
-++ s-inmaop.adb<7sinmaop.adb \
-++ s-intman.adb<5lintman.adb \
-++ s-mastop.adb<5omastop.adb \
-++ s-osinte.adb<5iosinte.adb \
-++ s-osinte.ads<57osinte.ads \
-++ s-osprim.adb<7sosprim.adb \
-++ s-taprop.adb<5itaprop.adb \
-++ s-taspri.ads<5itaspri.ads \
-++ s-tpopsp.adb<5atpopsp.adb \
-++ system.ads<56system.ads
-++
-++ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-++ THREADSLIB=-lpthread
-++ GNATLIB_SHARED=gnatlib-shared-dual
-++ GMEM_LIB=gmemlib
-++endif
-++
- ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
- ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
- LIBGNAT_TARGET_PAIRS = \
--@@ -867,7 +903,6 @@
-+@@ -867,7 +926,6 @@
- TGT_LIB=-lexc
- MISCLIB=-lexc
- SO_OPTS=-Wl,-all,-set_version,sgi1.0,-update_registry,../so_locations,-soname,
-@@ -114,7 +137,7 @@
- endif
-
- ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),)
--@@ -889,7 +924,7 @@
-+@@ -889,7 +947,7 @@
- TGT_LIB=/usr/lib/libcl.a
- THREADSLIB=-lpthread
- MISCLIB=
-@@ -123,7 +146,7 @@
- soext=.sl
- SO_OPTS=-Wl,+h,
- GNATLIB_SHARED=gnatlib-shared-dual
--@@ -1041,11 +1076,12 @@
-+@@ -1041,11 +1099,12 @@
- system.ads<5asystem.ads
-
- MISCLIB=
-@@ -138,7 +161,7 @@
- # Warning - Also update Makefile.vms
- ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
-
--@@ -1138,7 +1174,7 @@
-+@@ -1138,7 +1197,7 @@
- system.ads<5wsystem.ads
-
- MISCLIB = -lwsock32
-@@ -147,7 +170,7 @@
- GMEM_LIB=gmemlib
- EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
- EXTRA_GNATRTL_NONTASKING_OBJS = g-regist.o
--@@ -1687,7 +1723,7 @@
-+@@ -1687,7 +1746,7 @@
- # sources using the same mechanism as for gnatlib. The other sources are
- # accessed using the vpath directive below
-
-@@ -156,7 +179,7 @@
- -$(RM) tools/*
- -$(RMDIR) tools
- -$(MKDIR) tools
--@@ -1770,64 +1806,64 @@
-+@@ -1770,64 +1829,64 @@
- ../../gnatchop$(exeext):
- $(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)"
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop
-@@ -233,7 +256,7 @@
-
- gnatmake-re:
- $(GNATMAKE) $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
--@@ -1957,12 +1993,12 @@
-+@@ -1957,12 +2016,12 @@
-
- gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
- ../xgcc -B../ -dD -E ../config.h $(INCLUDES) > rts/config.h
-@@ -248,7 +271,7 @@
- ADA_INCLUDES="$(ADA_INCLUDES_FOR_SUBDIR)" \
- CFLAGS="$(GNATLIBCFLAGS)" \
- ADAFLAGS="$(GNATLIBFLAGS)" \
--@@ -2105,21 +2141,31 @@
-+@@ -2105,21 +2164,31 @@
- system.ads<5ysystem.ads" internal-ravenlib
-
- # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
-@@ -288,7 +311,7 @@
- cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
- cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
-
--@@ -2319,6 +2365,7 @@
-+@@ -2319,6 +2388,7 @@
- -fno-omit-frame-pointer $< $(OUTPUT_OPTION)
-
- mkdir.o : mkdir.c
-only in patch2:
-unchanged:
---- gnat-3.15p.orig/debian/02-kfreebsd-gnu.patch
-+++ gnat-3.15p/debian/02-kfreebsd-gnu.patch
-@@ -0,0 +1,1038 @@
-+Add support for i486-*-kfreebsd-gnu. Backported from gcc-4.1 via gcc-4.0,
-+gcc-3.4 and gcc-3.3.
-+
-+--- configure.in.old
-++++ configure.in
-+@@ -854,6 +854,19 @@
-+ thread_file='posix'
-+ fi
-+ ;;
-++ i[[34567]]86-*-kfreebsd*-gnu) # Intel 80386's running GNU/kFreeBSD
-++ xm_file=i386/xm-linux.h # with ELF format using glibc 2
-++ xmake_file=x-linux
-++ tm_file=i386/kfreebsd-gnu.h
-++ tmake_file="t-linux i386/t-crtstuff"
-++ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-++ fixincludes=Makefile.in # The headers are ok already.
-++ broken_install=yes
-++ gnu_ld=yes
-++ if [[ x$enable_threads = xyes ]]; then
-++ thread_file='posix'
-++ fi
-++ ;;
-+ i[[34567]]86-*-gnu*)
-+ ;;
-+ i[[34567]]86-go32-msdos | i[[34567]]86-*-go32*)
-+@@ -2541,7 +2554,7 @@
-+ esac
-+
-+ case $machine in
-+- *-*-linux-gnu*)
-++ *-*-linux-gnu* | *-*-kfreebsd*-gnu)
-+ ;; # Existing Linux/GNU systems do not use the GNU setup.
-+ *-*-gnu*)
-+ # On the GNU system, the setup is just about the same on
-+--- configure.old 2005-12-27 00:18:00.000000000 +0100
-++++ configure 2005-12-27 00:19:32.000000000 +0100
-+@@ -3348,6 +3348,19 @@
-+ thread_file='posix'
-+ fi
-+ ;;
-++ i[34567]86-*-kfreebsd-gnu*) # Intel 80386's running GNU/kFreeBSD
-++ xm_file=i386/xm-linux.h # with ELF format using glibc 2
-++ xmake_file=x-linux
-++ tm_file=i386/kfreebsd-gnu.h
-++ tmake_file="t-linux i386/t-crtstuff"
-++ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-++ fixincludes=Makefile.in # The headers are ok already.
-++ broken_install=yes
-++ gnu_ld=yes
-++ if [ x$enable_threads = xyes ]; then
-++ thread_file='posix'
-++ fi
-++ ;;
-+ i[34567]86-*-gnu*)
-+ ;;
-+ i[34567]86-go32-msdos | i[34567]86-*-go32*)
-+@@ -5035,7 +5048,7 @@
-+ esac
-+
-+ case $machine in
-+- *-*-linux-gnu*)
-++ *-*-linux-gnu* | *-*-kfreebsd*-gnu)
-+ ;; # Existing Linux/GNU systems do not use the GNU setup.
-+ *-*-gnu*)
-+ # On the GNU system, the setup is just about the same on
-+--- config.old/i386/kfreebsd-gnu.h
-++++ config/i386/kfreebsd-gnu.h
-+@@ -0,0 +1,46 @@
-++/* Definitions for Intel 386 running kFreeBSD-based GNU systems with ELF format
-++ Copyright (C) 2005
-++ Free Software Foundation, Inc.
-++ Contributed by Aurelien Jarno.
-++
-++This file is part of GNU CC.
-++
-++GCC is free software; you can redistribute it and/or modify
-++it under the terms of the GNU General Public License as published by
-++the Free Software Foundation; either version 2, or (at your option)
-++any later version.
-++
-++GCC is distributed in the hope that it will be useful,
-++but WITHOUT ANY WARRANTY; without even the implied warranty of
-++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-++GNU General Public License for more details.
-++
-++You should have received a copy of the GNU General Public License
-++along with GCC; see the file COPYING. If not, write to
-++the Free Software Foundation, 59 Temple Place - Suite 330,
-++Boston, MA 02111-1307, USA. */
-++
-++#include <i386/linux.h>
-++
-++#undef CPP_PREDEFINES
-++#define CPP_PREDEFINES "-D__FreeBSD_kernel__ -D__GLIBC__ -D__ELF__ -Dunix -Asystem(unix) -Asystem(posix)"
-++
-++/* Provide a LINK_SPEC appropriate for GNU/kFreeBSD. Here we provide support
-++ for the special GCC options -static and -shared, which allow us to
-++ link things in one of these three modes by applying the appropriate
-++ combinations of options at link-time.
-++
-++ When the -shared link option is used a final link is not being
-++ done. */
-++
-++/* If ELF is the default format. */
-++
-++#undef LINK_SPEC
-++#define LINK_SPEC "-m elf_i386_fbsd %{shared:-shared} \
-++ %{!shared: \
-++ %{!ibcs: \
-++ %{!static: \
-++ %{rdynamic:-export-dynamic} \
-++ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-++ %{static:-static}}}"
-++
-+--- ada.old/45intnam.ads 2005-12-26 17:22:28.000000000 +0100
-++++ ada/45intnam.ads 2005-12-26 17:21:50.000000000 +0100
-+@@ -0,0 +1,139 @@
-++------------------------------------------------------------------------------
-++-- --
-++-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
-++-- --
-++-- A D A . I N T E R R U P T S . N A M E S --
-++-- --
-++-- S p e c --
-++-- --
-++-- $Revision: 1.7 $
-++-- --
-++-- Copyright (C) 1991-2002 Free Software Foundation, Inc. --
-++-- --
-++-- GNARL is free software; you can redistribute it and/or modify it under --
-++-- terms of the GNU General Public License as published by the Free Soft- --
-++-- ware Foundation; either version 2, or (at your option) any later ver- --
-++-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-++-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-++-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-++-- for more details. You should have received a copy of the GNU General --
-++-- Public License distributed with GNARL; see file COPYING. If not, write --
-++-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
-++-- MA 02111-1307, USA. --
-++-- --
-++-- As a special exception, if other files instantiate generics from this --
-++-- unit, or you link this unit with other files to produce an executable, --
-++-- this unit does not by itself cause the resulting executable to be --
-++-- covered by the GNU General Public License. This exception does not --
-++-- however invalidate any other reasons why the executable file might be --
-++-- covered by the GNU Public License. --
-++-- --
-++-- GNARL was developed by the GNARL team at Florida State University. It is --
-++-- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
-++-- State University (http://www.gnat.com). --
-++-- --
-++------------------------------------------------------------------------------
-++
-++-- This is the FreeBSD THREADS version of this package
-++
-++with System.OS_Interface;
-++-- used for names of interrupts
-++
-++package Ada.Interrupts.Names is
-++
-++ SIGHUP : constant Interrupt_ID :=
-++ System.OS_Interface.SIGHUP; -- hangup
-++
-++ SIGINT : constant Interrupt_ID :=
-++ System.OS_Interface.SIGINT; -- interrupt (rubout)
-++
-++ SIGQUIT : constant Interrupt_ID :=
-++ System.OS_Interface.SIGQUIT; -- quit (ASCD FS)
-++
-++ SIGILL : constant Interrupt_ID :=
-++ System.OS_Interface.SIGILL; -- illegal instruction (not reset)
-++
-++ SIGTRAP : constant Interrupt_ID :=
-++ System.OS_Interface.SIGTRAP; -- trace trap (not reset)
-++
-++ SIGIOT : constant Interrupt_ID :=
-++ System.OS_Interface.SIGIOT; -- IOT instruction
-++
-++ SIGABRT : constant Interrupt_ID := -- used by abort,
-++ System.OS_Interface.SIGABRT; -- replace SIGIOT in the future
-++
-++ SIGFPE : constant Interrupt_ID :=
-++ System.OS_Interface.SIGFPE; -- floating point exception
-++
-++ SIGKILL : constant Interrupt_ID :=
-++ System.OS_Interface.SIGKILL; -- kill (cannot be caught or ignored)
-++
-++ SIGBUS : constant Interrupt_ID :=
-++ System.OS_Interface.SIGBUS; -- bus error
-++
-++ SIGSEGV : constant Interrupt_ID :=
-++ System.OS_Interface.SIGSEGV; -- segmentation violation
-++
-++ SIGPIPE : constant Interrupt_ID := -- write on a pipe with
-++ System.OS_Interface.SIGPIPE; -- no one to read it
-++
-++ SIGALRM : constant Interrupt_ID :=
-++ System.OS_Interface.SIGALRM; -- alarm clock
-++
-++ SIGTERM : constant Interrupt_ID :=
-++ System.OS_Interface.SIGTERM; -- software termination signal from kill
-++
-++ SIGURG : constant Interrupt_ID :=
-++ System.OS_Interface.SIGURG; -- urgent condition on IO channel
-++
-++ SIGSTOP : constant Interrupt_ID :=
-++ System.OS_Interface.SIGSTOP; -- stop (cannot be caught or ignored)
-++
-++ SIGTSTP : constant Interrupt_ID :=
-++ System.OS_Interface.SIGTSTP; -- user stop requested from tty
-++
-++ SIGCONT : constant Interrupt_ID :=
-++ System.OS_Interface.SIGCONT; -- stopped process has been continued
-++
-++ SIGCHLD : constant Interrupt_ID :=
-++ System.OS_Interface.SIGCHLD; -- 4.3BSD's/POSIX name for SIGCLD
-++
-++ SIGCLD : constant Interrupt_ID :=
-++ System.OS_Interface.SIGCLD; -- child status change
-++
-++ SIGTTIN : constant Interrupt_ID :=
-++ System.OS_Interface.SIGTTIN; -- background tty read attempted
-++
-++ SIGTTOU : constant Interrupt_ID :=
-++ System.OS_Interface.SIGTTOU; -- background tty write attempted
-++
-++ SIGIO : constant Interrupt_ID := -- input/output possible,
-++ System.OS_Interface.SIGIO; -- SIGPOLL alias (Solaris)
-++
-++ SIGXCPU : constant Interrupt_ID :=
-++ System.OS_Interface.SIGXCPU; -- CPU time limit exceeded
-++
-++ SIGXFSZ : constant Interrupt_ID :=
-++ System.OS_Interface.SIGXFSZ; -- filesize limit exceeded
-++
-++ SIGVTALRM : constant Interrupt_ID :=
-++ System.OS_Interface.SIGVTALRM; -- virtual timer expired
-++
-++ SIGPROF : constant Interrupt_ID :=
-++ System.OS_Interface.SIGPROF; -- profiling timer expired
-++
-++ SIGWINCH : constant Interrupt_ID :=
-++ System.OS_Interface.SIGWINCH; -- window size change
-++
-++ SIGUSR1 : constant Interrupt_ID :=
-++ System.OS_Interface.SIGUSR1; -- user defined signal 1
-++
-++ SIGUSR2 : constant Interrupt_ID :=
-++ System.OS_Interface.SIGUSR2; -- user defined signal 2
-++
-++ -- Beware that the mapping of names to signals may be
-++ -- many-to-one. There may be aliases. Also, for all
-++ -- signal names that are not supported on the current system
-++ -- the value of the corresponding constant will be zero.
-++
-++end Ada.Interrupts.Names;
-+--- ada.old/56system.ads 2005-12-26 17:39:13.000000000 +0100
-++++ ada/56system.ads 2005-12-26 17:44:01.000000000 +0100
-+@@ -0,0 +1,139 @@
-++------------------------------------------------------------------------------
-++-- --
-++-- GNAT RUN-TIME COMPONENTS --
-++-- --
-++-- S Y S T E M --
-++-- --
-++-- S p e c --
-++-- (FreeBSD/x86 Version) --
-++-- --
-++-- $Revision: 1.8 $ --
-++-- --
-++-- Copyright (C) 1992-2002 Free Software Foundation, Inc. --
-++-- --
-++-- This specification is derived from the Ada Reference Manual for use with --
-++-- GNAT. The copyright notice above, and the license provisions that follow --
-++-- apply solely to the contents of the part following the private keyword. --
-++-- --
-++-- GNAT is free software; you can redistribute it and/or modify it under --
-++-- terms of the GNU General Public License as published by the Free Soft- --
-++-- ware Foundation; either version 2, or (at your option) any later ver- --
-++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-++-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-++-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-++-- for more details. You should have received a copy of the GNU General --
-++-- Public License distributed with GNAT; see file COPYING. If not, write --
-++-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
-++-- MA 02111-1307, USA. --
-++-- --
-++-- As a special exception, if other files instantiate generics from this --
-++-- unit, or you link this unit with other files to produce an executable, --
-++-- this unit does not by itself cause the resulting executable to be --
-++-- covered by the GNU General Public License. This exception does not --
-++-- however invalidate any other reasons why the executable file might be --
-++-- covered by the GNU Public License. --
-++-- --
-++-- GNAT was originally developed by the GNAT team at New York University. --
-++-- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
-++-- --
-++------------------------------------------------------------------------------
-++
-++package System is
-++pragma Pure (System);
-++-- Note that we take advantage of the implementation permission to
-++-- make this unit Pure instead of Preelaborable, see RM 13.7(36)
-++
-++ type Name is (SYSTEM_NAME_GNAT);
-++ System_Name : constant Name := SYSTEM_NAME_GNAT;
-++
-++ -- System-Dependent Named Numbers
-++
-++ Min_Int : constant := Long_Long_Integer'First;
-++ Max_Int : constant := Long_Long_Integer'Last;
-++
-++ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size;
-++ Max_Nonbinary_Modulus : constant := Integer'Last;
-++
-++ Max_Base_Digits : constant := Long_Long_Float'Digits;
-++ Max_Digits : constant := Long_Long_Float'Digits;
-++
-++ Max_Mantissa : constant := 63;
-++ Fine_Delta : constant := 2.0 ** (-Max_Mantissa);
-++
-++ Tick : constant := 1.0;
-++
-++ -- Storage-related Declarations
-++
-++ type Address is private;
-++ Null_Address : constant Address;
-++
-++ Storage_Unit : constant := 8;
-++ Word_Size : constant := 32;
-++ Memory_Size : constant := 2 ** 32;
-++
-++ -- Address comparison
-++
-++ function "<" (Left, Right : Address) return Boolean;
-++ function "<=" (Left, Right : Address) return Boolean;
-++ function ">" (Left, Right : Address) return Boolean;
-++ function ">=" (Left, Right : Address) return Boolean;
-++ function "=" (Left, Right : Address) return Boolean;
-++
-++ pragma Import (Intrinsic, "<");
-++ pragma Import (Intrinsic, "<=");
-++ pragma Import (Intrinsic, ">");
-++ pragma Import (Intrinsic, ">=");
-++ pragma Import (Intrinsic, "=");
-++
-++ -- Other System-Dependent Declarations
-++
-++ type Bit_Order is (High_Order_First, Low_Order_First);
-++ Default_Bit_Order : constant Bit_Order := Low_Order_First;
-++
-++ -- Priority-related Declarations (RM D.1)
-++
-++ Max_Priority : constant Positive := 30;
-++ Max_Interrupt_Priority : constant Positive := 31;
-++
-++ subtype Any_Priority is Integer range 0 .. 31;
-++ subtype Priority is Any_Priority range 0 .. 30;
-++ subtype Interrupt_Priority is Any_Priority range 31 .. 31;
-++
-++ Default_Priority : constant Priority := 15;
-++
-++private
-++
-++ type Address is mod Memory_Size;
-++ Null_Address : constant Address := 0;
-++
-++ --------------------------------------
-++ -- System Implementation Parameters --
-++ --------------------------------------
-++
-++ -- These parameters provide information about the target that is used
-++ -- by the compiler. They are in the private part of System, where they
-++ -- can be accessed using the special circuitry in the Targparm unit
-++ -- whose source should be consulted for more detailed descriptions
-++ -- of the individual switch values.
-++
-++ AAMP : constant Boolean := False;
-++ Backend_Divide_Checks : constant Boolean := False;
-++ Backend_Overflow_Checks : constant Boolean := False;
-++ Command_Line_Args : constant Boolean := True;
-++ Denorm : constant Boolean := True;
-++ Fractional_Fixed_Ops : constant Boolean := False;
-++ Frontend_Layout : constant Boolean := False;
-++ Functions_Return_By_DSP : constant Boolean := False;
-++ Long_Shifts_Inlined : constant Boolean := True;
-++ High_Integrity_Mode : constant Boolean := False;
-++ Machine_Overflows : constant Boolean := False;
-++ Machine_Rounds : constant Boolean := True;
-++ OpenVMS : constant Boolean := False;
-++ Signed_Zeros : constant Boolean := True;
-++ Stack_Check_Default : constant Boolean := False;
-++ Stack_Check_Probes : constant Boolean := False;
-++ Use_Ada_Main_Program_Name : constant Boolean := False;
-++ ZCX_By_Default : constant Boolean := False;
-++ GCC_ZCX_Support : constant Boolean := False;
-++ Front_End_ZCX_Support : constant Boolean := True;
-++end System;
-+--- ada.old/57osinte.ads 2005-12-26 17:39:13.000000000 +0100
-++++ ada/57osinte.ads 2005-12-26 17:36:23.000000000 +0100
-+@@ -0,0 +1,522 @@
-++------------------------------------------------------------------------------
-++-- --
-++-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
-++-- --
-++-- S Y S T E M . O S _ I N T E R F A C E --
-++-- --
-++-- S p e c --
-++-- --
-++-- Copyright (C) 1992-2001 Free Software Foundation, Inc. --
-++-- --
-++-- GNARL is free software; you can redistribute it and/or modify it under --
-++-- terms of the GNU General Public License as published by the Free Soft- --
-++-- ware Foundation; either version 2, or (at your option) any later ver- --
-++-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-++-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-++-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-++-- for more details. You should have received a copy of the GNU General --
-++-- Public License distributed with GNARL; see file COPYING. If not, write --
-++-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
-++-- MA 02111-1307, USA. --
-++-- --
-++-- As a special exception, if other files instantiate generics from this --
-++-- unit, or you link this unit with other files to produce an executable, --
-++-- this unit does not by itself cause the resulting executable to be --
-++-- covered by the GNU General Public License. This exception does not --
-++-- however invalidate any other reasons why the executable file might be --
-++-- covered by the GNU Public License. --
-++-- --
-++-- GNARL was developed by the GNARL team at Florida State University. --
-++-- Extensive contributions were provided by Ada Core Technologies Inc. --
-++-- --
-++------------------------------------------------------------------------------
-++
-++-- This is the GNU/kFreeBSD (GNU/LinuxThreads) version of this package.
-++
-++-- This package encapsulates all direct interfaces to OS services
-++-- that are needed by children of System.
-++
-++-- PLEASE DO NOT add any with-clauses to this package
-++-- or remove the pragma Elaborate_Body.
-++-- It is designed to be a bottom-level (leaf) package.
-++
-++with Interfaces.C;
-++package System.OS_Interface is
-++ pragma Preelaborate;
-++
-++ pragma Linker_Options ("-lpthread");
-++
-++ subtype int is Interfaces.C.int;
-++ subtype char is Interfaces.C.char;
-++ subtype short is Interfaces.C.short;
-++ subtype long is Interfaces.C.long;
-++ subtype unsigned is Interfaces.C.unsigned;
-++ subtype unsigned_short is Interfaces.C.unsigned_short;
-++ subtype unsigned_long is Interfaces.C.unsigned_long;
-++ subtype unsigned_char is Interfaces.C.unsigned_char;
-++ subtype plain_char is Interfaces.C.plain_char;
-++ subtype size_t is Interfaces.C.size_t;
-++
-++ -----------
-++ -- Errno --
-++ -----------
-++
-++ function errno return int;
-++ pragma Import (C, errno, "__get_errno");
-++
-++ EAGAIN : constant := 35;
-++ EINTR : constant := 4;
-++ EINVAL : constant := 22;
-++ ENOMEM : constant := 12;
-++ EPERM : constant := 1;
-++ ETIMEDOUT : constant := 60;
-++
-++ -------------
-++ -- Signals --
-++ -------------
-++
-++ Max_Interrupt : constant := 128;
-++ type Signal is new int range 0 .. Max_Interrupt;
-++ for Signal'Size use int'Size;
-++
-++ SIGHUP : constant := 1; -- hangup
-++ SIGINT : constant := 2; -- interrupt (rubout)
-++ SIGQUIT : constant := 3; -- quit (ASCD FS)
-++ SIGILL : constant := 4; -- illegal instruction (not reset)
-++ SIGTRAP : constant := 5; -- trace trap (not reset)
-++ SIGIOT : constant := 6; -- IOT instruction
-++ SIGABRT : constant := 6; -- used by abort, replace SIGIOT in the future
-++ SIGEMT : constant := 7; -- EMT instruction
-++ SIGFPE : constant := 8; -- floating point exception
-++ SIGKILL : constant := 9; -- kill (cannot be caught or ignored)
-++ SIGBUS : constant := 10; -- bus error
-++ SIGSEGV : constant := 11; -- segmentation violation
-++ SIGSYS : constant := 12; -- bad argument to system call
-++ SIGPIPE : constant := 13; -- write on a pipe with no one to read it
-++ SIGALRM : constant := 14; -- alarm clock
-++ SIGTERM : constant := 15; -- software termination signal from kill
-++ SIGURG : constant := 16; -- urgent condition on IO channel
-++ SIGSTOP : constant := 17; -- stop (cannot be caught or ignored)
-++ SIGTSTP : constant := 18; -- user stop requested from tty
-++ SIGCONT : constant := 19; -- stopped process has been continued
-++ SIGCLD : constant := 20; -- alias for SIGCHLD
-++ SIGCHLD : constant := 20; -- child status change
-++ SIGTTIN : constant := 21; -- background tty read attempted
-++ SIGTTOU : constant := 22; -- background tty write attempted
-++ SIGIO : constant := 23; -- I/O possible (Solaris SIGPOLL alias)
-++ SIGXCPU : constant := 24; -- CPU time limit exceeded
-++ SIGXFSZ : constant := 25; -- filesize limit exceeded
-++ SIGVTALRM : constant := 26; -- virtual timer expired
-++ SIGPROF : constant := 27; -- profiling timer expired
-++ SIGWINCH : constant := 28; -- window size change
-++ SIGINFO : constant := 29; -- information request (NetBSD/FreeBSD)
-++ SIGUSR1 : constant := 30; -- user defined signal 1
-++ SIGUSR2 : constant := 31; -- user defined signal 2
-++ SIGLTHRRES : constant := 32; -- GNU/LinuxThreads restart signal
-++ SIGLTHRCAN : constant := 33; -- GNU/LinuxThreads cancel signal
-++ SIGLTHRDBG : constant := 34; -- GNU/LinuxThreads debugger signal
-++
-++ SIGADAABORT : constant := SIGABRT;
-++ -- Change this if you want to use another signal for task abort.
-++ -- SIGTERM might be a good one.
-++
-++ type Signal_Set is array (Natural range <>) of Signal;
-++
-++ Unmasked : constant Signal_Set := (
-++ SIGTRAP,
-++ -- To enable debugging on multithreaded applications, mark SIGTRAP to
-++ -- be kept unmasked.
-++
-++ SIGBUS,
-++
-++ SIGTTIN, SIGTTOU, SIGTSTP,
-++ -- Keep these three signals unmasked so that background processes
-++ -- and IO behaves as normal "C" applications
-++
-++ SIGPROF,
-++ -- To avoid confusing the profiler
-++
-++ SIGKILL, SIGSTOP,
-++ -- These two signals actually cannot be masked;
-++ -- POSIX simply won't allow it.
-++
-++ SIGLTHRRES, SIGLTHRCAN, SIGLTHRDBG);
-++ -- These three signals are used by GNU/LinuxThreads starting from
-++ -- glibc 2.1 (future 2.2).
-++
-++ Reserved : constant Signal_Set :=
-++ -- I am not sure why the following signal is reserved.
-++ -- I guess they are not supported by this version of GNU/kFreeBSD.
-++ (0 .. 0 => SIGVTALRM);
-++
-++ type sigset_t is private;
-++
-++ function sigaddset (set : access sigset_t; sig : Signal) return int;
-++ pragma Import (C, sigaddset, "sigaddset");
-++
-++ function sigdelset (set : access sigset_t; sig : Signal) return int;
-++ pragma Import (C, sigdelset, "sigdelset");
-++
-++ function sigfillset (set : access sigset_t) return int;
-++ pragma Import (C, sigfillset, "sigfillset");
-++
-++ function sigismember (set : access sigset_t; sig : Signal) return int;
-++ pragma Import (C, sigismember, "sigismember");
-++
-++ function sigemptyset (set : access sigset_t) return int;
-++ pragma Import (C, sigemptyset, "sigemptyset");
-++
-++ -- sigcontext is architecture dependent, so define it private
-++ type struct_sigcontext is private;
-++
-++ type struct_sigaction is record
-++ sa_handler : System.Address;
-++ sa_flags : int;
-++ sa_mask : sigset_t;
-++ end record;
-++ pragma Convention (C, struct_sigaction);
-++ type Machine_State is record
-++ eip : unsigned_long;
-++ ebx : unsigned_long;
-++ esp : unsigned_long;
-++ ebp : unsigned_long;
-++ esi : unsigned_long;
-++ edi : unsigned_long;
-++ end record;
-++ type Machine_State_Ptr is access all Machine_State;
-++ type struct_sigaction_ptr is access all struct_sigaction;
-++
-++ SIG_BLOCK : constant := 1;
-++ SIG_UNBLOCK : constant := 2;
-++ SIG_SETMASK : constant := 3;
-++
-++ SIG_DFL : constant := 0;
-++ SIG_IGN : constant := 1;
-++
-++ function sigaction
-++ (sig : Signal;
-++ act : struct_sigaction_ptr;
-++ oact : struct_sigaction_ptr) return int;
-++ pragma Import (C, sigaction, "sigaction");
-++
-++ ----------
-++ -- Time --
-++ ----------
-++
-++ type timespec is private;
-++
-++ function To_Duration (TS : timespec) return Duration;
-++ pragma Inline (To_Duration);
-++
-++ function To_Timespec (D : Duration) return timespec;
-++ pragma Inline (To_Timespec);
-++
-++ type struct_timeval is private;
-++
-++ function To_Duration (TV : struct_timeval) return Duration;
-++ pragma Inline (To_Duration);
-++
-++ function To_Timeval (D : Duration) return struct_timeval;
-++ pragma Inline (To_Timeval);
-++
-++ function gettimeofday
-++ (tv : access struct_timeval;
-++ tz : System.Address := System.Null_Address) return int;
-++ pragma Import (C, gettimeofday, "gettimeofday");
-++
-++ -------------------------
-++ -- Priority Scheduling --
-++ -------------------------
-++
-++ SCHED_FIFO : constant := 1;
-++ SCHED_OTHER : constant := 2;
-++ SCHED_RR : constant := 3;
-++
-++ -------------
-++ -- Process --
-++ -------------
-++
-++ type pid_t is private;
-++
-++ function kill (pid : pid_t; sig : Signal) return int;
-++ pragma Import (C, kill, "kill");
-++
-++ function getpid return pid_t;
-++ pragma Import (C, getpid, "getpid");
-++
-++ -------------
-++ -- Threads --
-++ -------------
-++
-++ type Thread_Body is access
-++ function (arg : System.Address) return System.Address;
-++ type pthread_t is private;
-++ subtype Thread_Id is pthread_t;
-++
-++ type pthread_mutex_t is limited private;
-++ type pthread_cond_t is limited private;
-++ type pthread_attr_t is limited private;
-++ type pthread_mutexattr_t is limited private;
-++ type pthread_condattr_t is limited private;
-++ type pthread_key_t is private;
-++
-++ PTHREAD_CREATE_DETACHED : constant := 1;
-++
-++ -----------
-++ -- Stack --
-++ -----------
-++
-++ function Get_Stack_Base (thread : pthread_t) return Address;
-++ pragma Inline (Get_Stack_Base);
-++ -- This is a dummy procedure to share some GNULLI files
-++
-++ ---------------------------------------
-++ -- Nonstandard Thread Initialization --
-++ ---------------------------------------
-++
-++ procedure pthread_init;
-++ pragma Inline (pthread_init);
-++ -- This is a dummy procedure to share some GNULLI files
-++
-++ -------------------------
-++ -- POSIX.1c Section 3 --
-++ -------------------------
-++
-++ function sigwait (set : access sigset_t; sig : access Signal) return int;
-++ pragma Import (C, sigwait, "sigwait");
-++
-++ function pthread_kill (thread : pthread_t; sig : Signal) return int;
-++ pragma Import (C, pthread_kill, "pthread_kill");
-++
-++ type sigset_t_ptr is access all sigset_t;
-++
-++ function pthread_sigmask
-++ (how : int;
-++ set : sigset_t_ptr;
-++ oset : sigset_t_ptr) return int;
-++ pragma Import (C, pthread_sigmask, "pthread_sigmask");
-++
-++ --------------------------
-++ -- POSIX.1c Section 11 --
-++ --------------------------
-++
-++ function pthread_mutexattr_init
-++ (attr : access pthread_mutexattr_t) return int;
-++ pragma Import (C, pthread_mutexattr_init, "pthread_mutexattr_init");
-++
-++ function pthread_mutexattr_destroy
-++ (attr : access pthread_mutexattr_t) return int;
-++ pragma Import (C, pthread_mutexattr_destroy, "pthread_mutexattr_destroy");
-++
-++ function pthread_mutex_init
-++ (mutex : access pthread_mutex_t;
-++ attr : access pthread_mutexattr_t) return int;
-++ pragma Import (C, pthread_mutex_init, "pthread_mutex_init");
-++
-++ function pthread_mutex_destroy (mutex : access pthread_mutex_t) return int;
-++ pragma Import (C, pthread_mutex_destroy, "pthread_mutex_destroy");
-++
-++ function pthread_mutex_lock (mutex : access pthread_mutex_t) return int;
-++ pragma Import (C, pthread_mutex_lock, "pthread_mutex_lock");
-++
-++ function pthread_mutex_unlock (mutex : access pthread_mutex_t) return int;
-++ pragma Import (C, pthread_mutex_unlock, "pthread_mutex_unlock");
-++
-++ function pthread_condattr_init
-++ (attr : access pthread_condattr_t) return int;
-++ pragma Import (C, pthread_condattr_init, "pthread_condattr_init");
-++
-++ function pthread_condattr_destroy
-++ (attr : access pthread_condattr_t) return int;
-++ pragma Import (C, pthread_condattr_destroy, "pthread_condattr_destroy");
-++
-++ function pthread_cond_init
-++ (cond : access pthread_cond_t;
-++ attr : access pthread_condattr_t) return int;
-++ pragma Import (C, pthread_cond_init, "pthread_cond_init");
-++
-++ function pthread_cond_destroy (cond : access pthread_cond_t) return int;
-++ pragma Import (C, pthread_cond_destroy, "pthread_cond_destroy");
-++
-++ function pthread_cond_signal (cond : access pthread_cond_t) return int;
-++ pragma Import (C, pthread_cond_signal, "pthread_cond_signal");
-++
-++ function pthread_cond_wait
-++ (cond : access pthread_cond_t;
-++ mutex : access pthread_mutex_t) return int;
-++ pragma Import (C, pthread_cond_wait, "pthread_cond_wait");
-++
-++ function pthread_cond_timedwait
-++ (cond : access pthread_cond_t;
-++ mutex : access pthread_mutex_t;
-++ abstime : access timespec) return int;
-++ pragma Import (C, pthread_cond_timedwait, "pthread_cond_timedwait");
-++
-++ Relative_Timed_Wait : constant Boolean := False;
-++ -- pthread_cond_timedwait requires an absolute delay time
-++
-++ --------------------------
-++ -- POSIX.1c Section 13 --
-++ --------------------------
-++
-++ type struct_sched_param is record
-++ sched_priority : int; -- scheduling priority
-++ end record;
-++ pragma Convention (C, struct_sched_param);
-++
-++ function pthread_setschedparam
-++ (thread : pthread_t;
-++ policy : int;
-++ param : access struct_sched_param) return int;
-++ pragma Import (C, pthread_setschedparam, "pthread_setschedparam");
-++
-++ function pthread_attr_setschedpolicy
-++ (attr : access pthread_attr_t;
-++ policy : int) return int;
-++ pragma Import
-++ (C, pthread_attr_setschedpolicy, "pthread_attr_setschedpolicy");
-++
-++ function sched_yield return int;
-++ pragma Import (C, sched_yield, "sched_yield");
-++
-++ ---------------------------
-++ -- P1003.1c - Section 16 --
-++ ---------------------------
-++
-++ function pthread_attr_init
-++ (attributes : access pthread_attr_t) return int;
-++ pragma Import (C, pthread_attr_init, "pthread_attr_init");
-++
-++ function pthread_attr_destroy
-++ (attributes : access pthread_attr_t) return int;
-++ pragma Import (C, pthread_attr_destroy, "pthread_attr_destroy");
-++
-++ function pthread_attr_setdetachstate
-++ (attr : access pthread_attr_t;
-++ detachstate : int) return int;
-++ pragma Import
-++ (C, pthread_attr_setdetachstate, "pthread_attr_setdetachstate");
-++
-++ function pthread_attr_setstacksize
-++ (attr : access pthread_attr_t;
-++ stacksize : size_t) return int;
-++ pragma Import (C, pthread_attr_setstacksize, "pthread_attr_setstacksize");
-++
-++ function pthread_create
-++ (thread : access pthread_t;
-++ attributes : access pthread_attr_t;
-++ start_routine : Thread_Body;
-++ arg : System.Address) return int;
-++ pragma Import (C, pthread_create, "pthread_create");
-++
-++ procedure pthread_exit (status : System.Address);
-++ pragma Import (C, pthread_exit, "pthread_exit");
-++
-++ function pthread_self return pthread_t;
-++ pragma Import (C, pthread_self, "pthread_self");
-++
-++ --------------------------
-++ -- POSIX.1c Section 17 --
-++ --------------------------
-++
-++ function pthread_setspecific
-++ (key : pthread_key_t;
-++ value : System.Address) return int;
-++ pragma Import (C, pthread_setspecific, "pthread_setspecific");
-++
-++ function pthread_getspecific (key : pthread_key_t) return System.Address;
-++ pragma Import (C, pthread_getspecific, "pthread_getspecific");
-++
-++ type destructor_pointer is access procedure (arg : System.Address);
-++
-++ function pthread_key_create
-++ (key : access pthread_key_t;
-++ destructor : destructor_pointer) return int;
-++ pragma Import (C, pthread_key_create, "pthread_key_create");
-++
-++private
-++
-++ type sigset_t is array (1 .. 4) of unsigned;
-++
-++ -- In FreeBSD the component sa_handler turns out to
-++ -- be one a union type, and the selector is a macro:
-++ -- #define sa_handler __sigaction_u._handler
-++ -- #define sa_sigaction __sigaction_u._sigaction
-++
-++ -- Should we add a signal_context type here ?
-++ -- How could it be done independent of the CPU architecture ?
-++ -- sigcontext type is opaque, so it is architecturally neutral.
-++ -- It is always passed as an access type, so define it as an empty record
-++ -- since the contents are not used anywhere.
-++ type struct_sigcontext is null record;
-++ pragma Convention (C, struct_sigcontext);
-++
-++ type pid_t is new int;
-++
-++ type time_t is new long;
-++
-++ type timespec is record
-++ tv_sec : time_t;
-++ tv_nsec : long;
-++ end record;
-++ pragma Convention (C, timespec);
-++
-++ type struct_timeval is record
-++ tv_sec : time_t;
-++ tv_usec : time_t;
-++ end record;
-++ pragma Convention (C, struct_timeval);
-++
-++ type pthread_attr_t is record
-++ detachstate : int;
-++ schedpolicy : int;
-++ schedparam : struct_sched_param;
-++ inheritsched : int;
-++ scope : int;
-++ guardsize : size_t;
-++ stackaddr_set : int;
-++ stackaddr : System.Address;
-++ stacksize : size_t;
-++ end record;
-++ pragma Convention (C, pthread_attr_t);
-++
-++ type pthread_condattr_t is record
-++ dummy : int;
-++ end record;
-++ pragma Convention (C, pthread_condattr_t);
-++
-++ type pthread_mutexattr_t is record
-++ mutexkind : int;
-++ end record;
-++ pragma Convention (C, pthread_mutexattr_t);
-++
-++ type pthread_t is new unsigned_long;
-++
-++ type struct_pthread_fast_lock is record
-++ status : long;
-++ spinlock : int;
-++ end record;
-++ pragma Convention (C, struct_pthread_fast_lock);
-++
-++ type pthread_mutex_t is record
-++ m_reserved : int;
-++ m_count : int;
-++ m_owner : System.Address;
-++ m_kind : int;
-++ m_lock : struct_pthread_fast_lock;
-++ end record;
-++ pragma Convention (C, pthread_mutex_t);
-++
-++ type pthread_cond_padding_t is array (0 .. 35) of unsigned_char;
-++ pragma Convention (C, pthread_cond_padding_t);
-++
-++ type pthread_cond_t is record
-++ c_lock : struct_pthread_fast_lock;
-++ c_waiting : System.Address;
-++ c_padding : pthread_cond_padding_t;
-++ end record;
-++ pragma Convention (C, pthread_cond_t);
-++
-++ type pthread_key_t is new unsigned;
-++
-++end System.OS_Interface;
-+--- ada.old/35soccon.ads 2005-12-26 17:39:13.000000000 +0100
-++++ ada/35soccon.ads 2005-12-26 17:47:20.000000000 +0100
-+@@ -0,0 +1,112 @@
-++------------------------------------------------------------------------------
-++-- --
-++-- GNAT COMPILER COMPONENTS --
-++-- --
-++-- G N A T . S O C K E T S . C O N S T A N T S --
-++-- --
-++-- S p e c --
-++-- --
-++-- Copyright (C) 2001 Ada Core Technologies, Inc. --
-++-- --
-++-- GNAT is free software; you can redistribute it and/or modify it under --
-++-- terms of the GNU General Public License as published by the Free Soft- --
-++-- ware Foundation; either version 2, or (at your option) any later ver- --
-++-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-++-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-++-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-++-- for more details. You should have received a copy of the GNU General --
-++-- Public License distributed with GNAT; see file COPYING. If not, write --
-++-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
-++-- MA 02111-1307, USA. --
-++-- --
-++-- As a special exception, if other files instantiate generics from this --
-++-- unit, or you link this unit with other files to produce an executable, --
-++-- this unit does not by itself cause the resulting executable to be --
-++-- covered by the GNU General Public License. This exception does not --
-++-- however invalidate any other reasons why the executable file might be --
-++-- covered by the GNU Public License. --
-++-- --
-++-- GNAT is maintained by Ada Core Technologies Inc (http://www.gnat.com). --
-++-- --
-++------------------------------------------------------------------------------
-++
-++-- This is the version for i386 FreeBSD
-++
-++package GNAT.Sockets.Constants is
-++
-++ -- Families
-++
-++ AF_INET : constant := 2;
-++ AF_INET6 : constant := 28;
-++
-++ SOCK_STREAM : constant := 1;
-++ SOCK_DGRAM : constant := 2;
-++
-++ -- Socket errors
-++
-++ EBADF : constant := 9;
-++ ENOTSOCK : constant := 38;
-++ ENOTCONN : constant := 57;
-++ ENOBUFS : constant := 55;
-++ EOPNOTSUPP : constant := 45;
-++ EFAULT : constant := 14;
-++ EWOULDBLOCK : constant := 35;
-++ EADDRNOTAVAIL : constant := 49;
-++ EMSGSIZE : constant := 40;
-++ EADDRINUSE : constant := 48;
-++ EINVAL : constant := 22;
-++ EACCES : constant := 13;
-++ EAFNOSUPPORT : constant := 47;
-++ EISCONN : constant := 56;
-++ ETIMEDOUT : constant := 60;
-++ ECONNREFUSED : constant := 61;
-++ ENETUNREACH : constant := 51;
-++ EALREADY : constant := 37;
-++ EINPROGRESS : constant := 36;
-++ ENOPROTOOPT : constant := 42;
-++ EPROTONOSUPPORT : constant := 43;
-++ EINTR : constant := 4;
-++ EIO : constant := 5;
-++ ESOCKTNOSUPPORT : constant := 44;
-++
-++ -- Host errors
-++
-++ HOST_NOT_FOUND : constant := 1;
-++ TRY_AGAIN : constant := 2;
-++ NO_ADDRESS : constant := 4;
-++ NO_RECOVERY : constant := 3;
-++
-++ -- Control flags
-++
-++ FIONBIO : constant := -2147195266;
-++ FIONREAD : constant := 1074030207;
-++
-++ -- Shutdown modes
-++
-++ SHUT_RD : constant := 0;
-++ SHUT_WR : constant := 1;
-++ SHUT_RDWR : constant := 2;
-++
-++ -- Protocol levels
-++
-++ SOL_SOCKET : constant := 65535;
-++ IPPROTO_IP : constant := 0;
-++ IPPROTO_UDP : constant := 17;
-++ IPPROTO_TCP : constant := 6;
-++
-++ -- Socket options
-++
-++ TCP_NODELAY : constant := 1;
-++ SO_SNDBUF : constant := 4097;
-++ SO_RCVBUF : constant := 4098;
-++ SO_REUSEADDR : constant := 4;
-++ SO_KEEPALIVE : constant := 8;
-++ SO_LINGER : constant := 128;
-++ SO_ERROR : constant := 4103;
-++ SO_BROADCAST : constant := 32;
-++ IP_ADD_MEMBERSHIP : constant := 12;
-++ IP_DROP_MEMBERSHIP : constant := 13;
-++ IP_MULTICAST_TTL : constant := 10;
-++ IP_MULTICAST_LOOP : constant := 11;
-++
-++end GNAT.Sockets.Constants;
Deleted: trunk/web/patches/gnome-libs.diff
===================================================================
--- trunk/web/patches/gnome-libs.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gnome-libs.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,185 +0,0 @@
-Author: aurel32
-Status: bug from rmh in the BTS
-
-diff -u gnome-libs-1.4.2/debian/patches/00list gnome-libs-1.4.2/debian/patches/00list
---- gnome-libs-1.4.2/debian/patches/00list
-+++ gnome-libs-1.4.2/debian/patches/00list
-@@ -16,0 +17 @@
-+17_kfreebsd
---- gnome-libs-1.4.2.orig/debian/patches/17_kfreebsd.dpatch
-+++ gnome-libs-1.4.2/debian/patches/17_kfreebsd.dpatch
-@@ -0,0 +1,174 @@
-+#! /bin/sh -e
-+
-+if [ $# -ne 1 ]; then
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1
-+fi
-+case "$1" in
-+ -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
-+ -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
-+ *)
-+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+ exit 1;;
-+esac
-+exit 0
-+
-+--- configure.orig 2005-09-02 20:47:32.000000000 +0200
-++++ configure 2005-09-02 20:48:49.000000000 +0200
-+@@ -1926,7 +1926,7 @@
-+ esac
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+@@ -3614,7 +3614,7 @@
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+@@ -4013,6 +4013,18 @@
-+ dynamic_linker=no
-+ ;;
-+
-++kfreebsd*-gnu)
-++ version_type=linux
-++ need_lib_prefix=no
-++ need_version=no
-++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-++ soname_spec='${libname}${release}.so$major'
-++ shlibpath_var=LD_LIBRARY_PATH
-++ shlibpath_overrides_runpath=no
-++ hardcode_into_libs=yes
-++ dynamic_linker='GNU ld.so'
-++ ;;
-++
-+ freebsd*)
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+--- aclocal.m4.orig 2005-09-02 20:47:37.000000000 +0200
-++++ aclocal.m4 2005-09-02 20:48:15.000000000 +0200
-+@@ -2273,7 +2273,7 @@
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+@@ -2669,6 +2669,19 @@
-+ dynamic_linker=no
-+ ;;
-+
-++kfreebsd*-gnu)
-++ version_type=linux
-++ need_lib_prefix=no
-++ need_version=no
-++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-++ soname_spec='${libname}${release}.so$major'
-++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-++ shlibpath_var=LD_LIBRARY_PATH
-++ shlibpath_overrides_runpath=no
-++ hardcode_into_libs=yes
-++ dynamic_linker='GNU ld.so'
-++ ;;
-++
-+ freebsd*)
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+@@ -3863,7 +3876,7 @@
-+ esac
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+--- libart_lgpl/aclocal.m4.orig 2005-09-02 21:18:13.000000000 +0200
-++++ libart_lgpl/aclocal.m4 2005-09-02 21:21:03.000000000 +0200
-+@@ -1620,7 +1620,7 @@
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+@@ -2016,6 +2016,19 @@
-+ dynamic_linker=no
-+ ;;
-+
-++kfreebsd*-gnu)
-++ version_type=linux
-++ need_lib_prefix=no
-++ need_version=no
-++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $li
-++bname.so'
-++ soname_spec='${libname}${release}.so$major'
-++ shlibpath_var=LD_LIBRARY_PATH
-++ shlibpath_overrides_runpath=no
-++ hardcode_into_libs=yes
-++ dynamic_linker='GNU ld.so'
-++ ;;
-++
-+ freebsd*)
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+@@ -3210,7 +3223,7 @@
-+ esac
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+
-+--- libart_lgpl/configure.orig 2005-09-02 21:18:08.000000000 +0200
-++++ libart_lgpl/configure 2005-09-02 21:20:52.000000000 +0200
-+@@ -1677,7 +1677,7 @@
-+ esac
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+@@ -3365,7 +3365,7 @@
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+@@ -3764,6 +3764,18 @@
-+ dynamic_linker=no
-+ ;;
-+
-++kfreebsd*-gnu)
-++ version_type=linux
-++ need_lib_prefix=no
-++ need_version=no
-++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-++ soname_spec='${libname}${release}.so$major'
-++ shlibpath_var=LD_LIBRARY_PATH
-++ shlibpath_overrides_runpath=no
-++ hardcode_into_libs=yes
-++ dynamic_linker='GNU ld.so'
-++ ;;
-++
-+ freebsd*)
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
Deleted: trunk/web/patches/gnome-main-menu.diff
===================================================================
--- trunk/web/patches/gnome-main-menu.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gnome-main-menu.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,87 +0,0 @@
-
-
-* hacked patch to avoid need of network-manager ...
-
-* apply and run autoreconf
-
-
-diff -u gnome-main-menu-0.9.8.svn.20070430/debian/control gnome-main-menu-0.9.8.svn.20070430/debian/control
---- gnome-main-menu-0.9.8.svn.20070430/debian/control
-+++ gnome-main-menu-0.9.8.svn.20070430/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Riccardo Setti <giskard at debian.org>
- Uploaders: Clément Stenac <zorglub at debian.org>
--Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, libgnome-desktop-dev, libpanel-applet2-dev, libgtop2-dev, libdbus-glib-1-dev ,network-manager-dev, libhal-storage-dev, libiw-dev, libgnome-menu-dev, libavahi-core-dev, gtk-doc-tools, librsvg2-dev, libnm-util-dev
-+Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, libgnome-desktop-dev, libpanel-applet2-dev, libgtop2-dev, libdbus-glib-1-dev, libhal-storage-dev, libgnome-menu-dev, libavahi-core-dev, gtk-doc-tools, librsvg2-dev
- Standards-Version: 3.7.2
-
- Package: gnome-main-menu
-only in patch2:
-unchanged:
---- gnome-main-menu-0.9.8.svn.20070430.orig/configure.in
-+++ gnome-main-menu-0.9.8.svn.20070430/configure.in
-@@ -43,16 +43,7 @@
- AC_SUBST(LIBSLAB_CFLAGS)
- AC_SUBST(LIBSLAB_LIBS)
-
--PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage cairo ])
--
--AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
--
--if test "x$have_iwlib" != "xyes" ; then
-- AC_ERROR(cannot find iwlib)
--else
-- MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw"
-- AC_SUBST(MAIN_MENU_LIBS)
--fi
-+PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ])
-
- AC_SUBST(MAIN_MENU_CFLAGS)
- AC_SUBST(MAIN_MENU_LIBS)
-only in patch2:
-unchanged:
---- gnome-main-menu-0.9.8.svn.20070430.orig/main-menu/src/main-menu-ui.c
-+++ gnome-main-menu-0.9.8.svn.20070430/main-menu/src/main-menu-ui.c
-@@ -42,7 +42,6 @@
- #include "directory-tile.h"
- #include "system-tile.h"
- #include "hard-drive-status-tile.h"
--#include "network-status-tile.h"
-
- #include "tile-table.h"
-
-@@ -694,19 +693,6 @@
- gtk_container_add (ctnr, tile);
- gtk_widget_show_all (GTK_WIDGET (ctnr));
-
-- ctnr = GTK_CONTAINER (glade_xml_get_widget (
-- priv->main_menu_xml, "network-status-container"));
-- tile = network_status_tile_new ();
--
-- gtk_widget_set_size_request (tile, 6 * icon_width, -1);
--
-- g_signal_connect (
-- G_OBJECT (tile), "tile-action-triggered",
-- G_CALLBACK (tile_action_triggered_cb), this);
--
-- gtk_container_add (ctnr, tile);
-- gtk_widget_show_all (GTK_WIDGET (ctnr));
--
- priv->status_section = glade_xml_get_widget (
- priv->main_menu_xml, "slab-status-section");
- }
-only in patch2:
-unchanged:
---- gnome-main-menu-0.9.8.svn.20070430.orig/main-menu/src/Makefile.am
-+++ gnome-main-menu-0.9.8.svn.20070430/main-menu/src/Makefile.am
-@@ -19,9 +19,6 @@
- main-menu-migration.c main-menu-migration.h \
- tile-table.c tile-table.h \
- hard-drive-status-tile.c hard-drive-status-tile.h \
-- network-status-tile.c network-status-tile.h \
-- network-status-agent.c network-status-agent.h \
-- network-status-info.c network-status-info.h \
- tomboykeybinder.c tomboykeybinder.h \
- eggaccelerators.c eggaccelerators.h
-
Deleted: trunk/web/patches/gnupg.bash
===================================================================
--- trunk/web/patches/gnupg.bash 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gnupg.bash 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -e
-
-# Status: in BTS.
-
-cp debian/control{,.in}
-patch -p1 < $0
-fakeroot debian/rules clean
-exit 0
-
-diff -ur gnupg-1.4.0.old/debian/control.in gnupg-1.4.0/debian/control.in
---- gnupg-1.4.0.old/debian/control.in 2005-02-24 08:16:57.000000000 +0100
-+++ gnupg-1.4.0/debian/control.in 2005-02-24 08:18:04.000000000 +0100
-@@ -3,11 +3,11 @@
- Priority: standard
- Maintainer: James Troup <james at nocrew.org>
- Standards-Version: 3.6.1.1
--Build-Depends: libz-dev, libldap2-dev, libbz2-dev, libcap-dev, libusb-dev, libreadline5-dev, file, gettext, dpatch, mail-transport-agent
-+Build-Depends: libz-dev, libldap2-dev, libbz2-dev, libcap-dev [@linux-gnu@], libusb-dev, libreadline5-dev, file, gettext, dpatch, mail-transport-agent
-
- Package: gnupg
- Architecture: any
--Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13) | devfsd | hurd
-+Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13) [@linux-gnu@] | devfsd [@linux-gnu@]
- Suggests: gnupg-doc, xloadimage
- Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
- Replaces: gpg-rsa, gpg-rsaref
-diff -ur gnupg-1.4.0.old/debian/rules gnupg-1.4.0/debian/rules
---- gnupg-1.4.0.old/debian/rules 2005-02-24 08:16:39.000000000 +0100
-+++ gnupg-1.4.0/debian/rules 2005-02-24 08:17:05.000000000 +0100
-@@ -58,6 +58,8 @@
- -rm -rf debian/tmp debian/gpgv-udeb debian/files* debian/*substvars debian/patched
- -rm -f po/ca.gmo
- find . -name \*~ | xargs rm -vf
-+ sed -e "s/@linux-gnu@/`type-handling any linux-gnu`/g" \
-+ < debian/control.in > debian/control
-
- binary-indep:
-
Deleted: trunk/web/patches/gnustep-back.diff
===================================================================
--- trunk/web/patches/gnustep-back.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gnustep-back.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,19 +0,0 @@
-
-Status: dirty hack obtained from upstream ML
-
-diff -ur gnustep-back-0.9.4.old/Source/x11/XWindowBuffer.m gnustep-back-0.9.4/Source/x11/XWindowBuffer.m
---- gnustep-back-0.9.4.old/Source/x11/XWindowBuffer.m 2003-06-12 19:23:58.000000000 +0200
-+++ gnustep-back-0.9.4/Source/x11/XWindowBuffer.m 2004-12-20 18:34:25.000000000 +0100
-@@ -178,12 +178,9 @@
- wi->ximage->bytes_per_line * wi->ximage->height,
- IPC_CREAT | 0700);
-
-- if (wi->shminfo.shmid == -1)
-- {
- NSLog(@"Warning: shmget() failed: %m." WARN);
- XDestroyImage(wi->ximage);
- goto no_xshm;
-- }
-
- wi->shminfo.shmaddr = wi->ximage->data = shmat(wi->shminfo.shmid, 0, 0);
- if ((int)wi->shminfo.shmaddr == -1)
Deleted: trunk/web/patches/goldedplus.diff
===================================================================
--- trunk/web/patches/goldedplus.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/goldedplus.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,29 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u goldedplus-1.1.4.7+1.1.5.20051016/debian/rules goldedplus-1.1.4.7+1.1.5.20051016/debian/rules
---- goldedplus-1.1.4.7+1.1.5.20051016/debian/rules
-+++ goldedplus-1.1.4.7+1.1.5.20051016/debian/rules
-@@ -22,6 +22,7 @@
- cat build/Makefile debian/patches/Makefile.addon > build/Makefile.Debian
- patch -p0 < debian/patches/compilefix-20051016snapshot.patch
- patch -p0 < debian/patches/compilefix-20051016snapshot-noni386.patch
-+ patch -p0 < debian/patches/gnu-kfreebsd.patch
- # Build it
- $(MAKE) -C build -f Makefile.Debian
- touch build-stamp
---- goldedplus-1.1.4.7+1.1.5.20051016.orig/debian/patches/gnu-kfreebsd.patch
-+++ goldedplus-1.1.4.7+1.1.5.20051016/debian/patches/gnu-kfreebsd.patch
-@@ -0,0 +1,12 @@
-+--- build/goldlib/gall/gcmpall.h.orig 2005-10-23 15:24:16.000000000 +0200
-++++ build/goldlib/gall/gcmpall.h 2005-10-23 15:24:33.000000000 +0200
-+@@ -68,6 +68,9 @@
-+ #if defined(__FreeBSD__)
-+ #define __UNIX__ __FreeBSD__
-+ #endif
-++ #if defined(__FreeBSD_kernel__)
-++ #define __UNIX__ __FreeBSD_kernel__
-++ #endif
-+ #if defined(__OpenBSD__)
-+ #define __UNIX__ __OpenBSD__
-+ #endif
Deleted: trunk/web/patches/gpsim.diff
===================================================================
--- trunk/web/patches/gpsim.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gpsim.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,67 +0,0 @@
-Status: in BTS
-Author: aurel32
-
-diff -u gpsim-0.20.14/modules/paraface.cc gpsim-0.20.14/modules/paraface.cc
---- gpsim-0.20.14/modules/paraface.cc
-+++ gpsim-0.20.14/modules/paraface.cc
-@@ -41,9 +41,20 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
-+#if defined(__linux__)
- #include <linux/parport.h>
- #include <linux/ppdev.h>
--
-+#elif defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-+#include <dev/ppbus/ppi.h>
-+#include <dev/ppbus/ppbconf.h>
-+#define PPRSTATUS PPIGSTATUS
-+#define PPWDATA PPISDATA
-+#define PARPORT_STATUS_ACK nACK
-+#define PARPORT_STATUS_BUSY nBUSY
-+#define PARPORT_STATUS_PAPEROUT PERROR
-+#define PARPORT_STATUS_SELECT SELECT
-+#define PARPORT_STATUS_ERROR nFAULT
-+#endif
-
- #include <errno.h>
- #include <stdlib.h>
-@@ -345,14 +356,17 @@
- perror ("open");
- return -1;
- }
--
-+
-+#if defined(PPCLAIM)
- if (ioctl (fd, PPCLAIM)) {
- perror ("PPCLAIM");
- close (fd);
- fd=-1;
- return -1;
- }
-+#endif
-
-+#if defined(PPNEGOT)
- /* Switch to compatibility mode. (In fact we don't need
- * to do this, since we start off in compatibility mode
- * anyway, but this demonstrates PPNEGOT.)*/
-@@ -364,6 +378,19 @@
- return -1;
- }
- return 0; // SUCCESS
-+#elif defined(PPISECR)
-+ /* Switch to compatibility mode. (In fact we don't need
-+ * to do this, since we start off in compatibility mode
-+ * anyway, but this demonstrates PPISECR.)*/
-+ mode = PPB_COMPATIBLE;
-+ if (ioctl (fd, PPISECR, &mode)) {
-+ perror ("PPISECR");
-+ close (fd);
-+ fd=-1;
-+ return -1;
-+ }
-+ return 0; // SUCCESS
-+#endif
- }
-
- // Return low five bits containing:
Deleted: trunk/web/patches/gpsk31.diff
===================================================================
--- trunk/web/patches/gpsk31.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gpsk31.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,50 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gpsk31-0.2.4a/src/psk31-transmitter.C gpsk31-0.2.4a/src/psk31-transmitter.C
---- gpsk31-0.2.4a/src/psk31-transmitter.C
-+++ gpsk31-0.2.4a/src/psk31-transmitter.C
-@@ -11,7 +11,12 @@
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
- #include <sys/ioctl.h>
- #include "psk31-coder.h"
- #include "psk31-transmitter.h"
-diff -u gpsk31-0.2.4a/src/main.C gpsk31-0.2.4a/src/main.C
---- gpsk31-0.2.4a/src/main.C
-+++ gpsk31-0.2.4a/src/main.C
-@@ -29,7 +29,12 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <stdio.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- gpsk31-0.2.4a.orig/src/spectrum.C
-+++ gpsk31-0.2.4a/src/spectrum.C
-@@ -30,7 +30,12 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <stdio.h>
Deleted: trunk/web/patches/gs-esp.diff
===================================================================
--- trunk/web/patches/gs-esp.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gs-esp.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,44 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gs-esp-8+8.15rc4.dfsg.1/configure gs-esp-8+8.15rc4.dfsg.1/configure
---- gs-esp-8+8.15rc4.dfsg.1/configure
-+++ gs-esp-8+8.15rc4.dfsg.1/configure
-@@ -9489,7 +9489,7 @@
- if test "${enable_dynamic+set}" = set; then
- enableval="$enable_dynamic"
- case `uname` in
-- Linux*)
-+ Linux* | GNU/kFreeBSD*)
- DYNAMIC_CFLAGS="-fPIC"
- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
- DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
-@@ -9519,7 +9519,7 @@
- if test "${enable_threads+set}" = set; then
- enableval="$enable_threads"
- case `uname` in
-- Linux* | IRIX* | SunOS*)
-+ Linux* | IRIX* | SunOS* | GNU/kFreeBSD*)
- THREADSYNC="posync"
- THREADLIBS="-lpthread"
- ;;
---- gs-esp-8+8.15rc4.dfsg.1.orig/src/configure.ac
-+++ gs-esp-8+8.15rc4.dfsg.1/src/configure.ac
-@@ -687,7 +687,7 @@
-
- AC_ARG_ENABLE(dynamic, [ --enable-dynamic enable dynamically loaded drivers (default=no)],
- [ case `uname` in
-- Linux*)
-+ Linux* | GNU/kFreeBSD*)
- DYNAMIC_CFLAGS="-fPIC"
- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
- DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
-@@ -713,7 +713,7 @@
-
- AC_ARG_ENABLE(threads, [ --enable-threads enable threaded output (default=no)],
- [ case `uname` in
-- Linux* | IRIX* | SunOS*)
-+ Linux* | IRIX* | SunOS* | GNU/kFreeBSD*)
- THREADSYNC="posync"
- THREADLIBS="-lpthread"
- ;;
Deleted: trunk/web/patches/gtick.diff
===================================================================
--- trunk/web/patches/gtick.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gtick.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,16 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- gtick-0.3.6.orig/src/dsp.c
-+++ gtick-0.3.6/src/dsp.c
-@@ -41,8 +41,8 @@
- #endif
-
- /* OSS headers */
--#ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
- #endif
Deleted: trunk/web/patches/gtk+2.0-directfb.diff
===================================================================
--- trunk/web/patches/gtk+2.0-directfb.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gtk+2.0-directfb.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,101 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gtk+2.0-directfb-2.0.9.2/debian/control gtk+2.0-directfb-2.0.9.2/debian/control
---- gtk+2.0-directfb-2.0.9.2/debian/control
-+++ gtk+2.0-directfb-2.0.9.2/debian/control
-@@ -3,14 +3,14 @@
- Priority: optional
- Maintainer: Debian Install System Team <debian-boot at lists.debian.org>
- Uploaders: Alastair McKinstry <mckinstry at debian.org>
--Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libdirectfb-dev (>= 0.9.22), autoconf, dbs
-+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libdirectfb-dev (>= 0.9.22), autoconf, dbs, libtool, automake1.4
- Standards-Version: 3.6.2
-
- Package: libgtk+2.0-directfb0-udeb
- Priority: extra
- Section: debian-installer
- Provides: libgtk-directfb-2.0-0
--Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64
-+Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64 kfreebsd-i386
- Depends: libc-udeb, libdirectfb-0.9-22
- XC-Package-Type: udeb
- Description: gtk+2.0 implementation for the frame buffer
-@@ -23,7 +23,7 @@
- Package: libgtk+2.0-directfb-dev
- Section: libdevel
- Priority: optional
--Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64
-+Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64 kfreebsd-i386
- Depends: ${shlibs:Depends}
- Requires: libgtk-directfb-2.0-0
- Description: gtk+2.0 implementation for the frame buffer, development files
-@@ -40,7 +40,7 @@
- Priority: optional
- Section: libs
- Provides: libgtk-directfb-2.0-0
--ptArchitecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64
-+Architecture: i386 ia64 arm alpha hppa mips mipsel sparc powerpc s390 m68k amd64 kfreebsd-i386
- Depends: libc6 | libc, libdirectfb-0.9-22
- Description: gtk+2.0 implementation for the frame buffer
- DirectFB is a thin library that provides hardware graphics acceleration, input
-diff -u gtk+2.0-directfb-2.0.9.2/debian/rules gtk+2.0-directfb-2.0.9.2/debian/rules
---- gtk+2.0-directfb-2.0.9.2/debian/rules
-+++ gtk+2.0-directfb-2.0.9.2/debian/rules
-@@ -42,6 +42,13 @@
-
- $(configure-stamp): $(patched)
- dh_testdir
-+
-+ cd $(BUILD_TREE) && \
-+ libtoolize -c -f && \
-+ aclocal-1.4 -I m4macros && \
-+ automake-1.4 && \
-+ autoconf
-+
- cd $(BUILD_TREE) && \
- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure --prefix=/usr \
-diff -u gtk+2.0-directfb-2.0.9.2/debian/patches/10_build_fixes.patch gtk+2.0-directfb-2.0.9.2/debian/patches/10_build_fixes.patch
---- gtk+2.0-directfb-2.0.9.2/debian/patches/10_build_fixes.patch
-+++ gtk+2.0-directfb-2.0.9.2/debian/patches/10_build_fixes.patch
-@@ -12,20 +12,18 @@
- diff -ruN gtk+-directfb-2.0.9-2-old/gtk/Makefile.am gtk+-directfb-2.0.9-2/gtk/Makefile.am
- --- gtk+-directfb-2.0.9-2-old/gtk/Makefile.am 2003-04-07 14:41:31.000000000 +0100
- +++ gtk+-directfb-2.0.9-2/gtk/Makefile.am 2005-09-18 11:33:13.907265744 +0100
--@@ -69,12 +69,16 @@
-+@@ -69,12 +69,14 @@
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -export-dynamic \
- -rpath $(libdir) \
--+ -BStatic
--+\
-++ -BStatic \
- $(no_undefined) \
- @LIBTOOL_EXPORT_OPTIONS@ \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/@gdktargetlib@ \
- $(libgtk_target_ldflags) \
- @GTK_DEP_LIBS@ \
--+ -Bdynamic
--+\
-++ -Bdynamic \
- @STRIP_END@
-
- #
-only in patch2:
-unchanged:
---- gtk+2.0-directfb-2.0.9.2.orig/debian/patches/20_configure.in.patch
-+++ gtk+2.0-directfb-2.0.9.2/debian/patches/20_configure.in.patch
-@@ -0,0 +1,11 @@
-+--- gtk+-directfb-2.0.9-2-old/acinclude.m4 2005-10-09 11:00:44.000000000 +0200
-++++ gtk+-directfb-2.0.9-2/acinclude.m4 2005-10-09 11:00:26.000000000 +0200
-+@@ -253,7 +253,7 @@
-+ AC_DEFINE(HAVE_STPCPY)
-+ fi
-+
-+- AM_LC_MESSAGES
-++ gt_LC_MESSAGES
-+ AM_GTK_WITH_NLS
-+
-+ if test "x$CATOBJEXT" != "x"; then
Deleted: trunk/web/patches/gtkguitune.diff
===================================================================
--- trunk/web/patches/gtkguitune.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gtkguitune.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,49 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gtkguitune-0.7/debian/control gtkguitune-0.7/debian/control
---- gtkguitune-0.7/debian/control
-+++ gtkguitune-0.7/debian/control
-@@ -2,7 +2,7 @@
- Section: x11
- Priority: optional
- Maintainer: Antonin Kral <A.Kral at sh.cvut.cz>
--Build-Depends: debhelper (>> 4.0.0), libgtkmm-dev, libgtk1.2-dev
-+Build-Depends: debhelper (>> 4.0.0), libgtkmm-dev, libgtk1.2-dev, autotools-dev
- Standards-Version: 3.6.2
-
- Package: gtkguitune
-only in patch2:
-unchanged:
---- gtkguitune-0.7.orig/main.cc
-+++ gtkguitune-0.7/main.cc
-@@ -24,7 +24,12 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gtk--/window.h>
-only in patch2:
-unchanged:
---- gtkguitune-0.7.orig/guitune.cc
-+++ gtkguitune-0.7/guitune.cc
-@@ -24,7 +24,12 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#include <sys/soundcard.h>
-+#endif
-
- #include <gtk--/main.h>
- #include <gtk--/box.h>
Deleted: trunk/web/patches/gtoaster.diff
===================================================================
--- trunk/web/patches/gtoaster.diff 2011-07-18 20:55:26 UTC (rev 3614)
+++ trunk/web/patches/gtoaster.diff 2011-07-18 22:37:59 UTC (rev 3615)
@@ -1,41 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- gtoaster-0.2002083100+1.0Beta6.orig/cdromlow.c
-+++ gtoaster-0.2002083100+1.0Beta6/cdromlow.c
-@@ -9,7 +9,7 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <unistd.h>
--#if !defined( __FreeBSD__) && !defined(__svr4__ )
-+#if !defined( __FreeBSD__) && !defined( __FreeBSD_kernel__) && !defined(__svr4__ )
- # include <linux/cdrom.h>
- #else
- # include <sys/cdio.h>
-@@ -37,7 +37,7 @@
-
- /* we provide some macro mappings here. FreeBSD structs are a bit
- * different to those used by Linux so we will use macros to compensate that */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined( __FreeBSD_kernel__)
-
- /* Needed by FreeBSD */
- # define CDROM_DATA_TRACK 4
-@@ -147,7 +147,7 @@
- entry.cdromlow_tocent_track=x;
- entry.cdromlow_tocent_format=CDROM_LBA;
- ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry);
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
- if (entry.cdte_ctrl&CDROM_DATA_TRACK)
- #else
- if (entry.entry.control & CDROM_DATA_TRACK)
-@@ -324,7 +324,7 @@
- track.cdromlow_tocent_format=CDROM_LBA;
- if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1)
- ok=0;
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
- if (track.cdte_ctrl&CDROM_DATA_TRACK)
- #else
- if (track.entry.control & CDROM_DATA_TRACK)
More information about the Glibc-bsd-commits
mailing list