aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2003-09-24 21:01:39 +0800
committerkrion <krion@FreeBSD.org>2003-09-24 21:01:39 +0800
commitd189f8d1fc66bad92b6e1f8a3c9fe4175b29366f (patch)
treed66d3747ca4d7184188bf6ed4ea290269a893053
parent82298165d9c8b41854ab3f9713b69636780c0179 (diff)
downloadfreebsd-ports-gnome-d189f8d1fc66bad92b6e1f8a3c9fe4175b29366f.tar.gz
freebsd-ports-gnome-d189f8d1fc66bad92b6e1f8a3c9fe4175b29366f.tar.zst
freebsd-ports-gnome-d189f8d1fc66bad92b6e1f8a3c9fe4175b29366f.zip
- Update to version 0.7.4-1
PR: 57092 Submitted by: KATO Tsuguru <tkato@prontomail.com>
-rw-r--r--devel/clanlib-devel/Makefile95
-rw-r--r--devel/clanlib-devel/distinfo2
-rw-r--r--devel/clanlib-devel/files/patch-Sources_Util_fcvt.c145
-rw-r--r--devel/clanlib-devel/files/patch-aa21
-rw-r--r--devel/clanlib-devel/files/patch-ab10
-rw-r--r--devel/clanlib-devel/files/patch-ac97
-rw-r--r--devel/clanlib-devel/files/patch-ad42
-rw-r--r--devel/clanlib-devel/files/patch-ae11
-rw-r--r--devel/clanlib-devel/files/patch-af11
-rw-r--r--devel/clanlib-devel/files/patch-ag11
-rw-r--r--devel/clanlib-devel/files/patch-ah87
-rw-r--r--devel/clanlib-devel/files/patch-ai11
-rw-r--r--devel/clanlib-devel/files/patch-aj304
-rw-r--r--devel/clanlib-devel/files/patch-ak26
-rw-r--r--devel/clanlib-devel/files/patch-al19
-rw-r--r--devel/clanlib-devel/files/patch-configure10
-rw-r--r--devel/clanlib-devel/files/patch-mutex_pthread.cpp23
-rw-r--r--devel/clanlib-devel/files/patch-socket.cpp11
-rw-r--r--devel/clanlib-devel/files/patch-soundoutput_oss.cpp17
-rw-r--r--devel/clanlib-devel/pkg-plist537
-rw-r--r--devel/clanlib-devel/pkg-plist.glx1
-rw-r--r--devel/clanlib/Makefile95
-rw-r--r--devel/clanlib/distinfo2
-rw-r--r--devel/clanlib/files/patch-Sources_Util_fcvt.c145
-rw-r--r--devel/clanlib/files/patch-aa21
-rw-r--r--devel/clanlib/files/patch-ab10
-rw-r--r--devel/clanlib/files/patch-ac97
-rw-r--r--devel/clanlib/files/patch-ad42
-rw-r--r--devel/clanlib/files/patch-ae11
-rw-r--r--devel/clanlib/files/patch-af11
-rw-r--r--devel/clanlib/files/patch-ag11
-rw-r--r--devel/clanlib/files/patch-ah87
-rw-r--r--devel/clanlib/files/patch-ai11
-rw-r--r--devel/clanlib/files/patch-aj304
-rw-r--r--devel/clanlib/files/patch-ak26
-rw-r--r--devel/clanlib/files/patch-al19
-rw-r--r--devel/clanlib/files/patch-configure10
-rw-r--r--devel/clanlib/files/patch-mutex_pthread.cpp23
-rw-r--r--devel/clanlib/files/patch-socket.cpp11
-rw-r--r--devel/clanlib/files/patch-soundoutput_oss.cpp17
-rw-r--r--devel/clanlib/pkg-plist537
-rw-r--r--devel/clanlib/pkg-plist.glx1
42 files changed, 990 insertions, 1992 deletions
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 13af8cc2d8c1..a91fc25626e1 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -6,38 +6,89 @@
#
PORTNAME= clanlib
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.7.4.1
CATEGORIES= devel
-MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
-DISTNAME= ClanLib-${PORTVERSION}
+MASTER_SITES= http://clanlib.org/~sphair/download/
+DISTNAME= ClanLib-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform game SDK
LIB_DEPENDS= Hermes.1:${PORTSDIR}/graphics/Hermes \
- png.5:${PORTSDIR}/graphics/png \
- vga.1:${PORTSDIR}/graphics/svgalib
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ png.5:${PORTSDIR}/graphics/png
-.if defined(WITHOUT_GL)
-CONFIGURE_ARGS+= --disable-opengl
+WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION:R}
+
+USE_BZIP2= yes
+USE_PERL5_BUILD= yes
+USE_XLIB= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_GMAKE= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
+INSTALLS_SHLIB= yes
+
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500032
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CPPFLAGS+= -I${LOCALBASE}/include/stlport
+LDFLAGS+= -lstlport_gcc
+CFLAGS+= -O0
+.endif
+
+.if defined(WITHOUT_SDL)
+CONFIGURE_ARGS+= --disable-clanSDL
+PLIST_SUB+= SDL="@comment "
+.else
+USE_SDL= yes
+CONFIGURE_ARGS+= --disable-sdltest
+PLIST_SUB+= SDL=""
+.endif
+
+.if defined(WITHOUT_OPENGL)
+CONFIGURE_ARGS+= --disable-clanGL
+PLIST_SUB+= OPENGL="@comment "
.else
USE_MESA= yes
-CONFIGURE_ARGS+= --enable-opengl
-PLIST= ${WRKDIR}/PLIST
+PLIST_SUB+= OPENGL=""
.endif
-USE_GMAKE= yes
-USE_XLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
-CFLAGS+= -fpermissive
-ALL_TARGET+= clanPNG clanGL
-
-.if !defined(WITHOUT_GL)
-pre-install:
- @cat ${PKGDIR}/pkg-plist.glx ${PKGDIR}/pkg-plist > ${PLIST}
+.if defined(WITHOUT_LIBMIKMOD)
+CONFIGURE_ARGS+= --disable-clanMikMod
+PLIST_SUB+= LIBMIKMOD="@comment "
+.else
+LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod
+PLIST_SUB+= LIBMIKMOD=""
.endif
-.include <bsd.port.mk>
+.if defined(WITHOUT_LIBVORBIS)
+CONFIGURE_ARGS+= --disable-clanVorbis
+PLIST_SUB+= LIBVORBIS="@comment "
+.else
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
+PLIST_SUB+= LIBVORBIS=""
+.endif
+
+pre-everything:
+ @${ECHO_MSG} "ClanLib has the following tunables option(s):"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " WITHOUT_SDL=yes Turns off SDL support"
+ @${ECHO_MSG} " WITHOUT_OPENGL=yes Turns off OpenGL support"
+ @${ECHO_MSG} " WITHOUT_LIBMIKMOD=yes Turns off libmikmod support"
+ @${ECHO_MSG} " WITHOUT_LIBVORBIS=yes Turns off libvorbis support"
+ @${ECHO_MSG} ""
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|-lpthread||g'
+ @${REINPLACE_CMD} -e 's|@perl_exec@|${PERL}|g' \
+ ${WRKSRC}/Documentation/Utilities/webbuilder.pl.in
+
+.include <bsd.port.post.mk>
diff --git a/devel/clanlib-devel/distinfo b/devel/clanlib-devel/distinfo
index 1d89290833b1..fc79778adfbf 100644
--- a/devel/clanlib-devel/distinfo
+++ b/devel/clanlib-devel/distinfo
@@ -1 +1 @@
-MD5 (ClanLib-0.4.4.tar.gz) = 13d52e35b0fa17c658a5980bbf576a1b
+MD5 (ClanLib-0.7.4-1.tar.bz2) = cf7aabf73590b4fedfa53907029de588
diff --git a/devel/clanlib-devel/files/patch-Sources_Util_fcvt.c b/devel/clanlib-devel/files/patch-Sources_Util_fcvt.c
deleted file mode 100644
index ed8898b293af..000000000000
--- a/devel/clanlib-devel/files/patch-Sources_Util_fcvt.c
+++ /dev/null
@@ -1,145 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null Wed Jan 10 00:32:20 2001
-+++ Sources/Util/fcvt.c Wed Jan 10 00:31:59 2001
-@@ -0,0 +1,139 @@
-+/* Compatibility functions for floating point formatting, reentrant versions.
-+ Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public License as
-+ published by the Free Software Foundation; either version 2 of the
-+ License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with the GNU C Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-+
-+#include <ctype.h>
-+#include <errno.h>
-+#include <float.h>
-+#include <math.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/param.h>
-+
-+extern int errno;
-+
-+#if DBL_MANT_DIG == 53
-+# define NDIGIT_MAX 17
-+#else
-+/*
-+ * See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a
-+ * compile time constant here, so we cannot use it.
-+ */
-+# error "NDIGIT_MAX must be precomputed"
-+# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
-+#endif
-+#define MAXDIG (NDIGIT_MAX + 3)
-+#define signbit(x) (((x)<(0))?(1):(0))
-+
-+static char *FCVT_BUFFER[MAXDIG];
-+
-+static int fcvt_r(double value, int ndigit, int *decpt, int *sign, char *buf, \
-+ size_t len)
-+{
-+ int n, i;
-+ int left;
-+
-+ if (buf == NULL)
-+ {
-+ errno = EINVAL;
-+ return -1;
-+ }
-+
-+ left = 0;
-+ if (finite(value))
-+ {
-+ *sign = signbit(value) != 0;
-+ if (*sign)
-+ value = -value;
-+
-+ if (ndigit < 0)
-+ {
-+
-+ while (ndigit < 0)
-+ {
-+ double new_value = value * 0.1;
-+
-+ if (new_value < 1.0)
-+ {
-+ ndigit = 0;
-+ break;
-+ }
-+
-+ value = new_value;
-+ ++left;
-+ ++ndigit;
-+ }
-+ }
-+ }
-+ else
-+ *sign = 0;
-+
-+ n = snprintf(buf, len, "%.*f", MIN(ndigit, NDIGIT_MAX), value);
-+
-+ if (n >= len)
-+ return -1;
-+
-+ i = 0;
-+ while (i < n && isdigit(buf[i]))
-+ ++i;
-+ *decpt = i;
-+
-+ if (i == 0)
-+ return 0;
-+
-+ if (i < n)
-+ {
-+ do
-+ ++i;
-+ while (i < n && !isdigit(buf[i]));
-+
-+ if (*decpt == 1 && buf[0] == '0' && value != 0.0)
-+ {
-+ --*decpt;
-+
-+ while (i < n && buf[i] == '0')
-+ {
-+ --*decpt;
-+ ++i;
-+ }
-+ }
-+
-+ memmove(&buf[MAX(*decpt, 0)], &buf[i], n - i);
-+ buf[n - (i - MAX(*decpt, 0))] = '\0';
-+ }
-+
-+ if (left)
-+ {
-+ *decpt += left;
-+ if (--len > n)
-+ {
-+ while (left-- > 0 && n < len)
-+ buf[n++] = '0';
-+ buf[n] = '\0';
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+char *fcvt(double value, int ndigit, int *decpt, int *sign)
-+{
-+ fcvt_r(value, ndigit, decpt, sign, (char *)FCVT_BUFFER, MAXDIG);
-+ return (char *)FCVT_BUFFER;
-+}
-+
diff --git a/devel/clanlib-devel/files/patch-aa b/devel/clanlib-devel/files/patch-aa
deleted file mode 100644
index 60cf5719f259..000000000000
--- a/devel/clanlib-devel/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.conf.in.orig Sun Apr 9 15:17:58 2000
-+++ Makefile.conf.in Sun Sep 24 15:52:59 2000
-@@ -13,15 +13,15 @@
- BIN_PREFIX = @bindir@
- TARGET_PREFIX = @libdir@/ClanLib
-
--INCLUDE_DIRS = -I Sources @x_includes@
-+INCLUDE_DIRS = -I Sources @x_includes@ -I ${LOCALBASE}/include
-
- COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
-
--LINK_CORE = @libs@
-+LINK_CORE = -L${LOCALBASE}/lib @libs@
-
- OBJF_NONDYN = @objf_nondyn@
-
--LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
-+LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) -L${LOCALBASE}/lib
-
- Libs/Intermediate/%.o : %.cpp
- @echo "Compiling $<"
diff --git a/devel/clanlib-devel/files/patch-ab b/devel/clanlib-devel/files/patch-ab
deleted file mode 100644
index 0e6d0275dd71..000000000000
--- a/devel/clanlib-devel/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Sources/Core/Network/Generic/network_generic.cpp.orig Wed May 10 15:44:12 2000
-+++ Sources/Core/Network/Generic/network_generic.cpp Wed May 10 15:44:41 2000
-@@ -13,6 +13,7 @@
- #include <Core/Network/Generic/network_generic.h>
-
- #ifndef WIN32
-+ #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/devel/clanlib-devel/files/patch-ac b/devel/clanlib-devel/files/patch-ac
deleted file mode 100644
index f07d49659630..000000000000
--- a/devel/clanlib-devel/files/patch-ac
+++ /dev/null
@@ -1,97 +0,0 @@
---- Sources/Core/Input/X11/joystick_linux.cpp.orig Wed May 10 15:54:52 2000
-+++ Sources/Core/Input/X11/joystick_linux.cpp Wed May 10 15:56:52 2000
-@@ -24,33 +24,33 @@
- #include <API/Core/Input/inputbutton.h>
- #include <Core/Input/X11/joystick_linux.h>
-
--#include "joystick_linux.h"
-+/*#include "joystick_linux.h"*/
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
-+#if 1
-
- CL_LinuxJoystick::CL_LinuxJoystick()
- {
-- fd = -1;
-+/* fd = -1;
- num_buttons = 0;
- num_axes = 0;
- axes = NULL;
-- buttons = NULL;
-+ buttons = NULL;*/
- }
-
- CL_LinuxJoystick::~CL_LinuxJoystick()
- {
-- if (fd != -1)
-+/* if (fd != -1)
- {
- close(fd);
- }
-
- delete[] axes;
-- delete[] buttons;
-+ delete[] buttons;*/
- }
-
- bool CL_LinuxJoystick::init(int number)
- {
-- cl_assert(fd == -1); // do not call init twice!
-+/* cl_assert(fd == -1); // do not call init twice!
-
- char devname[10];
- sprintf( devname, "/dev/js%d", number );
-@@ -58,20 +58,20 @@
- if (fd == -1) return false; // no joystick available
-
- ioctl( fd, JSIOCGBUTTONS, &num_buttons );
-- ioctl( fd, JSIOCGAXES, &num_axes );
-+ ioctl( fd, JSIOCGAXES, &num_axes );*/
- /*
- cout << "Number of axes: " << num_axes << endl;
- cout << "Number of buttons: " << num_buttons << endl;
- */
-- axes = new CL_LinuxJoystick_Axis[num_axes];
-- buttons = new CL_LinuxJoystick_Button[num_buttons];
-+/* axes = new CL_LinuxJoystick_Axis[num_axes];
-+ buttons = new CL_LinuxJoystick_Button[num_buttons];*/
-
- return true;
- }
-
- void CL_LinuxJoystick::keep_alive()
- {
-- cl_assert(fd != -1); // init _MUST_ be called before update!
-+/* cl_assert(fd != -1); // init _MUST_ be called before update!
-
- while (read( fd, &jev, sizeof(js_event) ) != -1)
- {
-@@ -85,23 +85,23 @@
- buttons[jev.number].set_value(jev.value);
- break;
- }
-- }
-+ }*/
- }
-
- CL_InputAxis *CL_LinuxJoystick::get_axis(int num)
- {
-- cl_assert(num >= 0); // disallow negative values
-+/* cl_assert(num >= 0); // disallow negative values
-
- if (num >= num_axes) return NULL;
-- return &axes[num];
-+ return &axes[num];*/
- }
-
- CL_InputButton *CL_LinuxJoystick::get_button(int num)
- {
-- cl_assert(num >= 0); // disallow negative values
-+/* cl_assert(num >= 0); // disallow negative values
-
- if (num >= num_buttons) return NULL;
-- return &buttons[num];
-+ return &buttons[num];*/
- }
-
- #endif
diff --git a/devel/clanlib-devel/files/patch-ad b/devel/clanlib-devel/files/patch-ad
deleted file mode 100644
index 069a12fa42e6..000000000000
--- a/devel/clanlib-devel/files/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
---- Sources/Core/Input/X11/joystick_linux.h.orig Wed May 10 15:48:28 2000
-+++ Sources/Core/Input/X11/joystick_linux.h Wed May 10 15:58:32 2000
-@@ -22,17 +22,17 @@
-
- // TODO: ifdef this out if it isn't a linux system.
-
--#include <linux/version.h>
-+/*#include <linux/version.h>*/
-
- #ifndef KERNEL_VERSION
- #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
- #endif
-
--#ifndef LINUX_VERSION_CODE
-+/*#ifndef LINUX_VERSION_CODE
- #error "You need to use at least 2.0 Linux kernel."
--#endif
-+#endif*/
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
-+#if 1
-
-
- #include "API/Core/Input/inputdevice.h"
-@@ -40,7 +40,7 @@
- #include "API/Core/System/keep_alive.h"
- #include "Core/System/Unix/init_linux.h"
-
--#include <linux/joystick.h>
-+/*#include <linux/joystick.h>*/
-
- class CL_LinuxJoystick_Axis;
- class CL_LinuxJoystick_Button;
-@@ -82,7 +82,7 @@
- int num_buttons;
- int num_axes;
-
-- js_event jev;
-+/* js_event jev;*/
-
- CL_LinuxJoystick_Axis *axes;
- CL_LinuxJoystick_Button *buttons;
diff --git a/devel/clanlib-devel/files/patch-ae b/devel/clanlib-devel/files/patch-ae
deleted file mode 100644
index 198ec890c2ec..000000000000
--- a/devel/clanlib-devel/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Core/System/Unix/init_linux.cpp.orig Wed May 10 16:02:01 2000
-+++ Sources/Core/System/Unix/init_linux.cpp Wed May 10 16:02:12 2000
-@@ -551,7 +551,7 @@
- break;
- millis -= elapsed;
- tv.tv_sec = millis/1000;
-- tv.tv_ysec = (millis%1000)*1000;
-+ tv.tv_usec = (millis%1000)*1000;
- #endif
- was_error = select(0, NULL, NULL, NULL, &tv);
- }
diff --git a/devel/clanlib-devel/files/patch-af b/devel/clanlib-devel/files/patch-af
deleted file mode 100644
index 4c52580b98a9..000000000000
--- a/devel/clanlib-devel/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Core/System/Unix/mutex_pthread.cpp.orig Wed May 10 16:07:43 2000
-+++ Sources/Core/System/Unix/mutex_pthread.cpp Wed May 10 16:07:55 2000
-@@ -33,7 +33,7 @@
- {
- pthread_mutexattr_t attr;
- pthread_mutexattr_init(&attr);
-- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+ pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&mutex, &attr);
- pthread_mutexattr_destroy(&attr);
-
diff --git a/devel/clanlib-devel/files/patch-ag b/devel/clanlib-devel/files/patch-ag
deleted file mode 100644
index 319498755cd7..000000000000
--- a/devel/clanlib-devel/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed May 10 00:46:48 2000
-+++ configure Sun Sep 24 15:22:16 2000
-@@ -2199,7 +2199,7 @@
-
-
-
--libs="-ldl -lz -lHermes -lpthread"
-+libs="-lz -lHermes -pthread"
-
- objf_nondyn=""
- flag_tty=""
diff --git a/devel/clanlib-devel/files/patch-ah b/devel/clanlib-devel/files/patch-ah
deleted file mode 100644
index 33e55013fcde..000000000000
--- a/devel/clanlib-devel/files/patch-ah
+++ /dev/null
@@ -1,87 +0,0 @@
---- Makefile.in.orig Sun Apr 9 15:17:58 2000
-+++ Makefile.in Wed Jan 10 00:20:32 2001
-@@ -35,7 +35,8 @@
- Sources/Lua:\
- Sources/Lua/tolua:\
- Sources/MPEG:\
-- Sources/GUI
-+ Sources/GUI:\
-+ Sources/Util
-
- OBJF_GENERIC = Libs/Intermediate/cliprect.o \
- Libs/Intermediate/res_surface_generic.o \
-@@ -131,7 +132,8 @@
- Libs/Intermediate/appconf.o \
- Libs/Intermediate/thread_pthread.o \
- Libs/Intermediate/mutex_pthread.o \
-- Libs/Intermediate/network_delivery_socket.o
-+ Libs/Intermediate/network_delivery_socket.o \
-+ Libs/Intermediate/fcvt.o
-
- OBJF_NETWORK_UNIX = Libs/Intermediate/network_delivery_unix.o \
- Libs/Intermediate/network_delivery_pipe.o \
-@@ -261,43 +263,43 @@
- @install -d $(BIN_PREFIX)
- @install -d $(LIB_PREFIX)
- @for i in `find Sources/API/* -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -c -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
- @echo "Libraries are being installed in $(LIB_PREFIX)."
- @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
- @if [ -f Libs/libclanGL.so ]; then \
-- install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so; \
- fi
- @if [ -f Libs/libclanMagick.so ]; then \
-- install Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMagick.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMagick.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMagick.so; \
- fi
- @if [ -f Libs/libclanMPEG.so ]; then \
-- install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so; \
- fi
- @if [ -f Libs/libclanLua.so ]; then \
-- install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so; \
- fi
- @if [ -f Libs/libclanGUI.so ]; then \
-- install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so; \
- fi
- @if [ -f Libs/libclanMikMod.so ]; then \
-- install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so; \
- fi
- @if [ -f Libs/libclanPNG.so ]; then \
-- install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so; \
- fi
-@@ -306,10 +308,10 @@
- install -d $(TARGET_PREFIX); \
- all_targets_var="$(ALL_TARGETS)"; \
- for curtarget in $$all_targets_var; do \
-- install $$curtarget $(TARGET_PREFIX); \
-+ install -c $$curtarget $(TARGET_PREFIX); \
- done; \
- fi
-- @install clanlib-config $(BIN_PREFIX)
-+ @install -c clanlib-config $(BIN_PREFIX)
-
- @echo ""
- @echo "Installation complete, now run 'ldconfig' as root or point the"
diff --git a/devel/clanlib-devel/files/patch-ai b/devel/clanlib-devel/files/patch-ai
deleted file mode 100644
index d0496d848903..000000000000
--- a/devel/clanlib-devel/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/API/Core/System/clanstring.h.orig Fri May 19 13:15:12 2000
-+++ Sources/API/Core/System/clanstring.h Fri May 19 13:15:16 2000
-@@ -27,7 +27,7 @@
- #include <cctype>
- #endif
-
--#ifdef __BEOS__
-+#if defined(__BEOS__) || defined(__FreeBSD__)
- extern char *fcvt (double, int, int *, int *);
- #endif
-
diff --git a/devel/clanlib-devel/files/patch-aj b/devel/clanlib-devel/files/patch-aj
deleted file mode 100644
index 6eeba9a1d4a1..000000000000
--- a/devel/clanlib-devel/files/patch-aj
+++ /dev/null
@@ -1,304 +0,0 @@
---- Sources/Core/Input/TTY/keyboard_tty.cpp.orig Wed Apr 26 00:40:16 2000
-+++ Sources/Core/Input/TTY/keyboard_tty.cpp Mon Sep 25 00:44:59 2000
-@@ -40,8 +40,9 @@
- #endif
- #ifdef HAVE_SYS_VT_H
- #include <sys/vt.h>
--#else
--#include <linux/vt.h>
-+#else /* FreeBSD :-P */
-+#include <vgakeyboard.h>
-+#include <sys/consio.h>
- #endif
-
- #include <linux/keyboard.h>
-@@ -72,56 +73,14 @@
- // CL_System_Generic::keep_alives.add(this);
-
- /* open the tty */
-- fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
-+ fd = keyboard_init_return_fd();
-
- if (fd < 0)
- {
- throw CL_Error("Couldn't open /dev/tty.");
- }
-
-- /* put tty into "straight through" mode. */
-- struct termios newterm;
--
-- if (tcgetattr(fd, &old_termios) < 0)
-- {
-- perror("tcgetattr failed");
-- }
--
-- memcpy ( &newterm, &old_termios, sizeof(termios) );
--
-- newterm.c_lflag &= ~(ICANON | ECHO | ISIG);
-- newterm.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
-- newterm.c_iflag |= IGNBRK;
-- newterm.c_cc[VMIN] = 0;
-- newterm.c_cc[VTIME] = 0;
--
-- if (tcsetattr(fd, TCSANOW, &newterm) < 0)
-- {
-- perror("tcsetattr failed");
-- }
--
-- /* save old mode and set to mediumraw */
-- if (ioctl(fd, KDGKBMODE, &old_mode) < 0)
-- {
-- perror("Couldn't get keyboard mode");
-- old_mode = K_XLATE;
-- }
-- if (ioctl(fd, KDSKBMODE, K_MEDIUMRAW) < 0)
-- {
-- perror("Couldn't set keyboard mode to K_MEDIUMRAW");
-- }
--
-- /* save old kd mode and set to graphics */
-- if (ioctl(fd, KDGETMODE, &old_kd) < 0)
-- {
-- perror("Couldn't get kd mode");
-- old_kd = KD_TEXT;
-- }
-- if (ioctl(fd, KDSETMODE, KD_GRAPHICS) < 0)
-- {
-- perror("Couldn't set kd mode to KD_GRAPHICS");
-- }
--
-+ ioctl(fd, GIO_KEYMAP, &vga_keymap);
- buttons = new CL_InputButton_TTYKeyboard*[CL_NUM_KEYS];
- for (int i=0; i<CL_NUM_KEYS; i++) buttons[i] = NULL;
- }
-@@ -144,13 +103,7 @@
- {
- if (fd>=0)
- {
-- ioctl(fd, KDSKBMODE, old_mode);
-- ioctl(fd, KDSETMODE, old_kd);
-- if (tcsetattr(fd, TCSANOW, &old_termios) < 0)
-- {
-- std::cerr << "Could not restore old terminal input settings! Please run 'reset'!" << std::endl;
-- perror( "System error message" );
-- }
-+ keyboard_close();
- close(fd);
- }
- }
-@@ -172,8 +125,8 @@
- void CL_TTYKeyboard::handle_code(char code)
- {
- bool keydown;
-- kbentry entry;
--
-+ struct keyent_t entry;
-+
- if (code & 0x80)
- {
- code &= 0x7f;
-@@ -183,109 +136,115 @@
- keydown = true;
- }
-
-+ // Simple belt against out-of-range codes
-+ if (code >= vga_keymap.n_keys)
-+ return;
-+
- //fetch the keycode
-- entry.kb_table = 0;
-- entry.kb_index = code;
-- ioctl(fd,KDGKBENT,&entry);
-+ entry = vga_keymap.key[code];
-
- CL_Key key;
-- key.id = translate(entry.kb_value);
-+ key.id = translate(entry);
- key.ascii = -1;
- key.state = keydown ? CL_Key::Pressed : CL_Key::Released;
-
- if (keydown) CL_Input::chain_button_press.on_button_press(this, key);
- else CL_Input::chain_button_release.on_button_release(this, key);
-
-- keymap[translate(entry.kb_value)] = keydown;
-+ keymap[translate(entry)] = keydown;
- }
-
--char CL_TTYKeyboard::translate(int kb_value)
-+char CL_TTYKeyboard::translate(struct keyent_t kb_value)
- {
-- switch (kb_value)
-- {
-- case K_F1: return CL_KEY_F1;
-- case K_F2: return CL_KEY_F2;
-- case K_F3: return CL_KEY_F3;
-- case K_F4: return CL_KEY_F4;
-- case K_F5: return CL_KEY_F5;
-- case K_F6: return CL_KEY_F6;
-- case K_F7: return CL_KEY_F7;
-- case K_F8: return CL_KEY_F8;
-- case K_F9: return CL_KEY_F9;
-- case K_F10: return CL_KEY_F10;
-- case K_F11: return CL_KEY_F11;
-- case K_F12: return CL_KEY_F12;
--
-- case 2816+'a': return CL_KEY_A;
-- case 2816+'b': return CL_KEY_B;
-- case 2816+'c': return CL_KEY_C;
-- case 2816+'d': return CL_KEY_D;
-- case 2816+'e': return CL_KEY_E;
-- case 2816+'f': return CL_KEY_F;
-- case 2816+'g': return CL_KEY_G;
-- case 2816+'h': return CL_KEY_H;
-- case 2816+'i': return CL_KEY_I;
-- case 2816+'j': return CL_KEY_J;
-- case 2816+'k': return CL_KEY_K;
-- case 2816+'l': return CL_KEY_L;
-- case 2816+'m': return CL_KEY_M;
-- case 2816+'n': return CL_KEY_N;
-- case 2816+'o': return CL_KEY_O;
-- case 2816+'p': return CL_KEY_P;
-- case 2816+'q': return CL_KEY_Q;
-- case 2816+'r': return CL_KEY_R;
-- case 2816+'s': return CL_KEY_S;
-- case 2816+'t': return CL_KEY_T;
-- case 2816+'u': return CL_KEY_U;
-- case 2816+'v': return CL_KEY_V;
-- case 2816+'w': return CL_KEY_W;
-- case 2816+'x': return CL_KEY_X;
-- case 2816+'y': return CL_KEY_Y;
-- case 2816+'z': return CL_KEY_Z;
-+ if (kb_value.spcl & 0x80)
-+ switch (kb_value.map[0])
-+ {
-+ case F(1): return CL_KEY_F1;
-+ case F(2): return CL_KEY_F2;
-+ case F(3): return CL_KEY_F3;
-+ case F(4): return CL_KEY_F4;
-+ case F(5): return CL_KEY_F5;
-+ case F(6): return CL_KEY_F6;
-+ case F(7): return CL_KEY_F7;
-+ case F(8): return CL_KEY_F8;
-+ case F(9): return CL_KEY_F9;
-+ case F(10): return CL_KEY_F10;
-+ case F(11): return CL_KEY_F11;
-+ case F(12): return CL_KEY_F12;
-+
-+ case RCTR: return CL_KEY_LCTRL;
-+ case LCTR: return CL_KEY_RCTRL;
-+ case LSH: return CL_KEY_LSHIFT;
-+ case RSH: return CL_KEY_RSHIFT;
-+ case LALT: return CL_KEY_ALT;
-+ case RALT: return CL_KEY_ALTGR;
-+
-+ case CLK: return CL_KEY_CAPSLOCK;
-+ case NLK: return CL_KEY_NUMLOCK;
-+ case SLK: return CL_KEY_SCRLOCK;
-+
-+ case F(49): return CL_KEY_HOME;
-+ case F(50): return CL_KEY_UP;
-+ case F(51): return CL_KEY_PAGEUP;
-+ case F(53): return CL_KEY_LEFT;
-+ case F(55): return CL_KEY_RIGHT;
-+ case F(57): return CL_KEY_END;
-+ case F(58): return CL_KEY_DOWN;
-+ case F(59): return CL_KEY_PAGEDOWN;
-+ case F(60): return CL_KEY_INSERT;
-+ case F(61): return CL_KEY_DELETE;
-+
-+ case NEXT: return CL_KEY_PRINT;
-+ }
-+ else switch (kb_value.map[0])
-+ {
-+ case 'a': return CL_KEY_A;
-+ case 'b': return CL_KEY_B;
-+ case 'c': return CL_KEY_C;
-+ case 'd': return CL_KEY_D;
-+ case 'e': return CL_KEY_E;
-+ case 'f': return CL_KEY_F;
-+ case 'g': return CL_KEY_G;
-+ case 'h': return CL_KEY_H;
-+ case 'i': return CL_KEY_I;
-+ case 'j': return CL_KEY_J;
-+ case 'k': return CL_KEY_K;
-+ case 'l': return CL_KEY_L;
-+ case 'm': return CL_KEY_M;
-+ case 'n': return CL_KEY_N;
-+ case 'o': return CL_KEY_O;
-+ case 'p': return CL_KEY_P;
-+ case 'q': return CL_KEY_Q;
-+ case 'r': return CL_KEY_R;
-+ case 's': return CL_KEY_S;
-+ case 't': return CL_KEY_T;
-+ case 'u': return CL_KEY_U;
-+ case 'v': return CL_KEY_V;
-+ case 'w': return CL_KEY_W;
-+ case 'x': return CL_KEY_X;
-+ case 'y': return CL_KEY_Y;
-+ case 'z': return CL_KEY_Z;
-+ case ' ': return CL_KEY_SPACE;
-
-- case 48: return CL_KEY_0;
-- case 49: return CL_KEY_1;
-- case 50: return CL_KEY_2;
-- case 51: return CL_KEY_3;
-- case 52: return CL_KEY_4;
-- case 53: return CL_KEY_5;
-- case 54: return CL_KEY_6;
-- case 55: return CL_KEY_7;
-- case 56: return CL_KEY_8;
-- case 57: return CL_KEY_9;
-+ case '0': return CL_KEY_0;
-+ case '1': return CL_KEY_1;
-+ case '2': return CL_KEY_2;
-+ case '3': return CL_KEY_3;
-+ case '4': return CL_KEY_4;
-+ case '5': return CL_KEY_5;
-+ case '6': return CL_KEY_6;
-+ case '7': return CL_KEY_7;
-+ case '8': return CL_KEY_8;
-+ case '9': return CL_KEY_9;
-
-- case 27: return CL_KEY_ESCAPE;
-- case K_LEFT: return CL_KEY_LEFT;
-- case K_RIGHT: return CL_KEY_RIGHT;
-- case K_UP: return CL_KEY_UP;
-- case K_DOWN: return CL_KEY_DOWN;
-- case K_ENTER: return CL_KEY_ENTER;
--
-- case K_CTRLL: return CL_KEY_LCTRL;
-- case K_CTRLR: return CL_KEY_RCTRL;
-- case K_SHIFTL: return CL_KEY_LSHIFT;
-- case K_SHIFTR: return CL_KEY_RSHIFT;
-- case K_ALT: return CL_KEY_ALT;
-- case K_ALTGR: return CL_KEY_ALTGR;
-- case 9: return CL_KEY_TAB;
-- case 32: return CL_KEY_SPACE;
-- case 127: return CL_KEY_BACKSPACE;
-- case K_INSERT: return CL_KEY_INSERT;
-- case K_REMOVE: return CL_KEY_DELETE;
-- case K_FIND: return CL_KEY_HOME;
-- case K_SELECT: return CL_KEY_END;
-- case K_PGUP: return CL_KEY_PAGEUP;
-- case K_PGDN: return CL_KEY_PAGEDOWN;
-- case K_CAPS: return CL_KEY_CAPSLOCK;
-- case K_NUM: return CL_KEY_NUMLOCK;
-- case K_HOLD: return CL_KEY_SCRLOCK;
-- case 28: return CL_KEY_PRINT;
-- case K(1,29): return CL_KEY_PAUSE;
-- case K_PSLASH: return CL_KEY_KP_DIV;
-- case K_PSTAR: return CL_KEY_KP_MULT;
-- case K_PMINUS: return CL_KEY_KP_MINUS;
-- case K_PPLUS: return CL_KEY_KP_PLUS;
-- case K_PENTER: return CL_KEY_KP_ENTER;
-+ case 27: return CL_KEY_ESCAPE;
-+ case 13: return CL_KEY_ENTER;
-+ case 9: return CL_KEY_TAB;
-+ case 8: return CL_KEY_BACKSPACE;
-+ case '/': return CL_KEY_KP_DIV;
-+ case '*': return CL_KEY_KP_MULT;
-+ case '-': return CL_KEY_KP_MINUS;
-+ case '+': return CL_KEY_KP_PLUS;
- }
-
- return CL_KEY_NONE_OF_THE_ABOVE;
diff --git a/devel/clanlib-devel/files/patch-ak b/devel/clanlib-devel/files/patch-ak
deleted file mode 100644
index c5758600b659..000000000000
--- a/devel/clanlib-devel/files/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
---- Sources/Core/Input/TTY/keyboard_tty.h.orig Sun Apr 9 15:18:01 2000
-+++ Sources/Core/Input/TTY/keyboard_tty.h Mon Sep 25 00:46:07 2000
-@@ -32,6 +32,8 @@
- #include "Core/System/Unix/init_linux.h"
- #include "API/Core/System/keep_alive.h"
- #include <termios.h>
-+#include <stdio.h>
-+#include <sys/kbio.h>
-
- class CL_InputButton_TTYKeyboard : public CL_InputButton
- {
-@@ -71,12 +73,13 @@
-
- char keymap[128];
-
-+ keymap_t vga_keymap;
- int fd;
- int old_mode;
- int old_kd;
- struct termios old_termios;
- void handle_code(char code);
-- char translate(int kb_value);
-+ char translate(struct keyent_t kb_value);
-
- CL_InputButton_TTYKeyboard **buttons;
- };
diff --git a/devel/clanlib-devel/files/patch-al b/devel/clanlib-devel/files/patch-al
deleted file mode 100644
index 2eed25179a63..000000000000
--- a/devel/clanlib-devel/files/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
---- Sources/Core/Display/Svgalib/displaycard_svgalib.cpp 2000/09/24 19:46:24 1.1
-+++ Sources/Core/Display/Svgalib/displaycard_svgalib.cpp 2000/09/24 19:58:09
-@@ -13,6 +13,8 @@
- */
-
- #include "Core/precomp.h"
-+#include "API/Core/Input/input.h"
-+#include "Core/Input/TTY/keyboard_tty.h"
-
- #ifdef USE_SVGALIB
-
-@@ -172,6 +174,7 @@
- blue_mask,
- 0); // alpha mask
-
-+ CL_Input::keyboards.push_back(new CL_TTYKeyboard());
- return;
- }
- }
diff --git a/devel/clanlib-devel/files/patch-configure b/devel/clanlib-devel/files/patch-configure
new file mode 100644
index 000000000000..247c45ec6eb1
--- /dev/null
+++ b/devel/clanlib-devel/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sun Sep 7 22:30:57 2003
++++ configure Mon Sep 8 02:32:28 2003
+@@ -18545,6 +18545,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/clanlib-devel/files/patch-mutex_pthread.cpp b/devel/clanlib-devel/files/patch-mutex_pthread.cpp
new file mode 100644
index 000000000000..5eb5d212d541
--- /dev/null
+++ b/devel/clanlib-devel/files/patch-mutex_pthread.cpp
@@ -0,0 +1,23 @@
+--- Sources/Core/System/Unix/mutex_pthread.cpp.orig Sat Sep 6 05:33:06 2003
++++ Sources/Core/System/Unix/mutex_pthread.cpp Mon Sep 8 05:08:56 2003
+@@ -32,11 +32,7 @@
+ // suck:
+ extern "C"
+ {
+-#ifdef __FreeBSD__
+- int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
+-#else
+ int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
+-#endif
+ }
+
+ CL_Mutex *CL_Mutex::create()
+@@ -59,7 +55,7 @@
+ # define PTHREAD_MUTEX_RECURSIVE_NP
+ #endif
+
+-#ifdef PTHREAD_MUTEX_RECURSIVE_NP
++#ifndef PTHREAD_MUTEX_RECURSIVE_NP
+ // FreeBSD & cygwin
+ pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE);
+ #else
diff --git a/devel/clanlib-devel/files/patch-socket.cpp b/devel/clanlib-devel/files/patch-socket.cpp
new file mode 100644
index 000000000000..6432f6d19b4e
--- /dev/null
+++ b/devel/clanlib-devel/files/patch-socket.cpp
@@ -0,0 +1,11 @@
+--- Sources/Network/Socket/socket.cpp.orig Thu Sep 11 18:42:36 2003
++++ Sources/Network/Socket/socket.cpp Sat Sep 20 12:15:04 2003
+@@ -25,6 +25,8 @@
+ #else
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/tcp.h>
+ #include <net/if.h> // needed for struct ifreq and struct ifconf
+ #include <sys/ioctl.h> // needed for ioctl ( on linux and bsd )
diff --git a/devel/clanlib-devel/files/patch-soundoutput_oss.cpp b/devel/clanlib-devel/files/patch-soundoutput_oss.cpp
new file mode 100644
index 000000000000..6603e39bd5ac
--- /dev/null
+++ b/devel/clanlib-devel/files/patch-soundoutput_oss.cpp
@@ -0,0 +1,17 @@
+--- Sources/Sound/Unix/soundoutput_oss.cpp.orig Fri Aug 22 19:32:54 2003
++++ Sources/Sound/Unix/soundoutput_oss.cpp Mon Sep 8 01:45:46 2003
+@@ -34,6 +34,14 @@
+ #include <sys/select.h>
+ #endif
+
++#if !defined(AFMT_S16_NE)
++#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
++#define AFMT_S16_NE AFMT_S16_BE
++#else
++#define AFMT_S16_NE AFMT_S16_LE
++#endif
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_SoundOutput_OSS construction:
+
diff --git a/devel/clanlib-devel/pkg-plist b/devel/clanlib-devel/pkg-plist
index f8411a44176c..3f9e34f4d033 100644
--- a/devel/clanlib-devel/pkg-plist
+++ b/devel/clanlib-devel/pkg-plist
@@ -1,178 +1,361 @@
-bin/clanlib-config
-include/ClanLib/Core/Display/cliprect.h
-include/ClanLib/Core/Display/display.h
-include/ClanLib/Core/Display/display_events.h
-include/ClanLib/Core/Display/displaycard.h
-include/ClanLib/Core/Display/mousecursor.h
-include/ClanLib/Core/Display/mousecursor_provider.h
-include/ClanLib/Core/Display/palette.h
-include/ClanLib/Core/Display/pixelformat.h
-include/ClanLib/Core/Display/res_surface.h
-include/ClanLib/Core/Display/surface.h
-include/ClanLib/Core/Display/surfacepriority.h
-include/ClanLib/Core/Display/surfaceprovider.h
-include/ClanLib/Core/Display/target.h
-include/ClanLib/Core/Display/vidmode.h
-include/ClanLib/Core/Font/font.h
-include/ClanLib/Core/Font/font_description.h
-include/ClanLib/Core/IOData/cl_endian.h
-include/ClanLib/Core/IOData/inputsource.h
-include/ClanLib/Core/IOData/inputsource_memory.h
-include/ClanLib/Core/IOData/inputsource_provider.h
-include/ClanLib/Core/IOData/outputsource.h
-include/ClanLib/Core/IOData/outputsource_memory.h
-include/ClanLib/Core/IOData/outputsource_provider.h
-include/ClanLib/Core/Input/input.h
-include/ClanLib/Core/Input/input_events.h
-include/ClanLib/Core/Input/inputaxis.h
-include/ClanLib/Core/Input/inputaxis_basic.h
-include/ClanLib/Core/Input/inputaxis_group.h
-include/ClanLib/Core/Input/inputbuffer.h
-include/ClanLib/Core/Input/inputbutton.h
-include/ClanLib/Core/Input/inputbutton_basic.h
-include/ClanLib/Core/Input/inputbutton_group.h
-include/ClanLib/Core/Input/inputbutton_to_axis_analog.h
-include/ClanLib/Core/Input/inputbutton_to_axis_digital.h
-include/ClanLib/Core/Input/inputcursor.h
-include/ClanLib/Core/Input/inputdevice.h
-include/ClanLib/Core/Input/inputhat.h
-include/ClanLib/Core/Input/key.h
-include/ClanLib/Core/Input/keyboard.h
-include/ClanLib/Core/Input/mouse.h
-include/ClanLib/Core/Math/bezier.h
-include/ClanLib/Core/Math/cl_vector.h
-include/ClanLib/Core/Math/math.h
-include/ClanLib/Core/Math/matrix.h
-include/ClanLib/Core/NetObjects/netdata_controller.h
-include/ClanLib/Core/NetObjects/netobject.h
-include/ClanLib/Core/NetObjects/netobject_controller.h
-include/ClanLib/Core/NetObjects/netobject_creator.h
-include/ClanLib/Core/Network/netcomputer.h
-include/ClanLib/Core/Network/netgame.h
-include/ClanLib/Core/Network/netgroup.h
-include/ClanLib/Core/Network/netmessage.h
-include/ClanLib/Core/Network/network.h
-include/ClanLib/Core/Resources/resource.h
-include/ClanLib/Core/Resources/resource_manager.h
-include/ClanLib/Core/Resources/resource_manager_net.h
-include/ClanLib/Core/Resources/resourceoption.h
-include/ClanLib/Core/Resources/resourceoptions.h
-include/ClanLib/Core/Resources/resourcetype.h
-include/ClanLib/Core/Resources/resourcetype_boolean.h
-include/ClanLib/Core/Resources/resourcetype_integer.h
-include/ClanLib/Core/Resources/resourcetype_string.h
-include/ClanLib/Core/Sound/cd_audio.h
-include/ClanLib/Core/Sound/sound.h
-include/ClanLib/Core/Sound/soundbuffer.h
-include/ClanLib/Core/Sound/soundbuffer_session.h
-include/ClanLib/Core/Sound/soundformat.h
-include/ClanLib/Core/Sound/static_soundprovider.h
-include/ClanLib/Core/Sound/stream_soundprovider.h
-include/ClanLib/Core/SoundProviders/static_provider_raw.h
-include/ClanLib/Core/SoundProviders/static_provider_wave.h
-include/ClanLib/Core/SoundProviders/stream_provider_raw.h
-include/ClanLib/Core/SoundProviders/stream_provider_wave.h
-include/ClanLib/Core/SurfaceProviders/canvas.h
-include/ClanLib/Core/SurfaceProviders/generic_surfaceprovider.h
-include/ClanLib/Core/SurfaceProviders/provider_bmp.h
-include/ClanLib/Core/SurfaceProviders/provider_convpoly.h
-include/ClanLib/Core/SurfaceProviders/provider_convpoly_basics.h
-include/ClanLib/Core/SurfaceProviders/provider_dynamic.h
-include/ClanLib/Core/SurfaceProviders/provider_empty.h
-include/ClanLib/Core/SurfaceProviders/provider_fli.h
-include/ClanLib/Core/SurfaceProviders/provider_mpeg.h
-include/ClanLib/Core/SurfaceProviders/provider_pcx.h
-include/ClanLib/Core/SurfaceProviders/provider_ppm.h
-include/ClanLib/Core/SurfaceProviders/provider_targa.h
-include/ClanLib/Core/SurfaceProviders/sprite.h
-include/ClanLib/Core/SurfaceProviders/sprite2.h
-include/ClanLib/Core/SurfaceProviders/sprite_subarray_provider.h
-include/ClanLib/Core/SurfaceProviders/sprite_subsection_provider.h
-include/ClanLib/Core/SurfaceProviders/surface_manager.h
-include/ClanLib/Core/System/cl_assert.h
-include/ClanLib/Core/System/clanapp.h
-include/ClanLib/Core/System/clanstring.h
-include/ClanLib/Core/System/clanstring.h.orig
-include/ClanLib/Core/System/error.h
-include/ClanLib/Core/System/eventchain.h
-include/ClanLib/Core/System/keep_alive.h
-include/ClanLib/Core/System/mutex.h
-include/ClanLib/Core/System/setupcore.h
-include/ClanLib/Core/System/system.h
-include/ClanLib/Core/System/thread.h
-include/ClanLib/Core/System/types.h
-include/ClanLib/GL/bsp.h
-include/ClanLib/GL/opengl.h
-include/ClanLib/GL/setupgl.h
-include/ClanLib/GL/texture.h
-include/ClanLib/GUI/cl_gapplication.h
-include/ClanLib/GUI/cl_gbutton.h
-include/ClanLib/GUI/cl_gconnection.h
-include/ClanLib/GUI/cl_gevent.h
-include/ClanLib/GUI/cl_glabel.h
-include/ClanLib/GUI/cl_gmultifield.h
-include/ClanLib/GUI/cl_gobject.h
-include/ClanLib/GUI/cl_gpoint.h
-include/ClanLib/GUI/cl_gpushbutton.h
-include/ClanLib/GUI/cl_grect.h
-include/ClanLib/GUI/cl_grootwindow.h
-include/ClanLib/GUI/cl_gsldef.h
-include/ClanLib/GUI/cl_gtextfield.h
-include/ClanLib/GUI/cl_gtogglebutton.h
-include/ClanLib/GUI/cl_gwidget.h
-include/ClanLib/GUI/trace.h
-include/ClanLib/Lua/lua.h
-include/ClanLib/MIDI/cl_midi.h
-include/ClanLib/MPEG/mpeg.h
-include/ClanLib/MPEG/mpeg_soundprovider.h
-include/ClanLib/Magick/provider_magick.h
-include/ClanLib/MikMod/streamed_mikmod_sample.h
-include/ClanLib/PNG/provider_png.h
-include/ClanLib/core.h
-include/ClanLib/efence.h
-include/ClanLib/gl.h
-include/ClanLib/gui.h
-include/ClanLib/lua.h
-include/ClanLib/magick.h
-include/ClanLib/midi.h
-include/ClanLib/mikmod.h
-include/ClanLib/mpeg.h
-include/ClanLib/png.h
-include/ClanLib/stl.h
-lib/ClanLib/libclan-display-svgalib.so.0.4.4
-lib/ClanLib/libclan-display-x11.so.0.4.4
-lib/ClanLib/libclan-input-tty.so.0.4.4
-lib/ClanLib/libclan-network.so.0.4.4
-lib/ClanLib/libclan-sound.so.0.4.4
+include/ClanLib-0.7/ClanLib/Application/clanapp.h
+include/ClanLib-0.7/ClanLib/Core/IOData/cl_endian.h
+include/ClanLib-0.7/ClanLib/Core/IOData/datatypes.h
+include/ClanLib-0.7/ClanLib/Core/IOData/directory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/directory_scanner.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_memory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_provider.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_provider_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_zipped.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_memory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_provider.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_zipped.h
+include/ClanLib-0.7/ClanLib/Core/IOData/zip_archive.h
+include/ClanLib-0.7/ClanLib/Core/IOData/zip_file_entry.h
+include/ClanLib-0.7/ClanLib/Core/Math/cl_vector.h
+include/ClanLib-0.7/ClanLib/Core/Math/math.h
+include/ClanLib-0.7/ClanLib/Core/Math/origin.h
+include/ClanLib-0.7/ClanLib/Core/Math/point.h
+include/ClanLib-0.7/ClanLib/Core/Math/rect.h
+include/ClanLib-0.7/ClanLib/Core/Math/size.h
+include/ClanLib-0.7/ClanLib/Core/Math/vector2.h
+include/ClanLib-0.7/ClanLib/Core/Math/vector2.inl
+include/ClanLib-0.7/ClanLib/Core/Resources/resource.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resource_manager.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcedata.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_boolean.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_integer.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_raw.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_string.h
+include/ClanLib-0.7/ClanLib/Core/System/call_stack.h
+include/ClanLib-0.7/ClanLib/Core/System/cl_assert.h
+include/ClanLib-0.7/ClanLib/Core/System/cl_library.h
+include/ClanLib-0.7/ClanLib/Core/System/clanstring.h
+include/ClanLib-0.7/ClanLib/Core/System/clonable.h
+include/ClanLib-0.7/ClanLib/Core/System/command_line.h
+include/ClanLib-0.7/ClanLib/Core/System/console_window.h
+include/ClanLib-0.7/ClanLib/Core/System/crash_reporter.h
+include/ClanLib-0.7/ClanLib/Core/System/error.h
+include/ClanLib-0.7/ClanLib/Core/System/event_listener.h
+include/ClanLib-0.7/ClanLib/Core/System/event_trigger.h
+include/ClanLib-0.7/ClanLib/Core/System/keep_alive.h
+include/ClanLib-0.7/ClanLib/Core/System/lazycopyptr.h
+include/ClanLib-0.7/ClanLib/Core/System/log.h
+include/ClanLib-0.7/ClanLib/Core/System/mutex.h
+include/ClanLib-0.7/ClanLib/Core/System/owningptr.h
+include/ClanLib-0.7/ClanLib/Core/System/setupcore.h
+include/ClanLib-0.7/ClanLib/Core/System/sharedptr.h
+include/ClanLib-0.7/ClanLib/Core/System/system.h
+include/ClanLib-0.7/ClanLib/Core/System/thread.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v0.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v1.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v2.h
+include/ClanLib-0.7/ClanLib/Core/System/timer.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_attr.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_cdata_section.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_character_data.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_comment.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document_fragment.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document_type.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_element.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_entity.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_entity_reference.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_exception.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_implementation.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_named_node_map.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_node.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_node_list.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_notation.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_processing_instruction.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_text.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_token.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_tokenizer.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_writer.h
+include/ClanLib-0.7/ClanLib/Display/Providers/dc_buffer.h
+include/ClanLib-0.7/ClanLib/Display/Providers/jpeg_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/pcx_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/png_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_factory.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_type.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_type_register.h
+include/ClanLib-0.7/ClanLib/Display/Providers/targa_provider.h
+include/ClanLib-0.7/ClanLib/Display/blend_func.h
+include/ClanLib-0.7/ClanLib/Display/color.h
+include/ClanLib-0.7/ClanLib/Display/display.h
+include/ClanLib-0.7/ClanLib/Display/display_mode.h
+include/ClanLib-0.7/ClanLib/Display/display_window.h
+include/ClanLib-0.7/ClanLib/Display/display_window_description.h
+include/ClanLib-0.7/ClanLib/Display/font.h
+include/ClanLib-0.7/ClanLib/Display/glyph_buffer.h
+include/ClanLib-0.7/ClanLib/Display/gradient.h
+include/ClanLib-0.7/ClanLib/Display/graphic_context.h
+include/ClanLib-0.7/ClanLib/Display/input_buffer.h
+include/ClanLib-0.7/ClanLib/Display/input_button.h
+include/ClanLib-0.7/ClanLib/Display/input_context.h
+include/ClanLib-0.7/ClanLib/Display/input_device.h
+include/ClanLib-0.7/ClanLib/Display/input_event.h
+include/ClanLib-0.7/ClanLib/Display/joystick.h
+include/ClanLib-0.7/ClanLib/Display/key_binding.h
+include/ClanLib-0.7/ClanLib/Display/keyboard.h
+include/ClanLib-0.7/ClanLib/Display/keys.h
+include/ClanLib-0.7/ClanLib/Display/mouse.h
+include/ClanLib-0.7/ClanLib/Display/palette.h
+include/ClanLib-0.7/ClanLib/Display/pixel_buffer.h
+include/ClanLib-0.7/ClanLib/Display/pixel_format.h
+include/ClanLib-0.7/ClanLib/Display/rle_surface.h
+include/ClanLib-0.7/ClanLib/Display/setupdisplay.h
+include/ClanLib-0.7/ClanLib/Display/sprite.h
+include/ClanLib-0.7/ClanLib/Display/sprite_description.h
+include/ClanLib-0.7/ClanLib/Display/sprite_packer.h
+include/ClanLib-0.7/ClanLib/Display/surface.h
+include/ClanLib-0.7/ClanLib/Display/text_styler.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl_surface.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl_window.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/setupgl.h
+include/ClanLib-0.7/ClanLib/GUI/button.h
+include/ClanLib-0.7/ClanLib/GUI/checkbox.h
+include/ClanLib-0.7/ClanLib/GUI/component.h
+include/ClanLib-0.7/ClanLib/GUI/component_manager.h
+include/ClanLib-0.7/ClanLib/GUI/component_move_handler.h
+include/ClanLib-0.7/ClanLib/GUI/component_options.h
+include/ClanLib-0.7/ClanLib/GUI/component_resize_handler.h
+include/ClanLib-0.7/ClanLib/GUI/component_style.h
+include/ClanLib-0.7/ClanLib/GUI/component_type.h
+include/ClanLib-0.7/ClanLib/GUI/filedialog.h
+include/ClanLib-0.7/ClanLib/GUI/frame.h
+include/ClanLib-0.7/ClanLib/GUI/gui_file_parser.h
+include/ClanLib-0.7/ClanLib/GUI/gui_manager.h
+include/ClanLib-0.7/ClanLib/GUI/image.h
+include/ClanLib-0.7/ClanLib/GUI/inputbox.h
+include/ClanLib-0.7/ClanLib/GUI/inputdialog.h
+include/ClanLib-0.7/ClanLib/GUI/label.h
+include/ClanLib-0.7/ClanLib/GUI/listbox.h
+include/ClanLib-0.7/ClanLib/GUI/listitem.h
+include/ClanLib-0.7/ClanLib/GUI/menudata.h
+include/ClanLib-0.7/ClanLib/GUI/menunode.h
+include/ClanLib-0.7/ClanLib/GUI/messagebox.h
+include/ClanLib-0.7/ClanLib/GUI/popupmenu.h
+include/ClanLib-0.7/ClanLib/GUI/progressbar.h
+include/ClanLib-0.7/ClanLib/GUI/radiobutton.h
+include/ClanLib-0.7/ClanLib/GUI/radiogroup.h
+include/ClanLib-0.7/ClanLib/GUI/scrollbar.h
+include/ClanLib-0.7/ClanLib/GUI/setupgui.h
+include/ClanLib-0.7/ClanLib/GUI/stylemanager.h
+include/ClanLib-0.7/ClanLib/GUI/treeitem.h
+include/ClanLib-0.7/ClanLib/GUI/treenode.h
+include/ClanLib-0.7/ClanLib/GUI/treeview.h
+include/ClanLib-0.7/ClanLib/GUI/window.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/button_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/checkbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/frame_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/image_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/inputbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/label_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/listbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/progressbar_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/radiobutton_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/scrollbar_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/stylemanager_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/window_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/button_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/checkbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/frame_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/image_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/inputbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/label_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/listbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/progressbar_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/radiobutton_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/scrollbar_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/stylemanager_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/window_silver.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/MikMod/setupmikmod.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/MikMod/soundprovider_mikmod.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_client.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_master.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_server.h
+include/ClanLib-0.7/ClanLib/Network/IRC/irc_connection.h
+include/ClanLib-0.7/ClanLib/Network/IRC/irc_numerics.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_client.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_controller.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_server.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/inputsource_netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/inputsource_netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netcomputer.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netgroup.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netsession.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/outputsource_netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/outputsource_netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetVariables/netvariables.h
+include/ClanLib-0.7/ClanLib/Network/Socket/inputsource_socket.h
+include/ClanLib-0.7/ClanLib/Network/Socket/ip_address.h
+include/ClanLib-0.7/ClanLib/Network/Socket/outputsource_socket.h
+include/ClanLib-0.7/ClanLib/Network/Socket/socket.h
+include/ClanLib-0.7/ClanLib/Network/setupnetwork.h
+%%SDL%%include/ClanLib-0.7/ClanLib/SDL/setupsdl.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v0.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v1.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v2.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v3.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v4.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v5.h
+include/ClanLib-0.7/ClanLib/Signals/slot.h
+include/ClanLib-0.7/ClanLib/Signals/slot_container.h
+include/ClanLib-0.7/ClanLib/Signals/slot_generic.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v0.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v1.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v2.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v3.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v4.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v5.h
+include/ClanLib-0.7/ClanLib/Signals/slotbuffer_v0.h
+include/ClanLib-0.7/ClanLib/Signals/slotbuffer_v1.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/echofilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/fadefilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/inverse_echofilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_factory.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_raw.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_type.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_type_register.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_wave.h
+include/ClanLib-0.7/ClanLib/Sound/cd_drive.h
+include/ClanLib-0.7/ClanLib/Sound/setupsound.h
+include/ClanLib-0.7/ClanLib/Sound/sound.h
+include/ClanLib-0.7/ClanLib/Sound/soundbuffer.h
+include/ClanLib-0.7/ClanLib/Sound/soundbuffer_session.h
+include/ClanLib-0.7/ClanLib/Sound/soundfilter.h
+include/ClanLib-0.7/ClanLib/Sound/soundformat.h
+include/ClanLib-0.7/ClanLib/Sound/soundoutput.h
+include/ClanLib-0.7/ClanLib/Sound/soundoutput_description.h
+include/ClanLib-0.7/ClanLib/Sound/soundprovider.h
+include/ClanLib-0.7/ClanLib/Sound/soundprovider_session.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/Vorbis/setupvorbis.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/Vorbis/soundprovider_vorbis.h
+include/ClanLib-0.7/ClanLib/application.h
+include/ClanLib-0.7/ClanLib/core.h
+include/ClanLib-0.7/ClanLib/display.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/gl.h
+include/ClanLib-0.7/ClanLib/gui.h
+include/ClanLib-0.7/ClanLib/guistyleboring.h
+include/ClanLib-0.7/ClanLib/guistylesilver.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/mikmod.h
+include/ClanLib-0.7/ClanLib/network.h
+%%SDL%%include/ClanLib-0.7/ClanLib/sdl.h
+include/ClanLib-0.7/ClanLib/signals.h
+include/ClanLib-0.7/ClanLib/sound.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/vorbis.h
+lib/libclanApp-0.7.so.0
+lib/libclanApp.a
+lib/libclanApp.so
+lib/libclanCore-0.7.so.0
+lib/libclanCore.a
lib/libclanCore.so
-lib/libclanCore.so.0
-lib/libclanCore.so.0.4.4
-lib/libclanGL.so
-lib/libclanGL.so.0
-lib/libclanGL.so.0.4.4
-lib/libclanPNG.so
-lib/libclanPNG.so.0
-lib/libclanPNG.so.0.4.4
-@dirrm lib/ClanLib
-@dirrm include/ClanLib/PNG
-@dirrm include/ClanLib/MikMod
-@dirrm include/ClanLib/Magick
-@dirrm include/ClanLib/MPEG
-@dirrm include/ClanLib/MIDI
-@dirrm include/ClanLib/Lua
-@dirrm include/ClanLib/GUI
-@dirrm include/ClanLib/GL
-@dirrm include/ClanLib/Core/System
-@dirrm include/ClanLib/Core/SurfaceProviders
-@dirrm include/ClanLib/Core/SoundProviders
-@dirrm include/ClanLib/Core/Sound
-@dirrm include/ClanLib/Core/Resources
-@dirrm include/ClanLib/Core/Network
-@dirrm include/ClanLib/Core/NetObjects
-@dirrm include/ClanLib/Core/Math
-@dirrm include/ClanLib/Core/Input
-@dirrm include/ClanLib/Core/IOData
-@dirrm include/ClanLib/Core/Font
-@dirrm include/ClanLib/Core/Display
-@dirrm include/ClanLib/Core
-@dirrm include/ClanLib
+lib/libclanDisplay-0.7.so.0
+lib/libclanDisplay.a
+lib/libclanDisplay.so
+%%OPENGL%%lib/libclanGL-0.7.so.0
+%%OPENGL%%lib/libclanGL.a
+%%OPENGL%%lib/libclanGL.so
+lib/libclanGUI-0.7.so.0
+lib/libclanGUI.a
+lib/libclanGUI.so
+lib/libclanGUIStyleBoring-0.7.so.0
+lib/libclanGUIStyleBoring.a
+lib/libclanGUIStyleBoring.so
+lib/libclanGUIStyleSilver-0.7.so.0
+lib/libclanGUIStyleSilver.a
+lib/libclanGUIStyleSilver.so
+%%LIBMIKMOD%%lib/libclanMikMod-0.7.so.0
+%%LIBMIKMOD%%lib/libclanMikMod.a
+%%LIBMIKMOD%%lib/libclanMikMod.so
+lib/libclanNetwork-0.7.so.0
+lib/libclanNetwork.a
+lib/libclanNetwork.so
+%%SDL%%lib/libclanSDL-0.7.so.0
+%%SDL%%lib/libclanSDL.a
+%%SDL%%lib/libclanSDL.so
+lib/libclanSignals-0.7.so.0
+lib/libclanSignals.a
+lib/libclanSignals.so
+lib/libclanSound-0.7.so.0
+lib/libclanSound.a
+lib/libclanSound.so
+%%LIBVORBIS%%lib/libclanVorbis-0.7.so.0
+%%LIBVORBIS%%lib/libclanVorbis.a
+%%LIBVORBIS%%lib/libclanVorbis.so
+libdata/pkgconfig/clanApp-0.7.pc
+libdata/pkgconfig/clanCore-0.7.pc
+libdata/pkgconfig/clanDisplay-0.7.pc
+%%OPENGL%%libdata/pkgconfig/clanGL-0.7.pc
+libdata/pkgconfig/clanGUI-0.7.pc
+libdata/pkgconfig/clanGUIStyleBoring-0.7.pc
+libdata/pkgconfig/clanGUIStyleSilver-0.7.pc
+%%LIBMIKMOD%%libdata/pkgconfig/clanMikMod-0.7.pc
+libdata/pkgconfig/clanNetwork-0.7.pc
+%%SDL%%libdata/pkgconfig/clanSDL-0.7.pc
+libdata/pkgconfig/clanSound-0.7.pc
+%%LIBVORBIS%%libdata/pkgconfig/clanVorbis-0.7.pc
+share/doc/clanlib/Tutorial/Quickflash/index.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial1.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial2.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial3.html
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-part2.zip
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-part3.zip
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-workspace.zip
+share/doc/clanlib/Tutorial/TicTacToe/figure1.png
+share/doc/clanlib/Tutorial/TicTacToe/figure10.png
+share/doc/clanlib/Tutorial/TicTacToe/figure2.png
+share/doc/clanlib/Tutorial/TicTacToe/figure3.png
+share/doc/clanlib/Tutorial/TicTacToe/figure8.png
+share/doc/clanlib/Tutorial/TicTacToe/figure9.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_board.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_circle.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_cross.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_menu.png
+share/doc/clanlib/Tutorial/TicTacToe/index.html
+share/doc/clanlib/Tutorial/TicTacToe/part-1.html
+share/doc/clanlib/Tutorial/TicTacToe/part-2.html
+share/doc/clanlib/Tutorial/TicTacToe/part-3.html
+share/doc/clanlib/Tutorial/TicTacToe/tictactoe.zip
+share/doc/clanlib/Tutorial/index.html
+@dirrm share/doc/clanlib/Tutorial/TicTacToe
+@dirrm share/doc/clanlib/Tutorial/Quickflash
+@dirrm share/doc/clanlib/Tutorial
+@dirrm share/doc/clanlib
+%%LIBVORBIS%%@dirrm include/ClanLib-0.7/ClanLib/Vorbis
+@dirrm include/ClanLib-0.7/ClanLib/Sound/SoundProviders
+@dirrm include/ClanLib-0.7/ClanLib/Sound/SoundFilters
+@dirrm include/ClanLib-0.7/ClanLib/Sound
+@dirrm include/ClanLib-0.7/ClanLib/Signals
+%%SDL%%@dirrm include/ClanLib-0.7/ClanLib/SDL
+@dirrm include/ClanLib-0.7/ClanLib/Network/Socket
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetVariables
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetSession
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetObjects
+@dirrm include/ClanLib-0.7/ClanLib/Network/IRC
+@dirrm include/ClanLib-0.7/ClanLib/Network/Browse
+@dirrm include/ClanLib-0.7/ClanLib/Network
+%%LIBMIKMOD%%@dirrm include/ClanLib-0.7/ClanLib/MikMod
+@dirrm include/ClanLib-0.7/ClanLib/GUIStyleSilver
+@dirrm include/ClanLib-0.7/ClanLib/GUIStyleBoring
+@dirrm include/ClanLib-0.7/ClanLib/GUI
+%%OPENGL%%@dirrm include/ClanLib-0.7/ClanLib/GL
+@dirrm include/ClanLib-0.7/ClanLib/Display/Providers
+@dirrm include/ClanLib-0.7/ClanLib/Display
+@dirrm include/ClanLib-0.7/ClanLib/Core/XML
+@dirrm include/ClanLib-0.7/ClanLib/Core/System
+@dirrm include/ClanLib-0.7/ClanLib/Core/Resources
+@dirrm include/ClanLib-0.7/ClanLib/Core/Math
+@dirrm include/ClanLib-0.7/ClanLib/Core/IOData
+@dirrm include/ClanLib-0.7/ClanLib/Core
+@dirrm include/ClanLib-0.7/ClanLib/Application
+@dirrm include/ClanLib-0.7/ClanLib
+@dirrm include/ClanLib-0.7
diff --git a/devel/clanlib-devel/pkg-plist.glx b/devel/clanlib-devel/pkg-plist.glx
deleted file mode 100644
index b2b2cc849498..000000000000
--- a/devel/clanlib-devel/pkg-plist.glx
+++ /dev/null
@@ -1 +0,0 @@
-lib/ClanLib/libclan-display-glx.so.0.4.4
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 13af8cc2d8c1..a91fc25626e1 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -6,38 +6,89 @@
#
PORTNAME= clanlib
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.7.4.1
CATEGORIES= devel
-MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
-DISTNAME= ClanLib-${PORTVERSION}
+MASTER_SITES= http://clanlib.org/~sphair/download/
+DISTNAME= ClanLib-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform game SDK
LIB_DEPENDS= Hermes.1:${PORTSDIR}/graphics/Hermes \
- png.5:${PORTSDIR}/graphics/png \
- vga.1:${PORTSDIR}/graphics/svgalib
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ png.5:${PORTSDIR}/graphics/png
-.if defined(WITHOUT_GL)
-CONFIGURE_ARGS+= --disable-opengl
+WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION:R}
+
+USE_BZIP2= yes
+USE_PERL5_BUILD= yes
+USE_XLIB= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_GMAKE= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
+INSTALLS_SHLIB= yes
+
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500032
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CPPFLAGS+= -I${LOCALBASE}/include/stlport
+LDFLAGS+= -lstlport_gcc
+CFLAGS+= -O0
+.endif
+
+.if defined(WITHOUT_SDL)
+CONFIGURE_ARGS+= --disable-clanSDL
+PLIST_SUB+= SDL="@comment "
+.else
+USE_SDL= yes
+CONFIGURE_ARGS+= --disable-sdltest
+PLIST_SUB+= SDL=""
+.endif
+
+.if defined(WITHOUT_OPENGL)
+CONFIGURE_ARGS+= --disable-clanGL
+PLIST_SUB+= OPENGL="@comment "
.else
USE_MESA= yes
-CONFIGURE_ARGS+= --enable-opengl
-PLIST= ${WRKDIR}/PLIST
+PLIST_SUB+= OPENGL=""
.endif
-USE_GMAKE= yes
-USE_XLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
-CFLAGS+= -fpermissive
-ALL_TARGET+= clanPNG clanGL
-
-.if !defined(WITHOUT_GL)
-pre-install:
- @cat ${PKGDIR}/pkg-plist.glx ${PKGDIR}/pkg-plist > ${PLIST}
+.if defined(WITHOUT_LIBMIKMOD)
+CONFIGURE_ARGS+= --disable-clanMikMod
+PLIST_SUB+= LIBMIKMOD="@comment "
+.else
+LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod
+PLIST_SUB+= LIBMIKMOD=""
.endif
-.include <bsd.port.mk>
+.if defined(WITHOUT_LIBVORBIS)
+CONFIGURE_ARGS+= --disable-clanVorbis
+PLIST_SUB+= LIBVORBIS="@comment "
+.else
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
+PLIST_SUB+= LIBVORBIS=""
+.endif
+
+pre-everything:
+ @${ECHO_MSG} "ClanLib has the following tunables option(s):"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " WITHOUT_SDL=yes Turns off SDL support"
+ @${ECHO_MSG} " WITHOUT_OPENGL=yes Turns off OpenGL support"
+ @${ECHO_MSG} " WITHOUT_LIBMIKMOD=yes Turns off libmikmod support"
+ @${ECHO_MSG} " WITHOUT_LIBVORBIS=yes Turns off libvorbis support"
+ @${ECHO_MSG} ""
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|-lpthread||g'
+ @${REINPLACE_CMD} -e 's|@perl_exec@|${PERL}|g' \
+ ${WRKSRC}/Documentation/Utilities/webbuilder.pl.in
+
+.include <bsd.port.post.mk>
diff --git a/devel/clanlib/distinfo b/devel/clanlib/distinfo
index 1d89290833b1..fc79778adfbf 100644
--- a/devel/clanlib/distinfo
+++ b/devel/clanlib/distinfo
@@ -1 +1 @@
-MD5 (ClanLib-0.4.4.tar.gz) = 13d52e35b0fa17c658a5980bbf576a1b
+MD5 (ClanLib-0.7.4-1.tar.bz2) = cf7aabf73590b4fedfa53907029de588
diff --git a/devel/clanlib/files/patch-Sources_Util_fcvt.c b/devel/clanlib/files/patch-Sources_Util_fcvt.c
deleted file mode 100644
index ed8898b293af..000000000000
--- a/devel/clanlib/files/patch-Sources_Util_fcvt.c
+++ /dev/null
@@ -1,145 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null Wed Jan 10 00:32:20 2001
-+++ Sources/Util/fcvt.c Wed Jan 10 00:31:59 2001
-@@ -0,0 +1,139 @@
-+/* Compatibility functions for floating point formatting, reentrant versions.
-+ Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public License as
-+ published by the Free Software Foundation; either version 2 of the
-+ License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with the GNU C Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-+
-+#include <ctype.h>
-+#include <errno.h>
-+#include <float.h>
-+#include <math.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/param.h>
-+
-+extern int errno;
-+
-+#if DBL_MANT_DIG == 53
-+# define NDIGIT_MAX 17
-+#else
-+/*
-+ * See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a
-+ * compile time constant here, so we cannot use it.
-+ */
-+# error "NDIGIT_MAX must be precomputed"
-+# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
-+#endif
-+#define MAXDIG (NDIGIT_MAX + 3)
-+#define signbit(x) (((x)<(0))?(1):(0))
-+
-+static char *FCVT_BUFFER[MAXDIG];
-+
-+static int fcvt_r(double value, int ndigit, int *decpt, int *sign, char *buf, \
-+ size_t len)
-+{
-+ int n, i;
-+ int left;
-+
-+ if (buf == NULL)
-+ {
-+ errno = EINVAL;
-+ return -1;
-+ }
-+
-+ left = 0;
-+ if (finite(value))
-+ {
-+ *sign = signbit(value) != 0;
-+ if (*sign)
-+ value = -value;
-+
-+ if (ndigit < 0)
-+ {
-+
-+ while (ndigit < 0)
-+ {
-+ double new_value = value * 0.1;
-+
-+ if (new_value < 1.0)
-+ {
-+ ndigit = 0;
-+ break;
-+ }
-+
-+ value = new_value;
-+ ++left;
-+ ++ndigit;
-+ }
-+ }
-+ }
-+ else
-+ *sign = 0;
-+
-+ n = snprintf(buf, len, "%.*f", MIN(ndigit, NDIGIT_MAX), value);
-+
-+ if (n >= len)
-+ return -1;
-+
-+ i = 0;
-+ while (i < n && isdigit(buf[i]))
-+ ++i;
-+ *decpt = i;
-+
-+ if (i == 0)
-+ return 0;
-+
-+ if (i < n)
-+ {
-+ do
-+ ++i;
-+ while (i < n && !isdigit(buf[i]));
-+
-+ if (*decpt == 1 && buf[0] == '0' && value != 0.0)
-+ {
-+ --*decpt;
-+
-+ while (i < n && buf[i] == '0')
-+ {
-+ --*decpt;
-+ ++i;
-+ }
-+ }
-+
-+ memmove(&buf[MAX(*decpt, 0)], &buf[i], n - i);
-+ buf[n - (i - MAX(*decpt, 0))] = '\0';
-+ }
-+
-+ if (left)
-+ {
-+ *decpt += left;
-+ if (--len > n)
-+ {
-+ while (left-- > 0 && n < len)
-+ buf[n++] = '0';
-+ buf[n] = '\0';
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+char *fcvt(double value, int ndigit, int *decpt, int *sign)
-+{
-+ fcvt_r(value, ndigit, decpt, sign, (char *)FCVT_BUFFER, MAXDIG);
-+ return (char *)FCVT_BUFFER;
-+}
-+
diff --git a/devel/clanlib/files/patch-aa b/devel/clanlib/files/patch-aa
deleted file mode 100644
index 60cf5719f259..000000000000
--- a/devel/clanlib/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.conf.in.orig Sun Apr 9 15:17:58 2000
-+++ Makefile.conf.in Sun Sep 24 15:52:59 2000
-@@ -13,15 +13,15 @@
- BIN_PREFIX = @bindir@
- TARGET_PREFIX = @libdir@/ClanLib
-
--INCLUDE_DIRS = -I Sources @x_includes@
-+INCLUDE_DIRS = -I Sources @x_includes@ -I ${LOCALBASE}/include
-
- COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
-
--LINK_CORE = @libs@
-+LINK_CORE = -L${LOCALBASE}/lib @libs@
-
- OBJF_NONDYN = @objf_nondyn@
-
--LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
-+LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) -L${LOCALBASE}/lib
-
- Libs/Intermediate/%.o : %.cpp
- @echo "Compiling $<"
diff --git a/devel/clanlib/files/patch-ab b/devel/clanlib/files/patch-ab
deleted file mode 100644
index 0e6d0275dd71..000000000000
--- a/devel/clanlib/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Sources/Core/Network/Generic/network_generic.cpp.orig Wed May 10 15:44:12 2000
-+++ Sources/Core/Network/Generic/network_generic.cpp Wed May 10 15:44:41 2000
-@@ -13,6 +13,7 @@
- #include <Core/Network/Generic/network_generic.h>
-
- #ifndef WIN32
-+ #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/devel/clanlib/files/patch-ac b/devel/clanlib/files/patch-ac
deleted file mode 100644
index f07d49659630..000000000000
--- a/devel/clanlib/files/patch-ac
+++ /dev/null
@@ -1,97 +0,0 @@
---- Sources/Core/Input/X11/joystick_linux.cpp.orig Wed May 10 15:54:52 2000
-+++ Sources/Core/Input/X11/joystick_linux.cpp Wed May 10 15:56:52 2000
-@@ -24,33 +24,33 @@
- #include <API/Core/Input/inputbutton.h>
- #include <Core/Input/X11/joystick_linux.h>
-
--#include "joystick_linux.h"
-+/*#include "joystick_linux.h"*/
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
-+#if 1
-
- CL_LinuxJoystick::CL_LinuxJoystick()
- {
-- fd = -1;
-+/* fd = -1;
- num_buttons = 0;
- num_axes = 0;
- axes = NULL;
-- buttons = NULL;
-+ buttons = NULL;*/
- }
-
- CL_LinuxJoystick::~CL_LinuxJoystick()
- {
-- if (fd != -1)
-+/* if (fd != -1)
- {
- close(fd);
- }
-
- delete[] axes;
-- delete[] buttons;
-+ delete[] buttons;*/
- }
-
- bool CL_LinuxJoystick::init(int number)
- {
-- cl_assert(fd == -1); // do not call init twice!
-+/* cl_assert(fd == -1); // do not call init twice!
-
- char devname[10];
- sprintf( devname, "/dev/js%d", number );
-@@ -58,20 +58,20 @@
- if (fd == -1) return false; // no joystick available
-
- ioctl( fd, JSIOCGBUTTONS, &num_buttons );
-- ioctl( fd, JSIOCGAXES, &num_axes );
-+ ioctl( fd, JSIOCGAXES, &num_axes );*/
- /*
- cout << "Number of axes: " << num_axes << endl;
- cout << "Number of buttons: " << num_buttons << endl;
- */
-- axes = new CL_LinuxJoystick_Axis[num_axes];
-- buttons = new CL_LinuxJoystick_Button[num_buttons];
-+/* axes = new CL_LinuxJoystick_Axis[num_axes];
-+ buttons = new CL_LinuxJoystick_Button[num_buttons];*/
-
- return true;
- }
-
- void CL_LinuxJoystick::keep_alive()
- {
-- cl_assert(fd != -1); // init _MUST_ be called before update!
-+/* cl_assert(fd != -1); // init _MUST_ be called before update!
-
- while (read( fd, &jev, sizeof(js_event) ) != -1)
- {
-@@ -85,23 +85,23 @@
- buttons[jev.number].set_value(jev.value);
- break;
- }
-- }
-+ }*/
- }
-
- CL_InputAxis *CL_LinuxJoystick::get_axis(int num)
- {
-- cl_assert(num >= 0); // disallow negative values
-+/* cl_assert(num >= 0); // disallow negative values
-
- if (num >= num_axes) return NULL;
-- return &axes[num];
-+ return &axes[num];*/
- }
-
- CL_InputButton *CL_LinuxJoystick::get_button(int num)
- {
-- cl_assert(num >= 0); // disallow negative values
-+/* cl_assert(num >= 0); // disallow negative values
-
- if (num >= num_buttons) return NULL;
-- return &buttons[num];
-+ return &buttons[num];*/
- }
-
- #endif
diff --git a/devel/clanlib/files/patch-ad b/devel/clanlib/files/patch-ad
deleted file mode 100644
index 069a12fa42e6..000000000000
--- a/devel/clanlib/files/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
---- Sources/Core/Input/X11/joystick_linux.h.orig Wed May 10 15:48:28 2000
-+++ Sources/Core/Input/X11/joystick_linux.h Wed May 10 15:58:32 2000
-@@ -22,17 +22,17 @@
-
- // TODO: ifdef this out if it isn't a linux system.
-
--#include <linux/version.h>
-+/*#include <linux/version.h>*/
-
- #ifndef KERNEL_VERSION
- #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
- #endif
-
--#ifndef LINUX_VERSION_CODE
-+/*#ifndef LINUX_VERSION_CODE
- #error "You need to use at least 2.0 Linux kernel."
--#endif
-+#endif*/
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
-+#if 1
-
-
- #include "API/Core/Input/inputdevice.h"
-@@ -40,7 +40,7 @@
- #include "API/Core/System/keep_alive.h"
- #include "Core/System/Unix/init_linux.h"
-
--#include <linux/joystick.h>
-+/*#include <linux/joystick.h>*/
-
- class CL_LinuxJoystick_Axis;
- class CL_LinuxJoystick_Button;
-@@ -82,7 +82,7 @@
- int num_buttons;
- int num_axes;
-
-- js_event jev;
-+/* js_event jev;*/
-
- CL_LinuxJoystick_Axis *axes;
- CL_LinuxJoystick_Button *buttons;
diff --git a/devel/clanlib/files/patch-ae b/devel/clanlib/files/patch-ae
deleted file mode 100644
index 198ec890c2ec..000000000000
--- a/devel/clanlib/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Core/System/Unix/init_linux.cpp.orig Wed May 10 16:02:01 2000
-+++ Sources/Core/System/Unix/init_linux.cpp Wed May 10 16:02:12 2000
-@@ -551,7 +551,7 @@
- break;
- millis -= elapsed;
- tv.tv_sec = millis/1000;
-- tv.tv_ysec = (millis%1000)*1000;
-+ tv.tv_usec = (millis%1000)*1000;
- #endif
- was_error = select(0, NULL, NULL, NULL, &tv);
- }
diff --git a/devel/clanlib/files/patch-af b/devel/clanlib/files/patch-af
deleted file mode 100644
index 4c52580b98a9..000000000000
--- a/devel/clanlib/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Core/System/Unix/mutex_pthread.cpp.orig Wed May 10 16:07:43 2000
-+++ Sources/Core/System/Unix/mutex_pthread.cpp Wed May 10 16:07:55 2000
-@@ -33,7 +33,7 @@
- {
- pthread_mutexattr_t attr;
- pthread_mutexattr_init(&attr);
-- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+ pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&mutex, &attr);
- pthread_mutexattr_destroy(&attr);
-
diff --git a/devel/clanlib/files/patch-ag b/devel/clanlib/files/patch-ag
deleted file mode 100644
index 319498755cd7..000000000000
--- a/devel/clanlib/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed May 10 00:46:48 2000
-+++ configure Sun Sep 24 15:22:16 2000
-@@ -2199,7 +2199,7 @@
-
-
-
--libs="-ldl -lz -lHermes -lpthread"
-+libs="-lz -lHermes -pthread"
-
- objf_nondyn=""
- flag_tty=""
diff --git a/devel/clanlib/files/patch-ah b/devel/clanlib/files/patch-ah
deleted file mode 100644
index 33e55013fcde..000000000000
--- a/devel/clanlib/files/patch-ah
+++ /dev/null
@@ -1,87 +0,0 @@
---- Makefile.in.orig Sun Apr 9 15:17:58 2000
-+++ Makefile.in Wed Jan 10 00:20:32 2001
-@@ -35,7 +35,8 @@
- Sources/Lua:\
- Sources/Lua/tolua:\
- Sources/MPEG:\
-- Sources/GUI
-+ Sources/GUI:\
-+ Sources/Util
-
- OBJF_GENERIC = Libs/Intermediate/cliprect.o \
- Libs/Intermediate/res_surface_generic.o \
-@@ -131,7 +132,8 @@
- Libs/Intermediate/appconf.o \
- Libs/Intermediate/thread_pthread.o \
- Libs/Intermediate/mutex_pthread.o \
-- Libs/Intermediate/network_delivery_socket.o
-+ Libs/Intermediate/network_delivery_socket.o \
-+ Libs/Intermediate/fcvt.o
-
- OBJF_NETWORK_UNIX = Libs/Intermediate/network_delivery_unix.o \
- Libs/Intermediate/network_delivery_pipe.o \
-@@ -261,43 +263,43 @@
- @install -d $(BIN_PREFIX)
- @install -d $(LIB_PREFIX)
- @for i in `find Sources/API/* -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -c -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
- @echo "Libraries are being installed in $(LIB_PREFIX)."
- @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
- @if [ -f Libs/libclanGL.so ]; then \
-- install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so; \
- fi
- @if [ -f Libs/libclanMagick.so ]; then \
-- install Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMagick.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMagick.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMagick.so; \
- fi
- @if [ -f Libs/libclanMPEG.so ]; then \
-- install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so; \
- fi
- @if [ -f Libs/libclanLua.so ]; then \
-- install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so; \
- fi
- @if [ -f Libs/libclanGUI.so ]; then \
-- install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so; \
- fi
- @if [ -f Libs/libclanMikMod.so ]; then \
-- install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so; \
- fi
- @if [ -f Libs/libclanPNG.so ]; then \
-- install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so; \
- fi
-@@ -306,10 +308,10 @@
- install -d $(TARGET_PREFIX); \
- all_targets_var="$(ALL_TARGETS)"; \
- for curtarget in $$all_targets_var; do \
-- install $$curtarget $(TARGET_PREFIX); \
-+ install -c $$curtarget $(TARGET_PREFIX); \
- done; \
- fi
-- @install clanlib-config $(BIN_PREFIX)
-+ @install -c clanlib-config $(BIN_PREFIX)
-
- @echo ""
- @echo "Installation complete, now run 'ldconfig' as root or point the"
diff --git a/devel/clanlib/files/patch-ai b/devel/clanlib/files/patch-ai
deleted file mode 100644
index d0496d848903..000000000000
--- a/devel/clanlib/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/API/Core/System/clanstring.h.orig Fri May 19 13:15:12 2000
-+++ Sources/API/Core/System/clanstring.h Fri May 19 13:15:16 2000
-@@ -27,7 +27,7 @@
- #include <cctype>
- #endif
-
--#ifdef __BEOS__
-+#if defined(__BEOS__) || defined(__FreeBSD__)
- extern char *fcvt (double, int, int *, int *);
- #endif
-
diff --git a/devel/clanlib/files/patch-aj b/devel/clanlib/files/patch-aj
deleted file mode 100644
index 6eeba9a1d4a1..000000000000
--- a/devel/clanlib/files/patch-aj
+++ /dev/null
@@ -1,304 +0,0 @@
---- Sources/Core/Input/TTY/keyboard_tty.cpp.orig Wed Apr 26 00:40:16 2000
-+++ Sources/Core/Input/TTY/keyboard_tty.cpp Mon Sep 25 00:44:59 2000
-@@ -40,8 +40,9 @@
- #endif
- #ifdef HAVE_SYS_VT_H
- #include <sys/vt.h>
--#else
--#include <linux/vt.h>
-+#else /* FreeBSD :-P */
-+#include <vgakeyboard.h>
-+#include <sys/consio.h>
- #endif
-
- #include <linux/keyboard.h>
-@@ -72,56 +73,14 @@
- // CL_System_Generic::keep_alives.add(this);
-
- /* open the tty */
-- fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
-+ fd = keyboard_init_return_fd();
-
- if (fd < 0)
- {
- throw CL_Error("Couldn't open /dev/tty.");
- }
-
-- /* put tty into "straight through" mode. */
-- struct termios newterm;
--
-- if (tcgetattr(fd, &old_termios) < 0)
-- {
-- perror("tcgetattr failed");
-- }
--
-- memcpy ( &newterm, &old_termios, sizeof(termios) );
--
-- newterm.c_lflag &= ~(ICANON | ECHO | ISIG);
-- newterm.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
-- newterm.c_iflag |= IGNBRK;
-- newterm.c_cc[VMIN] = 0;
-- newterm.c_cc[VTIME] = 0;
--
-- if (tcsetattr(fd, TCSANOW, &newterm) < 0)
-- {
-- perror("tcsetattr failed");
-- }
--
-- /* save old mode and set to mediumraw */
-- if (ioctl(fd, KDGKBMODE, &old_mode) < 0)
-- {
-- perror("Couldn't get keyboard mode");
-- old_mode = K_XLATE;
-- }
-- if (ioctl(fd, KDSKBMODE, K_MEDIUMRAW) < 0)
-- {
-- perror("Couldn't set keyboard mode to K_MEDIUMRAW");
-- }
--
-- /* save old kd mode and set to graphics */
-- if (ioctl(fd, KDGETMODE, &old_kd) < 0)
-- {
-- perror("Couldn't get kd mode");
-- old_kd = KD_TEXT;
-- }
-- if (ioctl(fd, KDSETMODE, KD_GRAPHICS) < 0)
-- {
-- perror("Couldn't set kd mode to KD_GRAPHICS");
-- }
--
-+ ioctl(fd, GIO_KEYMAP, &vga_keymap);
- buttons = new CL_InputButton_TTYKeyboard*[CL_NUM_KEYS];
- for (int i=0; i<CL_NUM_KEYS; i++) buttons[i] = NULL;
- }
-@@ -144,13 +103,7 @@
- {
- if (fd>=0)
- {
-- ioctl(fd, KDSKBMODE, old_mode);
-- ioctl(fd, KDSETMODE, old_kd);
-- if (tcsetattr(fd, TCSANOW, &old_termios) < 0)
-- {
-- std::cerr << "Could not restore old terminal input settings! Please run 'reset'!" << std::endl;
-- perror( "System error message" );
-- }
-+ keyboard_close();
- close(fd);
- }
- }
-@@ -172,8 +125,8 @@
- void CL_TTYKeyboard::handle_code(char code)
- {
- bool keydown;
-- kbentry entry;
--
-+ struct keyent_t entry;
-+
- if (code & 0x80)
- {
- code &= 0x7f;
-@@ -183,109 +136,115 @@
- keydown = true;
- }
-
-+ // Simple belt against out-of-range codes
-+ if (code >= vga_keymap.n_keys)
-+ return;
-+
- //fetch the keycode
-- entry.kb_table = 0;
-- entry.kb_index = code;
-- ioctl(fd,KDGKBENT,&entry);
-+ entry = vga_keymap.key[code];
-
- CL_Key key;
-- key.id = translate(entry.kb_value);
-+ key.id = translate(entry);
- key.ascii = -1;
- key.state = keydown ? CL_Key::Pressed : CL_Key::Released;
-
- if (keydown) CL_Input::chain_button_press.on_button_press(this, key);
- else CL_Input::chain_button_release.on_button_release(this, key);
-
-- keymap[translate(entry.kb_value)] = keydown;
-+ keymap[translate(entry)] = keydown;
- }
-
--char CL_TTYKeyboard::translate(int kb_value)
-+char CL_TTYKeyboard::translate(struct keyent_t kb_value)
- {
-- switch (kb_value)
-- {
-- case K_F1: return CL_KEY_F1;
-- case K_F2: return CL_KEY_F2;
-- case K_F3: return CL_KEY_F3;
-- case K_F4: return CL_KEY_F4;
-- case K_F5: return CL_KEY_F5;
-- case K_F6: return CL_KEY_F6;
-- case K_F7: return CL_KEY_F7;
-- case K_F8: return CL_KEY_F8;
-- case K_F9: return CL_KEY_F9;
-- case K_F10: return CL_KEY_F10;
-- case K_F11: return CL_KEY_F11;
-- case K_F12: return CL_KEY_F12;
--
-- case 2816+'a': return CL_KEY_A;
-- case 2816+'b': return CL_KEY_B;
-- case 2816+'c': return CL_KEY_C;
-- case 2816+'d': return CL_KEY_D;
-- case 2816+'e': return CL_KEY_E;
-- case 2816+'f': return CL_KEY_F;
-- case 2816+'g': return CL_KEY_G;
-- case 2816+'h': return CL_KEY_H;
-- case 2816+'i': return CL_KEY_I;
-- case 2816+'j': return CL_KEY_J;
-- case 2816+'k': return CL_KEY_K;
-- case 2816+'l': return CL_KEY_L;
-- case 2816+'m': return CL_KEY_M;
-- case 2816+'n': return CL_KEY_N;
-- case 2816+'o': return CL_KEY_O;
-- case 2816+'p': return CL_KEY_P;
-- case 2816+'q': return CL_KEY_Q;
-- case 2816+'r': return CL_KEY_R;
-- case 2816+'s': return CL_KEY_S;
-- case 2816+'t': return CL_KEY_T;
-- case 2816+'u': return CL_KEY_U;
-- case 2816+'v': return CL_KEY_V;
-- case 2816+'w': return CL_KEY_W;
-- case 2816+'x': return CL_KEY_X;
-- case 2816+'y': return CL_KEY_Y;
-- case 2816+'z': return CL_KEY_Z;
-+ if (kb_value.spcl & 0x80)
-+ switch (kb_value.map[0])
-+ {
-+ case F(1): return CL_KEY_F1;
-+ case F(2): return CL_KEY_F2;
-+ case F(3): return CL_KEY_F3;
-+ case F(4): return CL_KEY_F4;
-+ case F(5): return CL_KEY_F5;
-+ case F(6): return CL_KEY_F6;
-+ case F(7): return CL_KEY_F7;
-+ case F(8): return CL_KEY_F8;
-+ case F(9): return CL_KEY_F9;
-+ case F(10): return CL_KEY_F10;
-+ case F(11): return CL_KEY_F11;
-+ case F(12): return CL_KEY_F12;
-+
-+ case RCTR: return CL_KEY_LCTRL;
-+ case LCTR: return CL_KEY_RCTRL;
-+ case LSH: return CL_KEY_LSHIFT;
-+ case RSH: return CL_KEY_RSHIFT;
-+ case LALT: return CL_KEY_ALT;
-+ case RALT: return CL_KEY_ALTGR;
-+
-+ case CLK: return CL_KEY_CAPSLOCK;
-+ case NLK: return CL_KEY_NUMLOCK;
-+ case SLK: return CL_KEY_SCRLOCK;
-+
-+ case F(49): return CL_KEY_HOME;
-+ case F(50): return CL_KEY_UP;
-+ case F(51): return CL_KEY_PAGEUP;
-+ case F(53): return CL_KEY_LEFT;
-+ case F(55): return CL_KEY_RIGHT;
-+ case F(57): return CL_KEY_END;
-+ case F(58): return CL_KEY_DOWN;
-+ case F(59): return CL_KEY_PAGEDOWN;
-+ case F(60): return CL_KEY_INSERT;
-+ case F(61): return CL_KEY_DELETE;
-+
-+ case NEXT: return CL_KEY_PRINT;
-+ }
-+ else switch (kb_value.map[0])
-+ {
-+ case 'a': return CL_KEY_A;
-+ case 'b': return CL_KEY_B;
-+ case 'c': return CL_KEY_C;
-+ case 'd': return CL_KEY_D;
-+ case 'e': return CL_KEY_E;
-+ case 'f': return CL_KEY_F;
-+ case 'g': return CL_KEY_G;
-+ case 'h': return CL_KEY_H;
-+ case 'i': return CL_KEY_I;
-+ case 'j': return CL_KEY_J;
-+ case 'k': return CL_KEY_K;
-+ case 'l': return CL_KEY_L;
-+ case 'm': return CL_KEY_M;
-+ case 'n': return CL_KEY_N;
-+ case 'o': return CL_KEY_O;
-+ case 'p': return CL_KEY_P;
-+ case 'q': return CL_KEY_Q;
-+ case 'r': return CL_KEY_R;
-+ case 's': return CL_KEY_S;
-+ case 't': return CL_KEY_T;
-+ case 'u': return CL_KEY_U;
-+ case 'v': return CL_KEY_V;
-+ case 'w': return CL_KEY_W;
-+ case 'x': return CL_KEY_X;
-+ case 'y': return CL_KEY_Y;
-+ case 'z': return CL_KEY_Z;
-+ case ' ': return CL_KEY_SPACE;
-
-- case 48: return CL_KEY_0;
-- case 49: return CL_KEY_1;
-- case 50: return CL_KEY_2;
-- case 51: return CL_KEY_3;
-- case 52: return CL_KEY_4;
-- case 53: return CL_KEY_5;
-- case 54: return CL_KEY_6;
-- case 55: return CL_KEY_7;
-- case 56: return CL_KEY_8;
-- case 57: return CL_KEY_9;
-+ case '0': return CL_KEY_0;
-+ case '1': return CL_KEY_1;
-+ case '2': return CL_KEY_2;
-+ case '3': return CL_KEY_3;
-+ case '4': return CL_KEY_4;
-+ case '5': return CL_KEY_5;
-+ case '6': return CL_KEY_6;
-+ case '7': return CL_KEY_7;
-+ case '8': return CL_KEY_8;
-+ case '9': return CL_KEY_9;
-
-- case 27: return CL_KEY_ESCAPE;
-- case K_LEFT: return CL_KEY_LEFT;
-- case K_RIGHT: return CL_KEY_RIGHT;
-- case K_UP: return CL_KEY_UP;
-- case K_DOWN: return CL_KEY_DOWN;
-- case K_ENTER: return CL_KEY_ENTER;
--
-- case K_CTRLL: return CL_KEY_LCTRL;
-- case K_CTRLR: return CL_KEY_RCTRL;
-- case K_SHIFTL: return CL_KEY_LSHIFT;
-- case K_SHIFTR: return CL_KEY_RSHIFT;
-- case K_ALT: return CL_KEY_ALT;
-- case K_ALTGR: return CL_KEY_ALTGR;
-- case 9: return CL_KEY_TAB;
-- case 32: return CL_KEY_SPACE;
-- case 127: return CL_KEY_BACKSPACE;
-- case K_INSERT: return CL_KEY_INSERT;
-- case K_REMOVE: return CL_KEY_DELETE;
-- case K_FIND: return CL_KEY_HOME;
-- case K_SELECT: return CL_KEY_END;
-- case K_PGUP: return CL_KEY_PAGEUP;
-- case K_PGDN: return CL_KEY_PAGEDOWN;
-- case K_CAPS: return CL_KEY_CAPSLOCK;
-- case K_NUM: return CL_KEY_NUMLOCK;
-- case K_HOLD: return CL_KEY_SCRLOCK;
-- case 28: return CL_KEY_PRINT;
-- case K(1,29): return CL_KEY_PAUSE;
-- case K_PSLASH: return CL_KEY_KP_DIV;
-- case K_PSTAR: return CL_KEY_KP_MULT;
-- case K_PMINUS: return CL_KEY_KP_MINUS;
-- case K_PPLUS: return CL_KEY_KP_PLUS;
-- case K_PENTER: return CL_KEY_KP_ENTER;
-+ case 27: return CL_KEY_ESCAPE;
-+ case 13: return CL_KEY_ENTER;
-+ case 9: return CL_KEY_TAB;
-+ case 8: return CL_KEY_BACKSPACE;
-+ case '/': return CL_KEY_KP_DIV;
-+ case '*': return CL_KEY_KP_MULT;
-+ case '-': return CL_KEY_KP_MINUS;
-+ case '+': return CL_KEY_KP_PLUS;
- }
-
- return CL_KEY_NONE_OF_THE_ABOVE;
diff --git a/devel/clanlib/files/patch-ak b/devel/clanlib/files/patch-ak
deleted file mode 100644
index c5758600b659..000000000000
--- a/devel/clanlib/files/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
---- Sources/Core/Input/TTY/keyboard_tty.h.orig Sun Apr 9 15:18:01 2000
-+++ Sources/Core/Input/TTY/keyboard_tty.h Mon Sep 25 00:46:07 2000
-@@ -32,6 +32,8 @@
- #include "Core/System/Unix/init_linux.h"
- #include "API/Core/System/keep_alive.h"
- #include <termios.h>
-+#include <stdio.h>
-+#include <sys/kbio.h>
-
- class CL_InputButton_TTYKeyboard : public CL_InputButton
- {
-@@ -71,12 +73,13 @@
-
- char keymap[128];
-
-+ keymap_t vga_keymap;
- int fd;
- int old_mode;
- int old_kd;
- struct termios old_termios;
- void handle_code(char code);
-- char translate(int kb_value);
-+ char translate(struct keyent_t kb_value);
-
- CL_InputButton_TTYKeyboard **buttons;
- };
diff --git a/devel/clanlib/files/patch-al b/devel/clanlib/files/patch-al
deleted file mode 100644
index 2eed25179a63..000000000000
--- a/devel/clanlib/files/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
---- Sources/Core/Display/Svgalib/displaycard_svgalib.cpp 2000/09/24 19:46:24 1.1
-+++ Sources/Core/Display/Svgalib/displaycard_svgalib.cpp 2000/09/24 19:58:09
-@@ -13,6 +13,8 @@
- */
-
- #include "Core/precomp.h"
-+#include "API/Core/Input/input.h"
-+#include "Core/Input/TTY/keyboard_tty.h"
-
- #ifdef USE_SVGALIB
-
-@@ -172,6 +174,7 @@
- blue_mask,
- 0); // alpha mask
-
-+ CL_Input::keyboards.push_back(new CL_TTYKeyboard());
- return;
- }
- }
diff --git a/devel/clanlib/files/patch-configure b/devel/clanlib/files/patch-configure
new file mode 100644
index 000000000000..247c45ec6eb1
--- /dev/null
+++ b/devel/clanlib/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sun Sep 7 22:30:57 2003
++++ configure Mon Sep 8 02:32:28 2003
+@@ -18545,6 +18545,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/clanlib/files/patch-mutex_pthread.cpp b/devel/clanlib/files/patch-mutex_pthread.cpp
new file mode 100644
index 000000000000..5eb5d212d541
--- /dev/null
+++ b/devel/clanlib/files/patch-mutex_pthread.cpp
@@ -0,0 +1,23 @@
+--- Sources/Core/System/Unix/mutex_pthread.cpp.orig Sat Sep 6 05:33:06 2003
++++ Sources/Core/System/Unix/mutex_pthread.cpp Mon Sep 8 05:08:56 2003
+@@ -32,11 +32,7 @@
+ // suck:
+ extern "C"
+ {
+-#ifdef __FreeBSD__
+- int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
+-#else
+ int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
+-#endif
+ }
+
+ CL_Mutex *CL_Mutex::create()
+@@ -59,7 +55,7 @@
+ # define PTHREAD_MUTEX_RECURSIVE_NP
+ #endif
+
+-#ifdef PTHREAD_MUTEX_RECURSIVE_NP
++#ifndef PTHREAD_MUTEX_RECURSIVE_NP
+ // FreeBSD & cygwin
+ pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE);
+ #else
diff --git a/devel/clanlib/files/patch-socket.cpp b/devel/clanlib/files/patch-socket.cpp
new file mode 100644
index 000000000000..6432f6d19b4e
--- /dev/null
+++ b/devel/clanlib/files/patch-socket.cpp
@@ -0,0 +1,11 @@
+--- Sources/Network/Socket/socket.cpp.orig Thu Sep 11 18:42:36 2003
++++ Sources/Network/Socket/socket.cpp Sat Sep 20 12:15:04 2003
+@@ -25,6 +25,8 @@
+ #else
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/tcp.h>
+ #include <net/if.h> // needed for struct ifreq and struct ifconf
+ #include <sys/ioctl.h> // needed for ioctl ( on linux and bsd )
diff --git a/devel/clanlib/files/patch-soundoutput_oss.cpp b/devel/clanlib/files/patch-soundoutput_oss.cpp
new file mode 100644
index 000000000000..6603e39bd5ac
--- /dev/null
+++ b/devel/clanlib/files/patch-soundoutput_oss.cpp
@@ -0,0 +1,17 @@
+--- Sources/Sound/Unix/soundoutput_oss.cpp.orig Fri Aug 22 19:32:54 2003
++++ Sources/Sound/Unix/soundoutput_oss.cpp Mon Sep 8 01:45:46 2003
+@@ -34,6 +34,14 @@
+ #include <sys/select.h>
+ #endif
+
++#if !defined(AFMT_S16_NE)
++#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
++#define AFMT_S16_NE AFMT_S16_BE
++#else
++#define AFMT_S16_NE AFMT_S16_LE
++#endif
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_SoundOutput_OSS construction:
+
diff --git a/devel/clanlib/pkg-plist b/devel/clanlib/pkg-plist
index f8411a44176c..3f9e34f4d033 100644
--- a/devel/clanlib/pkg-plist
+++ b/devel/clanlib/pkg-plist
@@ -1,178 +1,361 @@
-bin/clanlib-config
-include/ClanLib/Core/Display/cliprect.h
-include/ClanLib/Core/Display/display.h
-include/ClanLib/Core/Display/display_events.h
-include/ClanLib/Core/Display/displaycard.h
-include/ClanLib/Core/Display/mousecursor.h
-include/ClanLib/Core/Display/mousecursor_provider.h
-include/ClanLib/Core/Display/palette.h
-include/ClanLib/Core/Display/pixelformat.h
-include/ClanLib/Core/Display/res_surface.h
-include/ClanLib/Core/Display/surface.h
-include/ClanLib/Core/Display/surfacepriority.h
-include/ClanLib/Core/Display/surfaceprovider.h
-include/ClanLib/Core/Display/target.h
-include/ClanLib/Core/Display/vidmode.h
-include/ClanLib/Core/Font/font.h
-include/ClanLib/Core/Font/font_description.h
-include/ClanLib/Core/IOData/cl_endian.h
-include/ClanLib/Core/IOData/inputsource.h
-include/ClanLib/Core/IOData/inputsource_memory.h
-include/ClanLib/Core/IOData/inputsource_provider.h
-include/ClanLib/Core/IOData/outputsource.h
-include/ClanLib/Core/IOData/outputsource_memory.h
-include/ClanLib/Core/IOData/outputsource_provider.h
-include/ClanLib/Core/Input/input.h
-include/ClanLib/Core/Input/input_events.h
-include/ClanLib/Core/Input/inputaxis.h
-include/ClanLib/Core/Input/inputaxis_basic.h
-include/ClanLib/Core/Input/inputaxis_group.h
-include/ClanLib/Core/Input/inputbuffer.h
-include/ClanLib/Core/Input/inputbutton.h
-include/ClanLib/Core/Input/inputbutton_basic.h
-include/ClanLib/Core/Input/inputbutton_group.h
-include/ClanLib/Core/Input/inputbutton_to_axis_analog.h
-include/ClanLib/Core/Input/inputbutton_to_axis_digital.h
-include/ClanLib/Core/Input/inputcursor.h
-include/ClanLib/Core/Input/inputdevice.h
-include/ClanLib/Core/Input/inputhat.h
-include/ClanLib/Core/Input/key.h
-include/ClanLib/Core/Input/keyboard.h
-include/ClanLib/Core/Input/mouse.h
-include/ClanLib/Core/Math/bezier.h
-include/ClanLib/Core/Math/cl_vector.h
-include/ClanLib/Core/Math/math.h
-include/ClanLib/Core/Math/matrix.h
-include/ClanLib/Core/NetObjects/netdata_controller.h
-include/ClanLib/Core/NetObjects/netobject.h
-include/ClanLib/Core/NetObjects/netobject_controller.h
-include/ClanLib/Core/NetObjects/netobject_creator.h
-include/ClanLib/Core/Network/netcomputer.h
-include/ClanLib/Core/Network/netgame.h
-include/ClanLib/Core/Network/netgroup.h
-include/ClanLib/Core/Network/netmessage.h
-include/ClanLib/Core/Network/network.h
-include/ClanLib/Core/Resources/resource.h
-include/ClanLib/Core/Resources/resource_manager.h
-include/ClanLib/Core/Resources/resource_manager_net.h
-include/ClanLib/Core/Resources/resourceoption.h
-include/ClanLib/Core/Resources/resourceoptions.h
-include/ClanLib/Core/Resources/resourcetype.h
-include/ClanLib/Core/Resources/resourcetype_boolean.h
-include/ClanLib/Core/Resources/resourcetype_integer.h
-include/ClanLib/Core/Resources/resourcetype_string.h
-include/ClanLib/Core/Sound/cd_audio.h
-include/ClanLib/Core/Sound/sound.h
-include/ClanLib/Core/Sound/soundbuffer.h
-include/ClanLib/Core/Sound/soundbuffer_session.h
-include/ClanLib/Core/Sound/soundformat.h
-include/ClanLib/Core/Sound/static_soundprovider.h
-include/ClanLib/Core/Sound/stream_soundprovider.h
-include/ClanLib/Core/SoundProviders/static_provider_raw.h
-include/ClanLib/Core/SoundProviders/static_provider_wave.h
-include/ClanLib/Core/SoundProviders/stream_provider_raw.h
-include/ClanLib/Core/SoundProviders/stream_provider_wave.h
-include/ClanLib/Core/SurfaceProviders/canvas.h
-include/ClanLib/Core/SurfaceProviders/generic_surfaceprovider.h
-include/ClanLib/Core/SurfaceProviders/provider_bmp.h
-include/ClanLib/Core/SurfaceProviders/provider_convpoly.h
-include/ClanLib/Core/SurfaceProviders/provider_convpoly_basics.h
-include/ClanLib/Core/SurfaceProviders/provider_dynamic.h
-include/ClanLib/Core/SurfaceProviders/provider_empty.h
-include/ClanLib/Core/SurfaceProviders/provider_fli.h
-include/ClanLib/Core/SurfaceProviders/provider_mpeg.h
-include/ClanLib/Core/SurfaceProviders/provider_pcx.h
-include/ClanLib/Core/SurfaceProviders/provider_ppm.h
-include/ClanLib/Core/SurfaceProviders/provider_targa.h
-include/ClanLib/Core/SurfaceProviders/sprite.h
-include/ClanLib/Core/SurfaceProviders/sprite2.h
-include/ClanLib/Core/SurfaceProviders/sprite_subarray_provider.h
-include/ClanLib/Core/SurfaceProviders/sprite_subsection_provider.h
-include/ClanLib/Core/SurfaceProviders/surface_manager.h
-include/ClanLib/Core/System/cl_assert.h
-include/ClanLib/Core/System/clanapp.h
-include/ClanLib/Core/System/clanstring.h
-include/ClanLib/Core/System/clanstring.h.orig
-include/ClanLib/Core/System/error.h
-include/ClanLib/Core/System/eventchain.h
-include/ClanLib/Core/System/keep_alive.h
-include/ClanLib/Core/System/mutex.h
-include/ClanLib/Core/System/setupcore.h
-include/ClanLib/Core/System/system.h
-include/ClanLib/Core/System/thread.h
-include/ClanLib/Core/System/types.h
-include/ClanLib/GL/bsp.h
-include/ClanLib/GL/opengl.h
-include/ClanLib/GL/setupgl.h
-include/ClanLib/GL/texture.h
-include/ClanLib/GUI/cl_gapplication.h
-include/ClanLib/GUI/cl_gbutton.h
-include/ClanLib/GUI/cl_gconnection.h
-include/ClanLib/GUI/cl_gevent.h
-include/ClanLib/GUI/cl_glabel.h
-include/ClanLib/GUI/cl_gmultifield.h
-include/ClanLib/GUI/cl_gobject.h
-include/ClanLib/GUI/cl_gpoint.h
-include/ClanLib/GUI/cl_gpushbutton.h
-include/ClanLib/GUI/cl_grect.h
-include/ClanLib/GUI/cl_grootwindow.h
-include/ClanLib/GUI/cl_gsldef.h
-include/ClanLib/GUI/cl_gtextfield.h
-include/ClanLib/GUI/cl_gtogglebutton.h
-include/ClanLib/GUI/cl_gwidget.h
-include/ClanLib/GUI/trace.h
-include/ClanLib/Lua/lua.h
-include/ClanLib/MIDI/cl_midi.h
-include/ClanLib/MPEG/mpeg.h
-include/ClanLib/MPEG/mpeg_soundprovider.h
-include/ClanLib/Magick/provider_magick.h
-include/ClanLib/MikMod/streamed_mikmod_sample.h
-include/ClanLib/PNG/provider_png.h
-include/ClanLib/core.h
-include/ClanLib/efence.h
-include/ClanLib/gl.h
-include/ClanLib/gui.h
-include/ClanLib/lua.h
-include/ClanLib/magick.h
-include/ClanLib/midi.h
-include/ClanLib/mikmod.h
-include/ClanLib/mpeg.h
-include/ClanLib/png.h
-include/ClanLib/stl.h
-lib/ClanLib/libclan-display-svgalib.so.0.4.4
-lib/ClanLib/libclan-display-x11.so.0.4.4
-lib/ClanLib/libclan-input-tty.so.0.4.4
-lib/ClanLib/libclan-network.so.0.4.4
-lib/ClanLib/libclan-sound.so.0.4.4
+include/ClanLib-0.7/ClanLib/Application/clanapp.h
+include/ClanLib-0.7/ClanLib/Core/IOData/cl_endian.h
+include/ClanLib-0.7/ClanLib/Core/IOData/datatypes.h
+include/ClanLib-0.7/ClanLib/Core/IOData/directory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/directory_scanner.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_memory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_provider.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_provider_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/inputsource_zipped.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_file.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_memory.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_provider.h
+include/ClanLib-0.7/ClanLib/Core/IOData/outputsource_zipped.h
+include/ClanLib-0.7/ClanLib/Core/IOData/zip_archive.h
+include/ClanLib-0.7/ClanLib/Core/IOData/zip_file_entry.h
+include/ClanLib-0.7/ClanLib/Core/Math/cl_vector.h
+include/ClanLib-0.7/ClanLib/Core/Math/math.h
+include/ClanLib-0.7/ClanLib/Core/Math/origin.h
+include/ClanLib-0.7/ClanLib/Core/Math/point.h
+include/ClanLib-0.7/ClanLib/Core/Math/rect.h
+include/ClanLib-0.7/ClanLib/Core/Math/size.h
+include/ClanLib-0.7/ClanLib/Core/Math/vector2.h
+include/ClanLib-0.7/ClanLib/Core/Math/vector2.inl
+include/ClanLib-0.7/ClanLib/Core/Resources/resource.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resource_manager.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcedata.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_boolean.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_integer.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_raw.h
+include/ClanLib-0.7/ClanLib/Core/Resources/resourcetype_string.h
+include/ClanLib-0.7/ClanLib/Core/System/call_stack.h
+include/ClanLib-0.7/ClanLib/Core/System/cl_assert.h
+include/ClanLib-0.7/ClanLib/Core/System/cl_library.h
+include/ClanLib-0.7/ClanLib/Core/System/clanstring.h
+include/ClanLib-0.7/ClanLib/Core/System/clonable.h
+include/ClanLib-0.7/ClanLib/Core/System/command_line.h
+include/ClanLib-0.7/ClanLib/Core/System/console_window.h
+include/ClanLib-0.7/ClanLib/Core/System/crash_reporter.h
+include/ClanLib-0.7/ClanLib/Core/System/error.h
+include/ClanLib-0.7/ClanLib/Core/System/event_listener.h
+include/ClanLib-0.7/ClanLib/Core/System/event_trigger.h
+include/ClanLib-0.7/ClanLib/Core/System/keep_alive.h
+include/ClanLib-0.7/ClanLib/Core/System/lazycopyptr.h
+include/ClanLib-0.7/ClanLib/Core/System/log.h
+include/ClanLib-0.7/ClanLib/Core/System/mutex.h
+include/ClanLib-0.7/ClanLib/Core/System/owningptr.h
+include/ClanLib-0.7/ClanLib/Core/System/setupcore.h
+include/ClanLib-0.7/ClanLib/Core/System/sharedptr.h
+include/ClanLib-0.7/ClanLib/Core/System/system.h
+include/ClanLib-0.7/ClanLib/Core/System/thread.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v0.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v1.h
+include/ClanLib-0.7/ClanLib/Core/System/threadfunc_v2.h
+include/ClanLib-0.7/ClanLib/Core/System/timer.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_attr.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_cdata_section.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_character_data.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_comment.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document_fragment.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_document_type.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_element.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_entity.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_entity_reference.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_exception.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_implementation.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_named_node_map.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_node.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_node_list.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_notation.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_processing_instruction.h
+include/ClanLib-0.7/ClanLib/Core/XML/dom_text.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_token.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_tokenizer.h
+include/ClanLib-0.7/ClanLib/Core/XML/xml_writer.h
+include/ClanLib-0.7/ClanLib/Display/Providers/dc_buffer.h
+include/ClanLib-0.7/ClanLib/Display/Providers/jpeg_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/pcx_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/png_provider.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_factory.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_type.h
+include/ClanLib-0.7/ClanLib/Display/Providers/provider_type_register.h
+include/ClanLib-0.7/ClanLib/Display/Providers/targa_provider.h
+include/ClanLib-0.7/ClanLib/Display/blend_func.h
+include/ClanLib-0.7/ClanLib/Display/color.h
+include/ClanLib-0.7/ClanLib/Display/display.h
+include/ClanLib-0.7/ClanLib/Display/display_mode.h
+include/ClanLib-0.7/ClanLib/Display/display_window.h
+include/ClanLib-0.7/ClanLib/Display/display_window_description.h
+include/ClanLib-0.7/ClanLib/Display/font.h
+include/ClanLib-0.7/ClanLib/Display/glyph_buffer.h
+include/ClanLib-0.7/ClanLib/Display/gradient.h
+include/ClanLib-0.7/ClanLib/Display/graphic_context.h
+include/ClanLib-0.7/ClanLib/Display/input_buffer.h
+include/ClanLib-0.7/ClanLib/Display/input_button.h
+include/ClanLib-0.7/ClanLib/Display/input_context.h
+include/ClanLib-0.7/ClanLib/Display/input_device.h
+include/ClanLib-0.7/ClanLib/Display/input_event.h
+include/ClanLib-0.7/ClanLib/Display/joystick.h
+include/ClanLib-0.7/ClanLib/Display/key_binding.h
+include/ClanLib-0.7/ClanLib/Display/keyboard.h
+include/ClanLib-0.7/ClanLib/Display/keys.h
+include/ClanLib-0.7/ClanLib/Display/mouse.h
+include/ClanLib-0.7/ClanLib/Display/palette.h
+include/ClanLib-0.7/ClanLib/Display/pixel_buffer.h
+include/ClanLib-0.7/ClanLib/Display/pixel_format.h
+include/ClanLib-0.7/ClanLib/Display/rle_surface.h
+include/ClanLib-0.7/ClanLib/Display/setupdisplay.h
+include/ClanLib-0.7/ClanLib/Display/sprite.h
+include/ClanLib-0.7/ClanLib/Display/sprite_description.h
+include/ClanLib-0.7/ClanLib/Display/sprite_packer.h
+include/ClanLib-0.7/ClanLib/Display/surface.h
+include/ClanLib-0.7/ClanLib/Display/text_styler.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl_surface.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/opengl_window.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/GL/setupgl.h
+include/ClanLib-0.7/ClanLib/GUI/button.h
+include/ClanLib-0.7/ClanLib/GUI/checkbox.h
+include/ClanLib-0.7/ClanLib/GUI/component.h
+include/ClanLib-0.7/ClanLib/GUI/component_manager.h
+include/ClanLib-0.7/ClanLib/GUI/component_move_handler.h
+include/ClanLib-0.7/ClanLib/GUI/component_options.h
+include/ClanLib-0.7/ClanLib/GUI/component_resize_handler.h
+include/ClanLib-0.7/ClanLib/GUI/component_style.h
+include/ClanLib-0.7/ClanLib/GUI/component_type.h
+include/ClanLib-0.7/ClanLib/GUI/filedialog.h
+include/ClanLib-0.7/ClanLib/GUI/frame.h
+include/ClanLib-0.7/ClanLib/GUI/gui_file_parser.h
+include/ClanLib-0.7/ClanLib/GUI/gui_manager.h
+include/ClanLib-0.7/ClanLib/GUI/image.h
+include/ClanLib-0.7/ClanLib/GUI/inputbox.h
+include/ClanLib-0.7/ClanLib/GUI/inputdialog.h
+include/ClanLib-0.7/ClanLib/GUI/label.h
+include/ClanLib-0.7/ClanLib/GUI/listbox.h
+include/ClanLib-0.7/ClanLib/GUI/listitem.h
+include/ClanLib-0.7/ClanLib/GUI/menudata.h
+include/ClanLib-0.7/ClanLib/GUI/menunode.h
+include/ClanLib-0.7/ClanLib/GUI/messagebox.h
+include/ClanLib-0.7/ClanLib/GUI/popupmenu.h
+include/ClanLib-0.7/ClanLib/GUI/progressbar.h
+include/ClanLib-0.7/ClanLib/GUI/radiobutton.h
+include/ClanLib-0.7/ClanLib/GUI/radiogroup.h
+include/ClanLib-0.7/ClanLib/GUI/scrollbar.h
+include/ClanLib-0.7/ClanLib/GUI/setupgui.h
+include/ClanLib-0.7/ClanLib/GUI/stylemanager.h
+include/ClanLib-0.7/ClanLib/GUI/treeitem.h
+include/ClanLib-0.7/ClanLib/GUI/treenode.h
+include/ClanLib-0.7/ClanLib/GUI/treeview.h
+include/ClanLib-0.7/ClanLib/GUI/window.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/button_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/checkbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/frame_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/image_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/inputbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/label_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/listbox_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/progressbar_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/radiobutton_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/scrollbar_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/stylemanager_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleBoring/window_boring.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/button_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/checkbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/frame_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/image_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/inputbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/label_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/listbox_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/progressbar_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/radiobutton_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/scrollbar_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/stylemanager_silver.h
+include/ClanLib-0.7/ClanLib/GUIStyleSilver/window_silver.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/MikMod/setupmikmod.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/MikMod/soundprovider_mikmod.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_client.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_master.h
+include/ClanLib-0.7/ClanLib/Network/Browse/browse_server.h
+include/ClanLib-0.7/ClanLib/Network/IRC/irc_connection.h
+include/ClanLib-0.7/ClanLib/Network/IRC/irc_numerics.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_client.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_controller.h
+include/ClanLib-0.7/ClanLib/Network/NetObjects/netobject_server.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/inputsource_netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/inputsource_netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netcomputer.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netgroup.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netsession.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/outputsource_netpacket.h
+include/ClanLib-0.7/ClanLib/Network/NetSession/outputsource_netstream.h
+include/ClanLib-0.7/ClanLib/Network/NetVariables/netvariables.h
+include/ClanLib-0.7/ClanLib/Network/Socket/inputsource_socket.h
+include/ClanLib-0.7/ClanLib/Network/Socket/ip_address.h
+include/ClanLib-0.7/ClanLib/Network/Socket/outputsource_socket.h
+include/ClanLib-0.7/ClanLib/Network/Socket/socket.h
+include/ClanLib-0.7/ClanLib/Network/setupnetwork.h
+%%SDL%%include/ClanLib-0.7/ClanLib/SDL/setupsdl.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v0.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v1.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v2.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v3.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v4.h
+include/ClanLib-0.7/ClanLib/Signals/signal_v5.h
+include/ClanLib-0.7/ClanLib/Signals/slot.h
+include/ClanLib-0.7/ClanLib/Signals/slot_container.h
+include/ClanLib-0.7/ClanLib/Signals/slot_generic.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v0.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v1.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v2.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v3.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v4.h
+include/ClanLib-0.7/ClanLib/Signals/slot_v5.h
+include/ClanLib-0.7/ClanLib/Signals/slotbuffer_v0.h
+include/ClanLib-0.7/ClanLib/Signals/slotbuffer_v1.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/echofilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/fadefilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundFilters/inverse_echofilter.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_factory.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_raw.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_type.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_type_register.h
+include/ClanLib-0.7/ClanLib/Sound/SoundProviders/soundprovider_wave.h
+include/ClanLib-0.7/ClanLib/Sound/cd_drive.h
+include/ClanLib-0.7/ClanLib/Sound/setupsound.h
+include/ClanLib-0.7/ClanLib/Sound/sound.h
+include/ClanLib-0.7/ClanLib/Sound/soundbuffer.h
+include/ClanLib-0.7/ClanLib/Sound/soundbuffer_session.h
+include/ClanLib-0.7/ClanLib/Sound/soundfilter.h
+include/ClanLib-0.7/ClanLib/Sound/soundformat.h
+include/ClanLib-0.7/ClanLib/Sound/soundoutput.h
+include/ClanLib-0.7/ClanLib/Sound/soundoutput_description.h
+include/ClanLib-0.7/ClanLib/Sound/soundprovider.h
+include/ClanLib-0.7/ClanLib/Sound/soundprovider_session.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/Vorbis/setupvorbis.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/Vorbis/soundprovider_vorbis.h
+include/ClanLib-0.7/ClanLib/application.h
+include/ClanLib-0.7/ClanLib/core.h
+include/ClanLib-0.7/ClanLib/display.h
+%%OPENGL%%include/ClanLib-0.7/ClanLib/gl.h
+include/ClanLib-0.7/ClanLib/gui.h
+include/ClanLib-0.7/ClanLib/guistyleboring.h
+include/ClanLib-0.7/ClanLib/guistylesilver.h
+%%LIBMIKMOD%%include/ClanLib-0.7/ClanLib/mikmod.h
+include/ClanLib-0.7/ClanLib/network.h
+%%SDL%%include/ClanLib-0.7/ClanLib/sdl.h
+include/ClanLib-0.7/ClanLib/signals.h
+include/ClanLib-0.7/ClanLib/sound.h
+%%LIBVORBIS%%include/ClanLib-0.7/ClanLib/vorbis.h
+lib/libclanApp-0.7.so.0
+lib/libclanApp.a
+lib/libclanApp.so
+lib/libclanCore-0.7.so.0
+lib/libclanCore.a
lib/libclanCore.so
-lib/libclanCore.so.0
-lib/libclanCore.so.0.4.4
-lib/libclanGL.so
-lib/libclanGL.so.0
-lib/libclanGL.so.0.4.4
-lib/libclanPNG.so
-lib/libclanPNG.so.0
-lib/libclanPNG.so.0.4.4
-@dirrm lib/ClanLib
-@dirrm include/ClanLib/PNG
-@dirrm include/ClanLib/MikMod
-@dirrm include/ClanLib/Magick
-@dirrm include/ClanLib/MPEG
-@dirrm include/ClanLib/MIDI
-@dirrm include/ClanLib/Lua
-@dirrm include/ClanLib/GUI
-@dirrm include/ClanLib/GL
-@dirrm include/ClanLib/Core/System
-@dirrm include/ClanLib/Core/SurfaceProviders
-@dirrm include/ClanLib/Core/SoundProviders
-@dirrm include/ClanLib/Core/Sound
-@dirrm include/ClanLib/Core/Resources
-@dirrm include/ClanLib/Core/Network
-@dirrm include/ClanLib/Core/NetObjects
-@dirrm include/ClanLib/Core/Math
-@dirrm include/ClanLib/Core/Input
-@dirrm include/ClanLib/Core/IOData
-@dirrm include/ClanLib/Core/Font
-@dirrm include/ClanLib/Core/Display
-@dirrm include/ClanLib/Core
-@dirrm include/ClanLib
+lib/libclanDisplay-0.7.so.0
+lib/libclanDisplay.a
+lib/libclanDisplay.so
+%%OPENGL%%lib/libclanGL-0.7.so.0
+%%OPENGL%%lib/libclanGL.a
+%%OPENGL%%lib/libclanGL.so
+lib/libclanGUI-0.7.so.0
+lib/libclanGUI.a
+lib/libclanGUI.so
+lib/libclanGUIStyleBoring-0.7.so.0
+lib/libclanGUIStyleBoring.a
+lib/libclanGUIStyleBoring.so
+lib/libclanGUIStyleSilver-0.7.so.0
+lib/libclanGUIStyleSilver.a
+lib/libclanGUIStyleSilver.so
+%%LIBMIKMOD%%lib/libclanMikMod-0.7.so.0
+%%LIBMIKMOD%%lib/libclanMikMod.a
+%%LIBMIKMOD%%lib/libclanMikMod.so
+lib/libclanNetwork-0.7.so.0
+lib/libclanNetwork.a
+lib/libclanNetwork.so
+%%SDL%%lib/libclanSDL-0.7.so.0
+%%SDL%%lib/libclanSDL.a
+%%SDL%%lib/libclanSDL.so
+lib/libclanSignals-0.7.so.0
+lib/libclanSignals.a
+lib/libclanSignals.so
+lib/libclanSound-0.7.so.0
+lib/libclanSound.a
+lib/libclanSound.so
+%%LIBVORBIS%%lib/libclanVorbis-0.7.so.0
+%%LIBVORBIS%%lib/libclanVorbis.a
+%%LIBVORBIS%%lib/libclanVorbis.so
+libdata/pkgconfig/clanApp-0.7.pc
+libdata/pkgconfig/clanCore-0.7.pc
+libdata/pkgconfig/clanDisplay-0.7.pc
+%%OPENGL%%libdata/pkgconfig/clanGL-0.7.pc
+libdata/pkgconfig/clanGUI-0.7.pc
+libdata/pkgconfig/clanGUIStyleBoring-0.7.pc
+libdata/pkgconfig/clanGUIStyleSilver-0.7.pc
+%%LIBMIKMOD%%libdata/pkgconfig/clanMikMod-0.7.pc
+libdata/pkgconfig/clanNetwork-0.7.pc
+%%SDL%%libdata/pkgconfig/clanSDL-0.7.pc
+libdata/pkgconfig/clanSound-0.7.pc
+%%LIBVORBIS%%libdata/pkgconfig/clanVorbis-0.7.pc
+share/doc/clanlib/Tutorial/Quickflash/index.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial1.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial2.html
+share/doc/clanlib/Tutorial/Quickflash/tutorial3.html
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-part2.zip
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-part3.zip
+share/doc/clanlib/Tutorial/TicTacToe/clanlib-tutorial-workspace.zip
+share/doc/clanlib/Tutorial/TicTacToe/figure1.png
+share/doc/clanlib/Tutorial/TicTacToe/figure10.png
+share/doc/clanlib/Tutorial/TicTacToe/figure2.png
+share/doc/clanlib/Tutorial/TicTacToe/figure3.png
+share/doc/clanlib/Tutorial/TicTacToe/figure8.png
+share/doc/clanlib/Tutorial/TicTacToe/figure9.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_board.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_circle.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_cross.png
+share/doc/clanlib/Tutorial/TicTacToe/figure_menu.png
+share/doc/clanlib/Tutorial/TicTacToe/index.html
+share/doc/clanlib/Tutorial/TicTacToe/part-1.html
+share/doc/clanlib/Tutorial/TicTacToe/part-2.html
+share/doc/clanlib/Tutorial/TicTacToe/part-3.html
+share/doc/clanlib/Tutorial/TicTacToe/tictactoe.zip
+share/doc/clanlib/Tutorial/index.html
+@dirrm share/doc/clanlib/Tutorial/TicTacToe
+@dirrm share/doc/clanlib/Tutorial/Quickflash
+@dirrm share/doc/clanlib/Tutorial
+@dirrm share/doc/clanlib
+%%LIBVORBIS%%@dirrm include/ClanLib-0.7/ClanLib/Vorbis
+@dirrm include/ClanLib-0.7/ClanLib/Sound/SoundProviders
+@dirrm include/ClanLib-0.7/ClanLib/Sound/SoundFilters
+@dirrm include/ClanLib-0.7/ClanLib/Sound
+@dirrm include/ClanLib-0.7/ClanLib/Signals
+%%SDL%%@dirrm include/ClanLib-0.7/ClanLib/SDL
+@dirrm include/ClanLib-0.7/ClanLib/Network/Socket
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetVariables
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetSession
+@dirrm include/ClanLib-0.7/ClanLib/Network/NetObjects
+@dirrm include/ClanLib-0.7/ClanLib/Network/IRC
+@dirrm include/ClanLib-0.7/ClanLib/Network/Browse
+@dirrm include/ClanLib-0.7/ClanLib/Network
+%%LIBMIKMOD%%@dirrm include/ClanLib-0.7/ClanLib/MikMod
+@dirrm include/ClanLib-0.7/ClanLib/GUIStyleSilver
+@dirrm include/ClanLib-0.7/ClanLib/GUIStyleBoring
+@dirrm include/ClanLib-0.7/ClanLib/GUI
+%%OPENGL%%@dirrm include/ClanLib-0.7/ClanLib/GL
+@dirrm include/ClanLib-0.7/ClanLib/Display/Providers
+@dirrm include/ClanLib-0.7/ClanLib/Display
+@dirrm include/ClanLib-0.7/ClanLib/Core/XML
+@dirrm include/ClanLib-0.7/ClanLib/Core/System
+@dirrm include/ClanLib-0.7/ClanLib/Core/Resources
+@dirrm include/ClanLib-0.7/ClanLib/Core/Math
+@dirrm include/ClanLib-0.7/ClanLib/Core/IOData
+@dirrm include/ClanLib-0.7/ClanLib/Core
+@dirrm include/ClanLib-0.7/ClanLib/Application
+@dirrm include/ClanLib-0.7/ClanLib
+@dirrm include/ClanLib-0.7
diff --git a/devel/clanlib/pkg-plist.glx b/devel/clanlib/pkg-plist.glx
deleted file mode 100644
index b2b2cc849498..000000000000
--- a/devel/clanlib/pkg-plist.glx
+++ /dev/null
@@ -1 +0,0 @@
-lib/ClanLib/libclan-display-glx.so.0.4.4