Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Nov 2001 06:47:17 -0600 (CST)
From:      Jeremy Norris <ishmael27@home.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/32186: Update port graphics/gliv
Message-ID:  <200111221247.fAMClHW90502@babylon.merseine.nu>

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

>Number:         32186
>Category:       ports
>Synopsis:       Update port graphics/gliv
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 22 04:50:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Norris
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD babylon.merseine.nu 4.4-STABLE FreeBSD 4.4-STABLE #0: Mon Nov 5 20:03:33 CST 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386

>Description:
Update port graphics/gliv to latest version, 1.4.1.

>How-To-Repeat:
Don't forget to cvs rm files/patch-rendering.c

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gliv/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	4 Nov 2001 10:04:08 -0000	1.6
+++ Makefile	22 Nov 2001 12:36:23 -0000
@@ -6,28 +6,29 @@
 #
 
 PORTNAME=	gliv
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://gliv.tuxfamily.org/
 
 MAINTAINER=	ishmael27@home.com
 
-LIB_DEPENDS=	Imlib2.1:${PORTSDIR}/graphics/imlib2 \
-		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+BUILD_DEPENDS=	${LOCALBASE}/bin/Magick-config:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+RUN_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GTK=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgnugetopt -L${X11BASE}/lib \
-			-lGLU -lGL -lXext -lX11 -lm ${PTHREAD_LIBS}"
+			-lXext -lX11 ${PTHREAD_LIBS}" \
+		GDK_PIXBUF_CONFIG=${X11BASE}/bin/gdk-pixbuf-config \
+		MAGICK_CONFIG=${LOCALBASE}/bin/Magick-config
+CONFIGURE_ARGS=	--disable-gtk2
 
 MAN1=		gliv.1
-
-post-patch:
-	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/gliv/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	4 Nov 2001 10:04:08 -0000	1.5
+++ distinfo	22 Nov 2001 11:51:51 -0000
@@ -1 +1 @@
-MD5 (gliv-1.3.1.tar.bz2) = 713433627e805ffe3265a1ec00ec2a41
+MD5 (gliv-1.4.1.tar.bz2) = 8d32c1b048148951887d8174b2e047b3
Index: pkg-comment
===================================================================
RCS file: /home/ncvs/ports/graphics/gliv/pkg-comment,v
retrieving revision 1.1
diff -u -r1.1 pkg-comment
--- pkg-comment	17 Mar 2001 16:35:37 -0000	1.1
+++ pkg-comment	22 Nov 2001 12:39:23 -0000
@@ -1 +1 @@
-An image viewer that uses Imlib2 and OpenGL
+An image viewer that uses Gdk-Pixbuf and OpenGL
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/graphics/gliv/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	23 Mar 2001 14:08:40 -0000	1.2
+++ pkg-descr	22 Nov 2001 12:39:09 -0000
@@ -1,3 +1,3 @@
-An Image viewer that uses Imlib2 to load images, and OpenGL to render them.
+An Image viewer that uses Gdk-Pixbuf to load images, and OpenGL to render them.
 
 WWW: http://gliv.tuxfamily.org/
Index: files/patch-rendering.c
===================================================================
RCS file: files/patch-rendering.c
diff -N files/patch-rendering.c
--- files/patch-rendering.c	4 Nov 2001 10:04:08 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- rendering.c.orig	Thu Sep 13 12:55:36 2001
-+++ rendering.c	Sun Sep 30 20:47:40 2001
-@@ -27,9 +27,14 @@
- #include <GL/glu.h>
- #include "gliv.h"
- 
-+/* FreeBSD has no fminf/fmin, so fake it */
-+#if 0
- #ifndef HAVE_FMINF
- #define fminf fmin
- #endif
-+#endif
-+
-+#define fminf(A, B) ((A) < (B) ? (A) : (B))
- 
- #ifndef HAVE_FABSF
- #define fabsf fabs
Index: files/patch-src::imagemagick.c
===================================================================
RCS file: files/patch-src::imagemagick.c
diff -N files/patch-src::imagemagick.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src::imagemagick.c	22 Nov 2001 12:44:00 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/imagemagick.c.orig	Wed Nov 21 13:19:48 2001
++++ src/imagemagick.c	Thu Nov 22 06:12:10 2001
+@@ -22,7 +22,7 @@
+  * Loading through ImageMagick. *
+  ********************************/
+ 
+-#include <fcntl.h>              /* S_IRWXU */
++#include <sys/stat.h>           /* S_IRWXU */
+ #include <stdio.h>              /* tmpnam() */
+ #include <time.h>               /* time() */
+ #include <unistd.h>             /* chdir(), getpid(), unlink() */
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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