[csw-devel] SF.net SVN: gar:[4355] csw/mgar/pkg/docbook-dtds/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu Apr 16 20:02:54 CEST 2009 

Revision: 4355
          http://gar.svn.sourceforge.net/gar/?rev=4355&view=rev
Author:   bdwalton
Date:     2009-04-16 18:02:54 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
- Updated to included the 4.5 sgml/xml dtds.
- Updated to include the 5.0 schemas (xml only: rng, dtd, etc).
- Steps up to install work.  Still need to handle the adm scripts.

Modified Paths:
--------------
    csw/mgar/pkg/docbook-dtds/trunk/Makefile
    csw/mgar/pkg/docbook-dtds/trunk/checksums
    csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch

Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/Makefile	2009-04-16 17:50:35 UTC (rev 4354)
+++ csw/mgar/pkg/docbook-dtds/trunk/Makefile	2009-04-16 18:02:54 UTC (rev 4355)
@@ -8,9 +8,8 @@
 # NOTE NOTE NOTE
 
 GARNAME = docbookdtds
-GARVERSION = 1.0
+GARVERSION = 5.0
 
-PATCHLEVEL = 30.1
 CATEGORIES = xtra
 
 REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2
@@ -48,12 +47,14 @@
 O_SRC += $(OASIS)/sgml/4.1/ $(OASIS)/xml/4.1.2/ $(OASIS)/sgml/4.2/
 O_SRC += $(OASIS)/xml/4.2/
 D_SRC = $(DOCBOOK)/sgml/4.3/ $(DOCBOOK)/xml/4.3/ $(DOCBOOK)/sgml/4.4/
-D_SRC += $(DOCBOOK)/xml/4.4/
+D_SRC += $(DOCBOOK)/xml/4.4/ $(DOCBOOK)/sgml/4.5/ $(DOCBOOK)/xml/4.5/
+D_SRC += $(DOCBOOK)/xml/5.0/
 
 # the various files we'll need to fetch from the various sources
 DBFILES = docbk30.zip docbk31.zip docbk40.zip docbk41.zip docbkx412.zip
 DBFILES += docbook-4.2.zip docbook-xml-4.2.zip docbook-4.3.zip
 DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip
+DBFILES += docbook-4.5.zip docbook-xml-4.5.zip docbook-5.0.zip
 
 MASTER_SITES = $(O_SRC) $(D_SRC)
 DISTFILES  = $(DBFILES)
@@ -75,7 +76,7 @@
 # nothing to build either...
 BUILD_SCRIPTS = 
 
-INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) PATCHLEVEL=$(PATCHLEVEL)
+INSTALL_ARGS = DESTDIR=$(DESTDIR)
 
 include gar/category.mk
 
@@ -111,7 +112,6 @@
 	unzip $(DOWNLOADDIR)/docbkx412.zip -d $(WORKSRC)/4.1.2-xml
 	@$(MAKECOOKIE)
 
-
 zip-extract-docbook-4.3.zip:
 	ginstall -d $(WORKSRC)/4.3-sgml
 	unzip $(DOWNLOADDIR)/docbook-4.3.zip -d $(WORKSRC)/4.3-sgml
@@ -122,6 +122,11 @@
 	unzip $(DOWNLOADDIR)/docbook-4.4.zip -d $(WORKSRC)/4.4-sgml
 	@$(MAKECOOKIE)
 
+zip-extract-docbook-4.5.zip:
+	ginstall -d $(WORKSRC)/4.5-sgml
+	unzip $(DOWNLOADDIR)/docbook-4.5.zip -d $(WORKSRC)/4.5-sgml
+	@$(MAKECOOKIE)
+
 zip-extract-docbook-xml-4.2.zip:
 	ginstall -d $(WORKSRC)/4.2-xml
 	unzip $(DOWNLOADDIR)/docbook-xml-4.2.zip -d $(WORKSRC)/4.2-xml
@@ -137,6 +142,18 @@
 	unzip $(DOWNLOADDIR)/docbook-xml-4.4.zip -d $(WORKSRC)/4.4-xml
 	@$(MAKECOOKIE)
 
