From b9a39f8977b66bbf6a81bf266f98dd0ecb8cbbbf Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Jun 2018 12:59:10 +0200 Subject: [PATCH 1/2] xdu: Update to version 3.0p7 Remove versions 3.0 and 3.0p5 which seem to be installed in parallel. Create new versionless bee build file for version 3.0p7. This release adds the ability to export into svg file (key 'v') --- xdu-3.0-0.bee | 35 -------------------- xdu-3.0_p5-0.bee | 35 -------------------- xdu.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 70 deletions(-) delete mode 100755 xdu-3.0-0.bee delete mode 100755 xdu-3.0_p5-0.bee create mode 100755 xdu.be0 diff --git a/xdu-3.0-0.bee b/xdu-3.0-0.bee deleted file mode 100755 index e46164225..000000000 --- a/xdu-3.0-0.bee +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://sd.wareonearth.com/~phil/xdu/xdu-3.0.tar.Z" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - -B=${S} - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_extract() { - tar xof ${1} -C ${S} -} - -mee_patch() { - bee_patch -} - -mee_configure() { -# bee_configure - xmkmf -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} diff --git a/xdu-3.0_p5-0.bee b/xdu-3.0_p5-0.bee deleted file mode 100755 index a0612bee8..000000000 --- a/xdu-3.0_p5-0.bee +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env beesh - -SRCURL[0]="/src/mariux/download/xdu-${PKGVERSION}_p5.tar.gz" - -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# BEE_BUILDTYPE= - -# EXCLUDE="" - -# build_in_sourcedir - - - -#mee_extract() { -# bee_extract ${@} -#} - -#mee_patch() { -# bee_patch ${@} -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} diff --git a/xdu.be0 b/xdu.be0 new file mode 100755 index 000000000..a645af322 --- /dev/null +++ b/xdu.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION xdu-3.0p7-0 + +## 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.) + +############################################################################### +## 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]="https://github.molgen.mpg.de/mariux64/xdu/archive/${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# 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 built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## 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. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 399e4d259246e5d2d7c417ef0d70bc60e9b74d1c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Jun 2018 13:18:15 +0200 Subject: [PATCH 2/2] xdu: Install files from bee script The makefile doesn't seem to habe an install target, so install the files manually. --- xdu.be0 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xdu.be0 b/xdu.be0 index a645af322..ec49250fa 100755 --- a/xdu.be0 +++ b/xdu.be0 @@ -61,9 +61,11 @@ SRCURL[0]="https://github.molgen.mpg.de/mariux64/xdu/archive/${PKGVERSION}.tar.g # bee_build #} -#mee_install() { +mee_install() { # bee_install -#} + start_cmd install -D -m 644 "${B}/XDu.ad" "${D}/${SYSCONFDIR}/X11/app-defaults/XDu" + start_cmd install -D "${B}/xdu" "${D}/${BINDIR}/xdu" +} ## by default this may be 'make install DESTDIR="${D}"' ###############################################################################