From f8cf500b28d15161d06b69f4e63a87e403ccfc80 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Wed, 7 Jan 2015 10:59:00 +0300 Subject: [PATCH] automake1.15: New package for new version of automake --- automake1.15/PKGBUILD | 74 +++++++++++++++++++ automake1.15/automake-1.15-msys2.patch | 72 ++++++++++++++++++ automake1.15/automake1.15-documentation.patch | 43 +++++++++++ 3 files changed, 189 insertions(+) create mode 100644 automake1.15/PKGBUILD create mode 100644 automake1.15/automake-1.15-msys2.patch create mode 100644 automake1.15/automake1.15-documentation.patch diff --git a/automake1.15/PKGBUILD b/automake1.15/PKGBUILD new file mode 100644 index 00000000..f401a75f --- /dev/null +++ b/automake1.15/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.15 +pkgver=1.15 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} + automake1.15-documentation.patch + automake-1.15-msys2.patch) +md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d' + 'SKIP' + 'dc671559c3ab5ff1fe38bb6859cc6f01' + 'eb5d504185474b2de2163060c4df4d8d') +replace=('automake') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p1 -i ${srcdir}/automake1.15-documentation.patch + patch -p1 -i ${srcdir}/automake-1.15-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.15.info automake.texi) + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake-history1.15.info automake-history.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am15 + + # install the 1.15 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.15/automake-1.15-msys2.patch b/automake1.15/automake-1.15-msys2.patch new file mode 100644 index 00000000..d56e7f32 --- /dev/null +++ b/automake1.15/automake-1.15-msys2.patch @@ -0,0 +1,72 @@ +diff -Naur automake-1.15-orig/lib/ar-lib automake-1.15/lib/ar-lib +--- automake-1.15-orig/lib/ar-lib 2014-12-31 00:53:05.000000000 +0300 ++++ automake-1.15/lib/ar-lib 2015-01-07 10:46:20.752400000 +0300 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur automake-1.15-orig/lib/compile automake-1.15/lib/compile +--- automake-1.15-orig/lib/compile 2014-12-31 00:53:05.000000000 +0300 ++++ automake-1.15/lib/compile 2015-01-07 10:46:57.337400000 +0300 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -67,7 +67,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur automake-1.15-orig/lib/config.guess automake-1.15/lib/config.guess +--- automake-1.15-orig/lib/config.guess 2014-12-27 20:23:54.000000000 +0300 ++++ automake-1.15/lib/config.guess 2015-01-07 10:47:31.019800000 +0300 +@@ -867,6 +867,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur automake-1.15-orig/t/compile5.sh automake-1.15/t/compile5.sh +--- automake-1.15-orig/t/compile5.sh 2014-12-30 16:49:41.000000000 +0300 ++++ automake-1.15/t/compile5.sh 2015-01-07 10:48:12.160000000 +0300 +@@ -47,11 +47,11 @@ + ;; + esac + case @build_os@ in +- mingw* | cygwin*) ++ mingw* | cygwin* | msys*) + ;; + *) + winepath -w / \ +- || skip_ "not on MinGW or Cygwin, and winepath not available" ++ || skip_ "not on MinGW or Cygwin or MSYS, and winepath not available" + ;; + esac + END diff --git a/automake1.15/automake1.15-documentation.patch b/automake1.15/automake1.15-documentation.patch new file mode 100644 index 00000000..a3669cb7 --- /dev/null +++ b/automake1.15/automake1.15-documentation.patch @@ -0,0 +1,43 @@ +diff -Naur automake-1.15-orig/doc/automake.texi automake-1.15/doc/automake.texi +--- automake-1.15-orig/doc/automake.texi 2014-12-31 16:26:32.000000000 +0300 ++++ automake-1.15/doc/automake.texi 2015-01-07 10:44:29.415400000 +0300 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.15.info ++@settitle automake1.15 + @documentencoding UTF-8 + @documentlanguage en + @setchapternewpage off +@@ -40,13 +40,13 @@ + + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake1.15: (automake). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal-1.15-invocation: (automake1.15)aclocal Invocation. Generating aclocal.m4. ++* automake-1.15-invocation: (automake1.15)automake Invocation. Generating Makefile.in. + @end direntry + + @titlepage +diff -Naur automake-1.15-orig/doc/automake-history.texi automake-1.15/doc/automake-history.texi +--- automake-1.15-orig/doc/automake-history.texi 2014-12-31 00:53:05.000000000 +0300 ++++ automake-1.15/doc/automake-history.texi 2015-01-07 10:44:50.585600000 +0300 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake-history.info +-@settitle automake-history ++@setfilename automake-history1.15.info ++@settitle automake-history1.15 + @setchapternewpage on + @c %**end of header +