diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/texinfo/ChangeLog | 17 | ||||
| -rw-r--r-- | abs/core/texinfo/PKGBUILD | 34 | ||||
| -rw-r--r-- | abs/core/texinfo/texinfo-4.13a-data_types.patch | 32 | ||||
| -rw-r--r-- | abs/core/texinfo/texinfo.install | 15 |
4 files changed, 62 insertions, 36 deletions
diff --git a/abs/core/texinfo/ChangeLog b/abs/core/texinfo/ChangeLog deleted file mode 100644 index 46091e7..0000000 --- a/abs/core/texinfo/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -2008-09-26 Eric Belanger <eric@archlinux.org> - - * texinfo 4.13a-1 - * Upstream update - * Moved to base group - * Added install scriptlet to handle info pages - -2008-04-28 Eric Belanger <eric@archlinux.org> - - * texinfo 4.12-2 - * Added to base-devel group - -2008-04-21 Eric Belanger <eric@archlinux.org> - - * texinfo 4.12-1 - * Upstream update - * Updated license diff --git a/abs/core/texinfo/PKGBUILD b/abs/core/texinfo/PKGBUILD index 69aa173..22ef3c6 100644 --- a/abs/core/texinfo/PKGBUILD +++ b/abs/core/texinfo/PKGBUILD @@ -1,26 +1,34 @@ -# $Id: PKGBUILD 13367 2008-09-27 01:52:08Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=1 +pkgrel=7 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') url="http://www.gnu.org/software/texinfo/" license=('GPL3') groups=('base') -depends=('ncurses') +depends=('ncurses' 'findutils' 'gzip') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('71ba711519209b5fb583fed2b3d86fcb') -sha1sums=('a1533cf8e03ea4fa6c443b73f4c85e4da04dead0') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + texinfo-4.13a-data_types.patch) +md5sums=('71ba711519209b5fb583fed2b3d86fcb' + 'db2ca82c831684cd7cef181234017c46' + 'd8574782ff7def1e2dc5c291dbeaec18') build() { - cd ${srcdir}/${pkgname}-4.13 - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/usr/share/info/dir - gzip ${pkgdir}/usr/share/info/* + cd ${srcdir}/${pkgname}-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-4.13 + make DESTDIR=${pkgdir} install + + # fix this here as it prevents make from trying to rebuild manual pages + sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi } diff --git a/abs/core/texinfo/texinfo-4.13a-data_types.patch b/abs/core/texinfo/texinfo-4.13a-data_types.patch new file mode 100644 index 0000000..2a87c21 --- /dev/null +++ b/abs/core/texinfo/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/abs/core/texinfo/texinfo.install b/abs/core/texinfo/texinfo.install index 87c7ac4..f1554e4 100644 --- a/abs/core/texinfo/texinfo.install +++ b/abs/core/texinfo/texinfo.install @@ -1,18 +1,21 @@ -infodir=/usr/share/info -filelist=(info.info.gz info-stnd.info.gz texinfo.gz texinfo-1.gz texinfo-2.gz texinfo-3.gz) +infodir=usr/share/info +filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3) post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + # Scan *all* info files on install + for file in $(find $infodir -type f ! -name dir); do + install-info $file $infodir/dir 2> /dev/null done } post_upgrade() { - post_install $1 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } pre_remove() { for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } |