Attachment #71411 for bug #104030

View | Details | Raw Unified | Return to bug 104030
Collapse All | Expand All

Lines 7-13 Link Here

(-)upp/Makefile (-1 / +2 lines)
7		7
8	PORTNAME= upp	8	PORTNAME= upp
9	PORTVERSION= 605	9	PORTVERSION= 605
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel x11-toolkits	11	CATEGORIES= devel x11-toolkits
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 24-29 Link Here
24	USE_DOS2UNIX= yes	24	USE_DOS2UNIX= yes
25	USE_GMAKE= yes	25	USE_GMAKE= yes
26	USE_X_PREFIX= yes	26	USE_X_PREFIX= yes
		27	USE_XLIB= yes
27		28
28	.if defined(WITH_SDL)	29	.if defined(WITH_SDL)
29	USE_SDL= sdl	30	USE_SDL= sdl




--- examples/SDLExample/SDLExample.upp.orig	Wed Oct  4 23:58:12 2006
+++ examples/SDLExample/SDLExample.upp	Thu Oct  5 00:00:08 2006
@@ -7,6 +7,8 @@
 
 library(LINUX) "SDL SDLmain";
 
+library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses";
+
+link(FREEBSD) -pthread;
+
 file
 	main.cpp;

Lines 1-11 Link Here

(-)upp/files/patch-examples-SDLExample-main.cpp (-11 lines)
1	--- examples/SDLExample/main.cpp.orig Tue Jun 6 21:18:47 2006
2	+++ examples/SDLExample/main.cpp Tue Jun 6 21:18:58 2006
3	@@ -3,7 +3,7 @@
4	#ifdef PLATFORM_WIN32
5	#include <SDL.h>
6	#else
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#endif
10
11	const int maxpoint = 1000;

Line 0 Link Here

(-)upp/files/patch-uppsrc-Core-Core.upp (+11 lines)
	1	--- uppsrc/Core/Core.upp.orig Thu Oct 5 00:00:40 2006
	2	+++ uppsrc/Core/Core.upp Thu Oct 5 00:01:06 2006
	3	@@ -7,6 +7,8 @@
	4
	5	library(LINUX) "pthread dl";
	6
	7	+library(FREEBSD) "pthread";
	8	+
	9	library(WIN32) "advapi32 shell32 winmm";
	10
	11	library(SOLARIS) "posix4 dl";




--- uppsrc/Draw/Draw.upp.orig	Thu Oct  5 00:01:36 2006
+++ uppsrc/Draw/Draw.upp	Thu Oct  5 00:03:16 2006
@@ -11,11 +11,9 @@
 
 library(FREEBSD) X11;
 
-library(FREEBSD !XLFD) "Xft fontconfig";
+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
 
 library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
-
-library(FREEBSD) "Xrender freetype expat";
 
 file
 	Draw.h,




--- uppsrc/Web/socket.cpp.orig	Thu Oct  5 00:43:27 2006
+++ uppsrc/Web/socket.cpp	Thu Oct  5 20:33:14 2006
@@ -12,6 +12,12 @@
 {
 	NB_TIMEOUT  = 30000,
 	SOCKBUFSIZE = 65536,
+
+#ifdef PLATFORM_WIN32
+	IS_BLOCKED = SOCKERR(EWOULDBLOCK),
+#else
+	IS_BLOCKED = SOCKERR(EINPROGRESS),
+#endif
 };
 
 static bool LogSocketFlag = false;
@@ -202,7 +208,7 @@
 		return true;
 
 	int err = GetLastError();
