Update to 3.17.0

Release 3.17.0 adds many improvements for ICO, TIFF, PNG, HDR, TGA, GIF,
RAW, JXR, JP2, Exif plugins. It comes with new conversion functions for
RGBA16/RGBAF formats, as well as new functions used to deal with external
pixel buffers (ConvertFromRawBitsEx, CreateView). Other useful added
functions are ReslaleRect, GetMemorySize, SetMetadataKeyValue and the
FIQ_LFPQUANT quantizer algorithm.
The library has been updated with the new LibPNG (1.6.16), LibTIFF (4.0.4),
LibRaw (0.17.a1), LibWebP (0.4.2), OpenEXR (2.2.0).
FreeImage is also distributed with updated VB6, Delphi and C++ wrappers.

3 files changed, 51 insertions, 7 deletions

diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index e5ec21652b9..46d30ddfafb 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/02/12 22:40:05 snj Exp $
+# $NetBSD: Makefile,v 1.2 2015/05/27 21:59:26 markd Exp $
 
-DISTNAME=	FreeImage3160
-PKGNAME=	freeimage-3.16.0
+DISTNAME=	FreeImage3170
+PKGNAME=	freeimage-3.17.0
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeimage/}
 EXTRACT_SUFX=	.zip
diff --git a/graphics/freeimage/distinfo b/graphics/freeimage/distinfo
index 8740927c32f..6d589c4cc3e 100644
--- a/graphics/freeimage/distinfo
+++ b/graphics/freeimage/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2015/02/12 22:40:05 snj Exp $
+$NetBSD: distinfo,v 1.2 2015/05/27 21:59:26 markd Exp $
 
-SHA1 (FreeImage3160.zip) = a70600d288fe5bd11131e85e6f857a93bb100ad8
-RMD160 (FreeImage3160.zip) = f0dcfb1514a288bbb2bc182130469b91d575e6cd
-Size (FreeImage3160.zip) = 5669228 bytes
+SHA1 (FreeImage3170.zip) = 6752c83798c2f81dee71a2e8bb11657068672669
+RMD160 (FreeImage3170.zip) = c4e87846098327ee346c49ae81b6036f6d9ab36d
+Size (FreeImage3170.zip) = 7020636 bytes
 SHA1 (patch-Makefile) = 719f3539d1e841761c8cf442634d71e792ea7231
+SHA1 (patch-Makefile.fip) = 3a8bdc29a2249b5cb9e30ccfcc25eb6be99755d9
 SHA1 (patch-Source_LibOpenJPEG_opj__malloc.h) = 4ba7924e5ce04b98c9c249bc31df600b7fbdcde3
diff --git a/graphics/freeimage/patches/patch-Makefile.fip b/graphics/freeimage/patches/patch-Makefile.fip
new file mode 100644
index 00000000000..23d89054d17
--- /dev/null
+++ b/graphics/freeimage/patches/patch-Makefile.fip
@@ -0,0 +1,43 @@
+$NetBSD: patch-Makefile.fip,v 1.1 2015/05/27 21:59:26 markd Exp $
+
+--- Makefile.fip.orig	2015-03-08 05:03:56.000000000 +0000
++++ Makefile.fip
+@@ -5,8 +5,8 @@ include fipMakefile.srcs
+ 
+ # General configuration variables:
+ DESTDIR ?= /
+-INCDIR ?= $(DESTDIR)/usr/include
+-INSTALLDIR ?= $(DESTDIR)/usr/lib
++INCDIR ?= $(DESTDIR)/$(PREFIX)/include
++INSTALLDIR ?= $(DESTDIR)/$(PREFIX)/lib
+ 
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+@@ -28,10 +28,8 @@ CXXFLAGS ?= -O3 -fPIC -fexceptions -fvis
+ CXXFLAGS += -D__ANSI__
+ CXXFLAGS += $(INCLUDE)
+ 
+-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
+-	CFLAGS += -fPIC
+-	CXXFLAGS += -fPIC
+-endif
++CFLAGS += -fPIC
++CXXFLAGS += -fPIC
+ 
+ TARGET  = freeimageplus
+ STATICLIB = lib$(TARGET).a
+@@ -71,11 +69,9 @@ $(SHAREDLIB): $(MODULES)
+ 	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+ 
+ install:
+-	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	$(BSD_INSTALL_DATA) $(HEADERFIP) $(INCDIR)
++	$(BSD_INSTALL_DATA) $(STATICLIB) $(INSTALLDIR)
++	$(BSD_INSTALL_LIB) $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+