upgrade to 1.9.5

PR:		95111
Submitted by:	Ports Fury

4 files changed, 36 insertions, 10 deletions

diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 0509cca89e1f..5309328204ad 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -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 @@ LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
 
 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}"
@@ -33,10 +32,6 @@ MANLANG=	"" de fr ru
 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 \
 		${PREFIX}/share/gnome/applications
diff --git a/graphics/gliv/distinfo b/graphics/gliv/distinfo
index 82ddf12ec978..05a3900d2222 100644
--- a/graphics/gliv/distinfo
+++ b/graphics/gliv/distinfo
@@ -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 --git a/graphics/gliv/files/patch-lib__getdelim.c b/graphics/gliv/files/patch-lib__getdelim.c
new file mode 100644
index 000000000000..c9609ecddbff
--- /dev/null
+++ b/graphics/gliv/files/patch-lib__getdelim.c
@@ -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 --git a/graphics/gliv/files/patch-src__matrix.c b/graphics/gliv/files/patch-src__matrix.c
new file mode 100644
index 000000000000..8b9eb5f7c294
--- /dev/null
+++ b/graphics/gliv/files/patch-src__matrix.c
@@ -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().