-	if(err != SOCKERR(EWOULDBLOCK)) {
+	if(err != IS_BLOCKED) {
 		SetSockError(NFormat("connect(%s:%d)", host, port));
 		SLOG("Socket::Data::OpenClient -> connect error, returning false");
 		return false;
@@ -274,7 +280,7 @@
 #endif
 	if(res == 0)
 		is_eof = true;
-	else if(res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
+	else if(res < 0 && GetLastError() != IS_BLOCKED)
 		SetSockError("recv");
 	return res;
 }
@@ -282,7 +288,7 @@
 int Socket::Data::Write(const void *buf, int amount)
 {
 	int res = send(socket, (const char *)buf, amount, 0);
-	if(res == 0 || res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
+	if(res == 0 || res < 0 && GetLastError() != IS_BLOCKED)
 		SetSockError("send");
 	return res;
 }

Return to bug 104030

Lines 1-12 Link Here

(-)upp/files/patch-examples-SDLExample-SDLExample.upp (-6 / +4 lines)
1	--- examples/SDLExample/SDLExample.upp.orig Tue Jun 6 20:57:56 2006	1	--- examples/SDLExample/SDLExample.upp.orig Wed Oct 4 23:58:12 2006
2	+++ examples/SDLExample/SDLExample.upp Tue Jun 6 21:18:25 2006	2	+++ examples/SDLExample/SDLExample.upp Thu Oct 5 00:00:08 2006
3	@@ -7,6 +7,10 @@	3	@@ -7,6 +7,8 @@
4		4
5	library(LINUX) "SDL SDLmain";	5	library(LINUX) "SDL SDLmain";
6		6
7	+library(FREEBSD) "SDL-1.1 m vgl X11 Xext vga aa usbhid";	7	+library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses";
8	+
9	+link(FREEBSD) -pthread;
10	+	8	+
11	file	9	file
12	main.cpp;	10	main.cpp;

Line 0 Link Here

(-)upp/files/patch-uppsrc-Draw-Draw.upp (+15 lines)
	1	--- uppsrc/Draw/Draw.upp.orig Thu Oct 5 00:01:36 2006
	2	+++ uppsrc/Draw/Draw.upp Thu Oct 5 00:03:16 2006
	3	@@ -11,11 +11,9 @@
	4
	5	library(FREEBSD) X11;
	6
	7	-library(FREEBSD !XLFD) "Xft fontconfig";
	8	+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
	9
	10	library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
	11	-
	12	-library(FREEBSD) "Xrender freetype expat";
	13
	14	file
	15	Draw.h,

Line 0 Link Here

(-)upp/files/patch-uppsrc-Web-socket.cpp (+42 lines)
	1	--- uppsrc/Web/socket.cpp.orig Thu Oct 5 00:43:27 2006
	2	+++ uppsrc/Web/socket.cpp Thu Oct 5 20:33:14 2006
	3	@@ -12,6 +12,12 @@
	4	{
	5	NB_TIMEOUT = 30000,
	6	SOCKBUFSIZE = 65536,
	7	+
	8	+#ifdef PLATFORM_WIN32
	9	+ IS_BLOCKED = SOCKERR(EWOULDBLOCK),
	10	+#else
	11	+ IS_BLOCKED = SOCKERR(EINPROGRESS),
	12	+#endif
	13	};
	14
	15	static bool LogSocketFlag = false;
	16	@@ -202,7 +208,7 @@
	17	return true;
	18
	19	int err = GetLastError();
	20	- if(err != SOCKERR(EWOULDBLOCK)) {
	21	+ if(err != IS_BLOCKED) {
	22	SetSockError(NFormat("connect(%s:%d)", host, port));
	23	SLOG("Socket::Data::OpenClient -> connect error, returning false");
	24	return false;
	25	@@ -274,7 +280,7 @@
	26	#endif
	27	if(res == 0)
	28	is_eof = true;
	29	- else if(res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
	30	+ else if(res < 0 && GetLastError() != IS_BLOCKED)
	31	SetSockError("recv");
	32	return res;
	33	}
	34	@@ -282,7 +288,7 @@
	35	int Socket::Data::Write(const void *buf, int amount)
	36	{
	37	int res = send(socket, (const char *)buf, amount, 0);
	38	- if(res == 0 \|\| res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
	39	+ if(res == 0 \|\| res < 0 && GetLastError() != IS_BLOCKED)
	40	SetSockError("send");
	41	return res;
	42	}