From 278c1a98a989c10c5f2a06a7aa39615820656e32 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 13 Mar 2008 14:08:22 +0000
Subject: - Update to 1.2.7 - Got rid of library renaming as done for
 devel/sdl12

PR:		117797
Submitted by:	Marcus von Appen <mva@sysfault.org>
---
 net/sdl_net/files/patch-Makefile.in    | 10 ----------
 net/sdl_net/files/patch-SDLnetselect.c | 29 -----------------------------
 net/sdl_net/files/patch-SDLnetsys.h    | 14 ++++++++++++++
 net/sdl_net/files/patch-aa             | 14 --------------
 4 files changed, 14 insertions(+), 53 deletions(-)
 delete mode 100644 net/sdl_net/files/patch-Makefile.in
 delete mode 100644 net/sdl_net/files/patch-SDLnetselect.c
 create mode 100644 net/sdl_net/files/patch-SDLnetsys.h
 delete mode 100644 net/sdl_net/files/patch-aa

(limited to 'net/sdl_net/files')

diff --git a/net/sdl_net/files/patch-Makefile.in b/net/sdl_net/files/patch-Makefile.in
deleted file mode 100644
index 93796b1512a6..000000000000
--- a/net/sdl_net/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Thu Aug 31 14:52:06 2006
-+++ Makefile.in	Thu Aug 31 14:52:12 2006
-@@ -263,7 +263,6 @@
- libSDL_net_la_LIBADD = @INETLIB@
- libSDL_net_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- @HAVE_GUI_LIB_FALSE@EXAMPLES = 
diff --git a/net/sdl_net/files/patch-SDLnetselect.c b/net/sdl_net/files/patch-SDLnetselect.c
deleted file mode 100644
index b29640787a83..000000000000
--- a/net/sdl_net/files/patch-SDLnetselect.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- SDLnetselect.c	2001/07/25 09:44:01	1.1
-+++ SDLnetselect.c	2001/07/25 09:45:57
-@@ -175,6 +175,7 @@
- 	SOCKET maxfd;
- 	int retval;
- 	struct timeval tv;
-+	struct timeval *tmp;
- 	fd_set mask;
- 
- 	/* Find the largest file descriptor */
-@@ -199,8 +200,14 @@
- 		tv.tv_sec = timeout/1000;
- 		tv.tv_usec = (timeout%1000)*1000;
- 
-+		/* XXX: Workaround for a bug in FreeBSD - w/o it in some cases select() chews 100% CPU */
-+		if (timeout == ~0)
-+			tmp = NULL;
-+		else
-+			tmp = &tv;
-+
- 		/* Look! */
--		retval = select(maxfd+1, &mask, NULL, NULL, &tv);
-+		retval = select(maxfd+1, &mask, NULL, NULL, tmp);
- 	} while ( errno == EINTR );
- 
- 	/* Mark all file descriptors ready that have data available */
diff --git a/net/sdl_net/files/patch-SDLnetsys.h b/net/sdl_net/files/patch-SDLnetsys.h
new file mode 100644
index 000000000000..db99084f9e97
--- /dev/null
+++ b/net/sdl_net/files/patch-SDLnetsys.h
@@ -0,0 +1,14 @@
+--- SDLnetsys.h.orig	Sun Jul  2 02:28:47 2000
++++ SDLnetsys.h	Wed Sep 20 18:42:27 2000
+@@ -41,6 +41,11 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #ifndef __BEOS__
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#endif /* FreeBSD */
+ #include <arpa/inet.h>
+ #endif
+ #include <netinet/in.h>
diff --git a/net/sdl_net/files/patch-aa b/net/sdl_net/files/patch-aa
deleted file mode 100644
index db99084f9e97..000000000000
--- a/net/sdl_net/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- SDLnetsys.h.orig	Sun Jul  2 02:28:47 2000
-+++ SDLnetsys.h	Wed Sep 20 18:42:27 2000
-@@ -41,6 +41,11 @@
- #include <unistd.h>
- #include <fcntl.h>
- #ifndef __BEOS__
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#endif /* FreeBSD */
- #include <arpa/inet.h>
- #endif
- #include <netinet/in.h>
-- 
cgit v1.2.3