[csw-devel] SF.net SVN: gar:[4271] csw/mgar/pkg/docbook-style-xsl/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Fri Apr 10 04:34:31 CEST 2009


Revision: 4271
          http://gar.svn.sourceforge.net/gar/?rev=4271&view=rev
Author:   bdwalton
Date:     2009-04-10 02:34:31 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
Bump to 1.74.3.
Convert to dynamic gspec.
Updated postinstall script.
Update makefile patch to reflect the fact that they now ship one (that
doesn't do an install).

Modified Paths:
--------------
    csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
    csw/mgar/pkg/docbook-style-xsl/trunk/checksums
    csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
    csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch

Removed Paths:
-------------
    csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec
    csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile	2009-04-10 02:34:31 UTC (rev 4271)
@@ -1,11 +1,16 @@
 GARNAME = docbookxsl
-GARVERSION = 1.69.1
-PATCHLEVEL = 5.1
+GARVERSION = 1.74.3
 CATEGORIES = xtra
 
 # for our (modified from rhel) copied in Makefile.
 PREREQUISITE_PKGS = CSWgfile CSWbash
 
+PACKAGES = CSWdocbookxsl CSWdocbookxsldoc
+ARCHALL = 1
+
+CATALOGNAME_CSWdocbookxsl = $(GARNAME)
+CATALOGNAME_CSWdocbookxsldoc = $(GARNAME)doc
+
 REQUIRED_PKGS_CSWdocbookxsl = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds
 REQUIRED_PKGS_CSWdocbookxsl += CSWlibxml2
 REQUIRED_PKGS_CSWdocbookxsldoc = CSWdocbookxsl
@@ -28,21 +33,18 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = docbook-xsl-$(GARVERSION).tar.bz2
 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove)
-DISTFILES += $(call admfiles,CSWdocbookxsldoc,)
+DISTFILES += CSWdocbookxsl.postinstall CSWdocbookxsl.preremove
 
-# These are listed in the same order they'd be applied during the rpm build...
-# They don't apply cleanly, otherwise.
-PATCHFILES  = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch
-PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch
 PATCHFILES += add_makefile.patch
 
 CONFIGURE_SCRIPTS =
 
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = 
 
 TEST_SCRIPTS =
 
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile.csw
+
 INSTALL_ARGS = DESTDIR=$(DESTDIR)
 
 #to make the package extraction happy...(we don't use the - separator)
@@ -50,5 +52,7 @@
 
 include gar/category.mk
 
-#override system checkpkg so that docbookxsldoc can depend on docbookxsl
-PATH := /home/bwalton:$(PATH)
+install-%/Makefile.csw:
+	@echo " ==> Running make install in $*"
+	@$(INSTALL_ENV) $(MAKE) -f Makefile.csw DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install
+	@$(MAKECOOKIE)
\ No newline at end of file

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-04-10 02:34:31 UTC (rev 4271)
@@ -1,11 +1,5 @@
-6ebd29a67f2dcc3f2220f475ee6f6552  download/docbook-xsl-1.69.1.tar.bz2
-b3bf09a0b1a368a3490e68ffc695d290  download/docbook-xsl-doc-1.69.1.tar.bz2
-4120f10e50070dd8fc2284d5214bf51d  download/CSWdocbookxsl.gspec
-e96ac786b8d7b1bd6bc76787c965017a  download/CSWdocbookxsl.postinstall
+c022eb8e15bf110605a4695235f20075  download/CSWdocbookxsl.postinstall
 1b98827c1a02fcec57ec0f7376bb8815  download/CSWdocbookxsl.preremove
-a0c6ee83fdef595158d9eed95d508d8f  download/CSWdocbookxsldoc.gspec
-84b37b559cc95c747e39a5a8f79558a3  download/docbook-xsl-pagesetup.patch
-1d1ff63f5ebd3527c925f68e55138b6f  download/docbook-xsl-marginleft.patch
-cec8c281ed1c9be99ad47a74362248d5  download/docbook-xsl-lists.patch
-e7bbf777eadbb70aaed073006de0347e  download/docbook-xsl-sp.patch
-8b8a8d4307fa3f3dcb992ebd16c4fb09  download/add_makefile.patch
+9ba4d6409de31404b8022f10630016e0  download/add_makefile.patch
+c77c0c317040b2f2e366842bd9df2218  download/docbook-xsl-1.74.3.tar.bz2
+2a032a95fbf24367d13acc8210f9cd72  download/docbook-xsl-doc-1.74.3.tar.bz2

Deleted: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec	2009-04-10 02:34:31 UTC (rev 4271)
@@ -1,5 +0,0 @@
-%var            bitname docbookxsl
-%var            pkgname CSWdocbookxsl
-%var		arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall	2009-04-10 02:34:31 UTC (rev 4271)
@@ -14,7 +14,7 @@
 CATALOG=/opt/csw/etc/xml/catalog
 
 #we need a version here, since that will be referenced in URLS being redirected
-VERSION=1.69.1
+VERSION=1.74.3
 
 $PREFIX $CATCMD --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/$VERSION" \

Deleted: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec	2009-04-10 02:34:31 UTC (rev 4271)
@@ -1,6 +0,0 @@
-%var            bitname docbookxsldoc
-%var            pkgname CSWdocbookxsldoc
-%var		arch all
-%var		desc Documentation for the Docbook XSL Stylesheets
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-04-10 00:13:56 UTC (rev 4270)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-04-10 02:34:31 UTC (rev 4271)
@@ -1,7 +1,6 @@
---- /dev/null	2008-12-14 03:06:26.000000000 +0100
-+++ docbook-xsl-1.69.1/Makefile	2008-12-14 04:12:33.444192066 +0100
-@@ -0,0 +1,49 @@
-+
+--- /dev/null	2009-04-10 02:03:32.000000000 +0200
++++ docbook-xsl-1.74.3/Makefile.csw	2009-04-10 04:25:32.872750482 +0200
+@@ -0,0 +1,46 @@
 +DESTDIR ?= ... should be overridden by GAR ...
 +
 +SHELL = /opt/csw/bin/bash
@@ -29,11 +28,9 @@
 +	cp htmlhelp/*.xsl $(instdir)/htmlhelp
 +	cp javahelp/*.xsl $(instdir)/javahelp
 +	cp lib/lib.xsl $(instdir)/lib
-+	cp template/README $(instdir)/template
 +	cp template/*.xml $(instdir)/template
 +	cp template/*.xsl $(instdir)/template
 +	cp xhtml/*.xsl $(instdir)/xhtml
-+	cp manpages/README $(instdir)/manpages
 +	cp manpages/*.xsl $(instdir)/manpages
 +	cp profiling/*.xsl $(instdir)/profiling
 +
@@ -48,6 +45,5 @@
 +
 +install-docs:
 +	gmkdir -p $(docdir)
-+	cp BUGS ChangeLog README TODO $(docdir)/
++	cp AUTHORS BUGS README TODO RELEASE-NOTES* NEWS* $(docdir)/
 +	cp -R doc $(docdir)/
-


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