dcraw: update to 9.19

2 files changed, 28 insertions, 50 deletions

diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD
index 9c2571b..c9228bd 100644
--- a/abs/extra/dcraw/PKGBUILD
+++ b/abs/extra/dcraw/PKGBUILD
@@ -1,48 +1,42 @@
-# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id$
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.15
+pkgver=9.19
 pkgrel=1
-pkgdesc="A command line based converter for digicams raw output"
+pkgdesc='Decodes any raw image from any digital camera'
+url='http://www.cybercom.net/~dcoffin/dcraw/'
 arch=('i686' 'x86_64')
-url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms' 'jasper')
-source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
-        license.txt)
-sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a'
-          '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
+source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4')
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  gcc ${CFLAGS} -O3 -o dcraw dcraw.c \
-    -Wall -Wno-unused-result -Wno-array-bounds \
-    -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
+	cd "${srcdir}/${pkgname}"
+	gcc ${CFLAGS} ${LDFLAGS} \
+		-o dcraw dcraw.c \
+		-lm -ljasper -ljpeg -llcms \
+		-DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
-  install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
-  
-  for langchar in \
-    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \
-    ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \
-    zh_TW.big5 zh_CN.gb2312
-  do
-    lang=$(echo $langchar | cut -d. -f1)
-    char=$(echo $langchar | cut -d. -f2-)
-    if [ -f dcraw_${lang}.1 ]; then
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
-      iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
-      cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
-    fi
-    mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
-    msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
-  done
+	cd "${srcdir}/${pkgname}"
 
-  install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+	install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
+	install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
+	
+	for i in dcraw_*.1; do j=${i#dcraw_}; k=${j%.1}
+		install -Dm644 $i "${pkgdir}"/usr/share/man/$k/man1/dcraw.1
+	done
+
+	for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po}
+		install -d "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES
+		msgfmt -o "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i
+	done
+
+	install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+	head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/abs/extra/dcraw/license.txt b/abs/extra/dcraw/license.txt
deleted file mode 100644
index 5803cf6..0000000
--- a/abs/extra/dcraw/license.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a command-line ANSI C program to convert raw photos from
-any digital camera on any computer running any operating system.
-
-No license is required to download and use dcraw.c.  However,
-to lawfully redistribute this code, you must either (a) include
-full source code* for all executable files containing RESTRICTED
-functions, (b) remove all RESTRICTED functions, re-implement them,
-or copy them from an earlier, unrestricted Revision of dcraw.c,
-or (c) purchase a license from the author.
-
-The functions that process Foveon images have been RESTRICTED
-since Revision 1.237.  All other code remains free for all uses.
-
-*If you have not modified dcraw.c in any way, a link to my
-homepage qualifies as "full source code".
-