Revision: 2609
http://gar.svn.sourceforge.net/gar/?rev=2609&view=rev
Author: bdwalton
Date: 2008-12-15 20:13:21 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
- Convert our local Makefile to a patch for easier application in gar2.
- Make postinstall/preremove use solaris-style chroot instead of linux-style.
- Clean package build under gar2.
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
Added Paths:
-----------
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 2008-12-15 20:11:36 UTC
(rev 2608)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-15 20:13:21 UTC
(rev 2609)
@@ -22,12 +22,12 @@
DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2
DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2
DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove)
-DISTFILES += Makefile
# 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 =
@@ -41,11 +41,7 @@
#to make the package extraction happy...(we don't use the - separator)
WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION)
-post-extract:
- @( cd $(WORKSRC); cp ../Makefile . )
- @$(MAKECOOKIE)
-
-post-install:
+post-install-modulated:
@(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \
ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \
xsl-stylesheets )
Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:11:36 UTC
(rev 2608)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:13:21 UTC
(rev 2609)
@@ -1,11 +1,10 @@
6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2
b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2
4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec
-6d190471746a394df111025da3060868 download/CSWdocbookxsl.depend
-626425bf8e0de42afd5781c2d63397fc download/CSWdocbookxsl.postinstall
-9f98469194bd4c15bf6b3fc76514b406 download/CSWdocbookxsl.preremove
-ae11620673a7144c4df9a6e408a3bcb1 download/Makefile
+8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall
+88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove
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
Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
2008-12-15 20:11:36 UTC (rev 2608)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall
2008-12-15 20:13:21 UTC (rev 2609)
@@ -1,8 +1,9 @@
#!/bin/sh
-if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then
- chroot $PKG_INSTALL_ROOT
-fi
+case "$PKG_INSTALL_ROOT" in
+ ""|"/") PREFIX= ;;
+ *) PREFIX="chroot $PKG_INSTALL_ROOT ";;
+esac
PATH=/opt/csw/bin:$PATH
@@ -13,15 +14,16 @@
DBHOME=/opt/csw/share/sgml/docbook
CATALOG=/opt/csw/etc/xml/catalog
-$CATCMD --noout --add "rewriteSystem" \
+
+$PREFIX $CATCMD --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/$VERSION"; \
"file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
-$CATCMD --noout --add "rewriteURI" \
+$PREFIX $CATCMD --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/$VERSION"; \
"file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
-$CATCMD --noout --add "rewriteSystem" \
+$PREFIX $CATCMD --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current"; \
"file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
-$CATCMD --noout --add "rewriteURI" \
+$PREFIX $CATCMD --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current"; \
"file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove
2008-12-15 20:11:36 UTC (rev 2608)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove
2008-12-15 20:13:21 UTC (rev 2609)
@@ -1,8 +1,9 @@
#!/bin/sh
-if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then
- chroot $PKG_INSTALL_ROOT
-fi
+case "$PKG_INSTALL_ROOT" in
+ ""|"/") PREFIX= ;;
+ *) PREFIX="chroot $PKG_INSTALL_ROOT ";;
+esac
PATH=/opt/csw/bin:$PATH
@@ -12,5 +13,5 @@
VERSION=1.69.1
RELEASE=5.1
-$XMLCAT --noout --del \
- "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
\ No newline at end of file
+$PREFIX $XMLCAT --noout --del \
+ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG
Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
(rev 0)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
2008-12-15 20:13:21 UTC (rev 2609)
@@ -0,0 +1,55 @@
+--- /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,51 @@
++
++DESTDIR ?= ... should be overridden by GAR ...
++GARVERSION ?= ... should be overridden by GAR ...
++PATCHLEVEL ?= ... should be overridden by GAR ...
++
++SHELL = /opt/csw/bin/bash
++
++prefix = $(DESTDIR)/opt/csw
++bindir = $(prefix)/bin
++datadir = $(prefix)/share
++
++instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL)
++docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL)
++
++all: install
++
++install: install-xsl install-img install-misc install-docs
++
++install-xsl:
++ gmkdir -p
$(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling}
++ cp common/*.dtd $(instdir)/common
++ cp common/*.xml $(instdir)/common
++ cp common/*.xsl $(instdir)/common
++ cp fo/*.xml $(instdir)/fo
++ cp fo/*.xsl $(instdir)/fo
++ cp html/*.xml $(instdir)/html
++ cp html/*.xsl $(instdir)/html
++ 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
++
++install-img:
++ gmkdir -p $(instdir)/images/callouts
++ cp images/*.gif $(instdir)/images
++ cp images/*.png $(instdir)/images
++ cp images/callouts/*.png $(instdir)/images/callouts
++
++install-misc:
++ cp VERSION $(instdir)
++
++install-docs:
++ gmkdir -p $(docdir)
++ cp BUGS ChangeLog README TODO $(docdir)/
++ cp -R doc $(docdir)/
+\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
