Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/tzdata/PKGBUILD

1 files changed, 30 insertions, 23 deletions

diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD
index 8468c92..8ae9657 100644
--- a/abs/extra/dcraw/PKGBUILD
+++ b/abs/extra/dcraw/PKGBUILD
@@ -1,41 +1,48 @@
-# $Id: PKGBUILD 84664 2010-07-03 05:41:46Z allan $
+# $Id$
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
-# Note for rebuilders:
-# dcraw.c  is released as pure C file, not as a package with a changing version
-# number in the name. The name of the file to be downloaded is always the same!
-# So if you are a bad boy (Santa knows everything!) and build as root, this file
-# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version
-# likely will fail due to an MD5 error. If so, delete the files from the cache
-# to force a new download.
-
 pkgname=dcraw
-pkgver=1.438
+pkgver=9.08
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64')
 url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms')
-source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.c
-        http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.1 
+source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
+md5sums=('eb1d365c27495a513c0768b2f696ba66'
+         '110b4604a6dacd5537339c4082e9e12a')
+sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e'
+          '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
-  cd "${srcdir}"
-  gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms
+  cd "${srcdir}/${pkgname}"
+  gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
-  cd "${srcdir}"
-  install -Dm755  ${pkgname} "${pkgdir}"/usr/bin/${pkgname}
-  
-  # install a manpage, provided separately on authors homepage
-  install -Dm644 ${pkgname}.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1
+  cd "${srcdir}/${pkgname}"
+  install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
+  install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
   
-  install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+  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
+
+  install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
-md5sums=('108f0c14a5be4d092c7ffa8460044fb3'
-         '6ba2a797c4ad698589f83171d6b36396'
-         '110b4604a6dacd5537339c4082e9e12a')