From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 27 18:10:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 913AF106567C for ; Tue, 27 May 2008 18:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 733CD8FC23 for ; Tue, 27 May 2008 18:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4RIA4cr038372 for ; Tue, 27 May 2008 18:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4RIA458038371; Tue, 27 May 2008 18:10:04 GMT (envelope-from gnats) Resent-Date: Tue, 27 May 2008 18:10:04 GMT Resent-Message-Id: <200805271810.m4RIA458038371@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CCD4106566B for ; Tue, 27 May 2008 18:02:15 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id 352828FC1C for ; Tue, 27 May 2008 18:02:15 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (U051221.ppp.dion.ne.jp [218.222.51.221]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id C57E223C031 for ; Wed, 28 May 2008 03:02:11 +0900 (JST) Message-Id: <20080528030044.13fc1bd6.tkato432@yahoo.com> Date: Wed, 28 May 2008 03:00:44 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/124046: Update port: x11-toolkits/plib to 1.8.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2008 18:10:04 -0000 >Number: 124046 >Category: ports >Synopsis: Update port: x11-toolkits/plib to 1.8.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 27 18:10:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.3-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.8.5 Remove file: files/patch-src::sl::slPortability.h files/patch-src_js_jsBSD.cxx files/patch-src_ssgAux_ssgaSky.h >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/plib/Makefile x11-toolkits/plib/Makefile --- /usr/ports/x11-toolkits/plib/Makefile 2008-04-29 21:57:00.000000000 +0900 +++ x11-toolkits/plib/Makefile 2008-05-15 16:17:04.000000000 +0900 @@ -6,20 +6,27 @@ # PORTNAME= plib -PORTVERSION= 1.8.4 -PORTREVISION= 5 +PORTVERSION= 1.8.5 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math +USE_GNOME= gnometarget USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + CXXFLAGS+= -fPIC -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread||g ; \ + s|-ldl||g ; \ + s|-lc_r||g' ${WRKSRC}/configure post-build: ${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c diff -urN /usr/ports/x11-toolkits/plib/distinfo x11-toolkits/plib/distinfo --- /usr/ports/x11-toolkits/plib/distinfo 2006-01-24 13:44:45.000000000 +0900 +++ x11-toolkits/plib/distinfo 2008-05-15 16:13:03.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (plib-1.8.4.tar.gz) = 5e3f289a9d1c5de0b1cfdec76bf139e6 -SHA256 (plib-1.8.4.tar.gz) = 79e71d02fc2d7c984a4341239ed1d89ced743db2d6d4f83c30c422edaa6020e1 -SIZE (plib-1.8.4.tar.gz) = 793758 +MD5 (plib-1.8.5.tar.gz) = 47a6fbf63668c1eed631024038b2ea90 +SHA256 (plib-1.8.5.tar.gz) = 485b22bf6fdc0da067e34ead5e26f002b76326f6371e2ae006415dea6a380a32 +SIZE (plib-1.8.5.tar.gz) = 779133 diff -urN /usr/ports/x11-toolkits/plib/files/patch-src::sl::slPortability.h x11-toolkits/plib/files/patch-src::sl::slPortability.h --- /usr/ports/x11-toolkits/plib/files/patch-src::sl::slPortability.h 2002-09-08 10:10:53.000000000 +0900 +++ x11-toolkits/plib/files/patch-src::sl::slPortability.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./src/sl/slPortability.h.orig Sat Sep 7 17:54:59 2002 -+++ ./src/sl/slPortability.h Sat Sep 7 17:55:22 2002 -@@ -74,7 +74,7 @@ - # if defined(__linux__) - # include - # elif defined(__FreeBSD__) --# include -+# include - # else - /* - Tom thinks this file may be under some diff -urN /usr/ports/x11-toolkits/plib/files/patch-src_js_jsBSD.cxx x11-toolkits/plib/files/patch-src_js_jsBSD.cxx --- /usr/ports/x11-toolkits/plib/files/patch-src_js_jsBSD.cxx 2005-12-07 19:07:28.000000000 +0900 +++ x11-toolkits/plib/files/patch-src_js_jsBSD.cxx 1970-01-01 09:00:00.000000000 +0900 @@ -1,48 +0,0 @@ ---- src/js/jsBSD.cxx.orig Wed Jan 12 02:22:26 2005 -+++ src/js/jsBSD.cxx Wed Dec 7 10:35:27 2005 -@@ -44,6 +44,8 @@ - #define HAVE_USB_JS 1 - #endif - -+#include -+#include - #include - #if defined(__FreeBSD__) - # include -@@ -312,7 +314,7 @@ - int buttons [ _JS_MAX_AXES ] ; - - rawRead ( buttons, axes ) ; -- error = axes[0] < -1000000000.0f ; -+ error = axes[0] < -1000000000.0f && axes[1] < -1000000000.0f ; - if ( error ) - return ; - -@@ -321,7 +323,11 @@ - joyfile = fopen ( joyfname, "r" ) ; - error = ( joyfile == NULL ) ; - if ( error ) -+ { -+ ulSetError ( UL_WARNING, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)", -+ joyfname, strerror ( errno ), id + 1 ); - return ; -+ } - - noargs = fscanf ( joyfile, "%d%f%f%f%f%f%f", &in_no_axes, - &min [ 0 ], ¢er [ 0 ], &max [ 0 ], -@@ -445,8 +451,13 @@ - - if ( axes != NULL ) - { -- axes[0] = (float) os->ajs.x ; -- axes[1] = (float) os->ajs.y ; -+ if ( os->ajs.x >= -1000000000 ) -+ os->cache_axes[0] = os->ajs.x; -+ if ( os->ajs.y >= -1000000000 ) -+ os->cache_axes[1] = os->ajs.y; -+ -+ axes[0] = os->cache_axes[0]; -+ axes[1] = os->cache_axes[1]; - } - - return; diff -urN /usr/ports/x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h --- /usr/ports/x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h 2007-10-02 13:29:40.000000000 +0900 +++ x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- src/ssgAux/ssgaSky.h.orig Fri Apr 6 03:58:33 2007 -+++ src/ssgAux/ssgaSky.h Fri Apr 6 03:58:45 2007 -@@ -104,7 +104,7 @@ - ssgaCelestialBodyList ( int init = 3 ) - : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { } - -- ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); } -+ ~ssgaCelestialBodyList () { removeAll(); } - - int getNum (void) { return total ; } - -@@ -192,7 +192,7 @@ - ssgaCloudLayerList ( int init = 3 ) - : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { } - -- ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); } -+ ~ssgaCloudLayerList () { removeAll(); } - - int getNum (void) { return total ; } - >Release-Note: >Audit-Trail: >Unformatted: