Fini la conversion du stage3 (nouveau format répertoire pkg)

[hvlinux.git] / stage3 / pkg / sgml-dtd4

diff --git a/stage3/pkg/sgml-dtd4 b/stage3/pkg/sgml-dtd4
index 192af58..5d41192 100644 (file)
--- a/stage3/pkg/sgml-dtd4
+++ b/stage3/pkg/sgml-dtd4
@@ -1,30 +1,23 @@
-#!/bin/sh
-set -o errexit
-
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}
-sed -i -e '/ISO 8879/d' \
-    -e '/gml/d' docbook.cat
-install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}
-chown -R root:root .
-install docbook.cat /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog
-cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}
-install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD4_VER}.cat \
-    /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog
-install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD4_VER}.cat \
-    /etc/sgml/sgml-docbook.cat
-
-# Using only the most current 4.x version of sgml-dtd requires the following:
-cat >> /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog << "EOF"
+#!/bin/bash
+
+hvbuild()
+{
+    cd ${LFS_TMP}/${PACKAGE}
+    sed -i -e '/ISO 8879/d' \
+        -e '/gml/d' docbook.cat
+    install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}
+    chown -R root:root .
+    install docbook.cat \
+        /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog
+    cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}
+    install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD4_VER}.cat \
+        /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog
+    install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD4_VER}.cat \
+        /etc/sgml/sgml-docbook.cat
+
+    # Using only the most current 4.x version of sgml-dtd requires the
+    # following:
+    cat >> /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog << "EOF"
   -- Begin Single Major Version catalog changes --
 
 PUBLIC "-//OASIS//DTD DocBook V4.3//EN" "docbook.dtd"
@@ -34,5 +27,4 @@ PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
 
   -- End Single Major Version catalog changes --
 EOF
-
-exit $?
+}