Update feh to 1.2.1. Changes include:

  * Move to buildlink2
  * Tons of bugfixes
  * stick in yudit.ttf. it's not as pretty, but it is, apparently, DFSG
    compliant etc.
  * add support for using the numeric keypad to scroll and zoom the
    image.
  * New menu colour/style - "feh -Tblack src/testimages"
  * Add --zoom option.
  * Use giblib fontstyles for menus, instead of hardcoding the shadow.
  * Let users choose menu style with --menu-style. Standard giblib
    semantics.
  * make sure fullscreen windows are really fullscreen.
  * feh uses giblib now
  * When you set a bg with feh, it now stores the necessary
    commandline to restore that bg in ~/.fehbg.
  * Use < or > keys to do in place edit rotations, 90 degrees left
    or right.
  * Some basic in place editing.
  * Slightly tweaked menu sliding behaviour.

4 files changed, 17 insertions, 22 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index a6a6ae9c5db..4ca71e4622f 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:05 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/20 10:59:21 rh Exp $
 #
 
-DISTNAME=	feh-1.1.0
-PKGREVISION=	1
+DISTNAME=	feh-1.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 
@@ -11,7 +10,8 @@ HOMEPAGE=	http://www.linuxbrit.co.uk/feh/
 COMMENT=	advanced image viewer
 
 GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 
-.include "../../graphics/imlib2/buildlink.mk"
+.include "../../devel/giblib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/feh/PLIST b/graphics/feh/PLIST
index b56b46d658b..7af4a29ec9d 100644
--- a/graphics/feh/PLIST
+++ b/graphics/feh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/20 10:59:21 rh Exp $
 bin/cam
 bin/feh
 bin/gen_cam_menu.sh
@@ -7,19 +7,14 @@ share/doc/feh/ChangeLog
 share/doc/feh/README
 share/doc/feh/TODO
 man/man1/feh.1
-share/feh/fonts/20thcent.ttf
-share/feh/fonts/cinema.ttf
-share/feh/fonts/droid.ttf
-share/feh/fonts/goodtime.ttf
-share/feh/fonts/grunge.ttf
-share/feh/fonts/joystix.ttf
-share/feh/fonts/morpheus.ttf
-share/feh/fonts/notepad.ttf
-share/feh/fonts/soulpapa.ttf
+share/feh/fonts/black.style
+share/feh/fonts/menu.style
+share/feh/fonts/yudit.ttf
 share/feh/images/about.png
 share/feh/images/menubg.png
 share/feh/images/menubg_aluminium.png
 share/feh/images/menubg_aqua.png
+share/feh/images/menubg_black.png
 share/feh/images/menubg_britney.png
 share/feh/images/menubg_brushed.png
 share/feh/images/menubg_chrome.png
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index e4ea1edf372..e4a1a315ad6 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/08/28 11:17:55 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/09/20 10:59:22 rh Exp $
 
-SHA1 (feh-1.1.0.tar.gz) = c8f63f9dd5e758519d91bde4e8585dfc1d1a41ee
-Size (feh-1.1.0.tar.gz) = 464391 bytes
+SHA1 (feh-1.2.1.tar.gz) = 7900337a9fae48db2f967fe32ca04d6bbf7f3674
+Size (feh-1.2.1.tar.gz) = 340390 bytes
 SHA1 (patch-aa) = 745c9ca77355a0beaacbe32bc33174e8dc057cbd
-SHA1 (patch-ab) = 01f3045bf9e40ef806d21a3f60dcd005a342821a
+SHA1 (patch-ab) = 4935ca2171f02d59df7e294b1b520881e21e0d6d
diff --git a/graphics/feh/patches/patch-ab b/graphics/feh/patches/patch-ab
index b6e9a6fc369..566c1582051 100644
--- a/graphics/feh/patches/patch-ab
+++ b/graphics/feh/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/16 10:52:18 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/09/20 10:59:22 rh Exp $
 
---- src/Makefile.in.orig	Thu Aug 16 01:44:41 2001
+--- src/Makefile.in.orig	Thu Sep 12 04:55:28 2002
 +++ src/Makefile.in
-@@ -73,7 +73,7 @@
+@@ -76,7 +76,7 @@ VERSION = @VERSION@
  
  MAINTAINERCLEANFILES = Makefile.in				
  
 -LDFLAGS = -L/usr/X11R6/lib
 +LDFLAGS = @LDFLAGS@
- INCLUDES = -I/usr/X11R6/include $(X_CFLAGS)                     -I$(prefix)/include -I$(includedir)                     -I. -I$(top_srcdir)/src                     -DPREFIX=\""$(prefix)"\"                     @IMLIB_CFLAGS@
+ INCLUDES = -I/usr/X11R6/include $(X_CFLAGS)                     -I$(prefix)/include -I$(includedir)                     -I. -I$(top_srcdir)/src                     -DPREFIX=\""$(prefix)"\"                     @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
  
  LIBOBJS = @LIBOBJS@