recode 3.6

3 files changed, 45 insertions, 13 deletions

diff --git a/abs/extra/recode/PKGBUILD b/abs/extra/recode/PKGBUILD
index af65e17..c1bf9ad 100644
--- a/abs/extra/recode/PKGBUILD
+++ b/abs/extra/recode/PKGBUILD
@@ -1,38 +1,45 @@
-# $Id: PKGBUILD 84692 2010-07-03 16:19:26Z ibiru $
+# $Id: PKGBUILD 151219 2012-02-25 08:35:55Z pierre $
+# Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=recode
 pkgver=3.6
-pkgrel=6
+pkgrel=7
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/recode/recode.html"
+url="http://recode.progiciels-bpi.ca/index.html"
 license=('GPL' 'LGPL')
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=recode.install
-#source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-source=(ftp://ftp.knoppmyth.net/R6/sources/pinard-Recode-v3.6-0-g2127b34.tar.gz
-        http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz
-        recode-3.6-as-if.patch recode-3.6-gettextfix.diff)
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
+        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
+        'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff' 'recode_automake.patch')
 
 build() {
   cd ${srcdir}/pinard-Recode-2127b34
   patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
   patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
-  patch -Np1 -i ${srcdir}/recode_3.6-15.diff
+  patch -Np1 -i ${srcdir}/recode_3.6-17.diff
+  patch -Np1 -i ${srcdir}/recode_automake.patch
   sed -i '1i#include <stdlib.h>' src/argmatch.c
   rm -f acinclude.m4
   autoreconf -fi
   libtoolize
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --infodir=/usr/share/info --without-included-gettext
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/pinard-Recode-2127b34
+  make DESTDIR=${pkgdir} install
+
   rm ${pkgdir}/usr/share/info/dir
   gzip ${pkgdir}/usr/share/info/*
 }
 md5sums=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
+         '3716ae269074e31add3d29387ff09438'
          'fca7484ba332c8ad59eb02334883cd92'
-         'eb602e80a24b5448604bfebeacc55304')
+         'eb602e80a24b5448604bfebeacc55304'
+         'ad550ad030ebbbd29b29d794e19f6ca8')
diff --git a/abs/extra/recode/__changelog b/abs/extra/recode/__changelog
index af8fbcb..14932e3 100644
--- a/abs/extra/recode/__changelog
+++ b/abs/extra/recode/__changelog
@@ -1 +1,3 @@
-1/2/11 - chw - fixed URL for source
+changed patch to 3.6.17
+added recode_automakepatch, taken from fedora
+
diff --git a/abs/extra/recode/recode_automake.patch b/abs/extra/recode/recode_automake.patch
new file mode 100644
index 0000000..8468f54
--- /dev/null
+++ b/abs/extra/recode/recode_automake.patch
@@ -0,0 +1,23 @@
+--- recode-3.6.orig/configure.in        2001-01-03 16:50:54.000000000 +0100
++++ recode-3.6/configure.in     2012-07-23 14:15:28.000000000 +0200
+@@ -15,7 +15,7 @@
+ AM_PROG_LIBTOOL
+
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
++dnl AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+ ad_AC_PROG_FLEX
+--- recode-3.6.orig/src/Makefile.am     2000-12-06 17:36:12.000000000 +0100
++++ recode-3.6/src/Makefile.am  2012-07-23 14:47:07.000000000 +0200
+@@ -17,7 +17,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+-AUTOMAKE_OPTIONS = gnits ansi2knr
++AUTOMAKE_OPTIONS = gnits
+ bin_PROGRAMS = recode
+ lib_LTLIBRARIES = librecode.la
+ man_MANS = recode.1
+