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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu Jan 1 20:19:57 CET 2009


Revision: 2730
          http://gar.svn.sourceforge.net/gar/?rev=2730&view=rev
Author:   bdwalton
Date:     2009-01-01 19:19:57 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
Further path cleaning.  No longer refernce the version in the diretory name
at all. 

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/CSWdocbookxsl.preremove
    csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile	2009-01-01 18:52:31 UTC (rev 2729)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile	2009-01-01 19:19:57 UTC (rev 2730)
@@ -43,17 +43,11 @@
 
 TEST_SCRIPTS =
 
-INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION)
+INSTALL_ARGS = DESTDIR=$(DESTDIR)
 
-
 #to make the package extraction happy...(we don't use the - separator)
 WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION)
 
-post-install-modulated:
-	@(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \
-		ln -s xsl-stylesheets-$(GARVERSION) xsl-stylesheets )
-	@$(MAKECOOKIE)
-
 include gar/category.mk
 
 #override system checkpkg so that docbookxsldoc can depend on docbookxsl

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-01-01 18:52:31 UTC (rev 2729)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-01-01 19:19:57 UTC (rev 2730)
@@ -1,11 +1,11 @@
 6ebd29a67f2dcc3f2220f475ee6f6552  download/docbook-xsl-1.69.1.tar.bz2
 b3bf09a0b1a368a3490e68ffc695d290  download/docbook-xsl-doc-1.69.1.tar.bz2
 4120f10e50070dd8fc2284d5214bf51d  download/CSWdocbookxsl.gspec
-8911f851d78a1ab1a21c49286f37f6cb  download/CSWdocbookxsl.postinstall
-88f331d079de730ef77a5091e69989e2  download/CSWdocbookxsl.preremove
+e96ac786b8d7b1bd6bc76787c965017a  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
-6e7ff9307e810ea822c94818cfbc86e0  download/add_makefile.patch
+8b8a8d4307fa3f3dcb992ebd16c4fb09  download/add_makefile.patch

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall	2009-01-01 18:52:31 UTC (rev 2729)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall	2009-01-01 19:19:57 UTC (rev 2730)
@@ -9,21 +9,22 @@
 
 CATCMD=/opt/csw/bin/xmlcatalog
 
-VERSION=1.69.1
-RELEASE=5.1
 DBHOME=/opt/csw/share/sgml/docbook
 
 CATALOG=/opt/csw/etc/xml/catalog
 
+#we need a version here, since that will be referenced in URLS being redirected
+VERSION=1.69.1
+
 $PREFIX $CATCMD --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/$VERSION" \
- "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
+ "file://$DBHOME/xsl-stylesheets" $CATALOG
 $PREFIX $CATCMD --noout --add "rewriteURI" \
  "http://docbook.sourceforge.net/release/xsl/$VERSION" \
- "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
+ "file://$DBHOME/xsl-stylesheets" $CATALOG
 $PREFIX $CATCMD --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/current" \
- "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
+ "file://$DBHOME/xsl-stylesheets" $CATALOG
 $PREFIX $CATCMD --noout --add "rewriteURI" \
  "http://docbook.sourceforge.net/release/xsl/current" \
- "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
+ "file://$DBHOME/xsl-stylesheets" $CATALOG

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove	2009-01-01 18:52:31 UTC (rev 2729)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove	2009-01-01 19:19:57 UTC (rev 2730)
@@ -10,8 +10,6 @@
 CATALOG=/opt/csw/etc/xml/catalog
 XMLCAT=/opt/csw/bin/xmlcatalog
 DBHOME=/opt/csw/share/sgml/docbook
-VERSION=1.69.1
-RELEASE=5.1
 
 $PREFIX $XMLCAT --noout --del \
-	 "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
+	 "file://$DBHOME/xsl-stylesheets" $CATALOG

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-01-01 18:52:31 UTC (rev 2729)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-01-01 19:19:57 UTC (rev 2730)
@@ -1,9 +1,8 @@
 --- /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,50 @@
+@@ -0,0 +1,49 @@
 +
 +DESTDIR ?= ... should be overridden by GAR ...
-+GARVERSION ?= ... should be overridden by GAR ...
 +
 +SHELL = /opt/csw/bin/bash
 +
@@ -11,8 +10,8 @@
 +bindir = $(prefix)/bin
 +datadir = $(prefix)/share
 +
-+instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)
-+docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)
++instdir = $(datadir)/sgml/docbook/xsl-stylesheets
++docdir = $(datadir)/doc/docbookxsl
 +
 +all: install
 +


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