<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119132] trunk/dports/textproc/sgml-common/Portfile</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119132">119132</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-04-17 15:40:25 -0700 (Thu, 17 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>textproc/sgml-common:
- Use new PortGroup xmlcatalog.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocsgmlcommonPortfile">trunk/dports/textproc/sgml-common/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocsgmlcommonPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/sgml-common/Portfile (119131 => 119132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/sgml-common/Portfile        2014-04-17 22:40:03 UTC (rev 119131)
+++ trunk/dports/textproc/sgml-common/Portfile        2014-04-17 22:40:25 UTC (rev 119132)
</span><span class="lines">@@ -1,29 +1,30 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><ins>+PortSystem 1.0
+PortGroup xmlcatalog 1.0
</ins><span class="cx"> 
</span><del>-PortSystem          1.0
-
</del><span class="cx"> name                sgml-common
</span><span class="cx"> version             0.6.3
</span><span class="cx"> set openjade_version 1.3.2
</span><ins>+revision            1
</ins><span class="cx"> categories          textproc
</span><span class="cx"> platforms           darwin
</span><span class="cx"> license             GPL-2+
</span><span class="cx"> maintainers         fourpalms.org:lockhart openmaintainer
</span><span class="cx"> supported_archs     noarch
</span><del>-
</del><span class="cx"> # Actually - there is no homepage of this project, on that URL
</span><span class="cx"> # page you could get complete ISO 8879 listing as was on the
</span><span class="cx"> # old page - only part of it is included in sgml-common package.
</span><span class="cx"> homepage            http://www.w3.org/2003/entities/
</span><span class="cx"> description         A collection of entities and DTDs common to multiple packages.
</span><del>-long_description    The sgml-common package contains a collection of entities and DTDs \
-                    that are useful for processing SGML, but that don't need to be \
-                    included in multiple packages.  Sgml-common also includes an \
-                    up-to-date Open Catalog file. \
-                    Transcribed from the Fedora 15 RPM written originally by \
-                    Tim Waugh &lt;twaugh@redhat.com&gt; based on work by Eric Bischoff \
-                    and with recent maintenance by Ondrej Vasik &lt;ovasik@redhat.com&gt;.
</del><ins>+long_description \
+    The sgml-common package contains a collection of entities and DTDs \
+    that are useful for processing SGML, but that don't need to be \
+    included in multiple packages.  Sgml-common also includes an \
+    up-to-date Open Catalog file. \
+    Transcribed from the Fedora 15 RPM written originally by \
+    Tim Waugh &lt;twaugh@redhat.com&gt; based on work by Eric Bischoff \
+    and with recent maintenance by Ondrej Vasik &lt;ovasik@redhat.com&gt;.
</ins><span class="cx"> 
</span><span class="cx"> master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/:redhat \
</span><span class="cx">                     sourceforge:project/openjade/openjade/${openjade_version}:openjade
</span><span class="lines">@@ -41,29 +42,11 @@
</span><span class="cx">                     rmd160  3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
</span><span class="cx">                     sha256  1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
</span><span class="cx"> 
</span><del>-depends_lib         port:perl5 \
-                    port:libxml2 \
-                    port:openjade \
-                    port:docbook-dsssl \
-                    port:docbook-sgml-4.2
</del><ins>+depends_lib-append  port:perl5 \
+                    port:libxml2
</ins><span class="cx"> 
</span><del>-depends_run         port:xmlcatmgr
</del><ins>+set sgmldir ${prefix}/share/sgml
</ins><span class="cx"> 
</span><del>-set bindir ${prefix}/bin
-set confdir ${prefix}/etc
-set datadir ${prefix}/share
-set sgmldir ${datadir}/sgml
-set sgmlcatalog ${confdir}/sgml/catalog
-set xmldir ${datadir}/xml
-set xmlcatalog ${confdir}/xml/catalog
-# xmlcatmgr as installed by MacPorts defaults to using
-# ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
-# SGML) if no catalog is specified, but we'll specify the path just in case
-# users have another installation of xmlcatmgr and happen to have it before
-# ${prefix}/bin in their PATH.
-set xml.args       &quot;-c ${xmlcatalog}&quot;
-set sgml.args      &quot;-s -c ${sgmlcatalog}&quot;
-
</del><span class="cx"> patch.pre_args      -p1
</span><span class="cx"> patchfiles          patch-bin-install-catalog.in.diff \
</span><span class="cx">                     patch-config-sgml.conf.diff \
</span><span class="lines">@@ -77,55 +60,11 @@
</span><span class="cx"> 
</span><span class="cx"> use_configure       no
</span><span class="cx"> 
</span><del>-build {
-    # XML catalog
-    # Make the directory if it doesn't exist
-    if {![file exists ${confdir}/xml]} {
-        xinstall -m 755 -d ${confdir}/xml
-    }
</del><ins>+build {}
</ins><span class="cx"> 
</span><del>-    # Create the catalog file if it doesn't exist
-    if {![file exists ${xmlcatalog}]} {
-        system &quot;xmlcatmgr ${xml.args} create&quot;
-    }
-
-    # SGML catalog
-    # Make the directory if it doesn't exist
-    if {![file exists ${confdir}/sgml]} {
-        xinstall -m 755 -d ${confdir}/sgml
-    }
-
-    # Create the catalog file if it doesn't exist
-    if {![file exists ${sgmlcatalog}]} {
-        system &quot;xmlcatmgr ${sgml.args} create&quot;
-    }
-
-    # Now put the common DocBook entries in it
-    # system &quot;${bindir}/xmlcatalog --noout --add 'delegatePublic' \
-    #     '-//OASIS//ENTITIES DocBook XML' \
-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}&quot;
-    # system &quot;${bindir}/xmlcatalog --noout --add 'delegatePublic' \
-    #     '-//OASIS//DTD DocBook XML' \
-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}&quot;
-    # system &quot;${bindir}/xmlcatalog --noout --add 'delegatePublic' \
-    #     'ISO 8879:1986' \
-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}&quot;
-    # system &quot;${bindir}/xmlcatalog --noout --add 'delegateSystem' \
-    #     'http://www.oasis-open.org/docbook/' \
-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}&quot;
-    # system &quot;${bindir}/xmlcatalog --noout --add 'delegateURI' \
-    #     'http://www.oasis-open.org/docbook/' \
-    #     'file://${confdir}/sgml/docbook/xmlcatalog'
-        # ${worksrcpath}${xmlcatalog}&quot;
-    # Also create the common DocBook catalog
-    # xinstall -d ${worksrcpath}${confdir}/sgml/docbook
-    # system &quot;${bindir}/xmlcatalog --noout --create \
-    #     ${worksrcpath}${confdir}/sgml/docbook/xmlcatalog&quot;
-}
-
</del><span class="cx"> destroot {
</span><del>-    xinstall -d ${destroot}${confdir}/sgml
-    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${prefix}/etc/sgml/sgml.conf
</del><ins>+    xinstall -d ${destroot}${sgml.confdir}
+    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${sgml.confdir}/sgml.conf
</ins><span class="cx">     xinstall -d ${destroot}${sgmldir}
</span><span class="cx">     # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
</span><span class="cx">     xinstall -W ${workpath}/${openjade}/pubtext xml.dcl xml.soc html.dcl html.soc ${destroot}${sgmldir}
</span></span></pre>
</div>
</div>

</body>
</html>