[csw-devel] SF.net SVN: gar:[2388] csw/mgar/pkg/sgml-xml-common/trunk

[bdwalton at users.sourceforge.net]

Revision: 2388
          http://gar.svn.sourceforge.net/gar/?rev=2388&view=rev
Author:   bdwalton
Date:     2008-11-29 01:06:43 +0000 (Sat, 29 Nov 2008)

Log Message:
-----------
Corrected another pathing issue.  Why go to the trouble of having a full
autotools framework if you're just going to hardcode paths anyway?

Modified Paths:
--------------
    csw/mgar/pkg/sgml-xml-common/trunk/Makefile
    csw/mgar/pkg/sgml-xml-common/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/sgml-xml-common/trunk/files/configure-sgml-conf.patch
    csw/mgar/pkg/sgml-xml-common/trunk/files/sgml-conf-autoconf.patch

Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sgml-xml-common/trunk/Makefile	2008-11-28 23:31:36 UTC (rev 2387)
+++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile	2008-11-29 01:06:43 UTC (rev 2388)
@@ -18,15 +18,16 @@
 
 MASTER_SITES = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWsgmlcommon,)
-DISTFILES += $(call admfiles,CSWxmlcommon,)
+DISTFILES += CSWsgmlcommon.gspec CSWsgmlcommon.prototype CSWsgmlcommon.depend
+DISTFILES += CSWxmlcommon.gspec CSWxmlcommon.prototype
 DISTFILES += $(EXTRA_FILES)
 
 PATCHFILES = sgml-common-0.6.3-docdir.patch sgml-common-automake.patch
 PATCHFILES += sgml-common-quotes.patch sgml-common-umask.patch
 PATCHFILES += sgml-common-xmldir.patch install-catalog-sanity.patch
 PATCHFILES += sgmlwhich-sanity.patch configure-man.patch
-PATCHFILES += install-catalog-man.patch
+PATCHFILES += install-catalog-man.patch sgml-conf-autoconf.patch
+PATCHFILES += configure-sgml-conf.patch
 
 CONFIGURE_ARGS = $(DIRPATHS) --with-docdir=$(datadir)/doc
 

Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums
===================================================================
--- csw/mgar/pkg/sgml-xml-common/trunk/checksums	2008-11-28 23:31:36 UTC (rev 2387)
+++ csw/mgar/pkg/sgml-xml-common/trunk/checksums	2008-11-29 01:06:43 UTC (rev 2388)
@@ -1,6 +1,9 @@
 103c9828f24820df86e55e7862e28974  download/sgml-common-0.6.3.tgz
 8344f78748603b2870f2d7f401ef49eb  download/CSWsgmlcommon.gspec
+fc5cd6cb77e22b8a1e21d0d9f662f891  download/CSWsgmlcommon.prototype
+a4bb3b3487dcd7f6c16ec4ecb799253b  download/CSWsgmlcommon.depend
 f68c56d0904b311d4d254130a63eeee6  download/CSWxmlcommon.gspec
+cd5928d3ad12438a4725b3469a6b98fd  download/CSWxmlcommon.prototype
 9ef2e183281920ecced665a3f644bace  download/xml.dcl
 e0135e28b7f6c566a3e0ee379528091b  download/html.dcl
 8f56c7a27cbe7c8251a385ddb90dd641  download/xml.soc
@@ -14,3 +17,5 @@
 b35d53333ca6dbc6cd96f0135cd4f85d  download/sgmlwhich-sanity.patch
 99ac766ea29643aa33236a39596d943c  download/configure-man.patch
 12b32f2a5ad0ab2edb70bfb83f3aecd6  download/install-catalog-man.patch
+267d4e173f9a1e4c75fd65733b179449  download/sgml-conf-autoconf.patch
+458bbce42a19fe1aa8066e1c7175f144  download/configure-sgml-conf.patch

Added: csw/mgar/pkg/sgml-xml-common/trunk/files/configure-sgml-conf.patch
===================================================================
--- csw/mgar/pkg/sgml-xml-common/trunk/files/configure-sgml-conf.patch	                        (rev 0)
+++ csw/mgar/pkg/sgml-xml-common/trunk/files/configure-sgml-conf.patch	2008-11-29 01:06:43 UTC (rev 2388)
@@ -0,0 +1,8 @@
+--- sgml-common-0.6.3/configure.in.orig	2008-11-29 01:23:20.764190162 +0100
++++ sgml-common-0.6.3/configure.in	2008-11-29 01:23:34.053309738 +0100
+@@ -23,4 +23,5 @@
+           config/Makefile \
+           doc/Makefile doc/HTML/Makefile doc/man/Makefile doc/refentry/Makefile \
+ 	  doc/man/install-catalog.8 \
++	  config/sgml.conf \
+           sgml-iso-entities/Makefile xml-iso-entities/Makefile)

Added: csw/mgar/pkg/sgml-xml-common/trunk/files/sgml-conf-autoconf.patch
===================================================================
--- csw/mgar/pkg/sgml-xml-common/trunk/files/sgml-conf-autoconf.patch	                        (rev 0)
+++ csw/mgar/pkg/sgml-xml-common/trunk/files/sgml-conf-autoconf.patch	2008-11-29 01:06:43 UTC (rev 2388)
@@ -0,0 +1,7 @@
+--- /dev/null	2008-11-29 01:02:29.000000000 +0100
++++ sgml-common-0.6.3/config/sgml.conf.in	2000-11-17 09:36:11.000000000 +0100
+@@ -0,0 +1,4 @@
++# /etc/sgml/sgml.conf conformant with LSB
++# Modified to be autoconf-able so that it can work in CSW too...
++SGML_BASE_DIR=@datadir@/sgml
++SGML_CATALOGS_DIR=@sysconfdir@/sgml


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.