xterm: updated to 330

diff --git a/xterm/.footprint b/xterm/.footprint
index 33188981741212980771e274fa9756b7e741dc29..7bd6882c4598264a6a0fcbc4cd28f4d584ff82ec 100644 (file)
--- a/xterm/.footprint
+++ b/xterm/.footprint
@@ -4,16 +4,17 @@ drwxr-xr-x    root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/resize
 -rwxr-xr-x     root/root       usr/bin/uxterm
 -rwxr-xr-x     root/root       usr/bin/xterm
-drwxr-xr-x     root/root       usr/lib/
-drwxr-xr-x     root/root       usr/lib/X11/
-drwxr-xr-x     root/root       usr/lib/X11/app-defaults/
--rw-r--r--     root/root       usr/lib/X11/app-defaults/KOI8RXTerm
--rw-r--r--     root/root       usr/lib/X11/app-defaults/KOI8RXTerm-color
--rw-r--r--     root/root       usr/lib/X11/app-defaults/UXTerm
--rw-r--r--     root/root       usr/lib/X11/app-defaults/UXTerm-color
--rw-r--r--     root/root       usr/lib/X11/app-defaults/XTerm
--rw-r--r--     root/root       usr/lib/X11/app-defaults/XTerm-color
 drwxr-xr-x     root/root       usr/share/
+drwxr-xr-x     root/root       usr/share/X11/
+drwxr-xr-x     root/root       usr/share/X11/app-defaults/
+-rw-r--r--     root/root       usr/share/X11/app-defaults/KOI8RXTerm
+-rw-r--r--     root/root       usr/share/X11/app-defaults/KOI8RXTerm-color
+-rw-r--r--     root/root       usr/share/X11/app-defaults/UXTerm
+-rw-r--r--     root/root       usr/share/X11/app-defaults/UXTerm-color
+-rw-r--r--     root/root       usr/share/X11/app-defaults/XTerm
+-rw-r--r--     root/root       usr/share/X11/app-defaults/XTerm-color
+drwxr-xr-x     root/root       usr/share/applications/
+-rw-r--r--     root/root       usr/share/applications/xterm.desktop
 drwxr-xr-x     root/root       usr/share/man/
 drwxr-xr-x     root/root       usr/share/man/man1/
 -rw-r--r--     root/root       usr/share/man/man1/koi8rxterm.1.gz

diff --git a/xterm/.md5sum b/xterm/.md5sum
index 5601cbcba5ec775b1f231c31728094c90c06dea0..b57ac2e05c1b8cc585b14fec9e31867ed1159f1d 100644 (file)
--- a/xterm/.md5sum
+++ b/xterm/.md5sum
@@ -1,2 +1 @@
-2bc971a1753fe57aca05fde7c005a16c  configure.diff
-3c32e931adcad44e64e57892e75d9e02  xterm-327.tgz
+9a6db7974aa4ccbb50eabebf72618467  xterm-330.tgz

diff --git a/xterm/Pkgfile b/xterm/Pkgfile
index 0ffd505c847753dc5914f052a252796d3f47e08f..489933c588dcd7d8d504533fbcc053d92f29d2d3 100644 (file)
--- a/xterm/Pkgfile
+++ b/xterm/Pkgfile
@@ -6,20 +6,22 @@
 # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
 
 name=xterm
-version=327
+version=330
 release=1
-source=(ftp://invisible-island.net/$name/$name-$version.tgz \
-        configure.diff)
+source=(ftp://invisible-island.net/$name/$name-$version.tgz)
 
 build() {
   cd $name-$version
-  [ -z "$BASH_VERSION" ] && patch -p0 -i $SRC/configure.diff
 
   ./configure --prefix=/usr \
+              --with-app-defaults=/usr/share/X11/app-defaults/ \
               --disable-nls \
               --enable-256-color \
               --enable-wide-chars
 
   make
   make install DESTDIR=$PKG
+
+  install -d $PKG/usr/share/applications
+  install -m 0644 xterm.desktop $PKG/usr/share/applications
 }

diff --git a/xterm/configure.diff b/xterm/configure.diff
deleted file mode 100644 (file)
index 327e5ec..0000000
--- a/xterm/configure.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix a stupid bashism
---- configure.orig     2006-05-02 02:01:12.637169936 +0200
-+++ configure  2006-05-02 02:01:30.861399432 +0200
-@@ -5217,7 +5217,7 @@ if test "${with_app_defaults+set}" = set
-   withval="$with_app_defaults"
- 
- else
--  withval="${appsdir-'\$(exec_prefix)/lib/X11/app-defaults'}"
-+  withval="${appsdir-'\$\(exec_prefix\)/lib/X11/app-defaults'}"
- fi;
- case ".$withval" in #(vi
- .\$\(*\)*|.\'*\'*) #(vi