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

[bdwalton at users.sourceforge.net]

Revision: 6262
          http://gar.svn.sourceforge.net/gar/?rev=6262&view=rev
Author:   bdwalton
Date:     2009-09-11 00:34:56 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
docbook-dtds: update patch to new sysconfdir, strip docbook 5 stuff

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-09-11 00:31:04 UTC (rev 6261)
+++ csw/mgar/pkg/docbook-dtds/trunk/Makefile	2009-09-11 00:34:56 UTC (rev 6262)
@@ -5,7 +5,7 @@
 # version supplied in the package.
 
 GARNAME = docbookdtds
-GARVERSION = 5.0
+GARVERSION = 4.5
 
 CATEGORIES = xtra
 
@@ -47,13 +47,12 @@
 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/ $(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
+DBFILES += docbook-4.5.zip docbook-xml-4.5.zip
 
 MASTER_SITES = $(O_SRC) $(D_SRC)
 DISTFILES  = $(DBFILES)
@@ -146,13 +145,6 @@
 	unzip $(DOWNLOADDIR)/docbook-xml-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-09-11 00:31:04 UTC (rev 6261)
+++ csw/mgar/pkg/docbook-dtds/trunk/checksums	2009-09-11 00:34:56 UTC (rev 6262)
@@ -1,6 +1,6 @@
 e7ba1cae44ae889b32c326f0a46f2c81  download/CSWdocbookdtds.postinstall
 da4b8f64c222276d2c291bf8afb20517  download/CSWdocbookdtds.preremove
-d22f42e2f4d073461f202a12fabb5b8a  download/add_makefile.patch
+9b4a512082ff0851ad3d705072dd5523  download/add_makefile.patch
 9a7f5b1b7dd52d0ca4fb080619f0459c  download/docbk30.zip
 432749c0c806dbae81c8bcb70da3b5d3  download/docbk31.zip
 fabcf7dd1d88b94797b7e5344389eab9  download/docbk40.zip

Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch	2009-09-11 00:31:04 UTC (rev 6261)
+++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch	2009-09-11 00:34:56 UTC (rev 6262)
@@ -1,8 +1,8 @@
 --- /dev/null	2008-12-15 18:41:04.000000000 +0100
 +++ docbookdtds-5.0/Makefile	2008-12-15 18:55:18.651895350 +0100
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,84 @@
 +prefix = /opt/csw
-+sysconfdir = $(prefix)/etc
++sysconfdir = /etc/opt/csw
 +datadir = $(prefix)/share
 +
 +
@@ -53,8 +53,6 @@
 +		[ -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-$*
 +inst-%-sgml:
@@ -82,16 +80,6 @@
 +			$(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.