<!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>[119131] trunk/dports/textproc/openjade/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/119131">119131</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-04-17 15:40:03 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>textproc/openjade:
- Use new PortGroup xmlcatalog.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocopenjadePortfile">trunk/dports/textproc/openjade/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocopenjadePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/openjade/Portfile (119130 => 119131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/Portfile 2014-04-17 22:39:43 UTC (rev 119130)
+++ trunk/dports/textproc/openjade/Portfile 2014-04-17 22:40:03 UTC (rev 119131)
</span><span class="lines">@@ -2,22 +2,22 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup xmlcatalog 1.0
</ins><span class="cx">
</span><span class="cx"> name openjade
</span><span class="cx"> version 1.3.2
</span><del>-revision 7
</del><ins>+revision 8
</ins><span class="cx"> categories textproc
</span><span class="cx"> license MIT
</span><span class="cx"> maintainers fourpalms.org:lockhart openmaintainer
</span><span class="cx"> description James Clark's implementation of DSSSL
</span><ins>+long_description \
+ OpenJade is an implementation of ISO/IEC 10179:1996 \
+ standard DSSSL language.
</ins><span class="cx"> homepage http://openjade.sourceforge.net/
</span><span class="cx"> platforms darwin freebsd
</span><ins>+master_sites sourceforge
</ins><span class="cx">
</span><del>-long_description OpenJade is an implementation of ISO/IEC 10179:1996 \
- standard DSSSL language.
-
-master_sites sourceforge:project/openjade/openjade/${version}
-
</del><span class="cx"> checksums md5 7df692e3186109cc00db6825b777201e
</span><span class="cx">
</span><span class="cx"> patchfiles clang.patch \
</span><span class="lines">@@ -30,25 +30,19 @@
</span><span class="cx"> depends_lib port:opensp
</span><span class="cx"> depends_run port:xmlcatmgr
</span><span class="cx">
</span><del>-# xmlcatmgr as installed by MacPorts defaults to using
-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
-# SGML). For historic reasons, openjade expects the catalog to be in
-# share/sgml/catalog. To avoid breaking existing setup, we simply add
-# a reference to the root catalog (/etc/sgml/catalog) to openjade's
-# catalog (/share/sgml/catalog)
-set catalog.sgml ${prefix}/etc/sgml/catalog
-set catalog.openjade ${prefix}/share/sgml/catalog
-
-configure.args --enable-http --enable-html --enable-mif \
- --disable-dependency-tracking \
- --enable-default-catalog=${catalog.openjade} \
- --datadir=${prefix}/share/sgml/openjade \
- --mandir=${prefix}/share/man
</del><ins>+set openjade.catalog ${prefix}/share/sgml/catalog
+set openjade.rootcatalog ${prefix}/share/sgml/openjade/catalog
</ins><span class="cx">
</span><del>-configure.env-append LIBS="-L${prefix}/lib"
-configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
-configure.ldflags-delete "-L${prefix}/lib"
</del><ins>+sgml.catalog ${openjade.rootcatalog}
+# Add the root catalog to the openjade catalog
+sgml.addtocatalog "${openjade.catalog}" "${sgml.rootcatalog}"
</ins><span class="cx">
</span><ins>+configure.args --enable-http --enable-html --enable-mif \
+ --disable-dependency-tracking \
+ --enable-default-catalog=${openjade.catalog} \
+ --datadir=${prefix}/share/sgml/openjade \
+ --mandir=${prefix}/share/man
+
</ins><span class="cx"> # Fix build failure on Tiger due to use of -isystem
</span><span class="cx"> compiler.blacklist gcc-4.0 gcc-3.3
</span><span class="cx">
</span><span class="lines">@@ -58,6 +52,10 @@
</span><span class="cx"> set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.env-append LIBS="-L${prefix}/lib"
+configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
+configure.ldflags-delete "-L${prefix}/lib"
+
</ins><span class="cx"> post-configure {
</span><span class="cx"> reinplace "s|^#pragma implementation||g" ${worksrcpath}/grove/Node.cxx
</span><span class="cx"> reinplace "s|^#pragma implementation||g" ${worksrcpath}/msggen.pl
</span><span class="lines">@@ -75,40 +73,7 @@
</span><span class="cx">
</span><span class="cx"> destroot.target install install-man
</span><span class="cx">
</span><del>-post-destroot {
</del><ins>+post-destroot {
</ins><span class="cx"> system "install -d -m 755 ${destroot}${prefix}/share/sgml/openjade"
</span><span class="cx"> system "install -m 644 ${worksrcpath}/dsssl/* ${destroot}${prefix}/share/sgml/openjade"
</span><span class="cx"> }
</span><del>-
-post-activate {
- # Make the directory if it doesn't exist
- if {![file exists ${prefix}/etc/sgml]} {
- xinstall -m 755 -d ${prefix}/etc/sgml
- }
-
- # Create the root catalog file if it doesn't exist
- if {![file exists ${catalog.sgml}]} {
- system "xmlcatmgr -s -c ${catalog.sgml} create"
- }
-
- # Create the openjade catalog file if it doesn't exist
- if {![file exists ${catalog.openjade}]} {
- system "xmlcatmgr -s -c ${catalog.openjade} create"
- }
-
- # Add the root catalog to openjade's catalog
- if {[catch {exec xmlcatmgr -s -c ${catalog.openjade} lookup ${catalog.sgml}}]} {
- system "xmlcatmgr -s -c ${catalog.openjade} add CATALOG ${catalog.sgml}"
- }
-
- # And add openjade's catalog to the root catalog
- if {[catch {exec xmlcatmgr -s -c ${catalog.sgml} lookup ${prefix}/share/sgml/openjade/catalog}]} {
- system "xmlcatmgr -s -c ${catalog.sgml} add CATALOG ${prefix}/share/sgml/openjade/catalog"
- }
-}
-
-# This will remove the catalog entry for this port.
-post-deactivate {
- # Remove the CATALOG entry from the catalog
- system "xmlcatmgr -s -c ${catalog.sgml} remove CATALOG ${prefix}/share/sgml/openjade/catalog"
-}
</del></span></pre>
</div>
</div>
</body>
</html>