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
Pullup ticket #3771 - requested by gls
devel/p5-Config-IniFiles: security update

Revisions pulled up:
- devel/p5-Config-IniFiles/Makefile                             1.30
- devel/p5-Config-IniFiles/distinfo                             1.17

---
   Module Name:	pkgsrc
   Committed By:	gls
   Date:		Sat May  5 13:40:48 UTC 2012

   Modified Files:
   	pkgsrc/devel/p5-Config-IniFiles: Makefile distinfo

   Log Message:
   Update devel/p5-Config-IniFiles to 2.71
   Fixes CVE-2012-2451.

   pkgsrc changes:
   ---------------

   - p5-List-MoreUtils is required

   Upstream Changes:
   -----------------

   Version 2.71:   ( Wed May  2 10:59:04 IDT 2012 )
   ------------------------------------------------

   * SECURITY BUG FIX: Config::IniFiles used to write to a temporary filename
   with a predictable name ("${filename}-new") which opens the door for potential
   exploits.

   * Now requiring List::MoreUtils (for any() and other functions), File::Temp
   and File::Basename .

   * Add "use warnings;" to lib/Config/IniFiles.pm .

   * More refactoring.

   Version 2.70:   ( Fri Apr  6 12:47:25 IDT 2012 )
   ------------------------------------------------

   * Fix the test dependency (in the new t/31comments_with_spaces.t test)
   on IO::stringy (now writing it to a file).
        - This caused some CPAN Testers failures such as:
            - http://www.cpantesters.org/cpan/report/c16b9978-7f40-11e1-9d6f-f6dbfa7543f5

   * Modernized some of the open() calls in the test files.
        - three args open, lexcial file handles, etc.

   Version 2.69:   ( Thu Apr  5 12:05:46 IDT 2012 )
   ------------------------------------------------

   * Fix https://sourceforge.net/tracker/?func=detail&aid=3388382&group_id=6926&atid=106926
        - "Trailing comments with whitespace are not recognised"
        - Thanks to briconaut for the report and to rbowen for the patch and test.

   * Add the method ->OutputConfigToFileHandle which is a more explicit and
   safer version of ->OutputConfig.
        - ->OutputConfig now uses it.
        - all existing tests pass, and a new test was added to
        t/15store-and-retrieve-here-doc-terminator.t .

   * Started refactoring the code.
        - Expand tabs to spaces.
        - many other small changes.