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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Mon Dec 15 18:35:52 CET 2008


Revision: 2606
          http://gar.svn.sourceforge.net/gar/?rev=2606&view=rev
Author:   bdwalton
Date:     2008-12-15 17:35:52 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Convert the local Makefile into a patch for easier 'installation' in gar2.  A
few other tweaks for better packaging under v2.

Modified Paths:
--------------
    csw/mgar/pkg/docbook-dtds/trunk/Makefile
    csw/mgar/pkg/docbook-dtds/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/docbook-dtds/trunk/files/Makefile

Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/Makefile	2008-12-15 16:27:27 UTC (rev 2605)
+++ csw/mgar/pkg/docbook-dtds/trunk/Makefile	2008-12-15 17:35:52 UTC (rev 2606)
@@ -56,7 +56,7 @@
 DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip
 
 MASTER_SITES = $(O_SRC) $(D_SRC)
-DISTFILES  = $(DBFILES) Makefile
+DISTFILES  = $(DBFILES)
 DISTFILES += $(call admfiles,CSWdocbookdtds,postinstall preremove)
 
 PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch
@@ -65,6 +65,7 @@
 PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch
 PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch
 PATCHFILES += docbook-dtds-ents.patch
+PATCHFILES += add_makefile.patch
 
 # we don't need no stinkin' configure! :)
 CONFIGURE_SCRIPTS = 
@@ -140,6 +141,7 @@
 	# Increase NAMELEN (bug #36058, bug #159382). [bug references from
 	# rpm .spec file]
 	( cd $(WORKSRC_FIRSTMOD); \
-		gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \
-		cp ../Makefile .)
+		gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen \
+			*/docbook.dcl )
+
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/checksums	2008-12-15 16:27:27 UTC (rev 2605)
+++ csw/mgar/pkg/docbook-dtds/trunk/checksums	2008-12-15 17:35:52 UTC (rev 2606)
@@ -9,7 +9,6 @@
 ab200202b9e136a144db1e0864c45074  download/docbook-xml-4.3.zip
 f89e1bd0b2c7a361e3f1f739e16b5d0d  download/docbook-4.4.zip
 cbb04e9a700955d88c50962ef22c1634  download/docbook-xml-4.4.zip
-e5318114e6c751a9e0835d7711275e13  download/Makefile
 536104a1ab1e8eac583cf27f4f8844a4  download/CSWdocbookdtds.gspec
 95eb4822347e50556398f4a11ee95097  download/CSWdocbookdtds.postinstall
 9035c448e6480f6e916084fea388b512  download/CSWdocbookdtds.preremove
@@ -20,3 +19,4 @@
 e976c302070ec2e14316d4a601c224cb  download/docbook-dtd41-sgml-1.0.catalog.patch
 0ee42c28835cd448b6b47b2345394b28  download/docbook-dtd42-sgml-1.0.catalog.patch
 1dae3f33fe7dda3fd68a4d4a3df2c653  download/docbook-dtds-ents.patch
+9fba7b568d66e824b498706eb1c83a73  download/add_makefile.patch

Deleted: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile
===================================================================
--- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile	2008-12-15 16:27:27 UTC (rev 2605)
+++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile	2008-12-15 17:35:52 UTC (rev 2606)
@@ -1,81 +0,0 @@
-prefix = /opt/csw
-sysconfdir = $(prefix)/etc
-datadir = $(prefix)/share
-
-
-INSTALL = /opt/csw/bin/ginstall -c
-INSTALL_DATA = $(INSTALL) -m 0644
-INSTALL_DIR = $(INSTALL) -m 0755 -d
-
-docbookdir = $(datadir)/sgml/docbook
-docdir = $(datadir)/doc/docbookdtds
-
-SGML = $(wildcard *-sgml)
-XML = $(wildcard *-xml)
-
-SGMLTARG = $(patsubst %,inst-%,$(SGML))
-XMLTARG = $(patsubst %,inst-%,$(XML))
-
-.PHONY: $(SGML) $(XMLT)
-
-all: build
-
-install: $(SGMLTARG) $(XMLTARG) links docs
-
-links: $(SGMLTARG) $(XMLTARG)
-	@echo Installing links to most current SGML and XML catalogs
-	@( $(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 \
-			$(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \
-		[ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \
-		ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \
-			$(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat )
-
-docs:
-	@echo Installing docs
-	$(INSTALL_DIR) $(DESTDIR)/$(docdir)/
-	for d in *; do \
-		if [  "`echo $$d/*txt`" != "$$d/*txt" ]; then \
-			$(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \
-			$(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \
-		fi \
-	done
-	for x in 3 4; do \
-		dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \
-		[ -d $$dir ] || $(INSTALL_DIR) $$dir; \
-		$(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \
-	done
-
-inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL)
-inst-%-sgml:
-	@echo Installing $*-sgml
-	@( cd $*-sgml; \
-		gmkdir -p $(DD); \
-		$(INSTALL_DATA) *dtd *mod $(DD)/; \
-		[ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \
-		$(INSTALL_DATA) docbook.cat $(DD)/; \
-		if [ -d ent ]; then \
-			$(INSTALL_DIR) $(DD)/ent; \
-			$(INSTALL_DATA) ent/* $(DD)/ent/; \
-		fi )
-
-inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL)
-inst-%-xml:
-	@echo Installing $*-xml
-	@( cd $*-xml; \
-		gmkdir -p $(DD); \
-		$(INSTALL_DATA) *dtd *mod $(DD)/; \
-		[ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \
-		$(INSTALL_DATA) docbook.cat $(DD)/; \
-		if [ -d ent ]; then \
-			$(INSTALL_DIR) $(DD)/ent; \
-			$(INSTALL_DATA) ent/* $(DD)/ent/; \
-		fi )
-
-build:
-	@echo Nothing to build...dummy statement in action.
-
-showtarg:
-	@echo $(SGMLTARG) $(XMLTARG)


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