[arch-commits] Commit in screen/trunk (PKGBUILD screen.install)

Allan McRae allan at archlinux.org
Thu May 28 11:39:59 UTC 2009


    Date: Thursday, May 28, 2009 @ 07:39:59
  Author: allan
Revision: 40120

upgpkg: screen 4.0.3-7
    get rid of unneeded dependencies (FS#14700), deal with info pages

Modified:
  screen/trunk/PKGBUILD
  screen/trunk/screen.install

----------------+
 PKGBUILD       |   36 +++++++++++++++++-------------------
 screen.install |   21 ++++++++++++++++++---
 2 files changed, 35 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-28 11:37:06 UTC (rev 40119)
+++ PKGBUILD	2009-05-28 11:39:59 UTC (rev 40120)
@@ -1,41 +1,39 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Committer: dorphell <dorphell at gmx.net>
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=6
+pkgrel=7
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
-license=('GPL')
 arch=('i686' 'x86_64')
-install=screen.install
-depends=(ncurses libelf shadow gpm)
-backup=('etc/screenrc' 'etc/pam.d/screen')
 url="ftp://ftp.uni-erlangen.de/pub/utilities/screen"
+license=('GPL')
+depends=('ncurses' 'pam')
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+install=screen.install
 source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz \
         screen.pam)
 md5sums=('8506fd205028a96c741e4037de6e3c42' '74f7919d7b65436cc2ea5341fa8ca374')
 
 build() {
-  export MAKEFLAGS="-j1"
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-pam \
         --with-sys-screenrc=/etc/screenrc --enable-colors256 \
        --enable-rxvt_osc --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man
+       --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  mkdir -p ${startdir}/pkg/etc/pam.d 
-  install -m644 ${startdir}/src/screen.pam ${startdir}/pkg/etc/pam.d/screen
+  make DESTDIR=${pkgdir} install || return 1
+  install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
 
-  cd etc/
-  mkdir -p ${startdir}/pkg/usr/share/zsh/site-functions/
-  install -m644 completer.zsh ${startdir}/pkg/usr/share/zsh/site-functions/screen
-  mkdir -p ${startdir}/pkg/etc/skel/
-  install -m644 etcscreenrc ${startdir}/pkg/etc/screenrc
-  install -m644 screenrc ${startdir}/pkg/etc/skel/.screenrc
+  install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen
+  install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc
+  install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc
 
-  rm -rf ${startdir}/pkg/usr/info
+  rm ${pkgdir}/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/*
 }

Modified: screen.install
===================================================================
--- screen.install	2009-05-28 11:37:06 UTC (rev 40119)
+++ screen.install	2009-05-28 11:39:59 UTC (rev 40120)
@@ -1,8 +1,21 @@
+infodir=/usr/share/info
+filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
 
+post_install() {
+    [ -x usr/bin/install-info ] || return 0
+    for file in ${filelist[@]}; do
+        install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+    done
+}
+
 pre_upgrade() {
     pre_remove $*
 }
 
+post_upgrade() {
+    post_install $1
+}
+
 pre_remove() {
     compiled="/usr/share/terminfo/s/screen-256color"
     if [ -e $compiled ]; then
@@ -20,8 +33,10 @@
             echo "done."
         fi
     fi
+
+    [ -x usr/bin/install-info ] || return 0
+    for file in ${filelist[@]}; do
+        install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+    done
 }
 
-op=$1
-shift
-$op $*




More information about the arch-commits mailing list