30 files changed, 340 insertions, 94 deletions

diff --git a/devel/clanlib/files/patch-Documentation::FAQ.theme b/devel/clanlib/files/patch-Documentation::FAQ.theme
new file mode 100644
index 000000000000..22d583fbf50d
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::FAQ.theme
@@ -0,0 +1,8 @@
+--- Documentation/FAQ.theme.orig	Thu Jan 22 15:35:29 2004
++++ Documentation/FAQ.theme	Thu Jan 22 15:35:39 2004
+@@ -1,3 +1,5 @@
++#! %%PERL%%
++
+ #
+ # ClanSoft Documentation: FAQ theme,
+ # Copyright (c) 1999 by Magnus Norddahl / ClanSoft & Kenneth Gangstoe.
diff --git a/devel/clanlib/files/patch-Documentation::Makefile.in b/devel/clanlib/files/patch-Documentation::Makefile.in
new file mode 100644
index 000000000000..39f025017b6b
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::Makefile.in
@@ -0,0 +1,28 @@
+--- Documentation/Makefile.in.orig	Thu Jan 22 15:34:28 2004
++++ Documentation/Makefile.in	Thu Jan 22 15:51:08 2004
+@@ -1,6 +1,4 @@
+-prefix=@prefix@/share/
+-
+-HTML_PREFIX = $(prefix)/doc/ClanLib-docs-@version_minor@/Documentation
++HTML_PREFIX = @prefix@/share/doc/clanlib
+ 
+ all: faq
+ 	Utilities/webbuilder.pl documentation.theme index.xml
+@@ -10,14 +8,15 @@
+ #	cd Tutorial; make
+ 
+ faq:
+-	perl FAQ.theme
++	chmod +x FAQ.theme
++	./FAQ.theme
+ 
+ install:
+ 	@install -d $(HTML_PREFIX)
+ 	@install -d $(HTML_PREFIX)/Images
+ 	@install -m 0644 Images/*.gif $(HTML_PREFIX)/Images
+ 	@install -m 0644 *.html $(HTML_PREFIX)
+-	
++
+ #	cd Reference; make man_install
+ 	cd Reference; make html_install
+ 	cd Overview; make install
diff --git a/devel/clanlib/files/patch-Documentation::Overview::Makefile.in b/devel/clanlib/files/patch-Documentation::Overview::Makefile.in
new file mode 100644
index 000000000000..2175740e2f77
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::Overview::Makefile.in
@@ -0,0 +1,18 @@
+--- Documentation/Overview/Makefile.in.orig	Thu Jan 22 14:53:10 2004
++++ Documentation/Overview/Makefile.in	Thu Jan 22 14:53:33 2004
+@@ -1,6 +1,4 @@
+-prefix=@prefix@/share
+-
+-HTML_PREFIX = $(prefix)/doc/ClanLib-docs-@version_minor@/Documentation
++HTML_PREFIX = @prefix@/share/doc/clanlib
+ 
+ all:	index.html
+ 
+@@ -26,6 +24,6 @@
+ 	@install -m 0644 Images/*.png $(HTML_PREFIX)/Overview/Images
+ distclean: clean
+ 	rm Makefile
+-	
++
+ clean:
+ 	rm -f *.html
diff --git a/devel/clanlib/files/patch-Documentation::Reference::Makefile.in b/devel/clanlib/files/patch-Documentation::Reference::Makefile.in
new file mode 100644
index 000000000000..b01d4b5b15cb
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::Reference::Makefile.in
@@ -0,0 +1,27 @@
+--- Documentation/Reference/Makefile.in.orig	Thu Jan 22 14:52:33 2004
++++ Documentation/Reference/Makefile.in	Thu Jan 22 15:11:07 2004
+@@ -1,13 +1,11 @@
+-
+-prefix=@prefix@/share
+-HTML_PREFIX = $(prefix)/doc/ClanLib-docs-@version_minor@/Documentation
++HTML_PREFIX = @prefix@/share/doc/clanlib
+ 
+ all:	html
+ 
+ html:
+ 	@echo 'Type "make html_install" to install the html reference pages.'
+ 	if [ ! -d html ]; then mkdir html; fi
+-	chmod +x ./pce2
++	chmod +xg-s ./pce2
+ 	find ../../Sources/API -name '*.h' | xargs ./pce2
+ 
+ html_install:
+@@ -20,7 +18,7 @@
+ 
+ distclean: clean
+ 	rm -f Makefile
+-	
++
+ clean:
+ 	rm -rf html
+ 
diff --git a/devel/clanlib/files/patch-Documentation::Reference::pce2 b/devel/clanlib/files/patch-Documentation::Reference::pce2
new file mode 100644
index 000000000000..b512e2bffae8
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::Reference::pce2
@@ -0,0 +1,8 @@
+--- Documentation/Reference/pce2.orig	Thu Jan 22 15:38:17 2004
++++ Documentation/Reference/pce2	Thu Jan 22 15:38:24 2004
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#! %%PERL%%
+ 
+ #  PCE2 - Perl C++ Extractor version 2
+ #  Copyright 2000-1999, Karl Nelson  <kenelson@users.sourceforge.net>
diff --git a/devel/clanlib/files/patch-Documentation::Utilities::transform.sh b/devel/clanlib/files/patch-Documentation::Utilities::transform.sh
new file mode 100644
index 000000000000..48a487d1dc51
--- /dev/null
+++ b/devel/clanlib/files/patch-Documentation::Utilities::transform.sh
@@ -0,0 +1,11 @@
+--- Documentation/Utilities/transform.sh.orig	Thu Jan 22 15:42:03 2004
++++ Documentation/Utilities/transform.sh	Thu Jan 22 15:42:08 2004
+@@ -3,7 +3,7 @@
+ # user-annotation capability.
+ 
+ DIRS=$@
+-EFED="perl Utilities/efed.pl"
++EFED="%%PERL%% Utilities/efed.pl"
+ 
+ for d in $DIRS; do
+   if test -d $d; then
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.display.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.display.in
new file mode 100644
index 000000000000..83b9586c74ff
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.display.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.display.in.orig	Thu Jan 22 08:27:39 2004
++++ Setup/Unix/Makefile.display.in	Thu Jan 22 08:27:53 2004
+@@ -114,7 +114,7 @@
+ 
+ # $(OBJF_DISP_X11) $(OBJF_DISP_FBDEV)
+ 
+-LINK_DISP = -L Libs -lclanCore @x_libraries@ -lHermes @directfb_libs@
++LINK_DISP = @LDFLAGS@ -L Libs -lclanCore @x_libraries@ -lHermes @directfb_libs@
+ 
+ Libs/libclanDisplay.so: Libs/libclanCore.so $(OBJF_DISP_ALL)
+ 	@echo "Building Libs/libclanDisplay.so"
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.jpeg.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.jpeg.in
new file mode 100644
index 000000000000..901564b43286
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.jpeg.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.jpeg.in.orig	Thu Jan 22 08:28:53 2004
++++ Setup/Unix/Makefile.jpeg.in	Thu Jan 22 08:29:02 2004
+@@ -21,7 +21,7 @@
+ 
+ Libs/libclanJPEG.so: Libs/libclanCore.so $(OBJF_LIB_JPEG)
+ 	@echo "Building Libs/libclanJPEG.so"
+-	@$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -ljpeg
++	@$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) @LDFLAGS@ -L Libs -lclanCore -ljpeg
+ 	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) Libs/libclanJPEG.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) Libs/libclanJPEG.so
+ 
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.mikmod.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.mikmod.in
new file mode 100644
index 000000000000..f7c285c0578f
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.mikmod.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.mikmod.in.orig	Thu Jan 22 08:28:13 2004
++++ Setup/Unix/Makefile.mikmod.in	Thu Jan 22 08:28:30 2004
+@@ -22,7 +22,7 @@
+ 
+ Libs/libclanMikMod.so: Libs/libclanCore.so $(OBJF_LIB_MIKMOD)
+ 	@echo "Building Libs/libclanMikMod.so"
+-	@$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lmikmod
++	@$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) @LDFLAGS@ -L Libs -lclanCore -lmikmod
+ 	@ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) Libs/libclanMikMod.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) Libs/libclanMikMod.so
+ 
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.png.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.png.in
new file mode 100644
index 000000000000..cfb945b43bcd
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.png.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.png.in.orig	Thu Jan 22 08:28:36 2004
++++ Setup/Unix/Makefile.png.in	Thu Jan 22 08:28:47 2004
+@@ -20,7 +20,7 @@
+ 
+ Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)
+ 	@echo "Building Libs/libclanPNG.so"
+-	@$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
++	@$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) @LDFLAGS@ -L Libs -lclanCore -lpng
+ 	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) Libs/libclanPNG.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) Libs/libclanPNG.so
+ 
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.ttf.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.ttf.in
new file mode 100644
index 000000000000..ace3ca271516
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.ttf.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.ttf.in.orig	Thu Jan 22 08:54:07 2004
++++ Setup/Unix/Makefile.ttf.in	Thu Jan 22 08:54:25 2004
+@@ -22,7 +22,7 @@
+ 
+ Libs/libclanTTF.so: Libs/libclanCore.so $(OBJF_LIB_TTF)
+ 	@echo "Building Libs/libclanTTF.so"
+-	@$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lfreetype
++	@$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) @LDFLAGS@ -L Libs -lclanCore -lfreetype
+ 	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) Libs/libclanTTF.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) Libs/libclanTTF.so
+ 
diff --git a/devel/clanlib/files/patch-Setup::Unix::Makefile.vorbis.in b/devel/clanlib/files/patch-Setup::Unix::Makefile.vorbis.in
new file mode 100644
index 000000000000..b3a0a1fd18da
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::Makefile.vorbis.in
@@ -0,0 +1,11 @@
+--- Setup/Unix/Makefile.vorbis.in.orig	Thu Jan 22 08:29:25 2004
++++ Setup/Unix/Makefile.vorbis.in	Thu Jan 22 08:29:36 2004
+@@ -20,7 +20,7 @@
+ 
+ Libs/libclanVorbis.so: Libs/libclanCore.so $(OBJF_LIB_VORBIS)
+ 	@echo "Building Libs/libclanVorbis.so"
+-	@$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
++	@$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) @LDFLAGS@ -L Libs -lclanCore -lvorbis
+ 	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) Libs/libclanVorbis.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) Libs/libclanVorbis.so	
+ 
diff --git a/devel/clanlib/files/patch-Setup::Unix::clanlib-config.in b/devel/clanlib/files/patch-Setup::Unix::clanlib-config.in
new file mode 100644
index 000000000000..4e0541d1ac1e
--- /dev/null
+++ b/devel/clanlib/files/patch-Setup::Unix::clanlib-config.in
@@ -0,0 +1,14 @@
+--- Setup/Unix/clanlib-config.in.orig	Fri Jan 23 15:32:52 2004
++++ Setup/Unix/clanlib-config.in	Fri Jan 23 15:33:42 2004
+@@ -16,9 +16,9 @@
+     ;;
+   --cflags)
+     includes=-I${includedir} 
+-    echo ${includes} @comp_mode@
++    echo ${includes} %%PTHREAD_CFLAGS%%
+     ;;     
+   --libs)
+-    echo -L${libdir} -lclanCore -lclanApp
++    echo -L${libdir} -lclanCore -lclanApp %%PTHREAD_LIBS%%
+     ;;
+ esac
diff --git a/devel/clanlib/files/patch-Sources::API::Core::System::clanstring.h b/devel/clanlib/files/patch-Sources::API::Core::System::clanstring.h
new file mode 100644
index 000000000000..51ae1124dbc4
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::API::Core::System::clanstring.h
@@ -0,0 +1,11 @@
+--- Sources/API/Core/System/clanstring.h.orig	Thu Jan 22 13:11:58 2004
++++ Sources/API/Core/System/clanstring.h	Thu Jan 22 13:12:12 2004
+@@ -39,7 +39,7 @@
+ #include <extras.h>
+ #endif
+ 
+-#ifdef __MACOS__
++#if defined(__MACOS__) || defined(__FreeBSD__)
+ #include <cctype>
+ #define NEED_FCVT
+ #endif
diff --git a/devel/clanlib/files/patch-Sources::GL::GLX::displaycard_glx.cpp b/devel/clanlib/files/patch-Sources::GL::GLX::displaycard_glx.cpp
new file mode 100644
index 000000000000..3d9e9ad0cbd1
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::GL::GLX::displaycard_glx.cpp
@@ -0,0 +1,12 @@
+--- Sources/GL/GLX/displaycard_glx.cpp.orig	Thu Jan 22 14:15:47 2004
++++ Sources/GL/GLX/displaycard_glx.cpp	Thu Jan 22 14:26:58 2004
+@@ -14,6 +14,9 @@
+ 
+ #ifdef USE_OPENGL
+ 
++#define GLX_GLXEXT_PROTOTYPES
++#include <GL/glx.h>
++
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
diff --git a/devel/clanlib/files/patch-Sources::IOData::Unix::directory_scanner_unix.cpp b/devel/clanlib/files/patch-Sources::IOData::Unix::directory_scanner_unix.cpp
new file mode 100644
index 000000000000..93216b38d4c5
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::IOData::Unix::directory_scanner_unix.cpp
@@ -0,0 +1,10 @@
+--- Sources/Core/IOData/Unix/directory_scanner_unix.cpp.orig	Thu Jan 10 11:23:30 2002
++++ Sources/Core/IOData/Unix/directory_scanner_unix.cpp	Sat Jan 24 13:31:49 2004
+@@ -13,6 +13,7 @@
+         ------------------------------------------------------------------------
+ */
+ 
++#include <assert.h>
+ #include <API/Core/System/error.h>
+ #include <iostream>
+ #include <libgen.h>
diff --git a/devel/clanlib/files/patch-Sources::Network::Generic::browse_client_generic.cpp b/devel/clanlib/files/patch-Sources::Network::Generic::browse_client_generic.cpp
new file mode 100644
index 000000000000..0d960d73ff5a
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Network::Generic::browse_client_generic.cpp
@@ -0,0 +1,10 @@
+--- Sources/Network/Generic/browse_client_generic.cpp.orig	Thu Jan 22 08:20:26 2004
++++ Sources/Network/Generic/browse_client_generic.cpp	Thu Jan 22 08:20:37 2004
+@@ -17,6 +17,7 @@
+ #pragma warning (disable:4355)
+ #include <winsock2.h> // needed for ntohl and ntohs
+ #else
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #endif
+ 
diff --git a/devel/clanlib/files/patch-Sources::Network::Generic::ip_address.cpp b/devel/clanlib/files/patch-Sources::Network::Generic::ip_address.cpp
new file mode 100644
index 000000000000..6e823d49e653
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Network::Generic::ip_address.cpp
@@ -0,0 +1,10 @@
+--- Sources/Network/Generic/ip_address.cpp.orig	Thu Jan 22 08:22:51 2004
++++ Sources/Network/Generic/ip_address.cpp	Thu Jan 22 08:23:01 2004
+@@ -15,6 +15,7 @@
+ #include "API/Core/System/error.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-Sources::Network::Generic::netcomputer.cpp b/devel/clanlib/files/patch-Sources::Network::Generic::netcomputer.cpp
new file mode 100644
index 000000000000..69c592bb31fb
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Network::Generic::netcomputer.cpp
@@ -0,0 +1,10 @@
+--- Sources/Network/Generic/netcomputer.cpp.orig	Thu Jan 22 08:19:24 2004
++++ Sources/Network/Generic/netcomputer.cpp	Thu Jan 22 08:20:01 2004
+@@ -19,6 +19,7 @@
+ #ifdef WIN32
+ #include <winsock2.h>
+ #else
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #endif
+ 
diff --git a/devel/clanlib/files/patch-Sources::Network::Generic::socket_generic.h b/devel/clanlib/files/patch-Sources::Network::Generic::socket_generic.h
new file mode 100644
index 000000000000..c51358aae0d3
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Network::Generic::socket_generic.h
@@ -0,0 +1,10 @@
+--- Sources/Network/Generic/socket_generic.h.orig	Thu Jan 22 08:21:55 2004
++++ Sources/Network/Generic/socket_generic.h	Thu Jan 22 08:22:06 2004
+@@ -21,6 +21,7 @@
+ #include <stack>
+ 
+ #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-Sources::SmallJPEG::jpgd::jidctfst.cpp b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jidctfst.cpp
new file mode 100644
index 000000000000..fb1978cbbfb5
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jidctfst.cpp
@@ -0,0 +1,8 @@
+--- Sources/SmallJPEG/jpgd/jidctfst.cpp.orig	Fri Jan 23 15:46:14 2004
++++ Sources/SmallJPEG/jpgd/jidctfst.cpp	Fri Jan 23 15:46:25 2004
+@@ -1,4 +1,5 @@
+ #include "jpegdecoder.h"
++#include <inttypes.h>
+ 
+ #ifdef WIN32
+ #pragma warning(push)
diff --git a/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::cdaudio_linux.cpp b/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::cdaudio_linux.cpp
new file mode 100644
index 000000000000..76ba8e1030d7
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::cdaudio_linux.cpp
@@ -0,0 +1,31 @@
+--- Sources/Sound/Sound/ClanSound/cdaudio_linux.cpp.orig	Thu Jan 22 13:48:18 2004
++++ Sources/Sound/Sound/ClanSound/cdaudio_linux.cpp	Thu Jan 22 14:02:41 2004
+@@ -293,7 +293,7 @@
+ {
+ 	#ifdef __FreeBSD__
+ 	ioc_read_subchannel sub_channel; 
+-	cd_sub_channel_header subinfo;
++	cd_sub_channel_info subinfo;
+ 
+ 	sub_channel.data_len = sizeof(subinfo);
+ 	sub_channel.data = &subinfo;	
+@@ -310,7 +310,7 @@
+ #ifdef __FreeBSD__
+ 	if(!ioctl(file_handle,CDIOCREADSUBCHANNEL, &sub_channel))
+ 	{
+-		if(subinfo.audio_status == CD_AS_PLAY_IN_PROGRESS)
++		if(subinfo.header.audio_status == CD_AS_PLAY_IN_PROGRESS)
+ 			return true;
+ 		else
+ 			return false;
+@@ -562,8 +562,8 @@
+ 	        return false;
+ 	    
+ #ifdef __FreeBSD__
+-			track.start_lba = cur_track_info.entry.addr.lba
+-			track.track_length = next_track_info.entry.data_len;
++	    track.start_lba = cur_track_info.entry.addr.lba;
++	    track.track_length = next_track_info.entry.addr.lba - cur_track_info.entry.addr.lba;
+ #else
+ 	    track.start_lba = cur_track_info.cdte_addr.lba;
+ 	    track.track_length = next_track_info.cdte_addr.lba - cur_track_info.cdte_addr.lba;
diff --git a/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::oss.cpp b/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::oss.cpp
new file mode 100644
index 000000000000..37d92875dce9
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::Sound::Sound::ClanSound::oss.cpp
@@ -0,0 +1,17 @@
+--- Sources/Sound/Sound/ClanSound/oss.cpp.orig	Thu Jan 22 13:09:00 2004
++++ Sources/Sound/Sound/ClanSound/oss.cpp	Thu Jan 22 13:10:07 2004
+@@ -28,6 +28,14 @@
+ #include "API/Core/System/system.h"
+ #include <Sound/Sound/ClanSound/oss.h>
+ 
++#ifndef 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
++
+ // If USE_DRIVER_FRAGSIZE is defined, we use the fragsize (and number of them)
+ // used by the soundcard driver. This is not as efficient as using our own
+ // settings - mainly provided for debugging.
diff --git a/devel/clanlib/files/patch-configure b/devel/clanlib/files/patch-configure
index 247c45ec6eb1..f02544e18695 100644
--- a/devel/clanlib/files/patch-configure
+++ b/devel/clanlib/files/patch-configure
@@ -1,10 +1,33 @@
---- configure.orig	Sun Sep  7 22:30:57 2003
-+++ configure	Mon Sep  8 02:32:28 2003
-@@ -18545,6 +18545,7 @@
+--- configure.orig	Sun Nov  3 22:41:57 2002
++++ configure	Fri Jan 23 15:49:01 2004
+@@ -3375,7 +3375,7 @@
+   fi
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+   OLDLIBS="$LIBS"
+-  LIBS="$x_libraries -lGL -lGLU -lpthread -lGL"
++  LIBS="$x_libraries -lGL -lGLU -lGL"
+   echo "$as_me:$LINENO: checking for GL" >&5
+ echo $ECHO_N "checking for GL... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+@@ -5268,18 +5268,18 @@
+   enableval="$enable_debug"
+ 
+   if test "$enableval" == "yes"; then
+-    comp_mode="-DDEBUG=1 -g3 -ggdb3 -O0"
++    comp_mode=
+     echo "$as_me:$LINENO: result: enabled" >&5
+ echo "${ECHO_T}enabled" >&6
+   else
+-    comp_mode="-O2"
++    comp_mode=
+     echo "$as_me:$LINENO: result: *********** <-- DISABLED --> ***********" >&5
+ echo "${ECHO_T}*********** <-- DISABLED --> ***********" >&6
+   fi
+ 
+ else
+ 
+-  comp_mode="-DDEBUG=1 -g3 -ggdb3"
++  comp_mode=
+   echo "$as_me:$LINENO: result: enabled" >&5
+ echo "${ECHO_T}enabled" >&6
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/clanlib/files/patch-inputbox.cpp b/devel/clanlib/files/patch-inputbox.cpp
deleted file mode 100644
index 6267f55bea24..000000000000
--- a/devel/clanlib/files/patch-inputbox.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Sources/GUI/inputbox.cpp.orig	Tue Oct 21 03:51:39 2003
-+++ Sources/GUI/inputbox.cpp	Tue Oct 21 04:05:08 2003
-@@ -21,6 +21,7 @@
- */
- 
- #include "precomp.h"
-+#include <cstdio>
- #include "API/Core/XML/dom_element.h"
- #include "API/GUI/inputbox.h"
- #include "API/GUI/stylemanager.h"
diff --git a/devel/clanlib/files/patch-mutex_pthread.cpp b/devel/clanlib/files/patch-mutex_pthread.cpp
deleted file mode 100644
index 5eb5d212d541..000000000000
--- a/devel/clanlib/files/patch-mutex_pthread.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 6432f6d19b4e..000000000000
--- a/devel/clanlib/files/patch-socket.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6603e39bd5ac..000000000000
--- a/devel/clanlib/files/patch-soundoutput_oss.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/patch-soundprovider_recorder_oss.cpp b/devel/clanlib/files/patch-soundprovider_recorder_oss.cpp
deleted file mode 100644
index 703d668b2cad..000000000000
--- a/devel/clanlib/files/patch-soundprovider_recorder_oss.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- Sources/Sound/SoundProviders/Unix/soundprovider_recorder_oss.cpp.orig	Tue Sep 23 07:15:13 2003
-+++ Sources/Sound/SoundProviders/Unix/soundprovider_recorder_oss.cpp	Tue Oct 21 02:52:21 2003
-@@ -34,6 +34,13 @@
- #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_SoundProvider_Recorder_OSS_Session construction:
diff --git a/devel/clanlib/files/patch-thread_pthread.cpp b/devel/clanlib/files/patch-thread_pthread.cpp
deleted file mode 100644
index e9cae5ddd1ed..000000000000
--- a/devel/clanlib/files/patch-thread_pthread.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- Sources/Core/System/Unix/thread_pthread.cpp.orig	Thu Oct  9 02:43:49 2003
-+++ Sources/Core/System/Unix/thread_pthread.cpp	Tue Oct 21 01:22:12 2003
-@@ -158,5 +158,5 @@
- 
- int CL_Thread::get_current_id()
- {
--	return pthread_self();
-+	return (int)pthread_self();
- }