+zip-extract-docbook-xml-4.5.zip:
+	ginstall -d $(WORKSRC)/4.5-xml
+	unzip $(DOWNLOADDIR)/docbook-4.5.zip -d $(WORKSRC)/4.5-xml
+	@$(MAKECOOKIE)
+
+zip-extract-docbook-5.0.zip:
+	ginstall -d $(WORKSRC)/5.0-xml
+	unzip $(DOWNLOADDIR)/docbook-5.0.zip -d $(WORKSRC)/5.0-xml
+	mv $(WORKSRC)/5.0-xml/docbook-5.0/* $(WORKSRC)/5.0-xml/
+	rmdir $(WORKSRC)/5.0-xml/docbook-5.0
+	@$(MAKECOOKIE)
+
 post-extract:
 	# Increase NAMELEN (bug #36058, bug #159382). [bug references from
 	# rpm .spec file]

Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/checksums	2009-04-16 17:50:35 UTC (rev 4354)
+++ csw/mgar/pkg/docbook-dtds/trunk/checksums	2009-04-16 18:02:54 UTC (rev 4355)
@@ -1,3 +1,7 @@
+536104a1ab1e8eac583cf27f4f8844a4  download/CSWdocbookdtds.gspec
+58c926e94c472fd0842d7850732cbcc8  download/CSWdocbookdtds.postinstall
+81e9ec3839d7fc7585515aaf6d412135  download/CSWdocbookdtds.preremove
+d22f42e2f4d073461f202a12fabb5b8a  download/add_makefile.patch
 9a7f5b1b7dd52d0ca4fb080619f0459c  download/docbk30.zip
 432749c0c806dbae81c8bcb70da3b5d3  download/docbk31.zip
 fabcf7dd1d88b94797b7e5344389eab9  download/docbk40.zip
@@ -3,14 +7,10 @@
 489f6ff2a2173eb1e14216c10533ede2  download/docbk41.zip
 900d7609fb7e6d78901b357e4acfbc17  download/docbkx412.zip
+318742d3a6648a6905727f071cbc9847  download/docbook-4.2-euro.patch
 0dfeb94569334dd22a62d90d99fc0630  download/docbook-4.2.zip
-73fe50dfe74ca631c1602f558ed8961f  download/docbook-xml-4.2.zip
 e3beb1b0b2923c24fa55a68e88654b01  download/docbook-4.3.zip
-ab200202b9e136a144db1e0864c45074  download/docbook-xml-4.3.zip
 f89e1bd0b2c7a361e3f1f739e16b5d0d  download/docbook-4.4.zip
-cbb04e9a700955d88c50962ef22c1634  download/docbook-xml-4.4.zip
-536104a1ab1e8eac583cf27f4f8844a4  download/CSWdocbookdtds.gspec
-58c926e94c472fd0842d7850732cbcc8  download/CSWdocbookdtds.postinstall
-81e9ec3839d7fc7585515aaf6d412135  download/CSWdocbookdtds.preremove
-318742d3a6648a6905727f071cbc9847  download/docbook-4.2-euro.patch
+07c581f4bbcba6d3aac85360a19f95f7  download/docbook-4.5.zip
+2411c19ed4fb141f3fa3d389fae40736  download/docbook-5.0.zip
 e3067045964536cc7445d5c3f1e99916  download/docbook-dtd30-sgml-1.0.catalog.patch
 856d40f5d1e3fc8fd939b88bf5fedc87  download/docbook-dtd31-sgml-1.0.catalog.patch
@@ -19,4 +19,7 @@
 e976c302070ec2e14316d4a601c224cb  download/docbook-dtd41-sgml-1.0.catalog.patch
 0ee42c28835cd448b6b47b2345394b28  download/docbook-dtd42-sgml-1.0.catalog.patch
 1dae3f33fe7dda3fd68a4d4a3df2c653  download/docbook-dtds-ents.patch
-e95f2615b1a3f50b9d14efdb4d188f3d  download/add_makefile.patch
+73fe50dfe74ca631c1602f558ed8961f  download/docbook-xml-4.2.zip
+ab200202b9e136a144db1e0864c45074  download/docbook-xml-4.3.zip
+cbb04e9a700955d88c50962ef22c1634  download/docbook-xml-4.4.zip
+03083e288e87a7e829e437358da7ef9e  download/docbook-xml-4.5.zip

Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch	2009-04-16 17:50:35 UTC (rev 4354)
+++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch	2009-04-16 18:02:54 UTC (rev 4355)
@@ -1,6 +1,6 @@
 --- /dev/null	2008-12-15 18:41:04.000000000 +0100
-+++ docbookdtds-1.0/Makefile	2008-12-15 18:55:18.651895350 +0100
-@@ -0,0 +1,81 @@
++++ docbookdtds-5.0/Makefile	2008-12-15 18:55:18.651895350 +0100
+@@ -0,0 +1,96 @@
 +prefix = /opt/csw
 +sysconfdir = $(prefix)/etc
 +datadir = $(prefix)/share
@@ -19,6 +19,9 @@
 +SGMLTARG = $(patsubst %,inst-%,$(SGML))
 +XMLTARG = $(patsubst %,inst-%,$(XML))
 +
++CUR_SGML = $(lastword $(sort $(subst -sgml,,$(SGMLTARG))))
++CUR_XML = $(lastword $(sort $(subst -xml,,$(XMLTARG))))
++
 +.PHONY: $(SGML) $(XMLT)
 +
 +all: build
@@ -30,10 +33,10 @@
 +	@( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \
 +		cd $(DESTDIR)/$(sysconfdir)/sgml; \
 +		[ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \
-+		ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \
++		ln -s sgml-docbook-$(CUR_SGML).cat \
 +			$(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \
 +		[ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \
-+		ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \
++		ln -s xml-docbook-$(CUR_XML).cat \
 +			$(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat )
 +
 +docs:
@@ -50,8 +53,10 @@
 +		[ -d $$dir ] || $(INSTALL_DIR) $$dir; \
 +		$(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \
 +	done
++	$(INSTALL_DIR) $(DESTDIR)/$(docdir)/5.0
++	cp -R 5.0-xml/docs/ $(DESTDIR)/$(docdir)/5.0/
 +
-+inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL)
++inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*
 +inst-%-sgml:
 +	@echo Installing $*-sgml
 +	@( cd $*-sgml; \
@@ -64,7 +69,7 @@
 +			$(INSTALL_DATA) ent/* $(DD)/ent/; \
 +		fi )
 +
-+inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL)
++inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*
 +inst-%-xml:
 +	@echo Installing $*-xml
 +	@( cd $*-xml; \
@@ -77,6 +82,16 @@
 +			$(INSTALL_DATA) ent/* $(DD)/ent/; \
 +		fi )
 +
++inst-5.0-xml: DD=$(DESTDIR)/$(docbookdir)/xml-schemas-5.0
++inst-5.0-xml:
++	@echo Installing 5.0-xml
++	@( cd 5.0-xml/; \
++	      gmkdir -p $(DD); \
++	      for d in dtd rng sch xsd; do \
++	      	  cp -R $$d $(DD); \
++	      done; \
++	      $(INSTALL_DATA) catalog.xml $(DD)/catalog; )
++
 +build:
 +	@echo Nothing to build...dummy statement in action.
 +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list