pkg/38566: graphics/xzgv 0.9

[svs%ropnet.ru@localhost]

>Number:         38566
>Category:       pkg
>Synopsis:       graphics/xzgv 0.9
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri May 02 21:25:00 +0000 2008
>Originator:     Sergey Svishchev
>Release:        4.0
>Organization:
>Environment:
>Description:
Changes: "This release updates xzgv to GTK 2.0. Some functionality has been 
lost in the process, principally the ability to change the brightness, contrast 
and gamma of viewed pictures."

I've also included a fix for the "missing preview icons" problem; it wasn't 
reviewed by upstream, though.
>How-To-Repeat:

>Fix:
Index: graphics/xzgv/Makefile
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/graphics/xzgv/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- graphics/xzgv/Makefile      4 Mar 2008 15:39:11 -0000       1.36
+++ graphics/xzgv/Makefile      15 Mar 2008 23:08:09 -0000
@@ -1,17 +1,11 @@
 # $NetBSD: Makefile,v 1.36 2008/03/04 15:39:11 jlam Exp $
 
-DISTNAME=      xzgv-0.8
-PKGNAME=       xzgv-0.8.0.1
-PKGREVISION=   3
+DISTNAME=      xzgv-0.9
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
-
-PATCHFILES=    xzgv-0.8-integer-overflow-fix.diff
-PATCH_SITES=   http://rus.members.beeb.net/
-PATCH_DIST_STRIP=      -p1
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xzgv/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://rus.members.beeb.net/xzgv.html
+HOMEPAGE=      http://sourceforge.net/projects/xzgv
 COMMENT=       Image viewer
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -32,4 +26,5 @@
        done
 
 .include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: graphics/xzgv/distinfo
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/graphics/xzgv/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- graphics/xzgv/distinfo      23 Sep 2006 14:59:34 -0000      1.9
+++ graphics/xzgv/distinfo      2 May 2008 20:47:29 -0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/09/23 14:59:34 adrianp Exp $
+$NetBSD$
 
-SHA1 (xzgv-0.8-integer-overflow-fix.diff) = 
b18dfdaafe295e2c42764f59784b6b6201b489ea
-RMD160 (xzgv-0.8-integer-overflow-fix.diff) = 
bd75c87cf6f20e4fa2757afe472111e2253cb640
-Size (xzgv-0.8-integer-overflow-fix.diff) = 6374 bytes
-SHA1 (xzgv-0.8.tar.gz) = 1aa21336e2562849e6f5f984cbbfcb745489df3b
-RMD160 (xzgv-0.8.tar.gz) = e36466a73c27616610fd032b3a92898d95a55a17
-Size (xzgv-0.8.tar.gz) = 302801 bytes
-SHA1 (patch-aa) = 7a0d6e6b24d788fb9cf45967e4c3b434c621def3
+SHA1 (xzgv-0.9.tar.gz) = 5d8115c87be3836d9ed35dba777cd1dc48541715
+RMD160 (xzgv-0.9.tar.gz) = 7c3284eac5a0a368db1be2ed87f882e26d39fab7
+Size (xzgv-0.9.tar.gz) = 235367 bytes
+SHA1 (patch-aa) = fa502e0fc4fc94cfc88c4aa41505ac7563d982a6
 SHA1 (patch-ab) = cf4c746e3c4b9ac3a5968211a8f2c0b69d43bc99
 SHA1 (patch-ac) = 3a67b625b6eabd0c6e2399fb0a59fde4460d3893
+SHA1 (patch-ad) = 4759bdda3d99bf48dc9f2cff80d53f5d3be94864
Index: graphics/xzgv/patches/patch-aa
===================================================================
RCS file: /vol/2/cvsup/pkgsrc/graphics/xzgv/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- graphics/xzgv/patches/patch-aa      23 Aug 2001 15:56:41 -0000      1.3
+++ graphics/xzgv/patches/patch-aa      15 Mar 2008 23:00:26 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2001/08/23 15:56:41 jlam Exp $
+$NetBSD$
 
---- config.mk.orig     Sun Jan  7 23:57:44 2001
+--- config.mk.orig     2007-08-12 10:14:42.000000000 +0000
 +++ config.mk
 @@ -6,8 +6,8 @@
  # Set the C compiler to use, and options for it.
@@ -13,21 +13,12 @@
  
  # Set the awk interpreter to use for a script used while compiling.
  # (This should be a `new' awk, such as gawk or mawk.)
-@@ -27,7 +27,7 @@
- # On non-x86-based machines (e.g. Alpha, Sparc, PPC), you should
- # comment it out.
- #
--CFLAGS+=-DINTERP_MMX
-+#CFLAGS+=-DINTERP_MMX
- 
- # Set rendering backend to use. Currently only Imlib 1.x is properly
- # supported, so leave this alone. :-)
-@@ -45,7 +45,7 @@
+@@ -24,7 +24,7 @@ AWK=awk
  # MANDIR to directory for man page.
  # Usually it will be simpler to just set PREFIX.
  #
 -PREFIX=/usr/local
 +#PREFIX=/usr/local
- 
- # In theory it would be nice to put the info file and man page under
- # /usr/local/share. However, it's not clear if this is widely
+ BINDIR=$(PREFIX)/bin
+ INFODIR=$(PREFIX)/share/info
+ MANDIR=$(PREFIX)/share/man/man1
Index: graphics/xzgv/patches/patch-ad
===================================================================
RCS file: graphics/xzgv/patches/patch-ad
diff -N graphics/xzgv/patches/patch-ad
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ graphics/xzgv/patches/patch-ad      30 Apr 2008 17:18:55 -0000
@@ -0,0 +1,32 @@
+$NetBSD$
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=1814712&group_id=203093&atid=984206
+
+--- src/main.c.orig    2007-09-09 00:36:21.000000000 +0000
++++ src/main.c
+@@ -200,7 +200,7 @@ int orient_state_flip[8]   ={2,3,0,1,6,7
+ /* required prototypes */
+ void render_pixmap(int reset_pos);
+ void cb_nextprev_tagged_image(int next,int view);
+-void idle_xvpic_load(int *entryp);
++gint idle_xvpic_load(int *entryp);
+ gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
+ void cb_scaling_double(void);
+ void cb_xscaling_double(void);
+@@ -2624,7 +2624,7 @@ else
+ }
+ 
+ 
+-void idle_xvpic_load(int *entryp)
++gint idle_xvpic_load(int *entryp)
+ {
+ static char buf[1024];
+ struct clist_data_tag *datptr;
+@@ -2748,6 +2748,7 @@ for(f=0;f<IDLE_XVPIC_NUM_PER_CALL;f++)
+     *entryp=-1;
+     }
+   }
++  return TRUE;
+ }
+ 
+