Ticket #41708: textproc.patches

File textproc.patches, 78.8 KB (added by lockhart (Thomas Lockhart), 7 years ago)

Patches for ports docbook-dsssl,docbook-sgml-4.2,docbook-utils,docbook-xml,docbook-xsl,docbook-xsl-ns,iso8879,openjade,sgml-common,xhtml1,xmlroff

Line 
1diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-dsssl/Portfile docbook-dsssl/Portfile
2--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-dsssl/Portfile       2012-12-02 22:17:50.000000000 -0800
3+++ docbook-dsssl/Portfile      2013-07-14 17:48:33.000000000 -0700
4@@ -1,74 +1,48 @@
5+# -*- 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
6 # $Id: Portfile 100113 2012-11-29 02:36:26Z ryandesign@macports.org $
7-PortSystem 1.0
8 
9-name           docbook-dsssl
10-version                1.79
11-revision       1
12-categories     textproc
13-license                MIT
14-description    the docbook dsssl stylesheets
15-platforms      darwin
16-depends_run    port:xmlcatmgr
17+PortSystem      1.0
18+PortGroup       xmlcatalog 1.0
19+
20+name            docbook-dsssl
21+version         1.79
22+revision        3
23+categories      textproc
24+license         MIT
25+description     The docbook DSSSL stylesheets
26+platforms       darwin
27 maintainers     decibel.org:decibel
28 supported_archs noarch
29-master_sites   sourceforge:docbook
30-homepage       http://docbook.sf.net/
31-checksums      md5 8459913bbd8a5724a6fe4b9ed5bab5af
32-use_configure  no
33-build          {}
34-
35-set things_to_install  "common contrib dtds frames html images lib olink print catalog VERSION"
36-set install_dir                ${prefix}/share/dsssl/${name}
37-
38-# xmlcatmgr as installed by MacPorts defaults to using
39-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
40-# SGML) if no catalog is specified, but we'll specify the path just in case
41-# users have another installation of xmlcatmgr and happen to have it before
42-# ${prefix}/bin in their PATH.
43-set catalog.sgml ${prefix}/etc/sgml/catalog
44-set xmlcatmgr.args "-s -c ${catalog.sgml}"
45+master_sites    sourceforge:docbook
46+homepage        http://docbook.sf.net/
47+checksums       md5 8459913bbd8a5724a6fe4b9ed5bab5af
48+use_configure   no
49+
50+set things_to_install "common contrib dtds frames html images lib olink print catalog VERSION"
51+
52+set install_dir ${prefix}/share/dsssl/${name}
53+sgml.catalog "${install_dir}/catalog"
54+
55+build {}
56 
57-destroot       {
58+destroot {
59     # Docs
60-       xinstall -m 755 -d ${destroot}${install_dir} \
61-               ${destroot}${prefix}/share/doc/${name} \
62-               ${destroot}${prefix}/share/${name}
63+    xinstall -m 755 -d ${destroot}${install_dir} \
64+        ${destroot}${prefix}/share/doc/${name} \
65+        ${destroot}${prefix}/share/${name}
66     
67     # bin
68-       xinstall -m 755 -W ${worksrcpath} bin/collateindex.pl \
69-               ${destroot}${prefix}/bin
70+    xinstall -m 755 -W ${worksrcpath} bin/collateindex.pl \
71+        ${destroot}${prefix}/bin
72     # man
73-       xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl.1 \
74-               ${destroot}${prefix}/share/man/man1
75+    xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl.1 \
76+        ${destroot}${prefix}/share/man/man1
77 
78     # everything else
79-       xinstall -m 644 -W ${worksrcpath} BUGS ChangeLog README \
80-               RELEASE-NOTES.html RELEASE-NOTES.xml RELEASE-NOTES.txt WhatsNew \
81-               ${destroot}${prefix}/share/doc/${name}
82-       foreach dirname $things_to_install {
83-               file copy ${worksrcpath}/${dirname} ${destroot}${install_dir}
84-       }
85-}
86-
87-post-activate {
88-       # Make the directory if it doesn't exist
89-       if {![file exists ${prefix}/etc/sgml]} {
90-               xinstall -m 755 -d ${prefix}/etc/sgml
91-       }
92-
93-       # Create the catalog file if it doesn't exist
94-       if {![file exists ${catalog.sgml}]} {
95-               system "xmlcatmgr ${xmlcatmgr.args} create"
96-       }
97-
98-       # Add the CATALOG entry to the catalog if it doesn't exist
99-       if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
100-               system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
101-       }
102-}
103-
104-# This will remove the catalog entry for this port.
105-post-deactivate {
106-       # Remove the CATALOG entry from the catalog
107-       system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
108+    xinstall -m 644 -W ${worksrcpath} BUGS ChangeLog README \
109+        RELEASE-NOTES.html RELEASE-NOTES.xml RELEASE-NOTES.txt WhatsNew \
110+        ${destroot}${prefix}/share/doc/${name}
111+    foreach dirname $things_to_install {
112+        file copy ${worksrcpath}/${dirname} ${destroot}${install_dir}
113+    }
114 }
115diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-sgml-4.2/Portfile docbook-sgml-4.2/Portfile
116--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-sgml-4.2/Portfile    2012-02-28 20:26:58.000000000 -0800
117+++ docbook-sgml-4.2/Portfile   2013-07-14 22:06:03.000000000 -0700
118@@ -2,9 +2,11 @@
119 # $Id: Portfile 86420 2011-10-25 13:54:14Z dports@macports.org $
120 
121 PortSystem 1.0
122+PortGroup xmlcatalog 1.0
123 
124 name            docbook-sgml-4.2
125 version         [strsed ${name} {s/docbook-sgml-//}]
126+revision        1
127 description     Version ${version} of the DocBook SGML DTDs
128 long_description \
129     Version ${version} of the DocBook SGML DTDs, which provide a structured,\
130@@ -18,7 +20,8 @@
131 supported_archs noarch
132 homepage        http://www.docbook.org/sgml/${version}/
133 
134-depends_run     port:xmlcatmgr port:docbook-dsssl port:iso8879
135+depends_lib     port:iso8879
136+depends_run     port:docbook-dsssl
137 
138 master_sites    http://www.oasis-open.org/docbook/sgml/${version}/
139 distname        docbook-${version}
140@@ -31,17 +34,11 @@
141 extract.mkdir   yes
142 
143 use_configure   no
144-build       {}
145 
146-set install_dir    ${prefix}/share/sgml/docbook/${version}
147+set install_dir ${prefix}/share/sgml/docbook/${version}
148+sgml.catalog "${install_dir}/docbook.cat"
149 
150-# xmlcatmgr as installed by MacPorts defaults to using
151-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
152-# SGML) if no catalog is specified, but we'll specify the path just in case
153-# users have another installation of xmlcatmgr and happen to have it before
154-# ${prefix}/bin in their PATH.
155-set catalog.sgml    ${prefix}/etc/sgml/catalog
156-set xmlcatmgr.args  "-s -c ${catalog.sgml}"
157+build {}
158 
159 destroot {
160     set destroot_dir    ${destroot}${install_dir}
161@@ -51,26 +48,3 @@
162         copy ${worksrcpath}/${file} ${destroot_dir}
163     }
164 }
165-
166-post-activate {
167-    # Make the directory if it doesn't exist
168-    if {![file exists ${prefix}/etc/sgml]} {
169-        xinstall -m 755 -d ${prefix}/etc/sgml
170-    }
171-
172-    # Create the catalog file if it doesn't exist
173-    if {![file exists ${catalog.sgml}]} {
174-        system "xmlcatmgr ${xmlcatmgr.args} create"
175-    }
176-
177-    # Add the CATALOG entry to the catalog if it doesn't exist
178-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/docbook.cat}]} {
179-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/docbook.cat"
180-    }
181-}
182-
183-# This will remove the catalog entry for this port.
184-post-deactivate {
185-    # Remove the CATALOG entry from the catalog
186-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/docbook.cat"
187-}
188diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile docbook-utils/Portfile
189--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile       2012-10-04 04:15:32.000000000 -0700
190+++ docbook-utils/Portfile      2013-07-14 22:14:40.000000000 -0700
191@@ -12,12 +12,13 @@
192 maintainers         fourpalms.org:lockhart openmaintainer
193 homepage            http://sources.redhat.com/docbook-tools/
194 description         Shell scripts for managing DocBook documents
195-long_description    This package contains scripts are for easy conversion from DocBook \
196-                    files to other formats (for example, HTML, RTF, and PostScript), and \
197-                    for comparing SGML files. \
198-                    Transcribed from the Fedora 15 RPM written originally by \
199-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
200-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
201+long_description \
202+    This package contains scripts are for easy conversion from DocBook \
203+    files to other formats (for example, HTML, RTF, and PostScript), and \
204+    for comparing SGML files. \
205+    Transcribed from the Fedora 15 RPM written originally by \
206+    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
207+    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
208 master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/
209 
210 checksums           rmd160  710fe047ea8a794cc6c0d944521184375a666e6b \
211@@ -63,7 +64,11 @@
212     reinplace "s|jade|openjade|" \
213         ${worksrcpath}/doc/man/Makefile.in \
214         ${worksrcpath}/doc/HTML/Makefile.in
215-    reinplace "s|nsgmls|onsgmls|" \
216+    reinplace "s|nsgmls|onsgmls|g" \
217+        ${worksrcpath}/backends/man.in \
218+        ${worksrcpath}/backends/texi.in \
219+        ${worksrcpath}/helpers/docbook2man-spec.pl \
220+        ${worksrcpath}/bin/sgmldiff.in \
221         ${worksrcpath}/doc/man/Makefile.in \
222         ${worksrcpath}/doc/HTML/Makefile.in
223 
224diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile docbook-xml/Portfile
225--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile 2013-04-19 09:01:53.000000000 -0700
226+++ docbook-xml/Portfile        2013-07-14 22:49:59.000000000 -0700
227@@ -1,11 +1,11 @@
228 # -*- 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
229 # $Id: Portfile 104041 2013-03-14 00:27:36Z jmr@macports.org $
230-
231-PortSystem          1.0
232+PortSystem 1.0
233+PortGroup xmlcatalog 1.0
234 
235 name                docbook-xml
236 revision            1
237-set revision-docbook-xml 2
238+set revision-docbook-xml 3
239 set docbook-xml-versions {
240     4.1.2
241     {
242@@ -50,39 +50,31 @@
243 homepage            http://www.docbook.org
244 
245 foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
246-
247     subport docbook-xml-${docbook-xml-version} {
248-
249-       if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
250-
251+        if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
252             distname            docbkx412
253             extract.mkdir       yes
254 
255             depends_lib-append  port:docbook-xml-4.2
256 
257             post-extract {
258-
259                 copy ${prefix}/share/xml/docbook/4.2/catalog.xml \
260                     ${worksrcpath}/
261             }
262             post-patch {
263-
264                 reinplace "s,V4.2 ..,V4.1.2 ,g" \
265                     ${worksrcpath}/catalog.xml
266                 reinplace "s,V4.2,V4.1.2,g" \
267                     ${worksrcpath}/catalog.xml
268             }
269         } elseif {[vercmp ${docbook-xml-version} 5.0] >= 0} {
270-
271             distname            docbook-${docbook-xml-version}
272         } else {
273-
274             distname            docbook-xml-${docbook-xml-version}
275             extract.mkdir       yes
276         }
277 
278         foreach part [string trim ${docbook-xml-checksums}] {
279-
280             checksums-append    $part
281         }
282 
283@@ -101,94 +93,32 @@
284 
285         set install_dir    ${prefix}/share/xml/docbook/${docbook-xml-version}
286 
287-        # xmlcatmgr as installed by MacPorts defaults to using
288-        # ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
289-        # SGML) if no catalog is specified, but we'll specify the path just in case
290-        # users have another installation of xmlcatmgr and happen to have it before
291-        # ${prefix}/bin in their PATH.
292-        set catalog.xml    ${prefix}/etc/xml/catalog
293-        set xml.args       "-c ${catalog.xml}"
294-        set catalog.sgml   ${prefix}/etc/sgml/catalog
295-        set sgml.args      "-s -c ${catalog.sgml}"
296+        xml.catalog "${install_dir}/catalog.xml"
297+        # SGML catalog support is only in the 4.x transitional versions...
298+        if {[vercmp ${docbook-xml-version} 5.0] < 0} {
299+            sgml.catalog "${install_dir}/docbook.cat"
300+        }
301 
302         destroot {
303-
304             set destroot_dir    ${destroot}${install_dir}
305             set destroot_files  [readdir ${worksrcpath}]
306             xinstall -m 755 -d ${destroot_dir}
307             foreach file ${destroot_files} {
308-
309                 copy ${worksrcpath}/${file} ${destroot_dir}
310             }
311         }
312-
313-        post-activate {
314-
315-            # XML catalog
316-            # Make the directory if it doesn't exist
317-            if {![file exists ${prefix}/etc/xml]} {
318-
319-                xinstall -m 755 -d ${prefix}/etc/xml
320-            }
321-
322-            # Create the catalog file if it doesn't exist
323-            if {![file exists ${catalog.xml}]} {
324-
325-                system "xmlcatmgr ${xml.args} create"
326-            }
327-
328-            # Add the nextCatalog entry to the catalog if it doesn't exist
329-            if {[catch {exec xmlcatmgr ${xml.args} lookup ${install_dir}/catalog.xml}]} {
330-
331-                system "xmlcatmgr ${xml.args} add nextCatalog ${install_dir}/catalog.xml"
332-            }
333-
334-            # SGML catalog
335-            # SGML catalog support is only in the 4.x transitional versions...
336-            if {[file exists ${install_dir}/docbook.cat]} {
337-                # Make the directory if it doesn't exist
338-                if {![file exists ${prefix}/etc/sgml]} {
339-
340-                    xinstall -m 755 -d ${prefix}/etc/sgml
341-                }
342-
343-                # Create the catalog file if it doesn't exist
344-                if {![file exists ${catalog.sgml}]} {
345-
346-                    system "xmlcatmgr ${sgml.args} create"
347-                }
348-
349-                # Add the CATALOG entry to the catalog if it doesn't exist
350-                if {[catch {exec xmlcatmgr ${sgml.args} lookup ${install_dir}/docbook.cat}]} {
351-
352-                    system "xmlcatmgr ${sgml.args} add CATALOG ${install_dir}/docbook.cat"
353-                }
354-            }
355-        }
356-
357-        # This will remove the catalog entry for this port.
358-        post-deactivate {
359-
360-            system "xmlcatmgr ${xml.args} remove nextCatalog ${install_dir}/catalog.xml"
361-            # Remove the CATALOG entry from the catalog
362-            # SGML catalog support is only in the 4.x transitional versions...
363-            system "xmlcatmgr ${sgml.args} remove CATALOG ${install_dir}/docbook.cat"
364-        }
365     }
366 }
367 
368 if {${name} == ${subport}} {
369-
370     revision            ${revision-docbook-xml}
371     use_configure       no
372     build               {}
373     distfiles
374     foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
375-
376         depends_lib-append  port:docbook-xml-${docbook-xml-version}
377     }
378     destroot {
379-
380         set docdir ${prefix}/share/doc/${name}
381         xinstall -d ${destroot}${docdir}
382         xinstall -m 0644 ${filespath}/README ${destroot}${docdir}
383diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile docbook-xsl/Portfile
384--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile 2013-10-02 21:34:30.000000000 -0700
385+++ docbook-xsl/Portfile        2013-06-23 14:02:09.000000000 -0700
386@@ -1,10 +1,12 @@
387-# $Id: Portfile 111353 2013-09-19 07:21:56Z ryandesign@macports.org $
388+# $Id: Portfile 104648 2013-03-30 18:06:55Z devans@macports.org $
389 # -*- 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
390 
391 PortSystem      1.0
392+PortGroup       xmlcatalog 1.0
393 
394 name            docbook-xsl
395 version         1.78.1
396+revision        1
397 categories      textproc
398 license         MIT Permissive
399 description     The docbook xsl stylesheets
400@@ -20,12 +22,12 @@
401 use_bzip2       yes
402 
403 distfiles-append \
404-                ${name}-doc-${version}${extract.suffix}
405+                [suffix ${name}-doc-${version}]
406 
407-checksums       ${distname}${extract.suffix} \
408+checksums       [suffix $distname] \
409                 sha1    1d668c845bb43c65115d1a1d9542f623801cfb6f \
410                 rmd160  1f29e74eaab655673ced47b7a011c35c4d1e5187 \
411-                ${name}-doc-${version}${extract.suffix} \
412+                [suffix $name-doc-$version] \
413                 sha1    bf69dc152a9f983a1af197d9041b8c4dc894dd5d \
414                 rmd160  78f6b1bc4ca2de024addd4ab9092dc929fd4d3aa
415 
416@@ -42,6 +44,8 @@
417 set instxsldir  "share/xsl/${name}"
418 set instdocdir  "share/doc/${name}"
419 
420+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
421+
422 destroot {
423     foreach pathname "${instxsldir} ${instdocdir}" {
424         xinstall -m 755 -d ${destroot}${prefix}/${pathname}
425@@ -53,29 +57,6 @@
426         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
427     }
428 }
429-post-activate {
430-    # xmlcatmgr as installed by MacPorts defaults to using
431-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
432-    # SGML) if no catalog is specified, but we'll specify the path just in case
433-    # users have another installation of xmlcatmgr and happen to have it before
434-    # ${prefix}/bin in their PATH.
435-    set catalog.xml ${prefix}/etc/xml/catalog
436-
437-    # Make the directory if it doesn't exist
438-    if {![file exists ${prefix}/etc/xml]} {
439-        xinstall -m 755 -d ${prefix}/etc/xml
440-    }
441-
442-    # Create the catalog file if it doesn't exist
443-    if {![file exists ${catalog.xml}]} {
444-        system "xmlcatmgr create -c ${catalog.xml}"
445-    }
446-
447-    # Add the nextCatalog entry to the catalog if it doesn't exist
448-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
449-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
450-    }
451-}
452 
453 if {${registry.format} == "receipt_flat"} {
454     notes \
455@@ -87,10 +68,5 @@
456 ######################################################################"
457 }
458 
459-# This will remove the catalog entry for this port.
460-post-deactivate {
461-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
462-}
463-
464 livecheck.url       http://docbook.sourceforge.net/release/xsl/
465 livecheck.regex "=\"(\\d+(?:\\.\\d+)*)"
466diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile docbook-xsl-ns/Portfile
467--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile      2012-02-28 20:26:53.000000000 -0800
468+++ docbook-xsl-ns/Portfile     2013-06-23 14:02:46.000000000 -0700
469@@ -1,9 +1,12 @@
470+# -*- 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
471 # $Id: Portfile 81135 2011-07-26 00:29:03Z jmr@macports.org $
472 
473 PortSystem      1.0
474+PortGroup       xmlcatalog 1.0
475 
476 name            docbook-xsl-ns
477 version         1.76.1
478+revision        1
479 categories      textproc
480 license         MIT Permissive
481 description     DocBook XSL NS (namespaced) Stylesheets
482@@ -36,6 +39,7 @@
483                 RELEASE-NOTES.pdf RELEASE-NOTES.txt TODO VERSION NEWS COPYING"
484 set instxsldir  "share/xsl/${name}"
485 set instdocdir  "share/doc/${name}"
486+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
487 
488 destroot {
489     foreach pathname "${instxsldir} ${instdocdir}" {
490@@ -48,33 +52,5 @@
491         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
492     }
493 }
494-post-activate {
495-    # xmlcatmgr as installed by MacPorts defaults to using
496-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
497-    # SGML) if no catalog is specified, but we'll specify the path just in case
498-    # users have another installation of xmlcatmgr and happen to have it before
499-    # ${prefix}/bin in their PATH.
500-    set catalog.xml ${prefix}/etc/xml/catalog
501-
502-    # Make the directory if it doesn't exist
503-    if {![file exists ${prefix}/etc/xml]} {
504-        xinstall -m 755 -d ${prefix}/etc/xml
505-    }
506-
507-    # Create the catalog file if it doesn't exist
508-    if {![file exists ${catalog.xml}]} {
509-        system "xmlcatmgr create -c ${catalog.xml}"
510-    }
511-
512-    # Add the nextCatalog entry to the catalog if it doesn't exist
513-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
514-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
515-    }
516-}
517-
518-# This will remove the catalog entry for this port.
519-post-deactivate {
520-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
521-}
522 
523 livecheck.distname  ${name}
524diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile iso8879/Portfile
525--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile     2012-02-28 20:26:52.000000000 -0800
526+++ iso8879/Portfile    2013-06-23 14:10:17.000000000 -0700
527@@ -1,66 +1,37 @@
528 # $Id: Portfile 86410 2011-10-25 11:15:36Z dports@macports.org $
529+# -*- 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
530 
531-PortSystem 1.0
532-name           iso8879
533-version                1986
534-revision       1
535-categories     textproc
536-license                Permissive
537-maintainers    nomaintainer
538-description    Character entity sets from ISO 8879:1986 (SGML)
539-platforms      darwin
540+PortSystem      1.0
541+PortGroup       xmlcatalog 1.0
542 
543-long_description $description
544-
545-master_sites   freebsd
546-
547-distname       isoENTS
548-checksums      md5 c8a9561212c1a2ec6e48919640de9c67
549-
550-use_zip                yes
551+name            iso8879
552+version         1986
553+revision        2
554+categories      textproc
555+license         Permissive
556+maintainers     nomaintainer
557+description     Character entity sets from ISO 8879:1986 (SGML)
558+platforms       darwin
559 
560-depends_run    port:xmlcatmgr
561+long_description $description
562 
563-use_configure  no
564-build          {}
565+master_sites    freebsd
566 
567-set install_dir        ${prefix}/share/sgml/${name}
568+distname        isoENTS
569+checksums       md5 c8a9561212c1a2ec6e48919640de9c67
570 
571-# xmlcatmgr as installed by MacPorts defaults to using
572-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
573-# SGML) if no catalog is specified, but we'll specify the path just in case
574-# users have another installation of xmlcatmgr and happen to have it before
575-# ${prefix}/bin in their PATH.
576-set catalog.sgml ${prefix}/etc/sgml/catalog
577-set xmlcatmgr.args "-s -c ${catalog.sgml}"
578+use_zip         yes
579 
580-destroot       {
581-       xinstall -m 755 -d ${destroot}${install_dir}
582-       xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
583-       eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
584-}
585+use_configure   no
586+build {}
587 
588-destroot.args  prefix=${destroot}${prefix}
589+set install_dir ${prefix}/share/sgml/${name}
590+sgml.catalog "${install_dir}/catalog"
591 
592-post-activate {
593-    # Make the directory if it doesn't exist
594-    if {![file exists ${prefix}/etc/sgml]} {
595-        xinstall -m 755 -d ${prefix}/etc/sgml
596-    }
597-
598-    # Create the catalog file if it doesn't exist
599-    if {![file exists ${catalog.sgml}]} {
600-        system "xmlcatmgr ${xmlcatmgr.args} create"
601-    }
602-
603-    # Add the CATALOG entry to the catalog if it doesn't exist
604-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
605-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
606-    }
607-}
608+destroot.args prefix=${destroot}${prefix}
609 
610-# This will remove the catalog entry for this port.
611-post-deactivate {
612-    # Remove the CATALOG entry from the catalog
613-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
614+destroot {
615+    xinstall -m 755 -d ${destroot}${install_dir}
616+    xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
617+    eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
618 }
619diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile openjade/Portfile
620--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile    2013-10-28 14:29:26.000000000 -0700
621+++ openjade/Portfile   2013-07-14 22:15:26.000000000 -0700
622@@ -1,22 +1,22 @@
623 # -*- 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
624-# $Id: Portfile 112550 2013-10-25 20:18:43Z ryandesign@macports.org $
625+# $Id: Portfile 99226 2012-10-29 22:32:17Z pixilla@macports.org $
626 
627 PortSystem 1.0
628+PortGroup xmlcatalog 1.0
629 
630 name            openjade
631 version         1.3.2
632-revision        4
633+revision        5
634 categories      textproc
635 license         MIT
636 maintainers     fourpalms.org:lockhart openmaintainer
637 description     James Clark's implementation of DSSSL
638+long_description \
639+    OpenJade is an implementation of ISO/IEC 10179:1996 \
640+    standard DSSSL language.
641 homepage        http://openjade.sourceforge.net/
642 platforms       darwin freebsd
643-
644-long_description OpenJade is an implementation of ISO/IEC 10179:1996 \
645-                 standard DSSSL language.
646-
647-master_sites    sourceforge:project/openjade/openjade/${version}
648+master_sites    sourceforge
649 
650 checksums       md5 7df692e3186109cc00db6825b777201e
651 
652@@ -27,33 +27,31 @@
653                 patch-GroveApp.h \
654                 patch-GroveBuilder.cxx \
655                 patch-Node.h \
656-                openjade-getoptperl.patch \
657-                delete_la_files.patch
658+                openjade-getoptperl.patch
659 
660 depends_lib     port:opensp
661 depends_run     port:xmlcatmgr
662 
663-# TeXFOTBuilder.cxx:1876:48: error: default initialization of an object of const type 'const TeXFOTBuilder::PageFloatFlowObj' requires a user-provided default constructor
664-compiler.blacklist *clang*
665+if {${configure.compiler} == "clang"} {
666+    configure.compiler llvm-gcc-4.2
667+}
668+
669+set openjade.catalog ${prefix}/share/sgml/catalog
670+set openjade.rootcatalog ${prefix}/share/sgml/openjade/catalog
671 
672-# xmlcatmgr as installed by MacPorts defaults to using
673-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
674-# SGML). For historic reasons, openjade expects the catalog to be in
675-# share/sgml/catalog. To avoid breaking existing setup, we simply add
676-# a reference to the root catalog (/etc/sgml/catalog) to openjade's
677-# catalog (/share/sgml/catalog)
678-set catalog.sgml      ${prefix}/etc/sgml/catalog
679-set catalog.openjade  ${prefix}/share/sgml/catalog
680-
681-configure.args  --enable-http --enable-html --enable-mif \
682-                --disable-dependency-tracking \
683-                --enable-default-catalog=${catalog.openjade} \
684-                --datadir=${prefix}/share/sgml/openjade \
685-                --mandir=${prefix}/share/man
686-
687-configure.env-append        LIBS="-L${prefix}/lib"
688-configure.cxxflags-append   "-isystem ${prefix}/include -fno-rtti"
689-configure.ldflags-delete    "-L${prefix}/lib"
690+sgml.catalog ${openjade.rootcatalog}
691+# Add the root catalog to the openjade catalog
692+sgml.addtocatalog "${openjade.catalog}" "${sgml.rootcatalog}"
693+
694+configure.args --enable-http --enable-html --enable-mif \
695+               --disable-dependency-tracking \
696+               --enable-default-catalog=${openjade.catalog} \
697+               --datadir=${prefix}/share/sgml/openjade \
698+               --mandir=${prefix}/share/man
699+
700+configure.env-append      LIBS="-L${prefix}/lib"
701+configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
702+configure.ldflags-delete  "-L${prefix}/lib"
703 
704 post-configure  {
705     reinplace "s|^#pragma implementation||g" ${worksrcpath}/grove/Node.cxx
706@@ -72,40 +70,7 @@
707 
708 destroot.target install install-man
709 
710-post-destroot   {
711+post-destroot {
712     system "install -d -m 755 ${destroot}${prefix}/share/sgml/openjade"
713     system "install -m 644 ${worksrcpath}/dsssl/* ${destroot}${prefix}/share/sgml/openjade"
714 }
715-
716-post-activate {
717-    # Make the directory if it doesn't exist
718-    if {![file exists ${prefix}/etc/sgml]} {
719-        xinstall -m 755 -d ${prefix}/etc/sgml
720-    }
721-
722-    # Create the root catalog file if it doesn't exist
723-    if {![file exists ${catalog.sgml}]} {
724-        system "xmlcatmgr -s -c ${catalog.sgml} create"
725-    }
726-
727-    # Create the openjade catalog file if it doesn't exist
728-    if {![file exists ${catalog.openjade}]} {
729-        system "xmlcatmgr -s -c ${catalog.openjade} create"
730-    }
731-
732-    # Add the root catalog to openjade's catalog
733-    if {[catch {exec xmlcatmgr -s -c ${catalog.openjade} lookup ${catalog.sgml}}]} {
734-        system "xmlcatmgr -s -c ${catalog.openjade} add CATALOG ${catalog.sgml}"
735-    }
736-
737-    # And add openjade's catalog to the root catalog
738-    if {[catch {exec xmlcatmgr -s -c ${catalog.sgml} lookup ${prefix}/share/sgml/openjade/catalog}]} {
739-        system "xmlcatmgr -s -c ${catalog.sgml} add CATALOG ${prefix}/share/sgml/openjade/catalog"
740-    }
741-}
742-
743-# This will remove the catalog entry for this port.
744-post-deactivate {
745-    # Remove the CATALOG entry from the catalog
746-    system "xmlcatmgr -s -c ${catalog.sgml} remove CATALOG ${prefix}/share/sgml/openjade/catalog"
747-}
748diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/files/delete_la_files.patch openjade/files/delete_la_files.patch
749--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/files/delete_la_files.patch 2013-10-02 21:34:31.000000000 -0700
750+++ openjade/files/delete_la_files.patch        1969-12-31 16:00:00.000000000 -0800
751@@ -1,11 +0,0 @@
752---- Makefile.prog.in.orig      2013-09-02 18:50:59.000000000 -0700
753-+++ Makefile.prog.in   2013-09-02 18:52:56.000000000 -0700
754-@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
755-
756- ALL_LIBS = $(XLIBS) $(LIBS)
757- Makefile.lt:
758--      echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
759-+      echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'|sed 's|libosp\.la|libosp.dylib|'` >Makefile.lt
760-
761- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
762-
763diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile sgml-common/Portfile
764--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile 2012-10-29 13:59:15.000000000 -0700
765+++ sgml-common/Portfile        2013-07-14 22:15:53.000000000 -0700
766@@ -1,29 +1,30 @@
767 # -*- 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
768 # $Id: Portfile 99124 2012-10-27 19:39:14Z ryandesign@macports.org $
769-
770-PortSystem          1.0
771+PortSystem 1.0
772+PortGroup xmlcatalog 1.0
773 
774 name                sgml-common
775 version             0.6.3
776 set openjade_version 1.3.2
777+revision            1
778 categories          textproc
779 platforms           darwin
780 license             GPL-2+
781 maintainers         fourpalms.org:lockhart openmaintainer
782 supported_archs     noarch
783-
784 # Actually - there is no homepage of this project, on that URL
785 # page you could get complete ISO 8879 listing as was on the
786 # old page - only part of it is included in sgml-common package.
787 homepage            http://www.w3.org/2003/entities/
788 description         A collection of entities and DTDs common to multiple packages.
789-long_description    The sgml-common package contains a collection of entities and DTDs \
790-                    that are useful for processing SGML, but that don't need to be \
791-                    included in multiple packages.  Sgml-common also includes an \
792-                    up-to-date Open Catalog file. \
793-                    Transcribed from the Fedora 15 RPM written originally by \
794-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
795-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
796+long_description \
797+    The sgml-common package contains a collection of entities and DTDs \
798+    that are useful for processing SGML, but that don't need to be \
799+    included in multiple packages.  Sgml-common also includes an \
800+    up-to-date Open Catalog file. \
801+    Transcribed from the Fedora 15 RPM written originally by \
802+    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
803+    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
804 
805 master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/:redhat \
806                     sourceforge:project/openjade/openjade/${openjade_version}:openjade
807@@ -41,28 +42,10 @@
808                     rmd160  3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
809                     sha256  1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
810 
811-depends_lib         port:perl5 \
812-                    port:libxml2 \
813-                    port:openjade \
814-                    port:docbook-dsssl \
815-                    port:docbook-sgml-4.2
816-
817-depends_run         port:xmlcatmgr
818-
819-set bindir ${prefix}/bin
820-set confdir ${prefix}/etc
821-set datadir ${prefix}/share
822-set sgmldir ${datadir}/sgml
823-set sgmlcatalog ${confdir}/sgml/catalog
824-set xmldir ${datadir}/xml
825-set xmlcatalog ${confdir}/xml/catalog
826-# xmlcatmgr as installed by MacPorts defaults to using
827-# ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
828-# SGML) if no catalog is specified, but we'll specify the path just in case
829-# users have another installation of xmlcatmgr and happen to have it before
830-# ${prefix}/bin in their PATH.
831-set xml.args       "-c ${xmlcatalog}"
832-set sgml.args      "-s -c ${sgmlcatalog}"
833+depends_lib-append  port:perl5 \
834+                    port:libxml2
835+
836+set sgmldir ${prefix}/share/sgml
837 
838 patch.pre_args      -p1
839 patchfiles          patch-bin-install-catalog.in.diff \
840@@ -77,55 +60,11 @@
841 
842 use_configure       no
843 
844-build {
845-    # XML catalog
846-    # Make the directory if it doesn't exist
847-    if {![file exists ${confdir}/xml]} {
848-        xinstall -m 755 -d ${confdir}/xml
849-    }
850-
851-    # Create the catalog file if it doesn't exist
852-    if {![file exists ${xmlcatalog}]} {
853-        system "xmlcatmgr ${xml.args} create"
854-    }
855-
856-    # SGML catalog
857-    # Make the directory if it doesn't exist
858-    if {![file exists ${confdir}/sgml]} {
859-        xinstall -m 755 -d ${confdir}/sgml
860-    }
861-
862-    # Create the catalog file if it doesn't exist
863-    if {![file exists ${sgmlcatalog}]} {
864-        system "xmlcatmgr ${sgml.args} create"
865-    }
866-
867-    # Now put the common DocBook entries in it
868-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
869-    #     '-//OASIS//ENTITIES DocBook XML' \
870-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
871-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
872-    #     '-//OASIS//DTD DocBook XML' \
873-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
874-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
875-    #     'ISO 8879:1986' \
876-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
877-    # system "${bindir}/xmlcatalog --noout --add 'delegateSystem' \
878-    #     'http://www.oasis-open.org/docbook/' \
879-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
880-    # system "${bindir}/xmlcatalog --noout --add 'delegateURI' \
881-    #     'http://www.oasis-open.org/docbook/' \
882-    #     'file://${confdir}/sgml/docbook/xmlcatalog'
883-       # ${worksrcpath}${xmlcatalog}"
884-    # Also create the common DocBook catalog
885-    # xinstall -d ${worksrcpath}${confdir}/sgml/docbook
886-    # system "${bindir}/xmlcatalog --noout --create \
887-    #     ${worksrcpath}${confdir}/sgml/docbook/xmlcatalog"
888-}
889+build {}
890 
891 destroot {
892-    xinstall -d ${destroot}${confdir}/sgml
893-    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${prefix}/etc/sgml/sgml.conf
894+    xinstall -d ${destroot}${sgml.confdir}
895+    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${sgml.confdir}/sgml.conf
896     xinstall -d ${destroot}${sgmldir}
897     # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
898     xinstall -W ${workpath}/${openjade}/pubtext xml.dcl xml.soc html.dcl html.soc ${destroot}${sgmldir}
899--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/textproc.patches     1969-12-31 16:00:00.000000000 -0800
900+++ textproc.patches    2013-12-05 15:46:25.000000000 -0800
901@@ -0,0 +1,898 @@
902+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-dsssl/Portfile docbook-dsssl/Portfile
903+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-dsssl/Portfile      2012-12-02 22:17:50.000000000 -0800
904++++ docbook-dsssl/Portfile     2013-07-14 17:48:33.000000000 -0700
905+@@ -1,74 +1,48 @@
906++# -*- 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
907+ # $Id: Portfile 100113 2012-11-29 02:36:26Z ryandesign@macports.org $
908+-PortSystem 1.0
909+
910+-name          docbook-dsssl
911+-version               1.79
912+-revision      1
913+-categories    textproc
914+-license               MIT
915+-description   the docbook dsssl stylesheets
916+-platforms     darwin
917+-depends_run   port:xmlcatmgr
918++PortSystem      1.0
919++PortGroup       xmlcatalog 1.0
920++
921++name            docbook-dsssl
922++version         1.79
923++revision        3
924++categories      textproc
925++license         MIT
926++description     The docbook DSSSL stylesheets
927++platforms       darwin
928+ maintainers     decibel.org:decibel
929+ supported_archs noarch
930+-master_sites  sourceforge:docbook
931+-homepage      http://docbook.sf.net/
932+-checksums     md5 8459913bbd8a5724a6fe4b9ed5bab5af
933+-use_configure         no
934+-build         {}
935+-
936+-set things_to_install "common contrib dtds frames html images lib olink print catalog VERSION"
937+-set install_dir               ${prefix}/share/dsssl/${name}
938+-
939+-# xmlcatmgr as installed by MacPorts defaults to using
940+-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
941+-# SGML) if no catalog is specified, but we'll specify the path just in case
942+-# users have another installation of xmlcatmgr and happen to have it before
943+-# ${prefix}/bin in their PATH.
944+-set catalog.sgml ${prefix}/etc/sgml/catalog
945+-set xmlcatmgr.args "-s -c ${catalog.sgml}"
946++master_sites    sourceforge:docbook
947++homepage        http://docbook.sf.net/
948++checksums       md5 8459913bbd8a5724a6fe4b9ed5bab5af
949++use_configure   no
950++
951++set things_to_install "common contrib dtds frames html images lib olink print catalog VERSION"
952++
953++set install_dir ${prefix}/share/dsssl/${name}
954++sgml.catalog "${install_dir}/catalog"
955++
956++build {}
957+
958+-destroot      {
959++destroot {
960+     # Docs
961+-      xinstall -m 755 -d ${destroot}${install_dir} \
962+-              ${destroot}${prefix}/share/doc/${name} \
963+-              ${destroot}${prefix}/share/${name}
964++    xinstall -m 755 -d ${destroot}${install_dir} \
965++        ${destroot}${prefix}/share/doc/${name} \
966++        ${destroot}${prefix}/share/${name}
967+     
968+     # bin
969+-      xinstall -m 755 -W ${worksrcpath} bin/collateindex.pl \
970+-              ${destroot}${prefix}/bin
971++    xinstall -m 755 -W ${worksrcpath} bin/collateindex.pl \
972++        ${destroot}${prefix}/bin
973+     # man
974+-      xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl.1 \
975+-              ${destroot}${prefix}/share/man/man1
976++    xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl.1 \
977++        ${destroot}${prefix}/share/man/man1
978+
979+     # everything else
980+-      xinstall -m 644 -W ${worksrcpath} BUGS ChangeLog README \
981+-              RELEASE-NOTES.html RELEASE-NOTES.xml RELEASE-NOTES.txt WhatsNew \
982+-              ${destroot}${prefix}/share/doc/${name}
983+-      foreach dirname $things_to_install {
984+-              file copy ${worksrcpath}/${dirname} ${destroot}${install_dir}
985+-      }
986+-}
987+-
988+-post-activate {
989+-      # Make the directory if it doesn't exist
990+-      if {![file exists ${prefix}/etc/sgml]} {
991+-              xinstall -m 755 -d ${prefix}/etc/sgml
992+-      }
993+-
994+-      # Create the catalog file if it doesn't exist
995+-      if {![file exists ${catalog.sgml}]} {
996+-              system "xmlcatmgr ${xmlcatmgr.args} create"
997+-      }
998+-
999+-      # Add the CATALOG entry to the catalog if it doesn't exist
1000+-      if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
1001+-              system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
1002+-      }
1003+-}
1004+-
1005+-# This will remove the catalog entry for this port.
1006+-post-deactivate {
1007+-      # Remove the CATALOG entry from the catalog
1008+-      system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
1009++    xinstall -m 644 -W ${worksrcpath} BUGS ChangeLog README \
1010++        RELEASE-NOTES.html RELEASE-NOTES.xml RELEASE-NOTES.txt WhatsNew \
1011++        ${destroot}${prefix}/share/doc/${name}
1012++    foreach dirname $things_to_install {
1013++        file copy ${worksrcpath}/${dirname} ${destroot}${install_dir}
1014++    }
1015+ }
1016+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-sgml-4.2/Portfile docbook-sgml-4.2/Portfile
1017+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-sgml-4.2/Portfile   2012-02-28 20:26:58.000000000 -0800
1018++++ docbook-sgml-4.2/Portfile  2013-07-14 22:06:03.000000000 -0700
1019+@@ -2,9 +2,11 @@
1020+ # $Id: Portfile 86420 2011-10-25 13:54:14Z dports@macports.org $
1021+
1022+ PortSystem 1.0
1023++PortGroup xmlcatalog 1.0
1024+
1025+ name            docbook-sgml-4.2
1026+ version         [strsed ${name} {s/docbook-sgml-//}]
1027++revision        1
1028+ description     Version ${version} of the DocBook SGML DTDs
1029+ long_description \
1030+     Version ${version} of the DocBook SGML DTDs, which provide a structured,\
1031+@@ -18,7 +20,8 @@
1032+ supported_archs noarch
1033+ homepage        http://www.docbook.org/sgml/${version}/
1034+
1035+-depends_run     port:xmlcatmgr port:docbook-dsssl port:iso8879
1036++depends_lib     port:iso8879
1037++depends_run     port:docbook-dsssl
1038+
1039+ master_sites    http://www.oasis-open.org/docbook/sgml/${version}/
1040+ distname        docbook-${version}
1041+@@ -31,17 +34,11 @@
1042+ extract.mkdir   yes
1043+
1044+ use_configure   no
1045+-build       {}
1046+
1047+-set install_dir    ${prefix}/share/sgml/docbook/${version}
1048++set install_dir ${prefix}/share/sgml/docbook/${version}
1049++sgml.catalog "${install_dir}/docbook.cat"
1050+
1051+-# xmlcatmgr as installed by MacPorts defaults to using
1052+-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
1053+-# SGML) if no catalog is specified, but we'll specify the path just in case
1054+-# users have another installation of xmlcatmgr and happen to have it before
1055+-# ${prefix}/bin in their PATH.
1056+-set catalog.sgml    ${prefix}/etc/sgml/catalog
1057+-set xmlcatmgr.args  "-s -c ${catalog.sgml}"
1058++build {}
1059+
1060+ destroot {
1061+     set destroot_dir    ${destroot}${install_dir}
1062+@@ -51,26 +48,3 @@
1063+         copy ${worksrcpath}/${file} ${destroot_dir}
1064+     }
1065+ }
1066+-
1067+-post-activate {
1068+-    # Make the directory if it doesn't exist
1069+-    if {![file exists ${prefix}/etc/sgml]} {
1070+-        xinstall -m 755 -d ${prefix}/etc/sgml
1071+-    }
1072+-
1073+-    # Create the catalog file if it doesn't exist
1074+-    if {![file exists ${catalog.sgml}]} {
1075+-        system "xmlcatmgr ${xmlcatmgr.args} create"
1076+-    }
1077+-
1078+-    # Add the CATALOG entry to the catalog if it doesn't exist
1079+-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/docbook.cat}]} {
1080+-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/docbook.cat"
1081+-    }
1082+-}
1083+-
1084+-# This will remove the catalog entry for this port.
1085+-post-deactivate {
1086+-    # Remove the CATALOG entry from the catalog
1087+-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/docbook.cat"
1088+-}
1089+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile docbook-utils/Portfile
1090+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile      2012-10-04 04:15:32.000000000 -0700
1091++++ docbook-utils/Portfile     2013-07-14 22:14:40.000000000 -0700
1092+@@ -12,12 +12,13 @@
1093+ maintainers         fourpalms.org:lockhart openmaintainer
1094+ homepage            http://sources.redhat.com/docbook-tools/
1095+ description         Shell scripts for managing DocBook documents
1096+-long_description    This package contains scripts are for easy conversion from DocBook \
1097+-                    files to other formats (for example, HTML, RTF, and PostScript), and \
1098+-                    for comparing SGML files. \
1099+-                    Transcribed from the Fedora 15 RPM written originally by \
1100+-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
1101+-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
1102++long_description \
1103++    This package contains scripts are for easy conversion from DocBook \
1104++    files to other formats (for example, HTML, RTF, and PostScript), and \
1105++    for comparing SGML files. \
1106++    Transcribed from the Fedora 15 RPM written originally by \
1107++    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
1108++    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
1109+ master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/
1110+
1111+ checksums           rmd160  710fe047ea8a794cc6c0d944521184375a666e6b \
1112+@@ -63,7 +64,11 @@
1113+     reinplace "s|jade|openjade|" \
1114+         ${worksrcpath}/doc/man/Makefile.in \
1115+         ${worksrcpath}/doc/HTML/Makefile.in
1116+-    reinplace "s|nsgmls|onsgmls|" \
1117++    reinplace "s|nsgmls|onsgmls|g" \
1118++        ${worksrcpath}/backends/man.in \
1119++        ${worksrcpath}/backends/texi.in \
1120++        ${worksrcpath}/helpers/docbook2man-spec.pl \
1121++        ${worksrcpath}/bin/sgmldiff.in \
1122+         ${worksrcpath}/doc/man/Makefile.in \
1123+         ${worksrcpath}/doc/HTML/Makefile.in
1124+
1125+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile docbook-xml/Portfile
1126+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile        2013-04-19 09:01:53.000000000 -0700
1127++++ docbook-xml/Portfile       2013-07-14 22:49:59.000000000 -0700
1128+@@ -1,11 +1,11 @@
1129+ # -*- 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
1130+ # $Id: Portfile 104041 2013-03-14 00:27:36Z jmr@macports.org $
1131+-
1132+-PortSystem          1.0
1133++PortSystem 1.0
1134++PortGroup xmlcatalog 1.0
1135+
1136+ name                docbook-xml
1137+ revision            1
1138+-set revision-docbook-xml 2
1139++set revision-docbook-xml 3
1140+ set docbook-xml-versions {
1141+     4.1.2
1142+     {
1143+@@ -50,39 +50,31 @@
1144+ homepage            http://www.docbook.org
1145+
1146+ foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
1147+-
1148+     subport docbook-xml-${docbook-xml-version} {
1149+-
1150+-      if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
1151+-
1152++        if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
1153+             distname            docbkx412
1154+             extract.mkdir       yes
1155+
1156+             depends_lib-append  port:docbook-xml-4.2
1157+
1158+             post-extract {
1159+-
1160+                 copy ${prefix}/share/xml/docbook/4.2/catalog.xml \
1161+                     ${worksrcpath}/
1162+             }
1163+             post-patch {
1164+-
1165+                 reinplace "s,V4.2 ..,V4.1.2 ,g" \
1166+                     ${worksrcpath}/catalog.xml
1167+                 reinplace "s,V4.2,V4.1.2,g" \
1168+                     ${worksrcpath}/catalog.xml
1169+             }
1170+         } elseif {[vercmp ${docbook-xml-version} 5.0] >= 0} {
1171+-
1172+             distname            docbook-${docbook-xml-version}
1173+         } else {
1174+-
1175+             distname            docbook-xml-${docbook-xml-version}
1176+             extract.mkdir       yes
1177+         }
1178+
1179+         foreach part [string trim ${docbook-xml-checksums}] {
1180+-
1181+             checksums-append    $part
1182+         }
1183+
1184+@@ -101,94 +93,32 @@
1185+
1186+         set install_dir    ${prefix}/share/xml/docbook/${docbook-xml-version}
1187+
1188+-        # xmlcatmgr as installed by MacPorts defaults to using
1189+-        # ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
1190+-        # SGML) if no catalog is specified, but we'll specify the path just in case
1191+-        # users have another installation of xmlcatmgr and happen to have it before
1192+-        # ${prefix}/bin in their PATH.
1193+-        set catalog.xml    ${prefix}/etc/xml/catalog
1194+-        set xml.args       "-c ${catalog.xml}"
1195+-        set catalog.sgml   ${prefix}/etc/sgml/catalog
1196+-        set sgml.args      "-s -c ${catalog.sgml}"
1197++        xml.catalog "${install_dir}/catalog.xml"
1198++        # SGML catalog support is only in the 4.x transitional versions...
1199++        if {[vercmp ${docbook-xml-version} 5.0] < 0} {
1200++            sgml.catalog "${install_dir}/docbook.cat"
1201++        }
1202+
1203+         destroot {
1204+-
1205+             set destroot_dir    ${destroot}${install_dir}
1206+             set destroot_files  [readdir ${worksrcpath}]
1207+             xinstall -m 755 -d ${destroot_dir}
1208+             foreach file ${destroot_files} {
1209+-
1210+                 copy ${worksrcpath}/${file} ${destroot_dir}
1211+             }
1212+         }
1213+-
1214+-        post-activate {
1215+-
1216+-            # XML catalog
1217+-            # Make the directory if it doesn't exist
1218+-            if {![file exists ${prefix}/etc/xml]} {
1219+-
1220+-                xinstall -m 755 -d ${prefix}/etc/xml
1221+-            }
1222+-
1223+-            # Create the catalog file if it doesn't exist
1224+-            if {![file exists ${catalog.xml}]} {
1225+-
1226+-                system "xmlcatmgr ${xml.args} create"
1227+-            }
1228+-
1229+-            # Add the nextCatalog entry to the catalog if it doesn't exist
1230+-            if {[catch {exec xmlcatmgr ${xml.args} lookup ${install_dir}/catalog.xml}]} {
1231+-
1232+-                system "xmlcatmgr ${xml.args} add nextCatalog ${install_dir}/catalog.xml"
1233+-            }
1234+-
1235+-            # SGML catalog
1236+-            # SGML catalog support is only in the 4.x transitional versions...
1237+-            if {[file exists ${install_dir}/docbook.cat]} {
1238+-                # Make the directory if it doesn't exist
1239+-                if {![file exists ${prefix}/etc/sgml]} {
1240+-
1241+-                    xinstall -m 755 -d ${prefix}/etc/sgml
1242+-                }
1243+-
1244+-                # Create the catalog file if it doesn't exist
1245+-                if {![file exists ${catalog.sgml}]} {
1246+-
1247+-                    system "xmlcatmgr ${sgml.args} create"
1248+-                }
1249+-
1250+-                # Add the CATALOG entry to the catalog if it doesn't exist
1251+-                if {[catch {exec xmlcatmgr ${sgml.args} lookup ${install_dir}/docbook.cat}]} {
1252+-
1253+-                    system "xmlcatmgr ${sgml.args} add CATALOG ${install_dir}/docbook.cat"
1254+-                }
1255+-            }
1256+-        }
1257+-
1258+-        # This will remove the catalog entry for this port.
1259+-        post-deactivate {
1260+-
1261+-            system "xmlcatmgr ${xml.args} remove nextCatalog ${install_dir}/catalog.xml"
1262+-            # Remove the CATALOG entry from the catalog
1263+-            # SGML catalog support is only in the 4.x transitional versions...
1264+-            system "xmlcatmgr ${sgml.args} remove CATALOG ${install_dir}/docbook.cat"
1265+-        }
1266+     }
1267+ }
1268+
1269+ if {${name} == ${subport}} {
1270+-
1271+     revision            ${revision-docbook-xml}
1272+     use_configure       no
1273+     build               {}
1274+     distfiles
1275+     foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
1276+-
1277+         depends_lib-append  port:docbook-xml-${docbook-xml-version}
1278+     }
1279+     destroot {
1280+-
1281+         set docdir ${prefix}/share/doc/${name}
1282+         xinstall -d ${destroot}${docdir}
1283+         xinstall -m 0644 ${filespath}/README ${destroot}${docdir}
1284+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile docbook-xsl/Portfile
1285+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile        2013-10-02 21:34:30.000000000 -0700
1286++++ docbook-xsl/Portfile       2013-06-23 14:02:09.000000000 -0700
1287+@@ -1,10 +1,12 @@
1288+-# $Id: Portfile 111353 2013-09-19 07:21:56Z ryandesign@macports.org $
1289++# $Id: Portfile 104648 2013-03-30 18:06:55Z devans@macports.org $
1290+ # -*- 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
1291+
1292+ PortSystem      1.0
1293++PortGroup       xmlcatalog 1.0
1294+
1295+ name            docbook-xsl
1296+ version         1.78.1
1297++revision        1
1298+ categories      textproc
1299+ license         MIT Permissive
1300+ description     The docbook xsl stylesheets
1301+@@ -20,12 +22,12 @@
1302+ use_bzip2       yes
1303+
1304+ distfiles-append \
1305+-                ${name}-doc-${version}${extract.suffix}
1306++                [suffix ${name}-doc-${version}]
1307+
1308+-checksums       ${distname}${extract.suffix} \
1309++checksums       [suffix $distname] \
1310+                 sha1    1d668c845bb43c65115d1a1d9542f623801cfb6f \
1311+                 rmd160  1f29e74eaab655673ced47b7a011c35c4d1e5187 \
1312+-                ${name}-doc-${version}${extract.suffix} \
1313++                [suffix $name-doc-$version] \
1314+                 sha1    bf69dc152a9f983a1af197d9041b8c4dc894dd5d \
1315+                 rmd160  78f6b1bc4ca2de024addd4ab9092dc929fd4d3aa
1316+
1317+@@ -42,6 +44,8 @@
1318+ set instxsldir  "share/xsl/${name}"
1319+ set instdocdir  "share/doc/${name}"
1320+
1321++xml.catalog "${prefix}/${instxsldir}/catalog.xml"
1322++
1323+ destroot {
1324+     foreach pathname "${instxsldir} ${instdocdir}" {
1325+         xinstall -m 755 -d ${destroot}${prefix}/${pathname}
1326+@@ -53,29 +57,6 @@
1327+         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
1328+     }
1329+ }
1330+-post-activate {
1331+-    # xmlcatmgr as installed by MacPorts defaults to using
1332+-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
1333+-    # SGML) if no catalog is specified, but we'll specify the path just in case
1334+-    # users have another installation of xmlcatmgr and happen to have it before
1335+-    # ${prefix}/bin in their PATH.
1336+-    set catalog.xml ${prefix}/etc/xml/catalog
1337+-
1338+-    # Make the directory if it doesn't exist
1339+-    if {![file exists ${prefix}/etc/xml]} {
1340+-        xinstall -m 755 -d ${prefix}/etc/xml
1341+-    }
1342+-
1343+-    # Create the catalog file if it doesn't exist
1344+-    if {![file exists ${catalog.xml}]} {
1345+-        system "xmlcatmgr create -c ${catalog.xml}"
1346+-    }
1347+-
1348+-    # Add the nextCatalog entry to the catalog if it doesn't exist
1349+-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
1350+-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
1351+-    }
1352+-}
1353+
1354+ if {${registry.format} == "receipt_flat"} {
1355+     notes \
1356+@@ -87,10 +68,5 @@
1357+ ######################################################################"
1358+ }
1359+ 
1360+-# This will remove the catalog entry for this port.
1361+-post-deactivate {
1362+-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
1363+-}
1364+-
1365+ livecheck.url       http://docbook.sourceforge.net/release/xsl/
1366+ livecheck.regex "=\"(\\d+(?:\\.\\d+)*)"
1367+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile docbook-xsl-ns/Portfile
1368+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile     2012-02-28 20:26:53.000000000 -0800
1369++++ docbook-xsl-ns/Portfile    2013-06-23 14:02:46.000000000 -0700
1370+@@ -1,9 +1,12 @@
1371++# -*- 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
1372+ # $Id: Portfile 81135 2011-07-26 00:29:03Z jmr@macports.org $
1373+ 
1374+ PortSystem      1.0
1375++PortGroup       xmlcatalog 1.0
1376+ 
1377+ name            docbook-xsl-ns
1378+ version         1.76.1
1379++revision        1
1380+ categories      textproc
1381+ license         MIT Permissive
1382+ description     DocBook XSL NS (namespaced) Stylesheets
1383+@@ -36,6 +39,7 @@
1384+                 RELEASE-NOTES.pdf RELEASE-NOTES.txt TODO VERSION NEWS COPYING"
1385+ set instxsldir  "share/xsl/${name}"
1386+ set instdocdir  "share/doc/${name}"
1387++xml.catalog "${prefix}/${instxsldir}/catalog.xml"
1388+
1389+ destroot {
1390+     foreach pathname "${instxsldir} ${instdocdir}" {
1391+@@ -48,33 +52,5 @@
1392+         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
1393+     }
1394+ }
1395+-post-activate {
1396+-    # xmlcatmgr as installed by MacPorts defaults to using
1397+-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
1398+-    # SGML) if no catalog is specified, but we'll specify the path just in case
1399+-    # users have another installation of xmlcatmgr and happen to have it before
1400+-    # ${prefix}/bin in their PATH.
1401+-    set catalog.xml ${prefix}/etc/xml/catalog
1402+-
1403+-    # Make the directory if it doesn't exist
1404+-    if {![file exists ${prefix}/etc/xml]} {
1405+-        xinstall -m 755 -d ${prefix}/etc/xml
1406+-    }
1407+-
1408+-    # Create the catalog file if it doesn't exist
1409+-    if {![file exists ${catalog.xml}]} {
1410+-        system "xmlcatmgr create -c ${catalog.xml}"
1411+-    }
1412+-
1413+-    # Add the nextCatalog entry to the catalog if it doesn't exist
1414+-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
1415+-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
1416+-    }
1417+-}
1418+-
1419+-# This will remove the catalog entry for this port.
1420+-post-deactivate {
1421+-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
1422+-}
1423+
1424+ livecheck.distname  ${name}
1425+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile iso8879/Portfile
1426+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile    2012-02-28 20:26:52.000000000 -0800
1427++++ iso8879/Portfile   2013-06-23 14:10:17.000000000 -0700
1428+@@ -1,66 +1,37 @@
1429+ # $Id: Portfile 86410 2011-10-25 11:15:36Z dports@macports.org $
1430++# -*- 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
1431+
1432+-PortSystem 1.0
1433+-name          iso8879
1434+-version               1986
1435+-revision      1
1436+-categories    textproc
1437+-license               Permissive
1438+-maintainers   nomaintainer
1439+-description   Character entity sets from ISO 8879:1986 (SGML)
1440+-platforms     darwin
1441++PortSystem      1.0
1442++PortGroup       xmlcatalog 1.0
1443+
1444+-long_description $description
1445+-
1446+-master_sites  freebsd
1447+-
1448+-distname      isoENTS
1449+-checksums     md5 c8a9561212c1a2ec6e48919640de9c67
1450+-
1451+-use_zip               yes
1452++name            iso8879
1453++version         1986
1454++revision        2
1455++categories      textproc
1456++license         Permissive
1457++maintainers     nomaintainer
1458++description     Character entity sets from ISO 8879:1986 (SGML)
1459++platforms       darwin
1460+
1461+-depends_run   port:xmlcatmgr
1462++long_description $description
1463+
1464+-use_configure no
1465+-build         {}
1466++master_sites    freebsd
1467+
1468+-set install_dir       ${prefix}/share/sgml/${name}
1469++distname        isoENTS
1470++checksums       md5 c8a9561212c1a2ec6e48919640de9c67
1471+
1472+-# xmlcatmgr as installed by MacPorts defaults to using
1473+-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
1474+-# SGML) if no catalog is specified, but we'll specify the path just in case
1475+-# users have another installation of xmlcatmgr and happen to have it before
1476+-# ${prefix}/bin in their PATH.
1477+-set catalog.sgml ${prefix}/etc/sgml/catalog
1478+-set xmlcatmgr.args "-s -c ${catalog.sgml}"
1479++use_zip         yes
1480+
1481+-destroot      {
1482+-      xinstall -m 755 -d ${destroot}${install_dir}
1483+-      xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
1484+-      eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
1485+-}
1486++use_configure   no
1487++build {}
1488+
1489+-destroot.args prefix=${destroot}${prefix}
1490++set install_dir ${prefix}/share/sgml/${name}
1491++sgml.catalog "${install_dir}/catalog"
1492+
1493+-post-activate {
1494+-    # Make the directory if it doesn't exist
1495+-    if {![file exists ${prefix}/etc/sgml]} {
1496+-        xinstall -m 755 -d ${prefix}/etc/sgml
1497+-    }
1498+-
1499+-    # Create the catalog file if it doesn't exist
1500+-    if {![file exists ${catalog.sgml}]} {
1501+-        system "xmlcatmgr ${xmlcatmgr.args} create"
1502+-    }
1503+-
1504+-    # Add the CATALOG entry to the catalog if it doesn't exist
1505+-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
1506+-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
1507+-    }
1508+-}
1509++destroot.args prefix=${destroot}${prefix}
1510+
1511+-# This will remove the catalog entry for this port.
1512+-post-deactivate {
1513+-    # Remove the CATALOG entry from the catalog
1514+-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
1515++destroot {
1516++    xinstall -m 755 -d ${destroot}${install_dir}
1517++    xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
1518++    eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
1519+ }
1520+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile openjade/Portfile
1521+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile   2013-10-28 14:29:26.000000000 -0700
1522++++ openjade/Portfile  2013-07-14 22:15:26.000000000 -0700
1523+@@ -1,22 +1,22 @@
1524+ # -*- 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
1525+-# $Id: Portfile 112550 2013-10-25 20:18:43Z ryandesign@macports.org $
1526++# $Id: Portfile 99226 2012-10-29 22:32:17Z pixilla@macports.org $
1527+
1528+ PortSystem 1.0
1529++PortGroup xmlcatalog 1.0
1530+
1531+ name            openjade
1532+ version         1.3.2
1533+-revision        4
1534++revision        5
1535+ categories      textproc
1536+ license         MIT
1537+ maintainers     fourpalms.org:lockhart openmaintainer
1538+ description     James Clark's implementation of DSSSL
1539++long_description \
1540++    OpenJade is an implementation of ISO/IEC 10179:1996 \
1541++    standard DSSSL language.
1542+ homepage        http://openjade.sourceforge.net/
1543+ platforms       darwin freebsd
1544+-
1545+-long_description OpenJade is an implementation of ISO/IEC 10179:1996 \
1546+-                 standard DSSSL language.
1547+-
1548+-master_sites    sourceforge:project/openjade/openjade/${version}
1549++master_sites    sourceforge
1550+
1551+ checksums       md5 7df692e3186109cc00db6825b777201e
1552+
1553+@@ -27,33 +27,31 @@
1554+                 patch-GroveApp.h \
1555+                 patch-GroveBuilder.cxx \
1556+                 patch-Node.h \
1557+-                openjade-getoptperl.patch \
1558+-                delete_la_files.patch
1559++                openjade-getoptperl.patch
1560+
1561+ depends_lib     port:opensp
1562+ depends_run     port:xmlcatmgr
1563+
1564+-# TeXFOTBuilder.cxx:1876:48: error: default initialization of an object of const type 'const TeXFOTBuilder::PageFloatFlowObj' requires a user-provided default constructor
1565+-compiler.blacklist *clang*
1566++if {${configure.compiler} == "clang"} {
1567++    configure.compiler llvm-gcc-4.2
1568++}
1569++
1570++set openjade.catalog ${prefix}/share/sgml/catalog
1571++set openjade.rootcatalog ${prefix}/share/sgml/openjade/catalog
1572+
1573+-# xmlcatmgr as installed by MacPorts defaults to using
1574+-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
1575+-# SGML). For historic reasons, openjade expects the catalog to be in
1576+-# share/sgml/catalog. To avoid breaking existing setup, we simply add
1577+-# a reference to the root catalog (/etc/sgml/catalog) to openjade's
1578+-# catalog (/share/sgml/catalog)
1579+-set catalog.sgml      ${prefix}/etc/sgml/catalog
1580+-set catalog.openjade  ${prefix}/share/sgml/catalog
1581+-
1582+-configure.args  --enable-http --enable-html --enable-mif \
1583+-                --disable-dependency-tracking \
1584+-                --enable-default-catalog=${catalog.openjade} \
1585+-                --datadir=${prefix}/share/sgml/openjade \
1586+-                --mandir=${prefix}/share/man
1587+-
1588+-configure.env-append        LIBS="-L${prefix}/lib"
1589+-configure.cxxflags-append   "-isystem ${prefix}/include -fno-rtti"
1590+-configure.ldflags-delete    "-L${prefix}/lib"
1591++sgml.catalog ${openjade.rootcatalog}
1592++# Add the root catalog to the openjade catalog
1593++sgml.addtocatalog "${openjade.catalog}" "${sgml.rootcatalog}"
1594++
1595++configure.args --enable-http --enable-html --enable-mif \
1596++               --disable-dependency-tracking \
1597++               --enable-default-catalog=${openjade.catalog} \
1598++               --datadir=${prefix}/share/sgml/openjade \
1599++               --mandir=${prefix}/share/man
1600++
1601++configure.env-append      LIBS="-L${prefix}/lib"
1602++configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
1603++configure.ldflags-delete  "-L${prefix}/lib"
1604+
1605+ post-configure  {
1606+     reinplace "s|^#pragma implementation||g" ${worksrcpath}/grove/Node.cxx
1607+@@ -72,40 +70,7 @@
1608+
1609+ destroot.target install install-man
1610+
1611+-post-destroot   {
1612++post-destroot {
1613+     system "install -d -m 755 ${destroot}${prefix}/share/sgml/openjade"
1614+     system "install -m 644 ${worksrcpath}/dsssl/* ${destroot}${prefix}/share/sgml/openjade"
1615+ }
1616+-
1617+-post-activate {
1618+-    # Make the directory if it doesn't exist
1619+-    if {![file exists ${prefix}/etc/sgml]} {
1620+-        xinstall -m 755 -d ${prefix}/etc/sgml
1621+-    }
1622+-
1623+-    # Create the root catalog file if it doesn't exist
1624+-    if {![file exists ${catalog.sgml}]} {
1625+-        system "xmlcatmgr -s -c ${catalog.sgml} create"
1626+-    }
1627+-
1628+-    # Create the openjade catalog file if it doesn't exist
1629+-    if {![file exists ${catalog.openjade}]} {
1630+-        system "xmlcatmgr -s -c ${catalog.openjade} create"
1631+-    }
1632+-
1633+-    # Add the root catalog to openjade's catalog
1634+-    if {[catch {exec xmlcatmgr -s -c ${catalog.openjade} lookup ${catalog.sgml}}]} {
1635+-        system "xmlcatmgr -s -c ${catalog.openjade} add CATALOG ${catalog.sgml}"
1636+-    }
1637+-
1638+-    # And add openjade's catalog to the root catalog
1639+-    if {[catch {exec xmlcatmgr -s -c ${catalog.sgml} lookup ${prefix}/share/sgml/openjade/catalog}]} {
1640+-        system "xmlcatmgr -s -c ${catalog.sgml} add CATALOG ${prefix}/share/sgml/openjade/catalog"
1641+-    }
1642+-}
1643+-
1644+-# This will remove the catalog entry for this port.
1645+-post-deactivate {
1646+-    # Remove the CATALOG entry from the catalog
1647+-    system "xmlcatmgr -s -c ${catalog.sgml} remove CATALOG ${prefix}/share/sgml/openjade/catalog"
1648+-}
1649+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/files/delete_la_files.patch openjade/files/delete_la_files.patch
1650+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/files/delete_la_files.patch        2013-10-02 21:34:31.000000000 -0700
1651++++ openjade/files/delete_la_files.patch       1969-12-31 16:00:00.000000000 -0800
1652+@@ -1,11 +0,0 @@
1653+---- Makefile.prog.in.orig     2013-09-02 18:50:59.000000000 -0700
1654+-+++ Makefile.prog.in  2013-09-02 18:52:56.000000000 -0700
1655+-@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
1656+-
1657+- ALL_LIBS = $(XLIBS) $(LIBS)
1658+- Makefile.lt:
1659+--     echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
1660+-+     echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'|sed 's|libosp\.la|libosp.dylib|'` >Makefile.lt
1661+-
1662+- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
1663+-
1664+diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile sgml-common/Portfile
1665+--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile        2012-10-29 13:59:15.000000000 -0700
1666++++ sgml-common/Portfile       2013-07-14 22:15:53.000000000 -0700
1667+@@ -1,29 +1,30 @@
1668+ # -*- 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
1669+ # $Id: Portfile 99124 2012-10-27 19:39:14Z ryandesign@macports.org $
1670+-
1671+-PortSystem          1.0
1672++PortSystem 1.0
1673++PortGroup xmlcatalog 1.0
1674+
1675+ name                sgml-common
1676+ version             0.6.3
1677+ set openjade_version 1.3.2
1678++revision            1
1679+ categories          textproc
1680+ platforms           darwin
1681+ license             GPL-2+
1682+ maintainers         fourpalms.org:lockhart openmaintainer
1683+ supported_archs     noarch
1684+-
1685+ # Actually - there is no homepage of this project, on that URL
1686+ # page you could get complete ISO 8879 listing as was on the
1687+ # old page - only part of it is included in sgml-common package.
1688+ homepage            http://www.w3.org/2003/entities/
1689+ description         A collection of entities and DTDs common to multiple packages.
1690+-long_description    The sgml-common package contains a collection of entities and DTDs \
1691+-                    that are useful for processing SGML, but that don't need to be \
1692+-                    included in multiple packages.  Sgml-common also includes an \
1693+-                    up-to-date Open Catalog file. \
1694+-                    Transcribed from the Fedora 15 RPM written originally by \
1695+-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
1696+-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
1697++long_description \
1698++    The sgml-common package contains a collection of entities and DTDs \
1699++    that are useful for processing SGML, but that don't need to be \
1700++    included in multiple packages.  Sgml-common also includes an \
1701++    up-to-date Open Catalog file. \
1702++    Transcribed from the Fedora 15 RPM written originally by \
1703++    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
1704++    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
1705+
1706+ master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/:redhat \
1707+                     sourceforge:project/openjade/openjade/${openjade_version}:openjade
1708+@@ -41,28 +42,10 @@
1709+                     rmd160  3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
1710+                     sha256  1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
1711+
1712+-depends_lib         port:perl5 \
1713+-                    port:libxml2 \
1714+-                    port:openjade \
1715+-                    port:docbook-dsssl \
1716+-                    port:docbook-sgml-4.2
1717+-
1718+-depends_run         port:xmlcatmgr
1719+-
1720+-set bindir ${prefix}/bin
1721+-set confdir ${prefix}/etc
1722+-set datadir ${prefix}/share
1723+-set sgmldir ${datadir}/sgml
1724+-set sgmlcatalog ${confdir}/sgml/catalog
1725+-set xmldir ${datadir}/xml
1726+-set xmlcatalog ${confdir}/xml/catalog
1727+-# xmlcatmgr as installed by MacPorts defaults to using
1728+-# ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
1729+-# SGML) if no catalog is specified, but we'll specify the path just in case
1730+-# users have another installation of xmlcatmgr and happen to have it before
1731+-# ${prefix}/bin in their PATH.
1732+-set xml.args       "-c ${xmlcatalog}"
1733+-set sgml.args      "-s -c ${sgmlcatalog}"
1734++depends_lib-append  port:perl5 \
1735++                    port:libxml2
1736++
1737++set sgmldir ${prefix}/share/sgml
1738+
1739+ patch.pre_args      -p1
1740+ patchfiles          patch-bin-install-catalog.in.diff \
1741+@@ -77,55 +60,11 @@
1742+
1743+ use_configure       no
1744+
1745+-build {
1746+-    # XML catalog
1747+-    # Make the directory if it doesn't exist
1748+-    if {![file exists ${confdir}/xml]} {
1749+-        xinstall -m 755 -d ${confdir}/xml
1750+-    }
1751+-
1752+-    # Create the catalog file if it doesn't exist
1753+-    if {![file exists ${xmlcatalog}]} {
1754+-        system "xmlcatmgr ${xml.args} create"
1755+-    }
1756+-
1757+-    # SGML catalog
1758+-    # Make the directory if it doesn't exist
1759+-    if {![file exists ${confdir}/sgml]} {
1760+-        xinstall -m 755 -d ${confdir}/sgml
1761+-    }
1762+-
1763+-    # Create the catalog file if it doesn't exist
1764+-    if {![file exists ${sgmlcatalog}]} {
1765+-        system "xmlcatmgr ${sgml.args} create"
1766+-    }
1767+-
1768+-    # Now put the common DocBook entries in it
1769+-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
1770+-    #     '-//OASIS//ENTITIES DocBook XML' \
1771+-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
1772+-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
1773+-    #     '-//OASIS//DTD DocBook XML' \
1774+-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
1775+-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
1776+-    #     'ISO 8879:1986' \
1777+-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
1778+-    # system "${bindir}/xmlcatalog --noout --add 'delegateSystem' \
1779+-    #     'http://www.oasis-open.org/docbook/' \
1780+-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
1781+-    # system "${bindir}/xmlcatalog --noout --add 'delegateURI' \
1782+-    #     'http://www.oasis-open.org/docbook/' \
1783+-    #     'file://${confdir}/sgml/docbook/xmlcatalog'
1784+-      # ${worksrcpath}${xmlcatalog}"
1785+-    # Also create the common DocBook catalog
1786+-    # xinstall -d ${worksrcpath}${confdir}/sgml/docbook
1787+-    # system "${bindir}/xmlcatalog --noout --create \
1788+-    #     ${worksrcpath}${confdir}/sgml/docbook/xmlcatalog"
1789+-}
1790++build {}
1791+
1792+ destroot {
1793+-    xinstall -d ${destroot}${confdir}/sgml
1794+-    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${prefix}/etc/sgml/sgml.conf
1795++    xinstall -d ${destroot}${sgml.confdir}
1796++    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${sgml.confdir}/sgml.conf
1797+     xinstall -d ${destroot}${sgmldir}
1798+     # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
1799+     xinstall -W ${workpath}/${openjade}/pubtext xml.dcl xml.soc html.dcl html.soc ${destroot}${sgmldir}
1800diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile xhtml1/Portfile
1801--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile      2013-05-17 06:23:07.000000000 -0700
1802+++ xhtml1/Portfile     2013-07-14 22:16:16.000000000 -0700
1803@@ -2,22 +2,22 @@
1804 # $Id: Portfile 106081 2013-05-14 14:12:58Z raimue@macports.org $
1805 
1806 PortSystem          1.0
1807+PortGroup           xmlcatalog 1.0
1808 
1809 name                xhtml1
1810 version             2.0
1811+revision            1
1812 categories          textproc
1813 platforms           darwin
1814 maintainers         nomaintainer
1815 supported_archs     noarch
1816-
1817 description         A reformulation of HTML 4 in XML 1.0
1818-
1819-long_description    The Second Edition of XHTML 1.0, a reformulation \
1820-                    of HTML 4 as an XML 1.0 application, and three DTDs \
1821-                    corresponding to the ones defined by HTML 4. \
1822-                    These DTDs are useful for validating or processing \
1823-                    world wide web pages with XML tools.
1824-
1825+long_description \
1826+    The Second Edition of XHTML 1.0, a reformulation \
1827+    of HTML 4 as an XML 1.0 application, and three DTDs \
1828+    corresponding to the ones defined by HTML 4. \
1829+    These DTDs are useful for validating or processing \
1830+    world wide web pages with XML tools.
1831 homepage            http://www.w3.org/TR/xhtml1/
1832 master_sites        http://www.w3.org/TR/xhtml1/
1833 
1834@@ -35,42 +35,23 @@
1835 
1836 set instdir         share/xml/html/4
1837 
1838+xml.entity "-//W3C//DTD XHTML 1.0 Strict//EN" "${prefix}/${instdir}/xhtml1-strict.dtd"
1839+xml.entity "-//W3C//DTD XHTML 1.0 Transitional//EN" "${prefix}/${instdir}/xhtml1-transitional.dtd"
1840+xml.entity "-//W3C//DTD XHTML 1.0 Frameset//EN" "${prefix}/${instdir}/xhtml1-frameset.dtd"
1841+xml.entity "-//W3C//ENTITIES Latin 1 for XHTML//EN" "${prefix}/${instdir}/xhtml-lat1.ent"
1842+xml.entity "-//W3C//ENTITIES Special for XHTML//EN" "${prefix}/${instdir}/xhtml-special.ent"
1843+xml.entity "-//W3C//ENTITIES Symbols for XHTML//EN" "${prefix}/${instdir}/xhtml-symbol.ent"
1844+
1845+xml.rewrite System "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
1846+xml.rewrite System "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
1847+xml.rewrite URI "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
1848+xml.rewrite URI "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
1849+
1850 destroot {
1851     xinstall -m 755 -d ${destroot}${prefix}/${instdir}
1852     xinstall -m 644 -W ${worksrcpath}/DTD/ xhtml.soc xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent xhtml1-frameset.dtd xhtml1-strict.dtd xhtml1-transitional.dtd xhtml1.dcl ${destroot}${prefix}/${instdir}
1853 }
1854 
1855-post-activate {
1856-    # xmlcatmgr as installed by MacPorts defaults to using
1857-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
1858-    # SGML) if no catalog is specified, but we'll specify the path just in case
1859-    # users have another installation of xmlcatmgr and happen to have it before
1860-    # ${prefix}/bin in their PATH.
1861-    set catalog.xml ${prefix}/etc/xml/catalog
1862-
1863-    # Make the directory if it doesn't exist
1864-    if {![file exists ${prefix}/etc/xml]} {
1865-        xinstall -m 755 -d ${prefix}/etc/xml
1866-    }
1867-
1868-    # Create the catalog file if it doesn't exist
1869-    if {![file exists ${catalog.xml}]} {
1870-        system "xmlcatmgr create -c ${catalog.xml}"
1871-    }
1872-
1873-    # Add the entries to the catalog
1874-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Strict//EN' '${prefix}/${instdir}/xhtml1-strict.dtd'"
1875-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Transitional//EN' '${prefix}/${instdir}/xhtml1-transitional.dtd'"
1876-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Frameset//EN' '${prefix}/${instdir}/xhtml1-frameset.dtd'"
1877-    system "xmlcatmgr add public '-//W3C//ENTITIES Latin 1 for XHTML//EN' '${prefix}/${instdir}/xhtml-lat1.ent'"
1878-    system "xmlcatmgr add public '-//W3C//ENTITIES Special for XHTML//EN' '${prefix}/${instdir}/xhtml-special.ent'"
1879-    system "xmlcatmgr add public '-//W3C//ENTITIES Symbols for XHTML//EN' '${prefix}/${instdir}/xhtml-symbol.ent'"
1880-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
1881-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
1882-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
1883-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
1884-}
1885-
1886 if {${registry.format} == "receipt_flat"} {
1887     notes \
1888 "######################################################################
1889@@ -90,18 +71,4 @@
1890 ######################################################################"
1891 }
1892 
1893-# This will remove the catalog entries for this port.
1894-post-deactivate {
1895-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Strict//EN'"
1896-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Transitional//EN'"
1897-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Frameset//EN'"
1898-    system "xmlcatmgr remove public '-//W3C//ENTITIES Latin 1 for XHTML//EN'"
1899-    system "xmlcatmgr remove public '-//W3C//ENTITIES Special for XHTML//EN'"
1900-    system "xmlcatmgr remove public '-//W3C//ENTITIES Symbols for XHTML//EN'"
1901-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/'"
1902-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
1903-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/'"
1904-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
1905-}
1906-
1907 livecheck.type      none
1908diff -Nur -x Portfile.diff /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile xmlroff/Portfile
1909--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile     2012-05-22 11:40:28.000000000 -0700
1910+++ xmlroff/Portfile    2013-07-14 22:18:06.000000000 -0700
1911@@ -2,20 +2,20 @@
1912 # $Id: Portfile 93159 2012-05-16 18:10:00Z ryandesign@macports.org $
1913 
1914 PortSystem          1.0
1915+PortGroup           xmlcatalog 1.0
1916 
1917 name                xmlroff
1918 version             0.6.2
1919+revision            1
1920 categories          textproc
1921 platforms           darwin
1922 maintainers         nomaintainer
1923 license             BSD
1924-
1925 description         An XSL formatter producing PDF and PostScript.
1926-
1927-long_description    Creates formatted output -- pages containing text in a \
1928-                    variety of type styles and sizes -- from an input XML \
1929-                    document and an XSL stylesheet.
1930-
1931+long_description \
1932+    Creates formatted output -- pages containing text in a \
1933+    variety of type styles and sizes -- from an input XML \
1934+    document and an XSL stylesheet.
1935 homepage            http://xmlroff.org/
1936 master_sites        ${homepage}download/
1937 
1938@@ -43,33 +43,4 @@
1939 configure.ldflags-append    "-framework CoreFoundation"
1940 
1941 # Specify catalog to add (catalog for xmlroff's libfo library)
1942-set libfocatalog ${prefix}/share/xml/libfo-${version}/catalog.xml
1943-
1944-post-activate {
1945-    # xmlcatmgr as installed by MacPorts defaults to using
1946-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
1947-    # SGML) if no catalog is specified, but we'll specify the path just in case
1948-    # users have another installation of xmlcatmgr and happen to have it before
1949-    # ${prefix}/bin in their PATH.
1950-    set catalog.xml ${prefix}/etc/xml/catalog
1951-
1952-    # Make the directory if it doesn't exist
1953-    if {![file exists ${prefix}/etc/xml]} {
1954-        xinstall -m 755 -d ${prefix}/etc/xml
1955-    }
1956-
1957-    # Create the catalog file if it doesn't exist
1958-    if {![file exists ${catalog.xml}]} {
1959-        system "xmlcatmgr create -c ${catalog.xml}"
1960-    }
1961-
1962-    # Add the nextCatalog entry to the catalog if it doesn't exist
1963-    if {[catch {exec xmlcatmgr lookup ${libfocatalog}}]} {
1964-        system "xmlcatmgr add nextCatalog ${libfocatalog}"
1965-    }
1966-}
1967-
1968-# This will remove the catalog entry for this port.
1969-post-deactivate {
1970-    system "xmlcatmgr remove nextCatalog ${libfocatalog}"
1971-}
1972+xml.catalog "${prefix}/share/xml/libfo-${version}/catalog.xml"