Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Mar 2006 01:00:22 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/95111: Update port: graphics/gliv to 1.9.5
Message-ID:  <20060331010022.f024166f.tkato432@yahoo.com>
Resent-Message-ID: <200603301610.k2UGALMB074991@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95111
>Category:       ports
>Synopsis:       Update port: graphics/gliv to 1.9.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:   Thu Mar 30 16:10:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p15 i386
>Organization:
>Environment:
>Description:
- Update to version 1.9.5

New file:
files/patch-lib__getdelim.c
files/patch-src__matrix.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/gliv/Makefile graphics/gliv/Makefile
--- /usr/ports/graphics/gliv/Makefile	Sat Nov 19 14:30:02 2005
+++ graphics/gliv/Makefile	Mon Mar 20 14:10:22 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gliv
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://guichaz.free.fr/gliv/
 
@@ -17,10 +17,9 @@
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
 USE_GETOPT_LONG=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -32,10 +31,6 @@
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|"stdio\.h"|<getdelim.h>|g ; \
-		 s|"stdlib\.h"|<stdlib.h>|g' ${WRKSRC}/lib/getdelim.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gliv.desktop \
diff -urN /usr/ports/graphics/gliv/distinfo graphics/gliv/distinfo
--- /usr/ports/graphics/gliv/distinfo	Sat Nov 19 14:30:02 2005
+++ graphics/gliv/distinfo	Mon Mar 20 12:01:17 2006
@@ -1,3 +1,3 @@
-MD5 (gliv-1.9.4.tar.bz2) = 757d5bd6d6c5b7b863bb7ffa96fc9b5c
-SHA256 (gliv-1.9.4.tar.bz2) = 4803b06fecf6f416e03f8846123c20248be8ab826fa0f8fa0953c27995daacbb
-SIZE (gliv-1.9.4.tar.bz2) = 495279
+MD5 (gliv-1.9.5.tar.bz2) = aca30a763f84db7e3ff11194ee53096d
+SHA256 (gliv-1.9.5.tar.bz2) = 6e653b92f77dbe4eddcf63aa263e4701c7f4a3df8c7ea1f1c21e8aec7818fa95
+SIZE (gliv-1.9.5.tar.bz2) = 508325
diff -urN /usr/ports/graphics/gliv/files/patch-lib__getdelim.c graphics/gliv/files/patch-lib__getdelim.c
--- /usr/ports/graphics/gliv/files/patch-lib__getdelim.c	Thu Jan  1 09:00:00 1970
+++ graphics/gliv/files/patch-lib__getdelim.c	Mon Mar 20 12:43:21 2006
@@ -0,0 +1,17 @@
+--- lib/getdelim.c.orig	Thu Jul  7 03:46:17 2005
++++ lib/getdelim.c	Mon Mar 20 12:42:53 2006
+@@ -7,8 +7,12 @@
+  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
+  */
+ 
+-#include "stdio.h"
+-#include "stdlib.h"
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifndef HAVE_GETDELIM
++#include "getdelim.h"
++#endif
+ 
+ /* Note: There is a defect in this function.  (size_t vs ssize_t). */
+ 
diff -urN /usr/ports/graphics/gliv/files/patch-src__matrix.c graphics/gliv/files/patch-src__matrix.c
--- /usr/ports/graphics/gliv/files/patch-src__matrix.c	Thu Jan  1 09:00:00 1970
+++ graphics/gliv/files/patch-src__matrix.c	Mon Mar 20 14:13:30 2006
@@ -0,0 +1,14 @@
+--- src/matrix.c.orig	Tue Nov 22 07:30:44 2005
++++ src/matrix.c	Mon Mar 20 14:13:22 2006
+@@ -35,6 +35,11 @@
+ extern options_struct *options;
+ extern GlivImage *current_image;
+ 
++#if !defined(INFINITY)
++#define HUGE_VALF (float)HUGE_VAL
++#define INFINITY HUGE_VALF
++#endif
++
+ /*
+  * OpenGL uses a transposed matrix, we use a 'normal' one,
+  * we transpose it just before glLoadMatrix().
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060331010022.f024166f.tkato432>