From c97ce67fb6f12672a3672019817ea43f72a69fa0 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 18 Oct 2019 08:26:29 +0200 Subject: [PATCH 1/5] tcl/tk: update to 8.6.9 tcl/tk: - bump version - be0ify - fix SRCURL - enable 64bit - remove dev man pages ( lmgtfy ) tcl: - remove dbc pkgs - remove sqlite tk: - remove /usr/lib64 dependecies - remove demos --- tcl-8.5.8-0.bee | 34 ----------------------- tcl.be0 | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ tk-8.5.8-0.bee | 36 ------------------------ tk.be0 | 68 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 70 deletions(-) delete mode 100755 tcl-8.5.8-0.bee create mode 100755 tcl.be0 delete mode 100755 tk-8.5.8-0.bee create mode 100755 tk.be0 diff --git a/tcl-8.5.8-0.bee b/tcl-8.5.8-0.bee deleted file mode 100755 index 91ff7b30b..000000000 --- a/tcl-8.5.8-0.bee +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/env beesh - -PGRP=( programming ) - -SRCURL="ftp://mirror.ovh.net/gentoo-distfiles/distfiles/tcl${PV}-src.tar.gz" - -IGNORE_DATAROOTDIR=yes -IGNORE_LOCALEDIR=yes -IGNORE_DOCDIR=yes - -mee_configure() { - S=${S}/unix - cd ${S} - - sed -i -e "s@TCL_LIBRARY='\$(prefix)/lib/tcl\$(VERSION)@TCL_LIBRARY='\$(libdir)/tcl\$(VERSION)@" configure - bee_configure --enable-threads -} - -mee_build() { - - bee_build - sed -i \ - -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \ - -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ - tclConfig.sh - -} - -mee_install() { - bee_install - make install-private-headers DESTDIR=${D} - ln -v -sf tclsh${PV:0:3} ${D}${BINDIR}/tclsh - chmod -v 755 ${D}${LIBDIR}/libtcl8.5.so -} diff --git a/tcl.be0 b/tcl.be0 new file mode 100755 index 000000000..a6401694b --- /dev/null +++ b/tcl.be0 @@ -0,0 +1,74 @@ +#!/usr/bin/env beesh + +# BEE_VERSION tcl-8.6.9-0 + +# more info: https://www.tcl.tk +# http://linuxfromscratch.org/blfs/view/svn/general/tcl.html + +SRCURL[0]="https://prdownloads.sourceforge.net/tcl/tcl${PKGVERSION}-src.tar.gz" + +BEE_BUILDTYPE=autotools + +# PATCHURL+=() + +build_in_sourcedir + +sourcesubdir_append unix + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} +mee_patch_post() { + mkdir -v ${S}/../attic + mv -v ${S}/../pkgs/{tdbc[mops],sqlite}* ${S}/../attic + + sed -e "s#char buf\[10\];#char buf[11];#" \ + -i ${S}/../pkgs/itcl4.1.2/generic/itclHelpers.c +} + +mee_configure() { + bee_configure \ + --enable-64bit +} + +#mee_build() { +# bee_build +#} + +mee_build_post() { + + SRCDIR=${S/\/unix} + + sed -e "s#$SRCDIR/unix#/usr/lib#" \ + -e "s#$SRCDIR#/usr/include#" \ + -i tclConfig.sh + + sed -e "s#$SRCDIR/unix/pkgs/tdbc1.1.0#/usr/lib/tdbc1.1.0#" \ + -e "s#$SRCDIR/pkgs/tdbc1.1.0/generic#/usr/include#" \ + -e "s#$SRCDIR/pkgs/tdbc1.1.0/library#/usr/lib/tcl8.6#" \ + -e "s#$SRCDIR/pkgs/tdbc1.1.0#/usr/include#" \ + -i pkgs/tdbc1.1.0/tdbcConfig.sh + + sed -e "s#$SRCDIR/unix/pkgs/itcl4.1.2#/usr/lib/itcl4.1.2#" \ + -e "s#$SRCDIR/pkgs/itcl4.1.2/generic#/usr/include#" \ + -e "s#$SRCDIR/pkgs/itcl4.1.2#/usr/include#" \ + -i pkgs/itcl4.1.2/itclConfig.sh +} + +mee_install() { + bee_install + + make ${BEE_MAKEFLAGS} install-private-headers DESTDIR=${D} + + ln -v -sf tclsh8.6 ${D}/usr/bin/tclsh + rm -vrf ${D}/usr/share/man/man3 + rm -vrf ${D}/usr/share/man/mann +} + +#mee_install_post() { +# exit +#} diff --git a/tk-8.5.8-0.bee b/tk-8.5.8-0.bee deleted file mode 100755 index 02effa54e..000000000 --- a/tk-8.5.8-0.bee +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env beesh - -PGRP=( programming ) - -SRCURL="ftp://mirror.ovh.net/gentoo-distfiles/distfiles/tk${PV}-src.tar.gz" - -IGNORE_DATAROOTDIR=yes -IGNORE_LOCALEDIR=yes -IGNORE_DOCDIR=yes - -mee_configure() { - S=${S}/unix - cd ${S} - - sed -i -e "s@TK_LIBRARY='\$(prefix)/lib/tk\$(VERSION)@TK_LIBRARY='\$(libdir)/tk\$(VERSION)@" configure - bee_configure --enable-threads -} - -mee_build() { - - bee_build - sed -i \ - -e "s@^\(TK_SRC_DIR='\).*@\1${INCLUDEDIR}'@" \ - -e "/TK_B/s@='\(-L\)\?.*unix@='\1${LIBDIR}@" \ - tkConfig.sh - echo "XXXXXXXXXX" - egrep "(TK_B|TK_SRC_DIR)" tkConfig.sh - -} - -mee_install() { - bee_install - make install-private-headers DESTDIR=${D} - ln -v -sf wish${PV:0:3} ${D}${BINDIR}/wish - chmod -v 755 ${D}${LIBDIR}/libtk8.5.so -} diff --git a/tk.be0 b/tk.be0 new file mode 100755 index 000000000..77ef0800f --- /dev/null +++ b/tk.be0 @@ -0,0 +1,68 @@ +#!/usr/bin/env beesh + +# BEE_VERSION tk-8.6.9.1-0 + +# more info: https://www.tcl.tk +# http://linuxfromscratch.org/blfs/view/svn/general/tk.html + +SRCURL[0]="https://prdownloads.sourceforge.net/tcl/tk${PKGVERSION}-src.tar.gz" + +BEE_BUILDTYPE=autotools + +build_in_sourcedir + +sourcesubdir_append unix + + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + + +mee_configure() { + bee_configure \ + --enable-64bit +} + +mee_configure_post() { + sed -e "s#/usr/lib64#/usr/lib#" \ + -i Makefile +} + +#mee_build() { +# bee_build +#} + +mee_build_post() { + sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \ + -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ + -i tkConfig.sh +} + +mee_install() { + bee_install + + make ${BEE_MAKEFLAGS} install-private-headers DESTDIR=${D} + + ln -v -sf wish8.6 ${D}/usr/bin/wish + rm -vrf ${D}/usr/lib/tk8.6/demos + rm -vrf ${D}/usr/share/man/man3 + rm -vrf ${D}/usr/share/man/mann +} + + +#mee_install_post() { +# cd ${D} +# find . -ls +# exit +#} From b366ab1b97f8f9667eba805a19f9376eae688d15 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 18 Oct 2019 08:27:19 +0200 Subject: [PATCH 2/5] plplot: rebuild for tcltk 8.6 --- plplot.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plplot.be0 b/plplot.be0 index 63f40d8cc..85ee31878 100755 --- a/plplot.be0 +++ b/plplot.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION plplot-5.13.0-1 +# BEE_VERSION plplot-5.15.0-0 SRCURL[0]="https://sourceforge.net/projects/plplot/files/plplot/${PKGVERSION}%20Source/plplot-${PKGVERSION}.tar.gz/download plplot-${PKGVERSION}.tar.gz" # PATCHURL+=() From d7ddf107c4cd47dbfbdf975e0c21422ecf31ea0a Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 18 Oct 2019 08:27:48 +0200 Subject: [PATCH 3/5] pidgin: rebuild for tcltk 8.6 --- pidgin.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidgin.be0 b/pidgin.be0 index 6df98f2c9..3c614a420 100755 --- a/pidgin.be0 +++ b/pidgin.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION pidgin-2.13.0-0 +# BEE_VERSION pidgin-2.13.0-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.) From 77d640b543c22d8c52ae5cbdfcee0f947d427ded Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 18 Oct 2019 08:28:13 +0200 Subject: [PATCH 4/5] gnudatalanguage-gdl: rebuild for tcltk 8.6 --- gnudatalanguage-gdl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnudatalanguage-gdl.be0 b/gnudatalanguage-gdl.be0 index bb90dd2cb..28fd5b0fa 100755 --- a/gnudatalanguage-gdl.be0 +++ b/gnudatalanguage-gdl.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gnudatalanguage-gdl-0.9.8-3 +# BEE_VERSION gnudatalanguage-gdl-0.9.8-4 SRCURL[0]="https://github.com/gnudatalanguage/gdl/archive/v${PKGVERSION}.tar.gz" From 203cb0694f11bb6823e745936a22911f6c531567 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 18 Oct 2019 08:28:53 +0200 Subject: [PATCH 5/5] expect: update to 5.45.4, rebuild to tcltk 8.6 --- expect.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expect.be0 b/expect.be0 index c9ed70652..b96290a1d 100755 --- a/expect.be0 +++ b/expect.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION expect-5.45-0 +# BEE_VERSION expect-5.45.4-0 SRCURL="https://downloads.sourceforge.net/expect/expect${PKGVERSION}.tar.gz"