Update graphics/feh to 1.14.1

pkgsrc-changes:
- Update MASTER_SITES and HOMEPAGE
- Set LICENSE

Upstream changes:

* Release v1.14.1
    * Fix compilation with curl=0
    * Make zoom_default key work properly with --geometry

Wed, 11 May 2011 11:37:32 +0200  Daniel Friesel <derf@finalrewind.org>

* Release v1.14
    * Only create caption directory when actually writing out a caption.
      <http://github.com/derf/feh/issues/42>
    * The --menu-bg option has been deprecated.  It will be removed along with
      --menu-style by the end of 2012.
      <http://github.com/derf/feh/issues/27>
    * read directory contents sorted by filename instead of 'randomly'
      (as returned by readdir) by default.  Thanks talisein!
      <https://github.com/derf/feh/pull/20>
    * Show certain warnings in the image window as well as on the commandline
      <http://github.com/derf/feh/issues/43>
    * Since the manual is way better structured and more detailed than the
      --help output, it now simply refers to the manual.  To include the old
      help text, build feh with 'help=1'
    * You can now use the next/prev/jump keys to navigate thumbnails. Use the
      render key to open the currently selected thumbnail.
      <http://github.com/derf/feh/issues/26>
    * Change a patch for NETWM fullscreen support to only apply to fullscreen
      windows.  This fixes the moving windows bug in fluxbox (since fluxbox
      doesn't report its window border width).
      <http://github.com/derf/feh/issues/22>
      <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570903>
    * Minor manpage fixes.
      <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625683>
    * Fix --auto-zoom / --zoom max/fill documentation, the "Auto-Zoom" menu
      option is now always checked when these options are used
    * Set _NET_WM_NAME and _NET_WM_ICON_NAME properties
      <http://github.com/derf/feh/issues/44>
    * The 'A' key (toggle_aliasing) now actually changes the current window,
      and not just the default for new windows
    * The zoom_default key now works fine with --scale-down
      <http://github.com/derf/feh/issues/41>
    * Fix access of uninitialized memory / malloc/realloc clash in continued
      theme definition handling.  Having a theme line with just one
      option/value pair used to produce undefined behaviour

Sat, 23 Apr 2011 22:00:27 +0200  Daniel Friesel <derf@finalrewind.org>

* Release v1.13
    * Fix segfault upon unloadable images when image-related format specifiers
      (e.g. %h) are used in --title
    * Show images in current directory when invoked without file arguments
    * Option to disable antialiasing, either global (--force-aliasing) or per
      image (press 'A' to toggle, keybinding toggle_aliasing)
    * Use SIGUSR1/SIGUSR2 to reload all images in multiwindow mode
    * Fix Imlib2 caching bug in reload (only worked after the second try)
    * The --bg options are now Xinerama-aware.  That is, they set the image in
      the respective mode (scale/fill/max/center) on each Xinerama screen. Use
      --no-xinerama to disable this.

Sat, 12 Mar 2011 22:49:53 +0100  Daniel Friesel <derf@finalrewind.org>

* Release v1.12
    * Add --zoom fill as equivalent for --auto-zoom
    * Add --zoom max (zooming like in --bg-max)
    * --menu-style is now deprecated
    * http images are now viewed using libcurl, not wget (thanks to talisein)
      This adds libcurl as dependency, and removes the wget recommendation
    * Slight build system change: make now has flags, e.g.
      "make xinerama=0 debug=1". By default feh is compiled with xinerama and
      libcurl support enabled, see README.
    * Remove builtin http client (--builtin)
    * Fix compilation issues with libpng 1.5.1

Wed, 09 Feb 2011 20:11:26 +0100  Daniel Friesel <derf@finalrewind.org>

* Release v1.11.2
    * Use wget --no-clobber to prevent TOCTTOU-based hole allowing a
      well-informed attacker to rewrite arbitrary user files with images.
      The attacker needs to know feh's PID and the URL the user gave it.
      It is still possible for an attacker to _create_ arbitrary files via the
      same hole.

Wed, 26 Jan 2011 21:07:19 +0100  Daniel Friesel <derf@finalrewind.org>

* Release v1.11.1
    * Show correct image dimensions in for cached thumbnails
    * Allow commandline options to override those set in a theme
    * Remove support for FEH_OPTIONS (was deprecated >5 years ago)
    * Restrict available modifiers to Control/Mod1/Mod4

Sat, 22 Jan 2011 11:48:33 +0100  Daniel Friesel <derf@finalrewind.org>

* Release v1.11
    * Patch by Pascal Bleser: Use getaddrinfo for builtin http client,
      this enables IPv6 support
    * Fix zooming when --scale-down is used
    * The themes are now read from ~/.config/feh/themes (BC for .fehrc exists)
    * Key bindings can now be configured via ~/.config/feh/keys
    * Removes --rcpath, use XDG_CONFIG_HOME instead
    * Increase movement steps for Ctrl+Left etc.
    * Make in/out zoom use equal zoom ratio

Fri, 03 Dec 2010 19:41:45 +0100  Daniel Friesel <derf@finalrewind.org>

* Release v1.10.1
    * Partially fix --scale-down behaviour (zooming is still broken)
    * Fix buffer overflow when using --draw-actions
    * Fix segfaults after trying to load several unloadable images
    * Fix fehrc created by feh (contined escape errors)

Thu, 07 Oct 2010 20:15:12 +0200  Daniel Friesel <derf@finalrewind.org>

* Release v1.10 (aka "2.0 will come real soon now")
    * Patch by Stefan Mark: Add --bg-max (scaled with borders)
    * Removed rather obscure --bg-seamless mode
    * Short option -Y for --hide-pointer
    * Panning via keys: Make it behave like scrolling (inverted directions)
    * Workaround for Xinerama fuckups: Set XINERAMA_SCREEN to the correct
      xinerama screen number
    * Add --info option to display custom image information
    * Do not change to the next slide when executing an action with ; as first
      character (this character is stripped when executing the action)
    * Speed up panning, zooming etc. by hiding image overlay text
    * Zoom button: Zoom to 100% on button release, not button click
    * --draw-filename: Always show position in filelist

Tue, 24 Aug 2010 19:23:36 +0200  Daniel Friesel <derf@chaosdorf.de>

* Release v1.9
    * Add --fullscreen option, --full-screen is now deprecated
    * Removed --menu-border option, it is largely useless
    * Add short options: -P for --cache-thumbnails,
                         -K for --caption-papth,
                         -G for --draw-actions
                    and  -J for --thumb-redraw
    * Patch by Noel Cragg: Improve support for tiling window managers
    * Set correct window title when starting feh in paused mode
    * Add Up/Down keys for zooming
    * When zooming via keyboard: Always zoom around the center of the window
    * The image can now be panned with Ctrl + arrow keys

Fri, 25 Jun 2010 16:07:20 +0200  Daniel Friesel <derf@chaosdorf.de>

* Release v1.8
    * support LDLIBS in Makefile/config.mk
    * Don't make the --thumbnails window fullscreen. The images launched from
      thumbnail mode may be fullscreen, though. You can still use 'v' to
      toggle fullscreen, should you really need it.
    * --font now sets the global default font (for action/filename display etc.)
    * Rename --screen-clip 0 to --no-screen-clip
    * Allow multiline theme definitions (via backslash, like in the shell)
    * Center the image after pressing <keypad /> or <keypad *>
    * Saving the filelist from thumbnail mode caused undefined behaviour due
      to handling of uninitialised memory. Since I consider this a rarely
      useful action, the feature has been disabled for thumbnail mode.
    * Remove -G/--wget-timestamp option. It was probably not working
      correctly, plus it contained a code execution hole when used with
      malicious URLs containing shell metacharacters (but only if those URLs
      led to a valid file)
    * Don't add ?randomnumber to URLs when downloading them, it confuses some
      servers and is not really neccessary in general

Thu Jun 10 12:12:04 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

* Release v1.7
    * Fix segfault in Thumbnail mode when trying to open a no longer
      existing image (e.g. when the file was renamed by a previous action)
    * Set a negative slideshow-delay to start the slideshow in paused mode
    * Remove Shift+Key bindings, they were doing the same as Nothing+Key
      anyways. Plus, I might want to bind Shift + <already used key> to other
      stuff in the future
    * Documentation improvements
    * Remove undocumented hjkl menu keys. Most of the menu options can also be
      accessed directly with keys, plus the number of non-qwerty users (which
      have no use for these shortcuts) is growing.
    * Draw a nice little message when in caption editing mode with empty
      caption (to indicate that caption editing is actually active)
    * caption mode: Automatically create caption directory if it doesn't exist
    * Slideshow mode: SIGUSR1 = next image, SIGUSR2 = previous image

Sat Jun  5 21:35:25 CEST 2010  Daniel Friesel <derf@chaosdorf.de

* Release v1.6.1
    * Fix omitted image borders at high zoom levels
    * Re-add getopt_long files (possibly relevant for non-glibc systems)
    * Do not require a running X server for -L, -u, -U options

Tue Jun  1 10:21:19 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

* Release v1.6
    * Patch by aaptel: Support numpad keys for actions
    * Fix blur mode (Ctrl + left mouse key)
    * Center images in index/thumbnail mode relative to the text below them
    * Support caching of "large" (up to 256x256 pixels) thumbnails
    * New --thumb-redraw option as workaround to speed up thumbnail mode
      (thumbnail mode redrawing is quite slow, so now a redraw only happens
      every 10 thumbnails by default - can be changed with this option)
    * Because of that: Major speed improvements for --thumbnails, especially
      with cached thumbnails
    * Do not link against Xext and freetype, they're only used by other libs
    * Fix "make uninstall". You do NOT want to call this for feh versions
      1.4.2 to 1.5

Thu May  6 08:34:39 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

* Release v1.5
    * Rewrite parts of the menu code & fix a memory leak while there
    * Make --start-at work with filenames instead of list positions
    * Add keybinding to toggle pointer visibility (see --hide-pointer)
    * Sort manual a bit

Thu Apr 22 22:28:09 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

* Release v1.4.3
     * Warp the pointer when reaching a window border in pan mode
     * Various zoom mode improvements, should be more intuitive now
       + When entering zoom mode, always continue from previous zoom level
       + The image part you clicked on to start zoom mode will remain where it
         is. The zoom happen around at that pixel.
     * Manpage review

Fri Apr  2 16:20:55 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

* Release v1.4.2
     * Replace autoconf by config.mk
     * patch by decklin: Use z key to randomly jump in the filelist
     * patch by muennich: Correctly set [Paused] window title in slideshow mode
     * patch by dylan: Remove temporary files if url opening fails
     * Fix problems with unexpectedly empty filelists

Tue Mar 16 07:56:36 CET 2010  Daniel Friesel <derf@chaosdorf.de>

  * Release v1.4.1
     * Fix chrome theme in the default .fehrc
     * Rename cam to feh-cam and gen_cam_menu.sh to gen-cam-menu
     * Add manual for feh-cam and gen-cam-menu (from Debian)
     * Fix lossless rotate for filenames with spaces etc.

Thu Mar  4 14:55:02 CET 2010  Daniel Friesel <derf@chaosdorf.de>

  * Release v1.4
     * Lots of documentation fixes/improvements
       (including previously undocumented options)
     * Fix --(un)loadable option
     * Add --draw-actions (show defined actions and their number)
     * Use <keypad begin> to antialias the image
     * Fix some keypad keys (+,-,/,*)
     * The button-related options have changed (NOT backwards-compatible)
     * Remove --xinerama option
     * Use jpegtran binary instead of libjpeg for lossless rotation
     * Add --bg-fill option (patch by Anonymous)

Mon Feb  8 21:47:56 CET 2010  Daniel Friesel <derf@chaosdorf.de>

  * Release v1.3.5
     * Import various Debian patches
     * Update feh(1) manpage
     * Make feh -l / feh -O work without a running X
     * Don't die after encountering three or more unloadable images
       (former "No more slides in show" error)
     * Depracate --xinerama <0|1>, use --no-xinerama or nothing instead
     * Fix transparency in thumbnail mode

11 files changed, 52 insertions, 122 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 1e655fa254d..e6d05ecc530 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.41 2011/01/13 13:38:01 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2011/05/25 19:44:26 gls Exp $
 #
 
-DISTNAME=	feh-1.3.4
-PKGREVISION=	8
+DISTNAME=	feh-1.14.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://linuxbrit.co.uk/downloads/
+MASTER_SITES=	http://feh.finalrewind.org/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://linuxbrit.co.uk/feh/
+HOMEPAGE=	http://feh.finalrewind.org/
 COMMENT=	Advanced image viewer
+LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	wget-[0-9]*:../../net/wget
-
-GNU_CONFIGURE=	YES
+#GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--program-transform-name=s,cam,feh_cam,
 
-USE_TOOLS+=	bash:run perl:run
+USE_TOOLS+=	bash:run perl:run gmake
+
+REPLACE_BASH=		cam/gen-cam-menu
+REPLACE_PERL=		scripts/*.pl cam/feh-cam
 
-REPLACE_BASH=		cam/gen_cam_menu.sh
-REPLACE_PERL=		cam/cam
+CFLAGS+=			-std=c99
 
 LDFLAGS.SunOS+=		-lnsl -lsocket
 
@@ -30,6 +31,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/giblib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/graphics/feh/PLIST b/graphics/feh/PLIST
index bd241bb9077..a21b4c41817 100644
--- a/graphics/feh/PLIST
+++ b/graphics/feh/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/05/25 19:44:26 gls Exp $
 bin/feh
-bin/feh_cam
-bin/gen_feh_cam_menu.sh
+bin/feh-cam
+bin/gen-cam-menu
+man/man1/feh-cam.1
 man/man1/feh.1
+man/man1/gen-cam-menu.1
 share/doc/feh/AUTHORS
 share/doc/feh/ChangeLog
 share/doc/feh/README
 share/doc/feh/TODO
+share/doc/feh/examples/keys
+share/doc/feh/examples/themes
 share/feh/fonts/black.style
 share/feh/fonts/menu.style
 share/feh/fonts/yudit.ttf
-share/feh/images/about.png
+share/feh/images/logo.svg
 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
 share/feh/images/menubg_default.png
-share/feh/images/menubg_pastel.png
 share/feh/images/menubg_sky.png
-share/feh/images/menubg_wood.png
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index b32b71d8dfa..c7c97e399fe 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.18 2011/01/15 22:42:48 tnn Exp $
+$NetBSD: distinfo,v 1.19 2011/05/25 19:44:26 gls Exp $
 
-SHA1 (feh-1.3.4.tar.gz) = cf02fd48325ba02467c7f791634a28e98edbe801
-RMD160 (feh-1.3.4.tar.gz) = 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c
-Size (feh-1.3.4.tar.gz) = 409530 bytes
-SHA1 (patch-aa) = 745c9ca77355a0beaacbe32bc33174e8dc057cbd
-SHA1 (patch-ab) = 1899f65deb3a5c3d9825b381298b752f0bec54cc
-SHA1 (patch-ac) = a0c76aebd0d38c990e12259d7ceb9e4d75920401
-SHA1 (patch-ad) = 7a3a5a5a88ffa65942606501181e6e9c09af5a56
-SHA1 (patch-ae) = 45c0a837c53393597d0617ff64bdf7fbf5aaa814
-SHA1 (patch-af) = f664f257c7466295e83e76eb9b13710aff2a360c
+SHA1 (feh-1.14.1.tar.bz2) = 4d35b14c41cd8a753e6d8d334bab216c69361688
+RMD160 (feh-1.14.1.tar.bz2) = e83879baa77910ca8181abe7514c80926ee3bd77
+Size (feh-1.14.1.tar.bz2) = 2229518 bytes
+SHA1 (patch-config.mk) = e2af53c04595f7e55645ba9da816eff5da70e3de
+SHA1 (patch-src_getopt.c) = 337fd15564c1d5b5596fe7d0d2f9bd6b0ca44ca7
diff --git a/graphics/feh/patches/patch-aa b/graphics/feh/patches/patch-aa
deleted file mode 100644
index acd5f7afae6..00000000000
--- a/graphics/feh/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 10:52:18 rh Exp $
-
---- Makefile.in.orig	Thu Aug 16 01:44:40 2001
-+++ Makefile.in
-@@ -82,7 +82,7 @@
- man_MANS = feh.1
- 
- docs_DATA = README AUTHORS ChangeLog TODO
--docsdir = $(prefix)/doc/feh
-+docsdir = $(prefix)/share/doc/feh
- 
- EXTRA_DIST =  feh.spec feh.1 $(docs_DATA)
- 
diff --git a/graphics/feh/patches/patch-ab b/graphics/feh/patches/patch-ab
deleted file mode 100644
index 78c27b8d6c3..00000000000
--- a/graphics/feh/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/11/25 20:00:05 snj Exp $
-
---- src/Makefile.in.orig	2004-10-28 15:36:32.000000000 -0700
-+++ src/Makefile.in	2004-11-25 11:52:32.000000000 -0800
-@@ -77,8 +77,8 @@ XINERAMA_LIBS = @XINERAMA_LIBS@
- 
- MAINTAINERCLEANFILES = Makefile.in				
- 
--LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
--INCLUDES = -I/usr/X11R6/include $(X_CFLAGS)                     -I$(prefix)/include -I$(includedir)                     -I. -I$(top_srcdir)/src                     -I/usr/local/include/libpng                     -DPREFIX=\""$(prefix)"\"                     @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-+LDFLAGS = @LDFLAGS@
-+INCLUDES = @CFLAGS@ $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir)/src -DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
- 
- LIBOBJS = @LIBOBJS@
- 
diff --git a/graphics/feh/patches/patch-ac b/graphics/feh/patches/patch-ac
deleted file mode 100644
index c1294950dda..00000000000
--- a/graphics/feh/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/05/22 13:01:38 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/slideshow.c.orig	Sun May  1 01:11:31 2005
-+++ src/slideshow.c	Sun May 22 14:58:08 2005
-@@ -353,8 +353,8 @@ feh_action_run(feh_file * file, char *ac
-   D_ENTER(4);
-   if (action)
-   {
--    D(3, ("Running action %s\n", action));
-     char *sys;
-+    D(3, ("Running action %s\n", action));
-     sys = feh_printf(action, file);
- 
-     if (opt.verbose && !opt.list && !opt.customlist)
diff --git a/graphics/feh/patches/patch-ad b/graphics/feh/patches/patch-ad
deleted file mode 100644
index c6bbc2f022d..00000000000
--- a/graphics/feh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/02 14:47:38 drochner Exp $
-
---- src/support.c.orig	2005-08-02 16:10:57.000000000 +0200
-+++ src/support.c
-@@ -233,7 +233,7 @@ feh_wm_set_bg(char *fil, Imlib_Image im,
-           char *path;
-           path = estrjoin("/", home, ".fehbg", NULL);
-           if ((fp = fopen(path, "w")) == NULL) {
--	     wprintf("Can't open %s for write", path);
-+	     weprintf("Can't open %s for write", path);
-           } else {
-              fprintf(fp, "%s\n", fehbg);
-              fclose(fp);
diff --git a/graphics/feh/patches/patch-ae b/graphics/feh/patches/patch-ae
deleted file mode 100644
index 28d880d16e5..00000000000
--- a/graphics/feh/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/02/26 21:37:19 joerg Exp $
-
---- src/filelist.c.orig	2006-02-23 20:17:53.000000000 +0000
-+++ src/filelist.c
-@@ -30,7 +30,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
- gib_list *filelist = NULL;
- int       filelist_len = 0;
- gib_list *current_file = NULL;
--extern int errno;
- 
- static gib_list *rm_filelist = NULL;
- 
diff --git a/graphics/feh/patches/patch-af b/graphics/feh/patches/patch-af
deleted file mode 100644
index e54118a0b6d..00000000000
--- a/graphics/feh/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/15 22:42:49 tnn Exp $
-
-Be compatible with png>=1.5.
-
---- src/feh_png.c.orig	2005-07-14 11:59:03.000000000 +0000
-+++ src/feh_png.c
-@@ -68,7 +68,7 @@ feh_png_read_comments(char *file)
- 		return hash;
- 	}
- 
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		fclose(fp);
-@@ -129,7 +129,7 @@ feh_png_write_png(Imlib_Image image, cha
- 		return 0;
- 	}
- 
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		fclose(fp);
- 		png_destroy_write_struct(&png_ptr, &info_ptr);
diff --git a/graphics/feh/patches/patch-config.mk b/graphics/feh/patches/patch-config.mk
new file mode 100644
index 00000000000..ad9a851102a
--- /dev/null
+++ b/graphics/feh/patches/patch-config.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-config.mk,v 1.1 2011/05/25 19:44:27 gls Exp $
+
+--- config.mk.orig      2011-05-19 20:36:13.000000000 +0000
++++ config.mk
+@@ -6,7 +6,7 @@ PREFIX ?= /usr/local
+
+ # Directories for manuals, executables, docs, data, etc.
+ main_dir = ${DESTDIR}${PREFIX}
+-man_dir = ${main_dir}/share/man
++man_dir = ${main_dir}/man
+ bin_dir = ${main_dir}/bin
+ doc_dir = ${main_dir}/share/doc/feh
+ image_dir = ${main_dir}/share/feh/images
diff --git a/graphics/feh/patches/patch-src_getopt.c b/graphics/feh/patches/patch-src_getopt.c
new file mode 100644
index 00000000000..33401439429
--- /dev/null
+++ b/graphics/feh/patches/patch-src_getopt.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_getopt.c,v 1.1 2011/05/25 19:44:27 gls Exp $
+
+--- src/getopt.c.orig	2011-05-19 20:36:13.000000000 +0000
++++ src/getopt.c
+@@ -36,6 +36,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C