From a73c64c79c6047314c96f02f5e3afe05c52addfb Mon Sep 17 00:00:00 2001
From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 9 Mar 2009 00:58:58 +0000
Subject: [PATCH] Update xterm to 242.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@14798 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Xorg/app/{xterm-233 => xterm}/Makefile                | 14 +++++---------
 Xorg/app/xterm/patches/010-no-transform.patch         | 19 +++++++++++++++++++
 .../{xterm-233 => xterm}/patches/100-install.patch    |  0
 3 files changed, 24 insertions(+), 9 deletions(-)
 rename Xorg/app/{xterm-233 => xterm}/Makefile (73%)
 create mode 100644 Xorg/app/xterm/patches/010-no-transform.patch
 rename Xorg/app/{xterm-233 => xterm}/patches/100-install.patch (100%)

diff --git a/Xorg/app/xterm-233/Makefile b/Xorg/app/xterm/Makefile
similarity index 73%
rename from Xorg/app/xterm-233/Makefile
rename to Xorg/app/xterm/Makefile
index cdbc076c1..cbed340a2 100644
--- a/Xorg/app/xterm-233/Makefile
+++ b/Xorg/app/xterm/Makefile
@@ -9,11 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xterm
-PKG_VERSION:=223
+PKG_VERSION:=242
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/extras/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://mirror1.openwrt.org/
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +27,7 @@ define Package/xterm
 endef
 
 define Build/Configure
-	sed -e "s%/usr/contrib/X11R6%${STAGING_DIR}/usr/lib%g" -i $(PKG_BUILD_DIR)/configure
+#	sed -e "s%/usr/contrib/X11R6%${STAGING_DIR}/usr/lib%g" -i $(PKG_BUILD_DIR)/configure
 	cd  $(PKG_BUILD_DIR)/; $(TARGET_CONFIGURE_OPTS)	$(CONFIGURE_VARS) \
 		$(CONFIGURE_CMD) \
 		$(CONFIGURE_ARGS_XTRA) \
@@ -37,11 +38,6 @@ define Build/Configure
 		LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) 
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
 define Package/xterm/install
 	$(INSTALL_DIR) $(1)/usr/
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/
diff --git a/Xorg/app/xterm/patches/010-no-transform.patch b/Xorg/app/xterm/patches/010-no-transform.patch
new file mode 100644
index 000000000..a568c6479
--- /dev/null
+++ b/Xorg/app/xterm/patches/010-no-transform.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.in b/Makefile.in
+index 62a2882..159755b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -160,10 +160,10 @@ resize$x : $(OBJS2)
+ 
+ charproc$o : main.h @CHARPROC_DEPS@
+ ################################################################################
+-actual_xterm  = `echo xterm|        sed '$(transform)'`
+-actual_resize = `echo resize|       sed '$(transform)'`
+-actual_uxterm = `echo uxterm|       sed '$(transform)'`
+-actual_k8term = `echo koi8rxterm|   sed '$(transform)'`
++actual_xterm  = xterm
++actual_resize = resize
++actual_uxterm = uxterm
++actual_k8term = koi8rxterm
+ 
+ binary_xterm  = $(actual_xterm)$x
+ binary_resize = $(actual_resize)$x
diff --git a/Xorg/app/xterm-233/patches/100-install.patch b/Xorg/app/xterm/patches/100-install.patch
similarity index 100%
rename from Xorg/app/xterm-233/patches/100-install.patch
rename to Xorg/app/xterm/patches/100-install.patch
-- 
2.11.0