From 2a77feab0549ab1b83fcd12a07b53fa253fb5f16 Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Wed, 11 Sep 2019 15:15:59 +0200 Subject: [PATCH 1/2] xterm: be0 conversion --- xterm-303-1.bee => xterm.be0 | 38 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 26 deletions(-) rename xterm-303-1.bee => xterm.be0 (73%) diff --git a/xterm-303-1.bee b/xterm.be0 similarity index 73% rename from xterm-303-1.bee rename to xterm.be0 index 717bee1a9..a0eec7233 100755 --- a/xterm-303-1.bee +++ b/xterm.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION xterm-303-1 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -16,14 +18,8 @@ SRCURL[0]="ftp://invisible-island.net/xterm/xterm-${PKGVERSION}.tgz" # PATCHURL+=() ############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source ## directory. # build_in_sourcedir @@ -36,7 +32,6 @@ SRCURL[0]="ftp://invisible-island.net/xterm/xterm-${PKGVERSION}.tgz" # sourcesubdir_append src -BEE_CONFIGURE='compat' ############################################################################### ## Change the default (auto-detected) steps to @@ -58,11 +53,12 @@ mee_patch_post() { } mee_configure() { - TERMINFO=/usr/lib/terminfo \ - bee_configure \ - --enable-luit \ - --enable-wide-chars \ - --with-app-defaults=/etc/X11/app-defaults + cd ${S} + ./configure \ + --prefix=/usr \ + --enable-luit \ + --enable-wide-chars \ + --with-app-defaults=/etc/X11/app-defaults } #mee_build() { @@ -73,17 +69,7 @@ mee_install() { bee_install make install-ti } - -#mee_install_post() { -# cat >> ${D}/etc/X11/app-defaults/XTerm <<- "EOF" -# *VT100*locale: true -# *VT100*faceName: Monospace -# *VT100*faceSize: 10 -# *backarrowKeyIsErase: true -# *ptyInitialErase: true -# EOF -#} - +## by default this may be 'make install DESTDIR="${D}"' ############################################################################### ## @@ -92,7 +78,7 @@ mee_install() { ## The name of this bee-file should follow the following naming convention: ## pkgname-pkgversion-pkgrevision.bee ## -## You may remove all comments as long as SRCURL[0]="" is set. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From 2bc5dcdb091f41a1519df8282c06ef996fdee97f Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Wed, 11 Sep 2019 15:36:13 +0200 Subject: [PATCH 2/2] xterm: update url --- xterm.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xterm.be0 b/xterm.be0 index a0eec7233..2be29fead 100755 --- a/xterm.be0 +++ b/xterm.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xterm-303-1 +# BEE_VERSION xterm-303-2 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="ftp://invisible-island.net/xterm/xterm-${PKGVERSION}.tgz" +SRCURL[0]="ftp://ftp.invisible-island.net/xterm/${PKGNAME}-${PKGVERSION}.tgz ${PKGNAME}-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array.