Update to 1.4.1

PR:		32186
Submitted by:	maintainer

6 files changed, 24 insertions, 29 deletions

diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 7dcfb0eba2c2..5d884c65e568 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -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>
diff --git a/graphics/gliv/distinfo b/graphics/gliv/distinfo
index fc36e616798e..a3acf6936b85 100644
--- a/graphics/gliv/distinfo
+++ b/graphics/gliv/distinfo
@@ -1 +1 @@
-MD5 (gliv-1.3.1.tar.bz2) = 713433627e805ffe3265a1ec00ec2a41
+MD5 (gliv-1.4.1.tar.bz2) = 8d32c1b048148951887d8174b2e047b3
diff --git a/graphics/gliv/files/patch-rendering.c b/graphics/gliv/files/patch-rendering.c
deleted file mode 100644
index 49fa4a3155b4..000000000000
--- a/graphics/gliv/files/patch-rendering.c
+++ /dev/null
@@ -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
diff --git a/graphics/gliv/files/patch-src::imagemagick.c b/graphics/gliv/files/patch-src::imagemagick.c
new file mode 100644
index 000000000000..203ce71f701b
--- /dev/null
+++ b/graphics/gliv/files/patch-src::imagemagick.c
@@ -0,0 +1,11 @@
+--- 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() */
diff --git a/graphics/gliv/pkg-comment b/graphics/gliv/pkg-comment
index 0d0bf8668aa0..4b577b0ba189 100644
--- a/graphics/gliv/pkg-comment
+++ b/graphics/gliv/pkg-comment
@@ -1 +1 @@
-An image viewer that uses Imlib2 and OpenGL
+An image viewer that uses Gdk-Pixbuf and OpenGL
diff --git a/graphics/gliv/pkg-descr b/graphics/gliv/pkg-descr
index ac08117dd374..40670ab35047 100644
--- a/graphics/gliv/pkg-descr
+++ b/graphics/gliv/pkg-descr
@@ -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/