From: lars Date: Mon, 9 Mar 2009 00:58:58 +0000 (+0000) Subject: Update xterm to 242. X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=a73c64c79c6047314c96f02f5e3afe05c52addfb;p=packages.git Update xterm to 242. git-svn-id: svn://svn.openwrt.org/openwrt/packages@14798 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Xorg/app/xterm-233/Makefile b/Xorg/app/xterm-233/Makefile deleted file mode 100644 index cdbc076c1..000000000 --- a/Xorg/app/xterm-233/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xterm -PKG_VERSION:=223 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/extras/ - -include $(INCLUDE_DIR)/package.mk - -define Package/xterm - SECTION:=xorg-extra - CATEGORY:=Xorg - SUBMENU:=terminals - TITLE:=xterm - DEPENDS:=+libX11 +libncurses +libXaw -endef - -define Build/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) \ - $(CONFIGURE_ARGS) \ - --host=$(GNU_TARGET_NAME) \ - --x-includes=$(STAGING_DIR)/usr/include/ \ - --x-libraries=$(STAGING_DIR)/usr/lib/ \ - 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/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/ -endef - -$(eval $(call BuildPackage,xterm)) diff --git a/Xorg/app/xterm-233/patches/100-install.patch b/Xorg/app/xterm-233/patches/100-install.patch deleted file mode 100644 index 1d783e3bf..000000000 --- a/Xorg/app/xterm-233/patches/100-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN xterm-223.orig/Makefile.in xterm-223/Makefile.in ---- xterm-223.orig/Makefile.in 2007-09-17 11:56:45.000000000 +0200 -+++ xterm-223/Makefile.in 2007-09-17 11:57:33.000000000 +0200 -@@ -150,7 +150,7 @@ - @MAY_SETUID@ $(SHELL) $(srcdir)/sinstall.sh @SINSTALL_OPTS@ "$(INSTALL_PROGRAM)" xterm$x @XTERM_PATH@ $(BINDIR)/$(binary_xterm) - @NOT_SETUID@ $(INSTALL_PROGRAM) xterm$x $(BINDIR)/$(binary_xterm) - $(INSTALL_PROGRAM) -m 755 resize$x $(BINDIR)/$(binary_resize) -- @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ -+# @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ - if test "$(binary_xterm)" != "xterm"; then \ - name="$(binary_xterm)"; \ - sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \ diff --git a/Xorg/app/xterm/Makefile b/Xorg/app/xterm/Makefile new file mode 100644 index 000000000..cbed340a2 --- /dev/null +++ b/Xorg/app/xterm/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xterm +PKG_VERSION:=242 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://mirror1.openwrt.org/ +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xterm + SECTION:=xorg-extra + CATEGORY:=Xorg + SUBMENU:=terminals + TITLE:=xterm + DEPENDS:=+libX11 +libncurses +libXaw +endef + +define Build/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) \ + $(CONFIGURE_ARGS) \ + --host=$(GNU_TARGET_NAME) \ + --x-includes=$(STAGING_DIR)/usr/include/ \ + --x-libraries=$(STAGING_DIR)/usr/lib/ \ + LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" +endef + +define Package/xterm/install + $(INSTALL_DIR) $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/ +endef + +$(eval $(call BuildPackage,xterm)) 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/patches/100-install.patch b/Xorg/app/xterm/patches/100-install.patch new file mode 100644 index 000000000..1d783e3bf --- /dev/null +++ b/Xorg/app/xterm/patches/100-install.patch @@ -0,0 +1,12 @@ +diff -urN xterm-223.orig/Makefile.in xterm-223/Makefile.in +--- xterm-223.orig/Makefile.in 2007-09-17 11:56:45.000000000 +0200 ++++ xterm-223/Makefile.in 2007-09-17 11:57:33.000000000 +0200 +@@ -150,7 +150,7 @@ + @MAY_SETUID@ $(SHELL) $(srcdir)/sinstall.sh @SINSTALL_OPTS@ "$(INSTALL_PROGRAM)" xterm$x @XTERM_PATH@ $(BINDIR)/$(binary_xterm) + @NOT_SETUID@ $(INSTALL_PROGRAM) xterm$x $(BINDIR)/$(binary_xterm) + $(INSTALL_PROGRAM) -m 755 resize$x $(BINDIR)/$(binary_resize) +- @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ ++# @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ + if test "$(binary_xterm)" != "xterm"; then \ + name="$(binary_xterm)"; \ + sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \