From d7a3a800ee0aa94f1cdd666108d2d515926967b9 Mon Sep 17 00:00:00 2001 From: hugo Date: Sat, 13 Feb 2010 07:03:43 +0000 Subject: [PATCH] =?utf8?q?Nouveau=20stage3=20compl=C3=A9t=C3=A9=20ok?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- packages-list | 2 +- stage3/cis-docbook-xsl | 15 +++++----- stage3/cis-opensp | 66 ++++++++++++++++++++++-------------------- stage3/cis-pm | 2 +- stage3/cis-sgml-common | 51 ++++++++++++++++++-------------- stage3/cis-sgml-spm | 16 +++++----- stage3/packages-update | 2 +- stage3/stage3-install | 4 ++- 8 files changed, 86 insertions(+), 72 deletions(-) diff --git a/packages-list b/packages-list index ffcfda3..5d2e847 100644 --- a/packages-list +++ b/packages-list @@ -268,7 +268,7 @@ LIBMUSICBRAINZ="libmusicbrainz-2.1.5" LIBRSVG="librsvg-2.26.0" LIBSNDFILE="libsndfile-1.0.18pre18" LIBSOUP="libsoup-2.4.1" -LIBXML2="libxml2-2.6.26" +LIBXML2="libxml2-2.7.6" LIBXSLT="libxslt-1.1.26" LIBUSB="libusb-0.1.10a" LIBGPHOTO2="libgphoto2-2.1.99" diff --git a/stage3/cis-docbook-xsl b/stage3/cis-docbook-xsl index 495fadd..1068189 100755 --- a/stage3/cis-docbook-xsl +++ b/stage3/cis-docbook-xsl @@ -12,15 +12,16 @@ source ../packages-list apply_patches ${1} cd ${LFS_TMP}/${1} -install -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} +install -v -m 755 -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} chown -R root:root . -cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \ - images javahelp lib manpages params profiling template xhtml \ +cp -v -R VERSION common eclipse extensions fo highlighting html \ + htmlhelp images javahelp lib manpages params profiling \ + slides template tools website xhtml \ /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} -install -d /usr/share/doc/xml -cp -af doc/* /usr/share/doc/xml -cd /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} -sh INSTALL +install -v -m644 -D README \ + /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VERSION}/README.XSL && +install -v -m755 RELEASE-NOTES* NEWS* \ + /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VERSION} if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml diff --git a/stage3/cis-opensp b/stage3/cis-opensp index 336b0d3..577a8f7 100755 --- a/stage3/cis-opensp +++ b/stage3/cis-opensp @@ -1,32 +1,41 @@ #!/bin/sh + set -o errexit -# First argument of this script is the package name +# First argument of this script is the package name. +# Remaining arguments are additional configure options. # Reading system configuration informations, functions and package versions. source ../sysinfos source ../functions source ../packages-list -# Remove the old catalog items prior to upgrading... -# First test for presence of 'install-catalog' program -install-catalog -v 1> /dev/null 2>&1 -if [ $? -eq 0 ]; then - # The following commands may fail if this is the first time - # that this package is installed. So we do not check the return value. - install-catalog --remove /etc/sgml/${1}.cat \ - /usr/share/sgml/${1}/catalog - install-catalog --remove /etc/sgml/sgml-docbook.cat \ - /etc/sgml/${1}.cat -fi +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} # Applying patches (if any) -apply_patches ${1} +apply_patches ${PACKAGE} + +CAT1="/etc/sgml/${PACKAGE}.cat" +CAT2="/usr/share/sgml/${PACKAGE}/catalog" +CAT3="/etc/sgml/sgml-docbook.cat" +CAT4="/etc/sgml/${PACKAGE}.cat" -cd ${LFS_TMP}/${1} +# Remove the old catalog items prior to upgrading... +# First test for presence of 'install-catalog' program +INSTALL_CATALOG=/usr/bin/install-catalog +if [ -x ${INSTALL_CATALOG} ]; then + if [ -f ${CAT1} ]; then + ${INSTALL_CATALOG} --remove ${CAT1} ${CAT2} + fi + if [ -f ${CAT4} ]; then + ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4} + fi +fi -# These seds prevent some annoying messages that may otherwise appear while running openjade. +cd ${LFS_TMP}/${PACKAGE} sed -i 's:32,:253,:' lib/Syntax.cxx sed -i 's:LITLEN 240 :LITLEN 8092:' \ unicode/{gensyntax.pl,unicode.syn} @@ -34,23 +43,18 @@ sed -i 's:LITLEN 240 :LITLEN 8092:' \ --prefix=/usr \ --disable-static \ --disable-doc-build \ - --enable-http \ --enable-default-catalog=/etc/sgml/catalog \ + --enable-http \ --enable-default-search-path=/usr/share/sgml -make pkgdatadir=/usr/share/sgml/${1} -make pkgdatadir=/usr/share/sgml/${1} install -ln -sf onsgmls /usr/bin/nsgmls -ln -sf osgmlnorm /usr/bin/sgmlnorm -ln -sf ospam /usr/bin/spam -ln -sf ospcat /usr/bin/spcat -ln -sf ospent /usr/bin/spent -ln -sf osx /usr/bin/sx -ln -sf osx /usr/bin/sgml2xml -ln -sf libosp.so /usr/lib/libsp.so - -#install-catalog --add /etc/sgml/${1}.cat \ -# /usr/share/sgml/${1}/catalog -#install-catalog --add /etc/sgml/sgml-docbook.cat \ -# /etc/sgml/${1}.cat +make pkgdatadir=/usr/share/sgml/${PACKAGE} +make pkgdatadir=/usr/share/sgml/${PACKAGE} install +ln -v -sf onsgmls /usr/bin/nsgmls +ln -v -sf osgmlnorm /usr/bin/sgmlnorm +ln -v -sf ospam /usr/bin/spam +ln -v -sf ospcat /usr/bin/spcat +ln -v -sf ospent /usr/bin/spent +ln -v -sf osx /usr/bin/sx +ln -v -sf osx /usr/bin/sgml2xml +ln -v -sf libosp.so /usr/lib/libsp.so exit $? diff --git a/stage3/cis-pm b/stage3/cis-pm index 8cb4309..ace1555 100755 --- a/stage3/cis-pm +++ b/stage3/cis-pm @@ -16,7 +16,7 @@ CONFIGURE_OPTS=${*} # Applying patches (if any) apply_patches ${PACKAGE} -cd ${LFS_TMP}/${1} +cd ${LFS_TMP}/${PACKAGE} # The option "-n" is used to avoid having to answer a question and accept the # default configuration. perl Makefile.PL -n ${CONFIGURE_OPTS} diff --git a/stage3/cis-sgml-common b/stage3/cis-sgml-common index 955d25d..91e66a5 100755 --- a/stage3/cis-sgml-common +++ b/stage3/cis-sgml-common @@ -1,42 +1,49 @@ #!/bin/sh set -o errexit -# First argument of this script is the package name +# First argument of this script is the package name. +# Remaining arguments are additional configure options. # Reading system configuration informations, functions and package versions. source ../sysinfos source ../functions source ../packages-list +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} + +# Applying patches (if any) +apply_patches ${PACKAGE} + +CAT1="/etc/sgml/sgml-ent.cat" +CAT2="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog" + +CAT3="/etc/sgml/sgml-docbook.cat" +CAT4="/etc/sgml/sgml-ent.cat" + # Remove the old catalog items prior to upgrading... # First test for presence of 'install-catalog' program -install-catalog -v 1> /dev/null 2>&1 -if [ $? -eq 0 ]; then - # The following commands may fail if this is the first time - # that this package is installed. So we do not check the return value. - install-catalog --remove /etc/sgml/sgml-ent.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog - install-catalog --remove /etc/sgml/sgml-docbook.cat \ - /etc/sgml/sgml-ent.cat +INSTALL_CATALOG=/usr/bin/install-catalog +if [ -x ${INSTALL_CATALOG} ]; then + if [ -f ${CAT2} ]; then + ${INSTALL_CATALOG} --remove ${CAT1} ${CAT2} + fi + if [ -f ${CAT4} ]; then + ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4} + fi fi -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1} -# Autotools used with this package are very old, so we regenerate the autotools files. -aclocal -automake -acf -autoconf +cd ${LFS_TMP}/${PACKAGE} +autoreconf -f -i ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man + ${CONFIGURE_OPTS} make make install -install-catalog --add /etc/sgml/sgml-ent.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -install-catalog --add /etc/sgml/sgml-docbook.cat \ - /etc/sgml/sgml-ent.cat + +${INSTALL_CATALOG} --add ${CAT1} ${CAT2} +${INSTALL_CATALOG} --add ${CAT3} ${CAT4} exit $? diff --git a/stage3/cis-sgml-spm b/stage3/cis-sgml-spm index 6cee4af..029344b 100755 --- a/stage3/cis-sgml-spm +++ b/stage3/cis-sgml-spm @@ -2,26 +2,26 @@ set -o errexit # First argument of this script is the package name. +# Remaining arguments are additional configure options. # Reading system configuration informations, functions and package versions. source ../sysinfos source ../functions source ../packages-list +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} + # Applying patches (if any) -apply_patches ${1} +apply_patches ${PACKAGE} -cd ${LFS_TMP}/${1} +cd ${LFS_TMP}/${PACKAGE} sed -i -e "s@/usr/local/bin@/usr/bin@" \ - -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL])@" \ + -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})@" \ -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \ Makefile make install -install -m755 -d /usr/share/doc/perl5 -make install_html -rm -f /usr/share/doc/perl5/SGMLSpm/sample.pl -install -m644 DOC/sample.pl /usr/share/doc/perl5/SGMLSpm - ldconfig exit $? diff --git a/stage3/packages-update b/stage3/packages-update index 7703578..f18b9b2 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -87,7 +87,7 @@ fpkg_sf ${OPENJADE} fpkg_hv ${SGML_SPM} # For re-generating fontconfig documentation. fpkg_sf ${DOCBOOK_DSSSL} "docbook" fpkg ${DOCBOOK_UTILS} "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES" -fpkg_gnome ${LIBXML2} +fpkg ${LIBXML2} "http://xmlsoft.org/sources" fpkg ${LIBXSLT} "http://xmlsoft.org/sources" fpkg_hv ${DOCBOOK_XML} fpkg_sf ${DOCBOOK_XSL} "docbook" diff --git a/stage3/stage3-install b/stage3/stage3-install index c6ad0d9..556e764 100755 --- a/stage3/stage3-install +++ b/stage3/stage3-install @@ -115,9 +115,11 @@ ipkg_ac ${LIBART} ipkg_ac ${LIBEXIF} ipkg_ac ${FRIBIDI} ipkg_ac_nb ${HICOLOR_ICON_THEME} -ipkg_ac ${LIBTIFF} +ipkg_ac ${TIFF} ipkg_ac ${GIFLIB} ipkg_ac_nb ${LCMS} ipkg_cust ${LIBMNG} cis-libmng +echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h" + exit $? -- 2.20.1