From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 5 20:20:33 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D7DE16A403 for ; Thu, 5 Oct 2006 20:20:33 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66AE143D49 for ; Thu, 5 Oct 2006 20:20:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k95KKJag097119 for ; Thu, 5 Oct 2006 20:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k95KKJ84097114; Thu, 5 Oct 2006 20:20:19 GMT (envelope-from gnats) Resent-Date: Thu, 5 Oct 2006 20:20:19 GMT Resent-Message-Id: <200610052020.k95KKJ84097114@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Sund Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7835916A40F for ; Thu, 5 Oct 2006 20:14:12 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DCC043D55 for ; Thu, 5 Oct 2006 20:14:09 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k95KE92n069877 for ; Thu, 5 Oct 2006 20:14:09 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k95KE8re069876; Thu, 5 Oct 2006 20:14:09 GMT (envelope-from nobody) Message-Id: <200610052014.k95KE8re069876@www.freebsd.org> Date: Thu, 5 Oct 2006 20:14:09 GMT From: Matthias Sund To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/104030: [patch] devel/upp: SDL, library dependencies and socket X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Oct 2006 20:20:33 -0000 >Number: 104030 >Category: misc >Synopsis: [patch] devel/upp: SDL, library dependencies and socket >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 05 20:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Matthias Sund >Release: 6.2-PRERELEASE >Organization: >Environment: FreeBSD travelmate 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Thu Sep 28 14:24:07 CEST 2006 masu@travelmate:/usr/obj/usr/src/sys/TRAVELMATE i386 >Description: - added socket patch to fix (non-)blocking behaviour - fixed a few library dependencies for upp packages - changed SDL usage (to reflect recent change in devel/sdl12) >How-To-Repeat: >Fix: diff -ruN upp_orig/Makefile upp/Makefile --- upp_orig/Makefile Wed Oct 4 23:15:21 2006 +++ upp/Makefile Wed Oct 4 23:56:36 2006 @@ -7,7 +7,7 @@ PORTNAME= upp PORTVERSION= 605 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,6 +24,7 @@ USE_DOS2UNIX= yes USE_GMAKE= yes USE_X_PREFIX= yes +USE_XLIB= yes .if defined(WITH_SDL) USE_SDL= sdl diff -ruN upp_orig/files/patch-examples-SDLExample-SDLExample.upp upp/files/patch-examples-SDLExample-SDLExample.upp --- upp_orig/files/patch-examples-SDLExample-SDLExample.upp Wed Oct 4 23:15:21 2006 +++ upp/files/patch-examples-SDLExample-SDLExample.upp Thu Oct 5 00:04:48 2006 @@ -1,12 +1,10 @@ ---- examples/SDLExample/SDLExample.upp.orig Tue Jun 6 20:57:56 2006 -+++ examples/SDLExample/SDLExample.upp Tue Jun 6 21:18:25 2006 -@@ -7,6 +7,10 @@ +--- 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-1.1 m vgl X11 Xext vga aa usbhid"; -+ -+link(FREEBSD) -pthread; ++library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses"; + file main.cpp; diff -ruN upp_orig/files/patch-examples-SDLExample-main.cpp upp/files/patch-examples-SDLExample-main.cpp --- upp_orig/files/patch-examples-SDLExample-main.cpp Wed Oct 4 23:15:21 2006 +++ upp/files/patch-examples-SDLExample-main.cpp Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- examples/SDLExample/main.cpp.orig Tue Jun 6 21:18:47 2006 -+++ examples/SDLExample/main.cpp Tue Jun 6 21:18:58 2006 -@@ -3,7 +3,7 @@ - #ifdef PLATFORM_WIN32 - #include - #else --#include -+#include - #endif - - const int maxpoint = 1000; diff -ruN upp_orig/files/patch-uppsrc-Core-Core.upp upp/files/patch-uppsrc-Core-Core.upp --- upp_orig/files/patch-uppsrc-Core-Core.upp Thu Jan 1 01:00:00 1970 +++ upp/files/patch-uppsrc-Core-Core.upp Thu Oct 5 00:05:17 2006 @@ -0,0 +1,11 @@ +--- uppsrc/Core/Core.upp.orig Thu Oct 5 00:00:40 2006 ++++ uppsrc/Core/Core.upp Thu Oct 5 00:01:06 2006 +@@ -7,6 +7,8 @@ + + library(LINUX) "pthread dl"; + ++library(FREEBSD) "pthread"; ++ + library(WIN32) "advapi32 shell32 winmm"; + + library(SOLARIS) "posix4 dl"; diff -ruN upp_orig/files/patch-uppsrc-Draw-Draw.upp upp/files/patch-uppsrc-Draw-Draw.upp --- upp_orig/files/patch-uppsrc-Draw-Draw.upp Thu Jan 1 01:00:00 1970 +++ upp/files/patch-uppsrc-Draw-Draw.upp Thu Oct 5 00:05:48 2006 @@ -0,0 +1,15 @@ +--- 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, diff -ruN upp_orig/files/patch-uppsrc-Web-socket.cpp upp/files/patch-uppsrc-Web-socket.cpp --- upp_orig/files/patch-uppsrc-Web-socket.cpp Thu Jan 1 01:00:00 1970 +++ upp/files/patch-uppsrc-Web-socket.cpp Thu Oct 5 20:51:38 2006 @@ -0,0 +1,42 @@ +--- 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; + } >Release-Note: >Audit-Trail: >Unformatted: