From e33fbf3a8dc5aaa6be0ed7bf8128f45d6bbf7739 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Sun, 6 May 2012 00:16:05 +0000
Subject: Pullup ticket #3770 - requested by gls graphics/feh: build fix

Revisions pulled up:
- graphics/feh/Makefile                                         1.48
- graphics/feh/distinfo                                         1.23
- graphics/feh/patches/patch-config.mk                          1.2

---
   Module Name:	pkgsrc
   Committed By:	gls
   Date:		Tue May  1 14:58:47 UTC 2012

   Modified Files:
   	pkgsrc/graphics/feh: Makefile distinfo
   	pkgsrc/graphics/feh/patches: patch-config.mk

   Log Message:
   Update graphics/feh to 2.5.

   pkgsrc changes
   --------------

   Don't mess with CFLAGS. I can't remember why that was even necessary, and it
   breaks the Linux build.

   Should fix PR pkg/46390.

   upstream changes
   ----------------

   * Add R, * and / bindings for keypad begin, keypad * and keypad /
   * Try to convert unloadable files with imagemagick for up to 5 seconds
   * Add --magick-timeout option to set imagemagick conversion timeout or disable
   it altogether
   * Clean up temporary / to-delete files when receiving SIG{INT,TERM,QUIT}
   * Do not scroll past image borders when using key bindings
   * --loadable / --unloadable: indicate result in exit status
---
 graphics/feh/Makefile                |  6 ++----
 graphics/feh/distinfo                | 10 +++++-----
 graphics/feh/patches/patch-config.mk |  8 +++++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'graphics')

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 29f245397ce..62312c3c6df 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2012/03/21 18:16:18 drochner Exp $
+# $NetBSD: Makefile,v 1.47.2.1 2012/05/06 00:16:05 tron Exp $
 #
 
-DISTNAME=	feh-2.4
+DISTNAME=	feh-2.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/
 EXTRACT_SUFX=	.tar.bz2
@@ -21,8 +21,6 @@ USE_TOOLS+=	bash:run perl:run gmake
 REPLACE_BASH=		cam/gen-cam-menu
 REPLACE_PERL=		scripts/*.pl cam/feh-cam
 
-CFLAGS+=			-std=c99
-
 LDFLAGS.SunOS+=		-lnsl -lsocket
 
 BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.4
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 3b9e8e679df..13194c3efd1 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2012/03/21 18:16:18 drochner Exp $
+$NetBSD: distinfo,v 1.22.2.1 2012/05/06 00:16:05 tron Exp $
 
-SHA1 (feh-2.4.tar.bz2) = 1798186105da2dacebd49210d7f0bd78687922a5
-RMD160 (feh-2.4.tar.bz2) = fa5bd5e06461cf6836058d7b9c10f7adf6e6f641
-Size (feh-2.4.tar.bz2) = 2227350 bytes
-SHA1 (patch-config.mk) = e2af53c04595f7e55645ba9da816eff5da70e3de
+SHA1 (feh-2.5.tar.bz2) = d1bf7fa8ec6b5d1ce16c291edf38d45de01f252d
+RMD160 (feh-2.5.tar.bz2) = 18c643fba46e585d500d4133b9f20e403c87982b
+Size (feh-2.5.tar.bz2) = 2227722 bytes
+SHA1 (patch-config.mk) = 7f99ff19820a62c8a7a9d3b0fb9c7f1a8151f6c5
 SHA1 (patch-src_getopt.c) = 337fd15564c1d5b5596fe7d0d2f9bd6b0ca44ca7
diff --git a/graphics/feh/patches/patch-config.mk b/graphics/feh/patches/patch-config.mk
index ad9a851102a..6fc57f67628 100644
--- a/graphics/feh/patches/patch-config.mk
+++ b/graphics/feh/patches/patch-config.mk
@@ -1,9 +1,11 @@
-$NetBSD: patch-config.mk,v 1.1 2011/05/25 19:44:27 gls Exp $
+$NetBSD: patch-config.mk,v 1.1.8.1 2012/05/06 00:16:05 tron Exp $
 
---- config.mk.orig      2011-05-19 20:36:13.000000000 +0000
+Fix man pages installation path
+
+--- config.mk.orig	2012-03-25 11:16:59.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
-- 
cgit v1.2.3