[arch-commits] Commit in screen/trunk (3 files)

[Allan McRae]

    Date: Friday, December 3, 2010 @ 05:20:47
  Author: allan
Revision: 101972

upgpkg: screen 4.0.3-9
allow longer #TERM, fix up install file

Added:
  screen/trunk/screen-4.0.3-long-term.patch
Modified:
  screen/trunk/PKGBUILD
  screen/trunk/screen.install

------------------------------+
 PKGBUILD                     |   23 +++++++++++++----------
 screen-4.0.3-long-term.patch |   24 ++++++++++++++++++++++++
 screen.install               |    6 +++---
 3 files changed, 40 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-03 10:03:08 UTC (rev 101971)
+++ PKGBUILD	2010-12-03 10:20:47 UTC (rev 101972)
@@ -4,7 +4,7 @@
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=8
+pkgrel=9
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
 arch=('i686' 'x86_64')
@@ -14,26 +14,29 @@
 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 \
+source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz
+        screen-4.0.3-long-term.patch
         screen.pam)
-md5sums=('8506fd205028a96c741e4037de6e3c42' '74f7919d7b65436cc2ea5341fa8ca374')
+md5sums=('8506fd205028a96c741e4037de6e3c42'
+         '2723c3e71d5a2e5a74b6ddbc5215ef0f'
+         '74f7919d7b65436cc2ea5341fa8ca374')
 
 build() {
-  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 --infodir=/usr/share/info
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
   install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
 
   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 ${pkgdir}/usr/share/info/dir
-  gzip -9 ${pkgdir}/usr/share/info/*
 }

Added: screen-4.0.3-long-term.patch
===================================================================
--- screen-4.0.3-long-term.patch	                        (rev 0)
+++ screen-4.0.3-long-term.patch	2010-12-03 10:20:47 UTC (rev 101972)
@@ -0,0 +1,24 @@
+diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
+--- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
++++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
+@@ -85,7 +85,7 @@
+   struct win *d_other;		/* pointer to other window */
+   int   d_nonblock;		/* -1 don't block if obufmax reached */
+ 				/* >0: block after nonblock secs */
+-  char  d_termname[20 + 1];	/* $TERM */
++  char  d_termname[40 + 1];	/* $TERM */
+   char	*d_tentry;		/* buffer for tgetstr */
+   char	d_tcinited;		/* termcap inited flag */
+   int	d_width, d_height;	/* width/height of the screen */
+diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
+--- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
++++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
+@@ -202,7 +202,7 @@
+ 	  char preselect[20];
+ 	  int esc;		/* his new escape character unless -1 */
+ 	  int meta_esc;		/* his new meta esc character unless -1 */
+-	  char envterm[20 + 1];	/* terminal type */
++	  char envterm[40 + 1];	/* terminal type */
+ 	  int encoding;		/* encoding of display */
+ 	}
+       attach;

Modified: screen.install
===================================================================
--- screen.install	2010-12-03 10:03:08 UTC (rev 101971)
+++ screen.install	2010-12-03 10:20:47 UTC (rev 101972)
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
 
 post_install() {
@@ -9,7 +9,7 @@
 }
 
 pre_upgrade() {
-    compiled="/usr/share/terminfo/s/screen-256color"
+    compiled="usr/share/terminfo/s/screen-256color"
     if [ -e $compiled ]; then
         if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
             echo -n "removing compiled terminfo..."
@@ -17,7 +17,7 @@
             echo "done."
         fi
     fi
-    compiled="/usr/share/terminfo/s/screen-256color-bce"
+    compiled="usr/share/terminfo/s/screen-256color-bce"
     if [ -e $compiled ]; then
         if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
             echo -n "removing compiled terminfo..."