Author: jhuntwork Date: 2005-04-17 16:03:25 -0600 (Sun, 17 Apr 2005) New Revision: 95
Modified: trunk/etc/profile trunk/packages/docbook-xml/Makefile trunk/packages/docbook-xml/install trunk/packages/docbook-xsl/Makefile trunk/packages/docbook-xsl/install trunk/packages/libxml2/Makefile trunk/packages/libxslt/Makefile Log: Upgraded libxst, libxml2, docbook-xml and docbook-xsl Modified: trunk/etc/profile =================================================================== --- trunk/etc/profile 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/etc/profile 2005-04-17 22:03:25 UTC (rev 95) @@ -2,7 +2,7 @@ INPUTRC=/etc/inputrc -XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.67.2/catalog.xml /etc/xml/catalog" +XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.68.1/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig Modified: trunk/packages/docbook-xml/Makefile =================================================================== --- trunk/packages/docbook-xml/Makefile 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/docbook-xml/Makefile 2005-04-17 22:03:25 UTC (rev 95) @@ -2,7 +2,7 @@ # Package versions NM= docbook-xml -VRS= 4.3 +VRS= 4.4 DIR= $(NM)-$(VRS) FILE= $(DIR).zip URL= http://www.docbook.org/xml/4.3/$(FILE) Modified: trunk/packages/docbook-xml/install =================================================================== --- trunk/packages/docbook-xml/install 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/docbook-xml/install 2005-04-17 22:03:25 UTC (rev 95) @@ -1,83 +1,94 @@ #!/bin/bash -install -d /usr/share/xml/docbook/xml-dtd-4.3 && +install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.4 && +install -v -d -m755 /etc/xml && chown -R root:root . && -cp -af docbook.cat *.dtd ent/ *.mod \ - /usr/share/xml/docbook/xml-dtd-4.3 && -if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog \ - --noout --create /etc/xml/catalog; fi && -if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \ - /etc/xml/docbook; fi && +cp -v -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-4.4 && +if [ ! -e /etc/xml/docbook ]; then + xmlcatalog --noout --create /etc/xml/docbook +fi && xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/dbpoolx.mod" \ + "-//OASIS//DTD DocBook XML V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/calstblx.dtd" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/dbcentx.mod" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/soextblx.dtd" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/dbnotnx.mod" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/dbpoolx.mod" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/dbgenent.mod" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/dbhierx.mod" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/dbhierx.mod" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/htmltblx.mod" \ + /etc/xml/docbook +xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/dbnotnx.mod" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/soextblx.dtd" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/dbcentx.mod" \ /etc/xml/docbook && xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3/calstblx.dtd" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4/dbgenent.mod" \ /etc/xml/docbook && xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.3"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + "http://www.oasis-open.org/docbook/xml/4.4"; \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ /etc/xml/docbook && xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.3"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + "http://www.oasis-open.org/docbook/xml/4.4"; \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ /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 && + "file:///etc/xml/docbook" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && -xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; \ - /etc/xml/docbook && -xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && -xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && -xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.1.2"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - /etc/xml/docbook && -xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.1.2"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - /etc/xml/docbook && -xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.2"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + "file:///etc/xml/docbook" \ + /etc/xml/catalog && +for DTDVERSION in 4.1.2 4.2 4.3 +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.4" \ + /etc/xml/docbook + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + /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 Modified: trunk/packages/docbook-xsl/Makefile =================================================================== --- trunk/packages/docbook-xsl/Makefile 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/docbook-xsl/Makefile 2005-04-17 22:03:25 UTC (rev 95) @@ -2,7 +2,7 @@ # Package versions NM= docbook-xsl -VRS= 1.67.2 +VRS= 1.68.1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL= http://voxel.dl.sourceforge.net/sourceforge/docbook/$(FILE) @@ -23,7 +23,7 @@ @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -d /usr/share/xml/docbook/xsl-stylesheets-current ] ; then tar xjvf $(FILE) && cd $(DIR) && \ ../install && \ - ln -s xsl-stylesheets-1.67.2 /usr/share/xml/docbook/xsl-stylesheets-current; fi + ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current; fi @make clean clean: Modified: trunk/packages/docbook-xsl/install =================================================================== --- trunk/packages/docbook-xsl/install 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/docbook-xsl/install 2005-04-17 22:03:25 UTC (rev 95) @@ -1,34 +1,49 @@ #!/bin/bash -install -d /usr/share/xml/docbook/xsl-stylesheets-1.67.2 && +install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 && +install -v -d -m755 /etc/xml && chown -R root:root . && -cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \ +cp -v -af INSTALL VERSION common eclipse extensions fo html htmlhelp \ images javahelp lib manpages params profiling template xhtml \ - /usr/share/xml/docbook/xsl-stylesheets-1.67.2 && -install -d /usr/share/doc/xml && -cp -af doc/* /usr/share/doc/xml && -cd /usr/share/xml/docbook/xsl-stylesheets-1.67.2 && + /usr/share/xml/docbook/xsl-stylesheets-1.68.1 && +install -v -d -m755 /usr/share/doc/xml && +cp -v -af doc/* /usr/share/doc/xml && +cd /usr/share/xml/docbook/xsl-stylesheets-1.68.1 && sh INSTALL && -if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog \ - --noout --create /etc/xml/catalog; fi && -if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \ - /etc/xml/docbook; fi && +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi && +if [ ! -f /etc/xml/docbook ]; then + xmlcatalog --noout --create /etc/xml/docbook +fi && xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.67.2" /etc/xml/catalog && + "http://docbook.sourceforge.net/release/xsl/1.68.1"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.67.2" /etc/xml/catalog && + "http://docbook.sourceforge.net/release/xsl/1.68.1"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ + /etc/xml/catalog && +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ + /etc/xml/catalog && +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateSystem" \ "http://docbook.sourceforge.net/release/xsl/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" \ + /etc/xml/catalog && xmlcatalog --noout --add "delegateURI" \ "http://docbook.sourceforge.net/release/xsl/"; \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" \ + /etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.65.1"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.67.2" \ + "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.65.1"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.67.2" \ + "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ + "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \ /etc/xml/catalog Modified: trunk/packages/libxml2/Makefile =================================================================== --- trunk/packages/libxml2/Makefile 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/libxml2/Makefile 2005-04-17 22:03:25 UTC (rev 95) @@ -2,7 +2,7 @@ # Package versions NM= libxml2 -VRS= 2.6.16 +VRS= 2.6.19 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL= http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/$(FILE) Modified: trunk/packages/libxslt/Makefile =================================================================== --- trunk/packages/libxslt/Makefile 2005-04-17 21:53:51 UTC (rev 94) +++ trunk/packages/libxslt/Makefile 2005-04-17 22:03:25 UTC (rev 95) @@ -2,7 +2,7 @@ # Package versions NM= libxslt -VRS= 1.1.12 +VRS= 1.1.14 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL= http://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/$(FILE) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
