update libfpx to version 1.3.1-6.

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Mon Dec 28 15:36:06 2015 +0100
Changeset:	06e7f7a117e9daec9fd17f805b092b7aa8430ea2

Modified Files:
	libfpx/Makefile
	libfpx/distinfo
Removed Files:
	libfpx/patches/patch-fpx_f__fpxvw.cpp
	libfpx/patches/patch-fpx_fpxlibio.cpp
	libfpx/patches/patch-fpxlib.h
	libfpx/patches/patch-ole_olecore.h

Log Message:
update libfpx to version 1.3.1-6.

all patches have now been applied upstream.
fixed download directory in one of the master sites.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=06e7f7a117e9daec9fd17f805b092b7aa8430ea2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libfpx/Makefile                       |  6 ++--
 libfpx/distinfo                       | 12 +++-----
 libfpx/patches/patch-fpx_f__fpxvw.cpp | 56 -----------------------------------
 libfpx/patches/patch-fpx_fpxlibio.cpp | 13 --------
 libfpx/patches/patch-fpxlib.h         | 14 ---------
 libfpx/patches/patch-ole_olecore.h    | 13 --------
 6 files changed, 7 insertions(+), 107 deletions(-)

diffs:
diff --git a/libfpx/Makefile b/libfpx/Makefile
index 9b1a907..4323a68 100644
--- a/libfpx/Makefile
+++ b/libfpx/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 libfpx_ver=	1.3.1
-DISTNAME=	libfpx-${libfpx_ver}-5
+DISTNAME=	libfpx-${libfpx_ver}-6
 PKGNAME=	libfpx-${libfpx_ver}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ \
-		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
+		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/delegates/ \
 		http://www.imagemagick.org/download/delegates/
 EXTRACT_SUFX=	.tar.xz
 
diff --git a/libfpx/distinfo b/libfpx/distinfo
index 547d1a7..24637ae 100644
--- a/libfpx/distinfo
+++ b/libfpx/distinfo
@@ -1,10 +1,6 @@
 $NetBSD$
 
-SHA1 (libfpx-1.3.1-5.tar.xz) = 2df0085b6d364d9cb2224b8cc14e308d7fad35ae
-RMD160 (libfpx-1.3.1-5.tar.xz) = ed63f57bdebd53bbf3fc6d01b4c5069800503283
-SHA512 (libfpx-1.3.1-5.tar.xz) = 23e2d27f1d6d132f3b12bc807fa68acbd211ba58b2c745a6f7735700329aa2973dd70d88811503eebd05f98812e84e8b977a837521b8749523864f3edb11d053
-Size (libfpx-1.3.1-5.tar.xz) = 1906544 bytes
-SHA1 (patch-fpx_f__fpxvw.cpp) = f096de5d72125b13e793210ca701c0c7e5ead0df
-SHA1 (patch-fpx_fpxlibio.cpp) = 5a8c52c07616b7623106eb54f5c47336451f53b3
-SHA1 (patch-fpxlib.h) = 3ee9dde1db3eee5b901c8da752f5a4c19d2d95d4
-SHA1 (patch-ole_olecore.h) = d9625be22f2f895ff63e56e032bbd31d59ba71ab
+SHA1 (libfpx-1.3.1-6.tar.xz) = 23c630e1c39b3adf52b34100af4db38234f95b1f
+RMD160 (libfpx-1.3.1-6.tar.xz) = 9bd3497f68b74b66b41e2c826445065501075e5b
+SHA512 (libfpx-1.3.1-6.tar.xz) = 0d4eb06954a76fde286acc2257774d515a9826154f1603d64f261342f31af29de608b00a7837bcd1942dfff1cca679c34166f0f7972373515126b27970ce2bf8
+Size (libfpx-1.3.1-6.tar.xz) = 1906256 bytes
diff --git a/libfpx/patches/patch-fpx_f__fpxvw.cpp b/libfpx/patches/patch-fpx_f__fpxvw.cpp
deleted file mode 100644
index 0174315..0000000
--- a/libfpx/patches/patch-fpx_f__fpxvw.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
---- fpx/f_fpxvw.cpp.orig	2015-12-28 09:55:50.000000000 +0000
-+++ fpx/f_fpxvw.cpp
-@@ -664,7 +664,7 @@ Boolean PFileFlashPixView::CreateCompObj
-       lpszNew[0]=chZero;
-     }
- 
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPSTR_NoPad(lpszNew);
- #elif _WINDOWS
-     char str[1024];
-@@ -675,7 +675,7 @@ Boolean PFileFlashPixView::CreateCompObj
-     // Get and write clsID string
-     LPOLESTR FAR clsIDStr;
-     StringFromCLSID(clsID, &clsIDStr);
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPSTR_NoPad(clsIDStr);
- #elif _WINDOWS
-     WideCharToMultiByte(CP_ACP, 0, clsIDStr, -1, str, 128, NULL, NULL);
-@@ -683,7 +683,7 @@ Boolean PFileFlashPixView::CreateCompObj
- #endif
- 
-     // Write prog id ( for now just write length = 0 )
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPSTR_NoPad(&chZero);
- #elif _WINDOWS
-     char progID = 0;
-@@ -695,21 +695,21 @@ Boolean PFileFlashPixView::CreateCompObj
-     curCompObj->WriteVT_I4(&temp);
- 
-     // Write unicode user type ( for now just write length = 0 )
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(lpszNew));
- #elif _WINDOWS
-     curCompObj->WriteVT_LPWSTR_NoPad(lpszNew);
- #endif
- 
-     // Write unicode clipboard format
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(&chZero));
- #elif _WINDOWS
-     curCompObj->WriteVT_LPWSTR_NoPad(&chZero);
- #endif
- 
-     // Write unicode prog id ( for now just write length = 0 )
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-     curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(&chZero));
- #elif _WINDOWS
-     curCompObj->WriteVT_LPWSTR_NoPad(&chZero);
diff --git a/libfpx/patches/patch-fpx_fpxlibio.cpp b/libfpx/patches/patch-fpx_fpxlibio.cpp
deleted file mode 100644
index 7ca73c3..0000000
--- a/libfpx/patches/patch-fpx_fpxlibio.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- fpx/fpxlibio.cpp.orig	2015-12-28 09:48:01.000000000 +0000
-+++ fpx/fpxlibio.cpp
-@@ -66,7 +66,7 @@
- #ifndef FlashPixJPEG_h
-   #include "fpxjpeg.h"
- #endif
--#if defined(__unix) // for CoFileTimeNow
-+#if defined(_UNIX) // for CoFileTimeNow
-   #include "time.hxx"
- #endif
- 
diff --git a/libfpx/patches/patch-fpxlib.h b/libfpx/patches/patch-fpxlib.h
deleted file mode 100644
index ab7b6ee..0000000
--- a/libfpx/patches/patch-fpxlib.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-* Don't use autoconf config file in public header,
-  it's macros are unused in it and the macros might conflict
-  with packages own config.h
---- fpxlib.h.orig	2015-12-11 19:33:16.000000000 +0000
-+++ fpxlib.h
-@@ -11,7 +11,6 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--#include "fpxlib-config.h"
- #include <inttypes.h>
- 
-   typedef struct IStream IStream;
diff --git a/libfpx/patches/patch-ole_olecore.h b/libfpx/patches/patch-ole_olecore.h
deleted file mode 100644
index d816cf2..0000000
--- a/libfpx/patches/patch-ole_olecore.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ole/olecore.h.orig	2015-12-28 09:38:12.000000000 +0000
-+++ ole/olecore.h
-@@ -55,7 +55,7 @@ const GUID BlankGUID = { 0, 0, 0, { 0, 0
- #ifdef _WIN32
- #define ORIGINATING_OS_VERSION  0x0002  // 32-bit Windows
- #endif
--#ifdef __unix
-+#if defined(_UNIX)
- #define ORIGINATING_OS_VERSION  0x0003  // generic UNIX identifier
- #endif
- #ifndef ORIGINATING_OS_VERSION