Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1400 from mariux64/update-tcltk-869
update tcl/tk
  • Loading branch information
donald committed Oct 18, 2019
2 parents ac3486d + 203cb06 commit 8b6bb4f
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 74 deletions.
2 changes: 1 addition & 1 deletion 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"

Expand Down
2 changes: 1 addition & 1 deletion 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"

Expand Down
2 changes: 1 addition & 1 deletion 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.)
Expand Down
2 changes: 1 addition & 1 deletion 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+=()
Expand Down
34 changes: 0 additions & 34 deletions tcl-8.5.8-0.bee

This file was deleted.

74 changes: 74 additions & 0 deletions 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
#}
36 changes: 0 additions & 36 deletions tk-8.5.8-0.bee

This file was deleted.

68 changes: 68 additions & 0 deletions 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
#}

0 comments on commit 8b6bb4f

Please sign in to comment.