From 471667fb417dcf2fa437393690764c187ca29b7e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 22 Mar 2008 01:26:35 +0000 Subject: tetex: move to nonworking as discussed in bug 2510. Closes 2510, 2607 and 3748. --- packages/nonworking/tetex/.mtn2git_empty | 0 packages/nonworking/tetex/files/.mtn2git_empty | 0 packages/nonworking/tetex/files/configure.patch | 137 ++++++++++++++++++++++++ packages/nonworking/tetex/tetex-native_3.0.bb | 35 ++++++ packages/nonworking/tetex/tetex-texmf_3.0.bb | 75 +++++++++++++ packages/nonworking/tetex/tetex_3.0.bb | 100 +++++++++++++++++ packages/tetex/.mtn2git_empty | 0 packages/tetex/files/.mtn2git_empty | 0 packages/tetex/files/configure.patch | 137 ------------------------ packages/tetex/tetex-native_3.0.bb | 35 ------ packages/tetex/tetex-texmf_3.0.bb | 75 ------------- packages/tetex/tetex_3.0.bb | 100 ----------------- 12 files changed, 347 insertions(+), 347 deletions(-) create mode 100644 packages/nonworking/tetex/.mtn2git_empty create mode 100644 packages/nonworking/tetex/files/.mtn2git_empty create mode 100644 packages/nonworking/tetex/files/configure.patch create mode 100644 packages/nonworking/tetex/tetex-native_3.0.bb create mode 100644 packages/nonworking/tetex/tetex-texmf_3.0.bb create mode 100644 packages/nonworking/tetex/tetex_3.0.bb delete mode 100644 packages/tetex/.mtn2git_empty delete mode 100644 packages/tetex/files/.mtn2git_empty delete mode 100644 packages/tetex/files/configure.patch delete mode 100644 packages/tetex/tetex-native_3.0.bb delete mode 100644 packages/tetex/tetex-texmf_3.0.bb delete mode 100644 packages/tetex/tetex_3.0.bb (limited to 'packages') diff --git a/packages/nonworking/tetex/.mtn2git_empty b/packages/nonworking/tetex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/tetex/files/.mtn2git_empty b/packages/nonworking/tetex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/tetex/files/configure.patch b/packages/nonworking/tetex/files/configure.patch new file mode 100644 index 0000000000..7a955917df --- /dev/null +++ b/packages/nonworking/tetex/files/configure.patch @@ -0,0 +1,137 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- tetex-src-3.0/configure~configure.patch ++++ tetex-src-3.0/configure +@@ -3903,10 +3903,6 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:3906: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then + ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 +-fi + rm -fr conftest* + fi + +@@ -3975,7 +3963,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + +--- tetex-src-3.0/libs/configure~configure.patch ++++ tetex-src-3.0/libs/configure +@@ -1711,10 +1711,6 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:1714: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 +-fi ++ac_compile_t1lib=0 + rm -fr conftest* + fi + +@@ -1783,7 +1771,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + +--- tetex-src-3.0/utils/texinfo/configure~configure.patch ++++ tetex-src-3.0/utils/texinfo/configure +@@ -689,7 +689,7 @@ + # FIXME: To remove some day. + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then +- cross_compiling=maybe ++ cross_compiling=no + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then +--- tetex-src-3.0/texk/dvipng/configure~configure.patch ++++ tetex-src-3.0/texk/dvipng/configure +@@ -2642,10 +2642,7 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:2645: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else ++ac_compile_t1lib=0 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 ++ac_compile_t1lib=0 + fi + rm -fr conftest* + fi +@@ -2696,7 +2686,6 @@ + echo "$ac_t""no, will compile my own version" 1>&6 + with_system_t1lib=no + fi +- fi + + LDFLAGS=$OLD_LDFLAGS + CPP=$OLD_CPP +@@ -2714,7 +2703,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + diff --git a/packages/nonworking/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb new file mode 100644 index 0000000000..4d683ff3d1 --- /dev/null +++ b/packages/nonworking/tetex/tetex-native_3.0.bb @@ -0,0 +1,35 @@ +require tetex_${PV}.bb +inherit native +DEPENDS = "" +PR = "r2" + +PACKAGES="" +RRECOMMENDS_${PN}="" + +do_configure() { + oe_runconf +} + +BINARIES = "texk/web2c/tangle \ + texk/web2c/ctangle \ + texk/web2c/otangle \ + texk/web2c/tie \ + utils/texinfo/info/makedoc \ + utils/texinfo/makeinfo/makeinfo" + +do_stage() { + for binary in ${BINARIES} + do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +do_install () { + : +} + + +do_rm_work () { + : +} + diff --git a/packages/nonworking/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb new file mode 100644 index 0000000000..80d6f779d8 --- /dev/null +++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb @@ -0,0 +1,75 @@ +DESCRIPTION = "teTeX data" +LICENSE = "GPL" +SECTION = "console/utils" +PR = "r0" + +SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz" +S = "${WORKDIR}" + +STUFF = "aliases ChangeLog doc dvips LICENSE.texmf makeindex metapost omega \ + scripts texdoctk bibtex context dvipdfm fonts ls-R metafont \ + mft release-tetex-texmf.txt tex web2c " + +do_install() { + install -d ${D}${datadir}/texmf + for i in ${STUFF} + do + cp -pPR $i ${D}${datadir}/texmf + done +} + +ALLOW_EMPTY_${PN} = "1" + +RRECOMMENDS_${PN} = " \ + tetex-texmf-common \ + tetex-texmf-bibtex \ + tetex-texmf-context \ + tetex-texmf-texdoc \ + tetex-texmf-dvipdfm \ + tetex-texmf-dvips \ + tetex-texmf-fonts \ + tetex-texmf-makeindex \ + tetex-texmf-metafont \ + tetex-texmf-metapost \ + tetex-texmf-mft \ + tetex-texmf-omega \ + tetex-texmf-scripts \ + tetex-texmf-tex \ + tetex-texmf-texdoctk \ + tetex-texmf-web2c " + +PACKAGES = "${PN}-dbg tetex-texmf \ + tetex-texmf-bibtex \ + tetex-texmf-context \ + tetex-texmf-texdoc \ + tetex-texmf-dvipdfm \ + tetex-texmf-dvips \ + tetex-texmf-fonts \ + tetex-texmf-makeindex \ + tetex-texmf-metafont \ + tetex-texmf-metapost \ + tetex-texmf-mft \ + tetex-texmf-omega \ + tetex-texmf-scripts \ + tetex-texmf-tex \ + tetex-texmf-texdoctk \ + tetex-texmf-web2c \ + tetex-texmf-common" + +FILES_${PN} = "" +FILES_tetex-texmf-common = "${datadir}/texmf" +FILES_tetex-texmf-bibtex = "${datadir}/texmf/bibtex" +FILES_tetex-texmf-context = "${datadir}/texmf/context" +FILES_tetex-texmf-texdoc = "${datadir}/texmf/doc" +FILES_tetex-texmf-dvipdfm = "${datadir}/texmf/dvipdfm" +FILES_tetex-texmf-dvips = "${datadir}/texmf/dvips" +FILES_tetex-texmf-fonts = "${datadir}/texmf/fonts" +FILES_tetex-texmf-makeindex = "${datadir}/texmf/makeindex" +FILES_tetex-texmf-metafont = "${datadir}/texmf/metafont" +FILES_tetex-texmf-metapost = "${datadir}/texmf/metapost" +FILES_tetex-texmf-mft = "${datadir}/texmf/mft" +FILES_tetex-texmf-omega = "${datadir}/texmf/omega" +FILES_tetex-texmf-scripts = "${datadir}/texmf/scripts" +FILES_tetex-texmf-tex = "${datadir}/texmf/tex" +FILES_tetex-texmf-texdoctk = "${datadir}/texmf/texdoctk" +FILES_tetex-texmf-web2c = "${datadir}/texmf/web2c" diff --git a/packages/nonworking/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb new file mode 100644 index 0000000000..eedf8820b2 --- /dev/null +++ b/packages/nonworking/tetex/tetex_3.0.bb @@ -0,0 +1,100 @@ +DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems" +HOMEPAGE = "http://www.tug.org/tetex" +LICENSE = "GPL" +SECTION = "console/utils" +DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" +PR = "r6" + +SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \ + file://configure.patch;patch=1" +S = "${WORKDIR}/tetex-src-${PV}" + +inherit autotools + +PARALLEL_MAKE = "" + +export BUILDCC = "${BUILD_CC}" +export BUILDCFLAGS = "${BUILD_CFLAGS}" +export BUILDLDFLAGS = "${BUILD_LDFLAGS}" +export BUILDCCLD = "${BUILD_CC}" + +EXTRA_OECONF = "--with-system-libgd \ + --with-system-ncurses \ + --with-ncurses-include=${STAGING_INCDIR} \ + --with-system-pnglib \ + --with-system-t1lib \ + --with-system-zlib \ + --without-dialog \ + --without-xdvik \ + --with-x11 \ + --without-mf-x-toolkit" + +# NOTE: In theory, teTeX has a good buildsystem, which automatically detects +# whether we are cross-compiling and compiles the necessary host tools. +# Unfortunately it doesn't work in our case and we better just add +# tetex-native for the time being. +# It would be good to autoreconf all the stuff, but the upstream configure.in +# is faulty and outdated :/ +do_configure() { + rm -f texk/libtool.m4 + libtoolize --force + gnu-configize + oe_runconf ${EXTRA_OECONF} + find . -name libtool|xargs rm -f + rm -rf ${S}/utils/texinfo/tools/info + rm -rf ${S}/utils/texinfo/tools/makeinfo + ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info + ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo + cat >${S}/utils/texinfo/tools/Makefile <= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:3906: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then - ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 --fi - rm -fr conftest* - fi - -@@ -3975,7 +3963,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - ---- tetex-src-3.0/libs/configure~configure.patch -+++ tetex-src-3.0/libs/configure -@@ -1711,10 +1711,6 @@ - if test "$with_system_t1lib" = yes; then - echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:1714: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 --fi -+ac_compile_t1lib=0 - rm -fr conftest* - fi - -@@ -1783,7 +1771,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - ---- tetex-src-3.0/utils/texinfo/configure~configure.patch -+++ tetex-src-3.0/utils/texinfo/configure -@@ -689,7 +689,7 @@ - # FIXME: To remove some day. - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then -- cross_compiling=maybe -+ cross_compiling=no - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then ---- tetex-src-3.0/texk/dvipng/configure~configure.patch -+++ tetex-src-3.0/texk/dvipng/configure -@@ -2642,10 +2642,7 @@ - if test "$with_system_t1lib" = yes; then - echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:2645: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else -+ac_compile_t1lib=0 - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 -+ac_compile_t1lib=0 - fi - rm -fr conftest* - fi -@@ -2696,7 +2686,6 @@ - echo "$ac_t""no, will compile my own version" 1>&6 - with_system_t1lib=no - fi -- fi - - LDFLAGS=$OLD_LDFLAGS - CPP=$OLD_CPP -@@ -2714,7 +2703,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/tetex/tetex-native_3.0.bb deleted file mode 100644 index 4d683ff3d1..0000000000 --- a/packages/tetex/tetex-native_3.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -require tetex_${PV}.bb -inherit native -DEPENDS = "" -PR = "r2" - -PACKAGES="" -RRECOMMENDS_${PN}="" - -do_configure() { - oe_runconf -} - -BINARIES = "texk/web2c/tangle \ - texk/web2c/ctangle \ - texk/web2c/otangle \ - texk/web2c/tie \ - utils/texinfo/info/makedoc \ - utils/texinfo/makeinfo/makeinfo" - -do_stage() { - for binary in ${BINARIES} - do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -do_install () { - : -} - - -do_rm_work () { - : -} - diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/tetex/tetex-texmf_3.0.bb deleted file mode 100644 index 80d6f779d8..0000000000 --- a/packages/tetex/tetex-texmf_3.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "teTeX data" -LICENSE = "GPL" -SECTION = "console/utils" -PR = "r0" - -SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz" -S = "${WORKDIR}" - -STUFF = "aliases ChangeLog doc dvips LICENSE.texmf makeindex metapost omega \ - scripts texdoctk bibtex context dvipdfm fonts ls-R metafont \ - mft release-tetex-texmf.txt tex web2c " - -do_install() { - install -d ${D}${datadir}/texmf - for i in ${STUFF} - do - cp -pPR $i ${D}${datadir}/texmf - done -} - -ALLOW_EMPTY_${PN} = "1" - -RRECOMMENDS_${PN} = " \ - tetex-texmf-common \ - tetex-texmf-bibtex \ - tetex-texmf-context \ - tetex-texmf-texdoc \ - tetex-texmf-dvipdfm \ - tetex-texmf-dvips \ - tetex-texmf-fonts \ - tetex-texmf-makeindex \ - tetex-texmf-metafont \ - tetex-texmf-metapost \ - tetex-texmf-mft \ - tetex-texmf-omega \ - tetex-texmf-scripts \ - tetex-texmf-tex \ - tetex-texmf-texdoctk \ - tetex-texmf-web2c " - -PACKAGES = "${PN}-dbg tetex-texmf \ - tetex-texmf-bibtex \ - tetex-texmf-context \ - tetex-texmf-texdoc \ - tetex-texmf-dvipdfm \ - tetex-texmf-dvips \ - tetex-texmf-fonts \ - tetex-texmf-makeindex \ - tetex-texmf-metafont \ - tetex-texmf-metapost \ - tetex-texmf-mft \ - tetex-texmf-omega \ - tetex-texmf-scripts \ - tetex-texmf-tex \ - tetex-texmf-texdoctk \ - tetex-texmf-web2c \ - tetex-texmf-common" - -FILES_${PN} = "" -FILES_tetex-texmf-common = "${datadir}/texmf" -FILES_tetex-texmf-bibtex = "${datadir}/texmf/bibtex" -FILES_tetex-texmf-context = "${datadir}/texmf/context" -FILES_tetex-texmf-texdoc = "${datadir}/texmf/doc" -FILES_tetex-texmf-dvipdfm = "${datadir}/texmf/dvipdfm" -FILES_tetex-texmf-dvips = "${datadir}/texmf/dvips" -FILES_tetex-texmf-fonts = "${datadir}/texmf/fonts" -FILES_tetex-texmf-makeindex = "${datadir}/texmf/makeindex" -FILES_tetex-texmf-metafont = "${datadir}/texmf/metafont" -FILES_tetex-texmf-metapost = "${datadir}/texmf/metapost" -FILES_tetex-texmf-mft = "${datadir}/texmf/mft" -FILES_tetex-texmf-omega = "${datadir}/texmf/omega" -FILES_tetex-texmf-scripts = "${datadir}/texmf/scripts" -FILES_tetex-texmf-tex = "${datadir}/texmf/tex" -FILES_tetex-texmf-texdoctk = "${datadir}/texmf/texdoctk" -FILES_tetex-texmf-web2c = "${datadir}/texmf/web2c" diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb deleted file mode 100644 index eedf8820b2..0000000000 --- a/packages/tetex/tetex_3.0.bb +++ /dev/null @@ -1,100 +0,0 @@ -DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems" -HOMEPAGE = "http://www.tug.org/tetex" -LICENSE = "GPL" -SECTION = "console/utils" -DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" -PR = "r6" - -SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \ - file://configure.patch;patch=1" -S = "${WORKDIR}/tetex-src-${PV}" - -inherit autotools - -PARALLEL_MAKE = "" - -export BUILDCC = "${BUILD_CC}" -export BUILDCFLAGS = "${BUILD_CFLAGS}" -export BUILDLDFLAGS = "${BUILD_LDFLAGS}" -export BUILDCCLD = "${BUILD_CC}" - -EXTRA_OECONF = "--with-system-libgd \ - --with-system-ncurses \ - --with-ncurses-include=${STAGING_INCDIR} \ - --with-system-pnglib \ - --with-system-t1lib \ - --with-system-zlib \ - --without-dialog \ - --without-xdvik \ - --with-x11 \ - --without-mf-x-toolkit" - -# NOTE: In theory, teTeX has a good buildsystem, which automatically detects -# whether we are cross-compiling and compiles the necessary host tools. -# Unfortunately it doesn't work in our case and we better just add -# tetex-native for the time being. -# It would be good to autoreconf all the stuff, but the upstream configure.in -# is faulty and outdated :/ -do_configure() { - rm -f texk/libtool.m4 - libtoolize --force - gnu-configize - oe_runconf ${EXTRA_OECONF} - find . -name libtool|xargs rm -f - rm -rf ${S}/utils/texinfo/tools/info - rm -rf ${S}/utils/texinfo/tools/makeinfo - ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info - ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo - cat >${S}/utils/texinfo/tools/Makefile <