From 5a9b04316e0cb5263943ae73bd9d466e20f46619 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sat, 29 Sep 2007 13:51:34 +0000 Subject: [PATCH] Removed blfs-tool envars and scripts. --- common/blfs-tool-deps/901-libxml2 | 11 --- common/blfs-tool-deps/902-libxslt | 11 --- common/blfs-tool-deps/903-tidy | 13 ---- common/blfs-tool-deps/904-unzip | 12 --- common/blfs-tool-deps/905-docbook-xml | 108 -------------------------- common/blfs-tool-deps/906-docbook-xsl | 39 ---------- common/blfs-tool-deps/907-gpm | 16 ---- common/blfs-tool-deps/908-lynx | 19 ----- common/blfs-tool-deps/909-sudo | 15 ---- common/blfs-tool-deps/910-wget | 12 --- common/blfs-tool-deps/911-subversion | 19 ----- jhalfs | 67 +--------------- 12 files changed, 1 insertion(+), 341 deletions(-) delete mode 100644 common/blfs-tool-deps/901-libxml2 delete mode 100644 common/blfs-tool-deps/902-libxslt delete mode 100644 common/blfs-tool-deps/903-tidy delete mode 100644 common/blfs-tool-deps/904-unzip delete mode 100644 common/blfs-tool-deps/905-docbook-xml delete mode 100644 common/blfs-tool-deps/906-docbook-xsl delete mode 100644 common/blfs-tool-deps/907-gpm delete mode 100644 common/blfs-tool-deps/908-lynx delete mode 100644 common/blfs-tool-deps/909-sudo delete mode 100644 common/blfs-tool-deps/910-wget delete mode 100644 common/blfs-tool-deps/911-subversion diff --git a/common/blfs-tool-deps/901-libxml2 b/common/blfs-tool-deps/901-libxml2 deleted file mode 100644 index 5c48d38..0000000 --- a/common/blfs-tool-deps/901-libxml2 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR -./configure --prefix=/usr -make -make install - -exit diff --git a/common/blfs-tool-deps/902-libxslt b/common/blfs-tool-deps/902-libxslt deleted file mode 100644 index 5c48d38..0000000 --- a/common/blfs-tool-deps/902-libxslt +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR -./configure --prefix=/usr -make -make install - -exit diff --git a/common/blfs-tool-deps/903-tidy b/common/blfs-tool-deps/903-tidy deleted file mode 100644 index b3053c1..0000000 --- a/common/blfs-tool-deps/903-tidy +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -./configure --prefix=/usr -make -make install -make -C htmldoc install_apidocs - -exit diff --git a/common/blfs-tool-deps/904-unzip b/common/blfs-tool-deps/904-unzip deleted file mode 100644 index c25e898..0000000 --- a/common/blfs-tool-deps/904-unzip +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -patch -Np1 -i ../unzip-5.52-security_fix-1.patch -make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux -make prefix=/usr install - -exit diff --git a/common/blfs-tool-deps/905-docbook-xml b/common/blfs-tool-deps/905-docbook-xml deleted file mode 100644 index ccd0a86..0000000 --- a/common/blfs-tool-deps/905-docbook-xml +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e - -cd /sources -mkdir docbook-xml -cd docbook-xml -unzip ../docbook-xml-4.5.zip -install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.5 -install -v -d -m755 /etc/xml -chown -R root:root . -cp -v -af docbook.cat *.dtd ent/ *.mod \ - /usr/share/xml/docbook/xml-dtd-4.5 -if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook -fi -xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - /etc/xml/docbook -xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook -xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook -if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog -fi -xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -for DTDVERSION in 4.1.2 4.2 4.3 4.4 -do - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \ - /etc/xml/docbook - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -done -cd .. -rm -rf docbook-xml - -exit diff --git a/common/blfs-tool-deps/906-docbook-xsl b/common/blfs-tool-deps/906-docbook-xsl deleted file mode 100644 index 7610d77..0000000 --- a/common/blfs-tool-deps/906-docbook-xsl +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-1.69.1 -cp -v -R VERSION common eclipse extensions fo html \ - htmlhelp images javahelp lib manpages params \ - profiling slides template website xhtml \ - /usr/share/xml/docbook/xsl-stylesheets-1.69.1 - -if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi -if [ ! -f /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog -fi - -xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.69.1" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog - -xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.69.1" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog - -xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog - -xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog - -exit diff --git a/common/blfs-tool-deps/907-gpm b/common/blfs-tool-deps/907-gpm deleted file mode 100644 index fa2ca01..0000000 --- a/common/blfs-tool-deps/907-gpm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -patch -Np1 -i ../gpm-1.20.1-segfault-1.patch -patch -Np1 -i ../gpm-1.20.1-silent-1.patch -./configure --prefix=/usr --sysconfdir=/etc -LDFLAGS="$LDFLAGS -lm" make -make install -cp -v conf/gpm-root.conf /etc -ldconfig - -exit diff --git a/common/blfs-tool-deps/908-lynx b/common/blfs-tool-deps/908-lynx deleted file mode 100644 index 64e81c7..0000000 --- a/common/blfs-tool-deps/908-lynx +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -./configure --prefix=/usr \ - --sysconfdir=/etc/lynx \ - --datadir=/usr/share/doc/lynx-2.8.6 \ - --with-zlib \ - --with-bzlib \ - --with-screen=ncursesw \ - --enable-locale-charset -make -make install-full -chgrp -v -R root /usr/share/doc/lynx-2.8.6/lynx_doc - -exit diff --git a/common/blfs-tool-deps/909-sudo b/common/blfs-tool-deps/909-sudo deleted file mode 100644 index e906ed3..0000000 --- a/common/blfs-tool-deps/909-sudo +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -patch -Np1 -i ../sudo-1.6.8p12-envvar_fix-1.patch -./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-noargs-shell --with-ignore-dot --with-all-insults \ - --enable-shell-sets-home -make -make install - -exit diff --git a/common/blfs-tool-deps/910-wget b/common/blfs-tool-deps/910-wget deleted file mode 100644 index 70e577c..0000000 --- a/common/blfs-tool-deps/910-wget +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -./configure --prefix=/usr --sysconfdir=/etc -make -make install - -exit diff --git a/common/blfs-tool-deps/911-subversion b/common/blfs-tool-deps/911-subversion deleted file mode 100644 index 48a65dc..0000000 --- a/common/blfs-tool-deps/911-subversion +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# $Id$ - -set -e -cd $PKGDIR - -./configure --prefix=/usr \ - --without-berkeley-db \ - --with-installbuilddir=/usr/lib/apr-0 -make -make install -rm doc/{Makefile,doxygen.conf} -find doc -type d -exec chmod 755 {} \; -find doc -type f -exec chmod 644 {} \; -install -v -m755 -d /usr/share/doc/subversion-1.3.1 -cp -v -R doc/* /usr/share/doc/subversion-1.3.1 - -exit diff --git a/jhalfs b/jhalfs index 049edf0..243dfb8 100755 --- a/jhalfs +++ b/jhalfs @@ -175,68 +175,6 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then branch-* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;; * ) BLFS_TREE=tags/${BLFS_BRANCH_ID} ;; esac - # Dependencies envars, to can update it more easy. - # Tidy and Unzip version are harcoded also in wrt_blfs_tool_targets() - # libxml2 - LIBXML_PKG="libxml2-2.6.29.tar.gz" - LIBXML_URL="ftp://xmlsoft.org/libxml2/${LIBXML_PKG}" - LIBXML_MD5="8b99b6e8b08e838438d9e6b639d79ebd" - # libxslt - LIBXSLT_PKG="libxslt-1.1.21.tar.gz" - LIBXSLT_URL="ftp://xmlsoft.org/libxslt/${LIBXSLT_PKG}" - LIBXSLT_MD5="59fe34e85692f71df2a38c2ee291b3ca" - # tidy - TIDY_PKG="tidy-cvs_20070326.tar.bz2" - TIDY_URL="http://anduin.linuxfromscratch.org/files/BLFS/sources/${TIDY_PKG}" - TIDY_MD5="468bfaa5cf917a8ecbe7834c13a61376" - # unzip - UNZIP_PKG="unzip552.tar.gz" - UNZIP_URL="http://downloads.sourceforge.net/infozip/${UNZIP_PKG}" - UNZIP_MD5="9d23919999d6eac9217d1f41472034a9" - # unzip security patch - UNZIP_PATCH="unzip-5.52-security_fix-1.patch" - UNZIP_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${UNZIP_PATCH}" - UNZIP_PATCH_MD5="00ebf64fdda2ad54ddfc619f85f328bb" - # DocBook XML DTD - DBXML_PKG="docbook-xml-4.5.zip" - DBXML_URL="http://www.docbook.org/xml/4.5/${DBXML_PKG}" - DBXML_MD5="03083e288e87a7e829e437358da7ef9e" - # DocBook XSL -# DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2" -# DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}" -# DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552" - # Links - LYNX_PKG="lynx2.8.6.tar.bz2" - LYNX_URL="http://lynx.isc.org/release/${LYNX_PKG}" - LYNX_MD5="dc80497b7dda6a28fd80404684d27548" - # sudo - SUDO_PKG="sudo-1.6.8p12.tar.gz" - SUDO_URL="http://anduin.linuxfromscratch.org/sources/BLFS/svn/s/${SUDO_PKG}" - SUDO_MD5="b29893c06192df6230dd5f340f3badf5" - # sudo envar fix patch - SUDO_PATCH="sudo-1.6.8p12-envvar_fix-1.patch" - SUDO_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${SUDO_PATCH}" - SUDO_PATCH_MD5="454925aedfe054dff8fe0d03b209f986" - # wget - WGET_PKG="wget-1.10.2.tar.gz" - WGET_URL="ftp://ftp.gnu.org/gnu/wget/${WGET_PKG}" - WGET_MD5="795fefbb7099f93e2d346b026785c4b8" - # Subversion - SVN_PKG="subversion-1.3.1.tar.bz2" - SVN_URL="http://subversion.tigris.org/tarballs/${SVN_PKG}" - SVN_MD5="07b95963968ae345541ca99d0e7bf082" - # GPM - GPM_PKG="gpm-1.20.1.tar.bz2" - GPM_URL="ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/${GPM_PKG}" - GPM_MD5="2c63e827d755527950d9d13fe3d87692" - # GPM segfaul patch - GPM_PATCH_1="gpm-1.20.1-segfault-1.patch" - GPM_PATCH_1_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${GPM_PATCH_1}" - GPM_PATCH_1_MD5="8c88f92990ba7613014fcd1db14ca7ac" - # GPM silent patch - GPM_PATCH_2="gpm-1.20.1-silent-1.patch" - GPM_PATCH_2_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${GPM_PATCH_2}" - GPM_PATCH_2_MD5="bf6cbefe20c6f15b587f19ebc1c8a37a" fi #--- Envars not sourced from configuration @@ -410,9 +348,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then # Set some harcoded envars to their proper values sed -i 's,blfs-xml,'$BLFS_XML',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,libs/book.xsl} sed -i 's,tracking-dir,'$TRACKING_DIR',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,gen-makefile.sh} - # Copy the dependencies build scripts - cp -r $COMMON_DIR/blfs-tool-deps $JHALFSDIR/ - rm -rf $JHALFSDIR/blfs-tool-deps/.svn fi # @@ -436,7 +371,7 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then fi -# When regeneration the Makefile we need to know also the canonical book version +# When regenerating the Makefile we need to know also the canonical book version if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then case $PROGNAME in clfs | clfs2 | clfs3 )