Ticket #41708: textproc.patches.full

File textproc.patches.full, 42.0 KB (added by lockhart (Thomas Lockhart), 12 years ago)

Updated patches to use the new xmlcatalog-1.0 PortGroup including docbook-dsssl and docbook-sgml-4.2

Line 
1diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-dsssl/Portfile textproc/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+++ textproc/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 -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-sgml-4.2/Portfile textproc/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+++ textproc/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 -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile textproc/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+++ textproc/docbook-utils/Portfile     2014-04-16 12:43:36.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 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@@ -49,7 +50,6 @@
212                     docbook-utils-nofinalecho.patch \
213                     docbook-utils-newgrep.patch
214 
215-
216 post-patch {
217     reinplace -E "s|^docdir=.+$|docdir='${prefix}/share/doc'|" \
218         ${worksrcpath}/configure
219@@ -63,7 +63,11 @@
220     reinplace "s|jade|openjade|" \
221         ${worksrcpath}/doc/man/Makefile.in \
222         ${worksrcpath}/doc/HTML/Makefile.in
223-    reinplace "s|nsgmls|onsgmls|" \
224+    reinplace "s|nsgmls|onsgmls|g" \
225+        ${worksrcpath}/backends/man.in \
226+        ${worksrcpath}/backends/texi.in \
227+        ${worksrcpath}/helpers/docbook2man-spec.pl \
228+        ${worksrcpath}/bin/sgmldiff.in \
229         ${worksrcpath}/doc/man/Makefile.in \
230         ${worksrcpath}/doc/HTML/Makefile.in
231 
232diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile textproc/docbook-xml/Portfile
233--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile 2013-04-19 09:01:53.000000000 -0700
234+++ textproc/docbook-xml/Portfile       2013-07-14 22:49:59.000000000 -0700
235@@ -1,11 +1,11 @@
236 # -*- 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
237 # $Id: Portfile 104041 2013-03-14 00:27:36Z jmr@macports.org $
238-
239-PortSystem          1.0
240+PortSystem 1.0
241+PortGroup xmlcatalog 1.0
242 
243 name                docbook-xml
244 revision            1
245-set revision-docbook-xml 2
246+set revision-docbook-xml 3
247 set docbook-xml-versions {
248     4.1.2
249     {
250@@ -50,39 +50,31 @@
251 homepage            http://www.docbook.org
252 
253 foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
254-
255     subport docbook-xml-${docbook-xml-version} {
256-
257-       if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
258-
259+        if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
260             distname            docbkx412
261             extract.mkdir       yes
262 
263             depends_lib-append  port:docbook-xml-4.2
264 
265             post-extract {
266-
267                 copy ${prefix}/share/xml/docbook/4.2/catalog.xml \
268                     ${worksrcpath}/
269             }
270             post-patch {
271-
272                 reinplace "s,V4.2 ..,V4.1.2 ,g" \
273                     ${worksrcpath}/catalog.xml
274                 reinplace "s,V4.2,V4.1.2,g" \
275                     ${worksrcpath}/catalog.xml
276             }
277         } elseif {[vercmp ${docbook-xml-version} 5.0] >= 0} {
278-
279             distname            docbook-${docbook-xml-version}
280         } else {
281-
282             distname            docbook-xml-${docbook-xml-version}
283             extract.mkdir       yes
284         }
285 
286         foreach part [string trim ${docbook-xml-checksums}] {
287-
288             checksums-append    $part
289         }
290 
291@@ -101,94 +93,32 @@
292 
293         set install_dir    ${prefix}/share/xml/docbook/${docbook-xml-version}
294 
295-        # xmlcatmgr as installed by MacPorts defaults to using
296-        # ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
297-        # SGML) if no catalog is specified, but we'll specify the path just in case
298-        # users have another installation of xmlcatmgr and happen to have it before
299-        # ${prefix}/bin in their PATH.
300-        set catalog.xml    ${prefix}/etc/xml/catalog
301-        set xml.args       "-c ${catalog.xml}"
302-        set catalog.sgml   ${prefix}/etc/sgml/catalog
303-        set sgml.args      "-s -c ${catalog.sgml}"
304+        xml.catalog "${install_dir}/catalog.xml"
305+        # SGML catalog support is only in the 4.x transitional versions...
306+        if {[vercmp ${docbook-xml-version} 5.0] < 0} {
307+            sgml.catalog "${install_dir}/docbook.cat"
308+        }
309 
310         destroot {
311-
312             set destroot_dir    ${destroot}${install_dir}
313             set destroot_files  [readdir ${worksrcpath}]
314             xinstall -m 755 -d ${destroot_dir}
315             foreach file ${destroot_files} {
316-
317                 copy ${worksrcpath}/${file} ${destroot_dir}
318             }
319         }
320-
321-        post-activate {
322-
323-            # XML catalog
324-            # Make the directory if it doesn't exist
325-            if {![file exists ${prefix}/etc/xml]} {
326-
327-                xinstall -m 755 -d ${prefix}/etc/xml
328-            }
329-
330-            # Create the catalog file if it doesn't exist
331-            if {![file exists ${catalog.xml}]} {
332-
333-                system "xmlcatmgr ${xml.args} create"
334-            }
335-
336-            # Add the nextCatalog entry to the catalog if it doesn't exist
337-            if {[catch {exec xmlcatmgr ${xml.args} lookup ${install_dir}/catalog.xml}]} {
338-
339-                system "xmlcatmgr ${xml.args} add nextCatalog ${install_dir}/catalog.xml"
340-            }
341-
342-            # SGML catalog
343-            # SGML catalog support is only in the 4.x transitional versions...
344-            if {[file exists ${install_dir}/docbook.cat]} {
345-                # Make the directory if it doesn't exist
346-                if {![file exists ${prefix}/etc/sgml]} {
347-
348-                    xinstall -m 755 -d ${prefix}/etc/sgml
349-                }
350-
351-                # Create the catalog file if it doesn't exist
352-                if {![file exists ${catalog.sgml}]} {
353-
354-                    system "xmlcatmgr ${sgml.args} create"
355-                }
356-
357-                # Add the CATALOG entry to the catalog if it doesn't exist
358-                if {[catch {exec xmlcatmgr ${sgml.args} lookup ${install_dir}/docbook.cat}]} {
359-
360-                    system "xmlcatmgr ${sgml.args} add CATALOG ${install_dir}/docbook.cat"
361-                }
362-            }
363-        }
364-
365-        # This will remove the catalog entry for this port.
366-        post-deactivate {
367-
368-            system "xmlcatmgr ${xml.args} remove nextCatalog ${install_dir}/catalog.xml"
369-            # Remove the CATALOG entry from the catalog
370-            # SGML catalog support is only in the 4.x transitional versions...
371-            system "xmlcatmgr ${sgml.args} remove CATALOG ${install_dir}/docbook.cat"
372-        }
373     }
374 }
375 
376 if {${name} == ${subport}} {
377-
378     revision            ${revision-docbook-xml}
379     use_configure       no
380     build               {}
381     distfiles
382     foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
383-
384         depends_lib-append  port:docbook-xml-${docbook-xml-version}
385     }
386     destroot {
387-
388         set docdir ${prefix}/share/doc/${name}
389         xinstall -d ${destroot}${docdir}
390         xinstall -m 0644 ${filespath}/README ${destroot}${docdir}
391diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile textproc/docbook-xsl/Portfile
392--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile 2013-10-02 21:34:30.000000000 -0700
393+++ textproc/docbook-xsl/Portfile       2014-04-16 12:48:46.000000000 -0700
394@@ -1,10 +1,12 @@
395-# $Id: Portfile 111353 2013-09-19 07:21:56Z ryandesign@macports.org $
396+# $Id: Portfile 104648 2013-03-30 18:06:55Z devans@macports.org $
397 # -*- 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
398 
399 PortSystem      1.0
400+PortGroup       xmlcatalog 1.0
401 
402 name            docbook-xsl
403 version         1.78.1
404+revision        1
405 categories      textproc
406 license         MIT Permissive
407 description     The docbook xsl stylesheets
408@@ -42,6 +44,8 @@
409 set instxsldir  "share/xsl/${name}"
410 set instdocdir  "share/doc/${name}"
411 
412+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
413+
414 destroot {
415     foreach pathname "${instxsldir} ${instdocdir}" {
416         xinstall -m 755 -d ${destroot}${prefix}/${pathname}
417@@ -53,29 +57,6 @@
418         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
419     }
420 }
421-post-activate {
422-    # xmlcatmgr as installed by MacPorts defaults to using
423-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
424-    # SGML) if no catalog is specified, but we'll specify the path just in case
425-    # users have another installation of xmlcatmgr and happen to have it before
426-    # ${prefix}/bin in their PATH.
427-    set catalog.xml ${prefix}/etc/xml/catalog
428-
429-    # Make the directory if it doesn't exist
430-    if {![file exists ${prefix}/etc/xml]} {
431-        xinstall -m 755 -d ${prefix}/etc/xml
432-    }
433-
434-    # Create the catalog file if it doesn't exist
435-    if {![file exists ${catalog.xml}]} {
436-        system "xmlcatmgr create -c ${catalog.xml}"
437-    }
438-
439-    # Add the nextCatalog entry to the catalog if it doesn't exist
440-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
441-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
442-    }
443-}
444 
445 if {${registry.format} == "receipt_flat"} {
446     notes \
447@@ -87,10 +68,5 @@
448 ######################################################################"
449 }
450 
451-# This will remove the catalog entry for this port.
452-post-deactivate {
453-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
454-}
455-
456 livecheck.url       http://docbook.sourceforge.net/release/xsl/
457 livecheck.regex "=\"(\\d+(?:\\.\\d+)*)"
458diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile textproc/docbook-xsl-ns/Portfile
459--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile      2012-02-28 20:26:53.000000000 -0800
460+++ textproc/docbook-xsl-ns/Portfile    2013-06-23 14:02:46.000000000 -0700
461@@ -1,9 +1,12 @@
462+# -*- 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
463 # $Id: Portfile 81135 2011-07-26 00:29:03Z jmr@macports.org $
464 
465 PortSystem      1.0
466+PortGroup       xmlcatalog 1.0
467 
468 name            docbook-xsl-ns
469 version         1.76.1
470+revision        1
471 categories      textproc
472 license         MIT Permissive
473 description     DocBook XSL NS (namespaced) Stylesheets
474@@ -36,6 +39,7 @@
475                 RELEASE-NOTES.pdf RELEASE-NOTES.txt TODO VERSION NEWS COPYING"
476 set instxsldir  "share/xsl/${name}"
477 set instdocdir  "share/doc/${name}"
478+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
479 
480 destroot {
481     foreach pathname "${instxsldir} ${instdocdir}" {
482@@ -48,33 +52,5 @@
483         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
484     }
485 }
486-post-activate {
487-    # xmlcatmgr as installed by MacPorts defaults to using
488-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
489-    # SGML) if no catalog is specified, but we'll specify the path just in case
490-    # users have another installation of xmlcatmgr and happen to have it before
491-    # ${prefix}/bin in their PATH.
492-    set catalog.xml ${prefix}/etc/xml/catalog
493-
494-    # Make the directory if it doesn't exist
495-    if {![file exists ${prefix}/etc/xml]} {
496-        xinstall -m 755 -d ${prefix}/etc/xml
497-    }
498-
499-    # Create the catalog file if it doesn't exist
500-    if {![file exists ${catalog.xml}]} {
501-        system "xmlcatmgr create -c ${catalog.xml}"
502-    }
503-
504-    # Add the nextCatalog entry to the catalog if it doesn't exist
505-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
506-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
507-    }
508-}
509-
510-# This will remove the catalog entry for this port.
511-post-deactivate {
512-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
513-}
514 
515 livecheck.distname  ${name}
516diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook2X/Portfile textproc/docbook2X/Portfile
517--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook2X/Portfile   2014-02-06 11:48:02.000000000 -0800
518+++ textproc/docbook2X/Portfile 2014-04-16 16:22:24.000000000 -0700
519@@ -1,11 +1,11 @@
520 # -*- 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
521-# $Id: Portfile 116250 2014-01-23 01:58:33Z larryv@macports.org $
522+# $Id: Portfile 97543 2012-09-08 16:31:47Z pixilla@macports.org $
523 
524 PortSystem          1.0
525 
526 name                docbook2X
527 version             0.8.8
528-revision            4
529+revision            5
530 categories          textproc
531 platforms           darwin
532 license             MIT
533diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile textproc/iso8879/Portfile
534--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile     2012-02-28 20:26:52.000000000 -0800
535+++ textproc/iso8879/Portfile   2013-06-23 14:10:17.000000000 -0700
536@@ -1,66 +1,37 @@
537 # $Id: Portfile 86410 2011-10-25 11:15:36Z dports@macports.org $
538+# -*- 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
539 
540-PortSystem 1.0
541-name           iso8879
542-version                1986
543-revision       1
544-categories     textproc
545-license                Permissive
546-maintainers    nomaintainer
547-description    Character entity sets from ISO 8879:1986 (SGML)
548-platforms      darwin
549+PortSystem      1.0
550+PortGroup       xmlcatalog 1.0
551 
552-long_description $description
553-
554-master_sites   freebsd
555-
556-distname       isoENTS
557-checksums      md5 c8a9561212c1a2ec6e48919640de9c67
558-
559-use_zip                yes
560+name            iso8879
561+version         1986
562+revision        2
563+categories      textproc
564+license         Permissive
565+maintainers     nomaintainer
566+description     Character entity sets from ISO 8879:1986 (SGML)
567+platforms       darwin
568 
569-depends_run    port:xmlcatmgr
570+long_description $description
571 
572-use_configure  no
573-build          {}
574+master_sites    freebsd
575 
576-set install_dir        ${prefix}/share/sgml/${name}
577+distname        isoENTS
578+checksums       md5 c8a9561212c1a2ec6e48919640de9c67
579 
580-# xmlcatmgr as installed by MacPorts defaults to using
581-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
582-# SGML) if no catalog is specified, but we'll specify the path just in case
583-# users have another installation of xmlcatmgr and happen to have it before
584-# ${prefix}/bin in their PATH.
585-set catalog.sgml ${prefix}/etc/sgml/catalog
586-set xmlcatmgr.args "-s -c ${catalog.sgml}"
587+use_zip         yes
588 
589-destroot       {
590-       xinstall -m 755 -d ${destroot}${install_dir}
591-       xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
592-       eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
593-}
594+use_configure   no
595+build {}
596 
597-destroot.args  prefix=${destroot}${prefix}
598+set install_dir ${prefix}/share/sgml/${name}
599+sgml.catalog "${install_dir}/catalog"
600 
601-post-activate {
602-    # Make the directory if it doesn't exist
603-    if {![file exists ${prefix}/etc/sgml]} {
604-        xinstall -m 755 -d ${prefix}/etc/sgml
605-    }
606-
607-    # Create the catalog file if it doesn't exist
608-    if {![file exists ${catalog.sgml}]} {
609-        system "xmlcatmgr ${xmlcatmgr.args} create"
610-    }
611-
612-    # Add the CATALOG entry to the catalog if it doesn't exist
613-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
614-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
615-    }
616-}
617+destroot.args prefix=${destroot}${prefix}
618 
619-# This will remove the catalog entry for this port.
620-post-deactivate {
621-    # Remove the CATALOG entry from the catalog
622-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
623+destroot {
624+    xinstall -m 755 -d ${destroot}${install_dir}
625+    xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
626+    eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
627 }
628diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile textproc/openjade/Portfile
629--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile    2014-01-21 16:32:53.000000000 -0800
630+++ textproc/openjade/Portfile  2014-02-19 15:42:59.000000000 -0800
631@@ -2,21 +2,21 @@
632 # $Id: Portfile 115642 2014-01-07 19:12:38Z ryandesign@macports.org $
633 
634 PortSystem 1.0
635+PortGroup xmlcatalog 1.0
636 
637 name            openjade
638 version         1.3.2
639-revision        7
640+revision        8
641 categories      textproc
642 license         MIT
643 maintainers     fourpalms.org:lockhart openmaintainer
644 description     James Clark's implementation of DSSSL
645+long_description \
646+    OpenJade is an implementation of ISO/IEC 10179:1996 \
647+    standard DSSSL language.
648 homepage        http://openjade.sourceforge.net/
649 platforms       darwin freebsd
650-
651-long_description OpenJade is an implementation of ISO/IEC 10179:1996 \
652-                 standard DSSSL language.
653-
654-master_sites    sourceforge:project/openjade/openjade/${version}
655+master_sites    sourceforge
656 
657 checksums       md5 7df692e3186109cc00db6825b777201e
658 
659@@ -30,24 +30,18 @@
660 depends_lib     port:opensp
661 depends_run     port:xmlcatmgr
662 
663-# xmlcatmgr as installed by MacPorts defaults to using
664-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
665-# SGML). For historic reasons, openjade expects the catalog to be in
666-# share/sgml/catalog. To avoid breaking existing setup, we simply add
667-# a reference to the root catalog (/etc/sgml/catalog) to openjade's
668-# catalog (/share/sgml/catalog)
669-set catalog.sgml      ${prefix}/etc/sgml/catalog
670-set catalog.openjade  ${prefix}/share/sgml/catalog
671-
672-configure.args  --enable-http --enable-html --enable-mif \
673-                --disable-dependency-tracking \
674-                --enable-default-catalog=${catalog.openjade} \
675-                --datadir=${prefix}/share/sgml/openjade \
676-                --mandir=${prefix}/share/man
677-
678-configure.env-append        LIBS="-L${prefix}/lib"
679-configure.cxxflags-append   "-isystem ${prefix}/include -fno-rtti"
680-configure.ldflags-delete    "-L${prefix}/lib"
681+set openjade.catalog ${prefix}/share/sgml/catalog
682+set openjade.rootcatalog ${prefix}/share/sgml/openjade/catalog
683+
684+sgml.catalog ${openjade.rootcatalog}
685+# Add the root catalog to the openjade catalog
686+sgml.addtocatalog "${openjade.catalog}" "${sgml.rootcatalog}"
687+
688+configure.args --enable-http --enable-html --enable-mif \
689+               --disable-dependency-tracking \
690+               --enable-default-catalog=${openjade.catalog} \
691+               --datadir=${prefix}/share/sgml/openjade \
692+               --mandir=${prefix}/share/man
693 
694 # Fix build failure on Tiger due to use of -isystem
695 compiler.blacklist    gcc-4.0 gcc-3.3
696@@ -58,6 +52,10 @@
697     set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
698 }
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     reinplace "s|^#pragma implementation||g" ${worksrcpath}/msggen.pl
707@@ -75,40 +73,7 @@
708 
709 destroot.target install install-man
710 
711-post-destroot   {
712+post-destroot {
713     system "install -d -m 755 ${destroot}${prefix}/share/sgml/openjade"
714     system "install -m 644 ${worksrcpath}/dsssl/* ${destroot}${prefix}/share/sgml/openjade"
715 }
716-
717-post-activate {
718-    # Make the directory if it doesn't exist
719-    if {![file exists ${prefix}/etc/sgml]} {
720-        xinstall -m 755 -d ${prefix}/etc/sgml
721-    }
722-
723-    # Create the root catalog file if it doesn't exist
724-    if {![file exists ${catalog.sgml}]} {
725-        system "xmlcatmgr -s -c ${catalog.sgml} create"
726-    }
727-
728-    # Create the openjade catalog file if it doesn't exist
729-    if {![file exists ${catalog.openjade}]} {
730-        system "xmlcatmgr -s -c ${catalog.openjade} create"
731-    }
732-
733-    # Add the root catalog to openjade's catalog
734-    if {[catch {exec xmlcatmgr -s -c ${catalog.openjade} lookup ${catalog.sgml}}]} {
735-        system "xmlcatmgr -s -c ${catalog.openjade} add CATALOG ${catalog.sgml}"
736-    }
737-
738-    # And add openjade's catalog to the root catalog
739-    if {[catch {exec xmlcatmgr -s -c ${catalog.sgml} lookup ${prefix}/share/sgml/openjade/catalog}]} {
740-        system "xmlcatmgr -s -c ${catalog.sgml} add CATALOG ${prefix}/share/sgml/openjade/catalog"
741-    }
742-}
743-
744-# This will remove the catalog entry for this port.
745-post-deactivate {
746-    # Remove the CATALOG entry from the catalog
747-    system "xmlcatmgr -s -c ${catalog.sgml} remove CATALOG ${prefix}/share/sgml/openjade/catalog"
748-}
749diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile textproc/sgml-common/Portfile
750--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile 2012-10-29 13:59:15.000000000 -0700
751+++ textproc/sgml-common/Portfile       2013-07-14 22:15:53.000000000 -0700
752@@ -1,29 +1,30 @@
753 # -*- 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
754 # $Id: Portfile 99124 2012-10-27 19:39:14Z ryandesign@macports.org $
755-
756-PortSystem          1.0
757+PortSystem 1.0
758+PortGroup xmlcatalog 1.0
759 
760 name                sgml-common
761 version             0.6.3
762 set openjade_version 1.3.2
763+revision            1
764 categories          textproc
765 platforms           darwin
766 license             GPL-2+
767 maintainers         fourpalms.org:lockhart openmaintainer
768 supported_archs     noarch
769-
770 # Actually - there is no homepage of this project, on that URL
771 # page you could get complete ISO 8879 listing as was on the
772 # old page - only part of it is included in sgml-common package.
773 homepage            http://www.w3.org/2003/entities/
774 description         A collection of entities and DTDs common to multiple packages.
775-long_description    The sgml-common package contains a collection of entities and DTDs \
776-                    that are useful for processing SGML, but that don't need to be \
777-                    included in multiple packages.  Sgml-common also includes an \
778-                    up-to-date Open Catalog file. \
779-                    Transcribed from the Fedora 15 RPM written originally by \
780-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
781-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
782+long_description \
783+    The sgml-common package contains a collection of entities and DTDs \
784+    that are useful for processing SGML, but that don't need to be \
785+    included in multiple packages.  Sgml-common also includes an \
786+    up-to-date Open Catalog file. \
787+    Transcribed from the Fedora 15 RPM written originally by \
788+    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
789+    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
790 
791 master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/:redhat \
792                     sourceforge:project/openjade/openjade/${openjade_version}:openjade
793@@ -41,28 +42,10 @@
794                     rmd160  3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
795                     sha256  1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
796 
797-depends_lib         port:perl5 \
798-                    port:libxml2 \
799-                    port:openjade \
800-                    port:docbook-dsssl \
801-                    port:docbook-sgml-4.2
802-
803-depends_run         port:xmlcatmgr
804-
805-set bindir ${prefix}/bin
806-set confdir ${prefix}/etc
807-set datadir ${prefix}/share
808-set sgmldir ${datadir}/sgml
809-set sgmlcatalog ${confdir}/sgml/catalog
810-set xmldir ${datadir}/xml
811-set xmlcatalog ${confdir}/xml/catalog
812-# xmlcatmgr as installed by MacPorts defaults to using
813-# ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
814-# SGML) if no catalog is specified, but we'll specify the path just in case
815-# users have another installation of xmlcatmgr and happen to have it before
816-# ${prefix}/bin in their PATH.
817-set xml.args       "-c ${xmlcatalog}"
818-set sgml.args      "-s -c ${sgmlcatalog}"
819+depends_lib-append  port:perl5 \
820+                    port:libxml2
821+
822+set sgmldir ${prefix}/share/sgml
823 
824 patch.pre_args      -p1
825 patchfiles          patch-bin-install-catalog.in.diff \
826@@ -77,55 +60,11 @@
827 
828 use_configure       no
829 
830-build {
831-    # XML catalog
832-    # Make the directory if it doesn't exist
833-    if {![file exists ${confdir}/xml]} {
834-        xinstall -m 755 -d ${confdir}/xml
835-    }
836-
837-    # Create the catalog file if it doesn't exist
838-    if {![file exists ${xmlcatalog}]} {
839-        system "xmlcatmgr ${xml.args} create"
840-    }
841-
842-    # SGML catalog
843-    # Make the directory if it doesn't exist
844-    if {![file exists ${confdir}/sgml]} {
845-        xinstall -m 755 -d ${confdir}/sgml
846-    }
847-
848-    # Create the catalog file if it doesn't exist
849-    if {![file exists ${sgmlcatalog}]} {
850-        system "xmlcatmgr ${sgml.args} create"
851-    }
852-
853-    # Now put the common DocBook entries in it
854-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
855-    #     '-//OASIS//ENTITIES DocBook XML' \
856-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
857-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
858-    #     '-//OASIS//DTD DocBook XML' \
859-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
860-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
861-    #     'ISO 8879:1986' \
862-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
863-    # system "${bindir}/xmlcatalog --noout --add 'delegateSystem' \
864-    #     'http://www.oasis-open.org/docbook/' \
865-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
866-    # system "${bindir}/xmlcatalog --noout --add 'delegateURI' \
867-    #     'http://www.oasis-open.org/docbook/' \
868-    #     'file://${confdir}/sgml/docbook/xmlcatalog'
869-       # ${worksrcpath}${xmlcatalog}"
870-    # Also create the common DocBook catalog
871-    # xinstall -d ${worksrcpath}${confdir}/sgml/docbook
872-    # system "${bindir}/xmlcatalog --noout --create \
873-    #     ${worksrcpath}${confdir}/sgml/docbook/xmlcatalog"
874-}
875+build {}
876 
877 destroot {
878-    xinstall -d ${destroot}${confdir}/sgml
879-    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${prefix}/etc/sgml/sgml.conf
880+    xinstall -d ${destroot}${sgml.confdir}
881+    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${sgml.confdir}/sgml.conf
882     xinstall -d ${destroot}${sgmldir}
883     # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
884     xinstall -W ${workpath}/${openjade}/pubtext xml.dcl xml.soc html.dcl html.soc ${destroot}${sgmldir}
885diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile textproc/xhtml1/Portfile
886--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile      2013-05-17 06:23:07.000000000 -0700
887+++ textproc/xhtml1/Portfile    2013-07-14 22:16:16.000000000 -0700
888@@ -2,22 +2,22 @@
889 # $Id: Portfile 106081 2013-05-14 14:12:58Z raimue@macports.org $
890 
891 PortSystem          1.0
892+PortGroup           xmlcatalog 1.0
893 
894 name                xhtml1
895 version             2.0
896+revision            1
897 categories          textproc
898 platforms           darwin
899 maintainers         nomaintainer
900 supported_archs     noarch
901-
902 description         A reformulation of HTML 4 in XML 1.0
903-
904-long_description    The Second Edition of XHTML 1.0, a reformulation \
905-                    of HTML 4 as an XML 1.0 application, and three DTDs \
906-                    corresponding to the ones defined by HTML 4. \
907-                    These DTDs are useful for validating or processing \
908-                    world wide web pages with XML tools.
909-
910+long_description \
911+    The Second Edition of XHTML 1.0, a reformulation \
912+    of HTML 4 as an XML 1.0 application, and three DTDs \
913+    corresponding to the ones defined by HTML 4. \
914+    These DTDs are useful for validating or processing \
915+    world wide web pages with XML tools.
916 homepage            http://www.w3.org/TR/xhtml1/
917 master_sites        http://www.w3.org/TR/xhtml1/
918 
919@@ -35,42 +35,23 @@
920 
921 set instdir         share/xml/html/4
922 
923+xml.entity "-//W3C//DTD XHTML 1.0 Strict//EN" "${prefix}/${instdir}/xhtml1-strict.dtd"
924+xml.entity "-//W3C//DTD XHTML 1.0 Transitional//EN" "${prefix}/${instdir}/xhtml1-transitional.dtd"
925+xml.entity "-//W3C//DTD XHTML 1.0 Frameset//EN" "${prefix}/${instdir}/xhtml1-frameset.dtd"
926+xml.entity "-//W3C//ENTITIES Latin 1 for XHTML//EN" "${prefix}/${instdir}/xhtml-lat1.ent"
927+xml.entity "-//W3C//ENTITIES Special for XHTML//EN" "${prefix}/${instdir}/xhtml-special.ent"
928+xml.entity "-//W3C//ENTITIES Symbols for XHTML//EN" "${prefix}/${instdir}/xhtml-symbol.ent"
929+
930+xml.rewrite System "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
931+xml.rewrite System "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
932+xml.rewrite URI "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
933+xml.rewrite URI "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
934+
935 destroot {
936     xinstall -m 755 -d ${destroot}${prefix}/${instdir}
937     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}
938 }
939 
940-post-activate {
941-    # xmlcatmgr as installed by MacPorts defaults to using
942-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
943-    # SGML) if no catalog is specified, but we'll specify the path just in case
944-    # users have another installation of xmlcatmgr and happen to have it before
945-    # ${prefix}/bin in their PATH.
946-    set catalog.xml ${prefix}/etc/xml/catalog
947-
948-    # Make the directory if it doesn't exist
949-    if {![file exists ${prefix}/etc/xml]} {
950-        xinstall -m 755 -d ${prefix}/etc/xml
951-    }
952-
953-    # Create the catalog file if it doesn't exist
954-    if {![file exists ${catalog.xml}]} {
955-        system "xmlcatmgr create -c ${catalog.xml}"
956-    }
957-
958-    # Add the entries to the catalog
959-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Strict//EN' '${prefix}/${instdir}/xhtml1-strict.dtd'"
960-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Transitional//EN' '${prefix}/${instdir}/xhtml1-transitional.dtd'"
961-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Frameset//EN' '${prefix}/${instdir}/xhtml1-frameset.dtd'"
962-    system "xmlcatmgr add public '-//W3C//ENTITIES Latin 1 for XHTML//EN' '${prefix}/${instdir}/xhtml-lat1.ent'"
963-    system "xmlcatmgr add public '-//W3C//ENTITIES Special for XHTML//EN' '${prefix}/${instdir}/xhtml-special.ent'"
964-    system "xmlcatmgr add public '-//W3C//ENTITIES Symbols for XHTML//EN' '${prefix}/${instdir}/xhtml-symbol.ent'"
965-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
966-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
967-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
968-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
969-}
970-
971 if {${registry.format} == "receipt_flat"} {
972     notes \
973 "######################################################################
974@@ -90,18 +71,4 @@
975 ######################################################################"
976 }
977 
978-# This will remove the catalog entries for this port.
979-post-deactivate {
980-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Strict//EN'"
981-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Transitional//EN'"
982-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Frameset//EN'"
983-    system "xmlcatmgr remove public '-//W3C//ENTITIES Latin 1 for XHTML//EN'"
984-    system "xmlcatmgr remove public '-//W3C//ENTITIES Special for XHTML//EN'"
985-    system "xmlcatmgr remove public '-//W3C//ENTITIES Symbols for XHTML//EN'"
986-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/'"
987-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
988-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/'"
989-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
990-}
991-
992 livecheck.type      none
993diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile textproc/xmlroff/Portfile
994--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile     2012-05-22 11:40:28.000000000 -0700
995+++ textproc/xmlroff/Portfile   2013-07-14 22:18:06.000000000 -0700
996@@ -2,20 +2,20 @@
997 # $Id: Portfile 93159 2012-05-16 18:10:00Z ryandesign@macports.org $
998 
999 PortSystem          1.0
1000+PortGroup           xmlcatalog 1.0
1001 
1002 name                xmlroff
1003 version             0.6.2
1004+revision            1
1005 categories          textproc
1006 platforms           darwin
1007 maintainers         nomaintainer
1008 license             BSD
1009-
1010 description         An XSL formatter producing PDF and PostScript.
1011-
1012-long_description    Creates formatted output -- pages containing text in a \
1013-                    variety of type styles and sizes -- from an input XML \
1014-                    document and an XSL stylesheet.
1015-
1016+long_description \
1017+    Creates formatted output -- pages containing text in a \
1018+    variety of type styles and sizes -- from an input XML \
1019+    document and an XSL stylesheet.
1020 homepage            http://xmlroff.org/
1021 master_sites        ${homepage}download/
1022 
1023@@ -43,33 +43,4 @@
1024 configure.ldflags-append    "-framework CoreFoundation"
1025 
1026 # Specify catalog to add (catalog for xmlroff's libfo library)
1027-set libfocatalog ${prefix}/share/xml/libfo-${version}/catalog.xml
1028-
1029-post-activate {
1030-    # xmlcatmgr as installed by MacPorts defaults to using
1031-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
1032-    # SGML) if no catalog is specified, but we'll specify the path just in case
1033-    # users have another installation of xmlcatmgr and happen to have it before
1034-    # ${prefix}/bin in their PATH.
1035-    set catalog.xml ${prefix}/etc/xml/catalog
1036-
1037-    # Make the directory if it doesn't exist
1038-    if {![file exists ${prefix}/etc/xml]} {
1039-        xinstall -m 755 -d ${prefix}/etc/xml
1040-    }
1041-
1042-    # Create the catalog file if it doesn't exist
1043-    if {![file exists ${catalog.xml}]} {
1044-        system "xmlcatmgr create -c ${catalog.xml}"
1045-    }
1046-
1047-    # Add the nextCatalog entry to the catalog if it doesn't exist
1048-    if {[catch {exec xmlcatmgr lookup ${libfocatalog}}]} {
1049-        system "xmlcatmgr add nextCatalog ${libfocatalog}"
1050-    }
1051-}
1052-
1053-# This will remove the catalog entry for this port.
1054-post-deactivate {
1055-    system "xmlcatmgr remove nextCatalog ${libfocatalog}"
1056-}
1057+xml.catalog "${prefix}/share/xml/libfo-${version}/catalog.xml"