libmng: adopt the port from opt-x86_64

4 files changed, 23 insertions, 55 deletions

diff --git a/libmng/.footprint b/libmng/.footprint
index 6bb4e72d5..559aecc07 100644
--- a/libmng/.footprint
+++ b/libmng/.footprint
@@ -6,7 +6,12 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmng.a
 -rwxr-xr-x	root/root	usr/lib/libmng.la
-lrwxrwxrwx	root/root	usr/lib/libmng.so -> libmng.so.1
-lrwxrwxrwx	root/root	usr/lib/libmng.so.1 -> libmng.so.1.1.0.10
-lrwxrwxrwx	root/root	usr/lib/libmng.so.1.0.10 -> libmng.so.1.1.0.10
--rwxr-xr-x	root/root	usr/lib/libmng.so.1.1.0.10
+lrwxrwxrwx	root/root	usr/lib/libmng.so -> libmng.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libmng.so.1 -> libmng.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libmng.so.1.0.0
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man3/
+-rw-r--r--	root/root	usr/man/man3/libmng.3.gz
+drwxr-xr-x	root/root	usr/man/man5/
+-rw-r--r--	root/root	usr/man/man5/jng.5.gz
+-rw-r--r--	root/root	usr/man/man5/mng.5.gz
diff --git a/libmng/.md5sum b/libmng/.md5sum
index 23e5eb805..f1bef7639 100644
--- a/libmng/.md5sum
+++ b/libmng/.md5sum
@@ -1,2 +1 @@
 a464ae7d679781beebdf7440d144b7bd  libmng-1.0.10.tar.gz
-0397575438abbe8f7d829fb67c529fa3  libmng.la
diff --git a/libmng/Pkgfile b/libmng/Pkgfile
index a859f07c0..a413028c6 100644
--- a/libmng/Pkgfile
+++ b/libmng/Pkgfile
@@ -1,23 +1,22 @@
-# Description: libmng - Mutliple Image Network Graphics 
-# URL:         http://www.libmng.com
-# Maintainer:  Juergen Daubert, jue at crux dot nu
-# Packager:    Daniel Mueller, daniel at danm dot de
-# Depends on:  zlib, libjpeg, lcms
+# Description:  libmng - Mutliple Image Network Graphics 
+# URL:          http://www.libmng.com
+# Maintainer:   Juergen Daubert, jue at crux dot nu
+# Packager:     Fredrik Rinnestam, fredrik at obra dot se
+# Depends on:   zlib, libjpeg, lcms
 
 name=libmng
 version=1.0.10
-release=1
-source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \
-        libmng.la)
+release=2
+source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
-    mkdir -p $PKG/usr/{include,lib}
     cd $name-$version
-    cp makefiles/makefile.linux Makefile
-    sed -i -e 's|/local||g' Makefile
-    sed -i 's|1\.0\.9|1\.0\.10|g' Makefile
+
+    ln -s makefiles/configure.in .
+    ln -s makefiles/Makefile.am .
+    sed -i '/AM_C_PROTOTYPES/d' configure.in
+    autoreconf --force --install
+    ./configure --prefix=/usr --mandir=/usr/man
     make
-    make prefix=$PKG/usr install
-    ln -s libmng.so.1.1.0.10 $PKG/usr/lib/libmng.so.1.0.10
-    install -m 755 $SRC/libmng.la $PKG/usr/lib
+    make DESTDIR=$PKG install
 }
diff --git a/libmng/libmng.la b/libmng/libmng.la
deleted file mode 100644
index 93ab1b7f3..000000000
--- a/libmng/libmng.la
+++ /dev/null
@@ -1,35 +0,0 @@
-# libmng.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5a (1.1240 2003/06/26 06:55:19)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libmng.so.1'
-
-# Names of this library.
-library_names='libmng.so.1.0.10 libmng.so.1 libmng.so'
-
-# The name of the static archive.
-old_library='libmng.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lz /usr/lib/libjpeg.la /usr/lib/liblcms.la -lm'
-
-# Version information for libmng.
-current=1
-age=0
-revision=10
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'