summaryrefslogtreecommitdiffstats
path: root/abs/core/readline
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-02-19 21:10:18 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-02-19 21:10:18 (GMT)
commit2648e999d277eac5c3d331a3609bcc73fafbea71 (patch)
tree40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/core/readline
parentc759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff)
parent7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff)
downloadlinhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip
linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz
linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2
Merge branch 'testing'
# By James Meyer (1091) and others # Via James Meyer (5) and others * testing: (1148 commits) LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables. xf86-video-ati: xorg ati driver. LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE. LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop. e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers. LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902 zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900 iguanair: rebuild with python 2.7 LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first. linhes-udev-rules: add rules for mce,streamzap,serial lirc devices. mythinstall: recompile for matching libs mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/ ...
Diffstat (limited to 'abs/core/readline')
-rw-r--r--abs/core/readline/PKGBUILD69
-rw-r--r--abs/core/readline/inputrc4
-rw-r--r--abs/core/readline/readline.install9
3 files changed, 38 insertions, 44 deletions
diff --git a/abs/core/readline/PKGBUILD b/abs/core/readline/PKGBUILD
index 24126df..037b7e1 100644
--- a/abs/core/readline/PKGBUILD
+++ b/abs/core/readline/PKGBUILD
@@ -1,35 +1,44 @@
-# $Id: PKGBUILD 82724 2010-06-16 04:51:23Z allan $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=readline
-_patchlevel=002 #prepare for some patches
-pkgver=6.1.$_patchlevel
-pkgrel=2
+_basever=6.2
+_patchlevel=004 #prepare for some patches
+pkgver=$_basever.$_patchlevel
+pkgrel=1
pkgdesc="GNU readline library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://tiswww.case.edu/php/chet/readline/rltop.html"
license=('GPL')
depends=('glibc' 'ncurses')
-backup=("etc/inputrc")
-source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz
+backup=('etc/inputrc')
+options=('!emptydirs')
+install=readline.install
+source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
inputrc)
if [ $_patchlevel -gt 00 ]; then
- for (( p=1; p<=$_patchlevel; p++ )); do
- source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$(printf "%03d" $p))
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
done
fi
-md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3'
- 'e5fc955f56d9fa5beb871f3279b8fa8b'
- 'c642f2e84d820884b0bf9fd176bc6c3f'
- '1a76781a1ea734e831588285db7ec9b1')
+md5sums=('67948acb2ca081f23359d0256e9a271c'
+ '928f7d248320a65e43c2dc427e99582b'
+ '58d54966c1191db45973cb3191ac621a'
+ '83287d52a482f790dfb30ec0a8746669'
+ '8e6a51e2e0e6e45a82752e3692c111ac'
+ '0665020ea118e8434bd145fb71f452cc'
+ '285361ca6d48c51ae2428157e174e812'
+ 'c9d5d79718856e711667dede87cb7622'
+ '4437205bb1462f5f32e4812b8292c675'
+ 'c08e787f50579ce301075c523fa660a4'
+ '7e39cad1d349b8ae789e4fc33dbb235f')
build() {
- cd ${srcdir}/${pkgname}-6.1
- for p in ../readline61-*; do
- [ -e "$p" ] || continue
- msg "applying patch ${p}"
- patch -Np0 -i ${p} || return 1
+ cd ${srcdir}/${pkgname}-$_basever
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
+ patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
done
# Remove RPATH from shared objects (FS#14366)
@@ -38,19 +47,13 @@ build() {
# build with -fPIC for x86_64 (FS#15634)
[ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
- ./configure --prefix=/usr --libdir=/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info
- make SHLIB_LIBS=-lncurses || return 1
- make DESTDIR=${pkgdir} install || return 1
-
- mkdir -p ${pkgdir}/etc
- install -m644 ../inputrc ${pkgdir}/etc/inputrc || return 1
- #FHS recommends only shared libs in /lib
- mkdir -p $pkgdir/usr/lib
- mv $pkgdir/lib/*.a $pkgdir/usr/lib
+ ./configure --prefix=/usr
+ make SHLIB_LIBS=-lncurses
+}
- # to make the linker find the shared lib and fix compile issues
- cd ${pkgdir}/usr/lib
- ln -sv /lib/libreadline.so .
- ln -sv /lib/libhistory.so .
+package() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
}
diff --git a/abs/core/readline/inputrc b/abs/core/readline/inputrc
index 6ad9dd9..fd13a67 100644
--- a/abs/core/readline/inputrc
+++ b/abs/core/readline/inputrc
@@ -34,7 +34,3 @@ $if mode=emacs
"\e[H": beginning-of-line
"\e[F": end-of-line
$endif
-
-# Include user-specific configuration
-$include ~/.inputrc
-
diff --git a/abs/core/readline/readline.install b/abs/core/readline/readline.install
index 0d40c51..06b646f 100644
--- a/abs/core/readline/readline.install
+++ b/abs/core/readline/readline.install
@@ -1,18 +1,13 @@
-infodir=/usr/share/info
+infodir=usr/share/info
filelist=(history.info readline.info rluserman.info)
-post_install() {
+post_upgrade() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
-post_upgrade() {
- post_install $1
- echo ">> You can safely ignore any \"cannot open shared object\" errors you see above"
-}
-
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do