From 71370547139c1b385b472c24e073a00ead9890e5 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 17 Aug 2013 20:22:13 +0200
Subject: update package libmng

---
 src/libmng-1-fixes.patch | 32 --------------------------------
 src/libmng.mk            | 28 ++++++++++------------------
 2 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 src/libmng-1-fixes.patch

diff --git a/src/libmng-1-fixes.patch b/src/libmng-1-fixes.patch
deleted file mode 100644
index dcf0fdb..0000000
--- a/src/libmng-1-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 1a94342a8f86ab72b8d6c24b8ecd974d2821be04 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Thu, 3 Nov 2011 14:40:24 +0100
-Subject: [PATCH] add pkg-config file
-
-
-diff --git a/libmng.pc.in b/libmng.pc.in
-new file mode 100644
-index 0000000..1dfc9fa
---- /dev/null
-+++ b/libmng.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: libmng
-+Description:  The MNG library.
-+Version: @VERSION@
-+Libs: -L${libdir} -lmng
-+Libs.private: @mng_libs_private@
-+Cflags: -I${includedir}
-+Requires.private: @mng_requires_private@
--- 
-1.7.7
-
diff --git a/src/libmng.mk b/src/libmng.mk
index 33a9151..6f08e09 100644
--- a/src/libmng.mk
+++ b/src/libmng.mk
@@ -3,12 +3,12 @@
 
 PKG             := libmng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.10
-$(PKG)_CHECKSUM := c21c84b614500ae1a41c6595d5f81c596e406ca2
+$(PKG)_VERSION  := 2.0.2
+$(PKG)_CHECKSUM := 7dd35369ff5916e1823cbacef984ab1b87714b69
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc zlib jpeg lcms1
+$(PKG)_DEPS     := gcc zlib jpeg lcms
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \
@@ -17,18 +17,10 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    $(MAKE) -C '$(1)' -j '$(JOBS)' \
-        -f '$(1)'/makefiles/makefile.unix \
-        CC=$(TARGET)-gcc CFLAGS='-DMNG_BUILD_SO -DMNG_FULL_CMS'
-    $(TARGET)-ranlib '$(1)/libmng.a'
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/libmng.a' '$(PREFIX)/$(TARGET)/lib/'
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
-    $(INSTALL) -m644 '$(1)/libmng.h' '$(1)/libmng_conf.h' '$(1)/libmng_types.h' '$(PREFIX)/$(TARGET)/include/'
-    $(SED) -e 's^@prefix@^$(PREFIX)/$(TARGET)^;' \
-           -e 's^@VERSION@^$(libmng_VERSION)^;' \
-           -e 's^@mng_libs_private@^-ljpeg^;' \
-           -e 's^@mng_requires_private@^lcms zlib^;' \
-           < '$(1)/libmng.pc.in' > '$(1)/libmng.pc'
-    $(INSTALL) -m644 '$(1)/libmng.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/'
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
-- 
cgit v0.12