Ticket #41708: textproc.patches.subset

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

Patches for portfiles to use the new xmlcatalog-1.0 PortGroup omitting docbook-dsssl and docbook-sgml-4.2

Line 
1diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile textproc/docbook-utils/Portfile
2--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-utils/Portfile       2012-10-04 04:15:32.000000000 -0700
3+++ textproc/docbook-utils/Portfile     2014-04-16 12:43:36.000000000 -0700
4@@ -12,12 +12,13 @@
5 maintainers         fourpalms.org:lockhart openmaintainer
6 homepage            http://sources.redhat.com/docbook-tools/
7 description         Shell scripts for managing DocBook documents
8-long_description    This package contains scripts are for easy conversion from DocBook \
9-                    files to other formats (for example, HTML, RTF, and PostScript), and \
10-                    for comparing SGML files. \
11-                    Transcribed from the Fedora 15 RPM written originally by \
12-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
13-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
14+long_description \
15+    This package contains scripts for easy conversion from DocBook \
16+    files to other formats (for example, HTML, RTF, and PostScript), and \
17+    for comparing SGML files. \
18+    Transcribed from the Fedora 15 RPM written originally by \
19+    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
20+    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
21 master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/
22 
23 checksums           rmd160  710fe047ea8a794cc6c0d944521184375a666e6b \
24@@ -49,7 +50,6 @@
25                     docbook-utils-nofinalecho.patch \
26                     docbook-utils-newgrep.patch
27 
28-
29 post-patch {
30     reinplace -E "s|^docdir=.+$|docdir='${prefix}/share/doc'|" \
31         ${worksrcpath}/configure
32@@ -63,7 +63,11 @@
33     reinplace "s|jade|openjade|" \
34         ${worksrcpath}/doc/man/Makefile.in \
35         ${worksrcpath}/doc/HTML/Makefile.in
36-    reinplace "s|nsgmls|onsgmls|" \
37+    reinplace "s|nsgmls|onsgmls|g" \
38+        ${worksrcpath}/backends/man.in \
39+        ${worksrcpath}/backends/texi.in \
40+        ${worksrcpath}/helpers/docbook2man-spec.pl \
41+        ${worksrcpath}/bin/sgmldiff.in \
42         ${worksrcpath}/doc/man/Makefile.in \
43         ${worksrcpath}/doc/HTML/Makefile.in
44 
45diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile textproc/docbook-xml/Portfile
46--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xml/Portfile 2013-04-19 09:01:53.000000000 -0700
47+++ textproc/docbook-xml/Portfile       2013-07-14 22:49:59.000000000 -0700
48@@ -1,11 +1,11 @@
49 # -*- 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
50 # $Id: Portfile 104041 2013-03-14 00:27:36Z jmr@macports.org $
51-
52-PortSystem          1.0
53+PortSystem 1.0
54+PortGroup xmlcatalog 1.0
55 
56 name                docbook-xml
57 revision            1
58-set revision-docbook-xml 2
59+set revision-docbook-xml 3
60 set docbook-xml-versions {
61     4.1.2
62     {
63@@ -50,39 +50,31 @@
64 homepage            http://www.docbook.org
65 
66 foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
67-
68     subport docbook-xml-${docbook-xml-version} {
69-
70-       if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
71-
72+        if {[vercmp ${docbook-xml-version} 4.1.2] == 0} {
73             distname            docbkx412
74             extract.mkdir       yes
75 
76             depends_lib-append  port:docbook-xml-4.2
77 
78             post-extract {
79-
80                 copy ${prefix}/share/xml/docbook/4.2/catalog.xml \
81                     ${worksrcpath}/
82             }
83             post-patch {
84-
85                 reinplace "s,V4.2 ..,V4.1.2 ,g" \
86                     ${worksrcpath}/catalog.xml
87                 reinplace "s,V4.2,V4.1.2,g" \
88                     ${worksrcpath}/catalog.xml
89             }
90         } elseif {[vercmp ${docbook-xml-version} 5.0] >= 0} {
91-
92             distname            docbook-${docbook-xml-version}
93         } else {
94-
95             distname            docbook-xml-${docbook-xml-version}
96             extract.mkdir       yes
97         }
98 
99         foreach part [string trim ${docbook-xml-checksums}] {
100-
101             checksums-append    $part
102         }
103 
104@@ -101,94 +93,32 @@
105 
106         set install_dir    ${prefix}/share/xml/docbook/${docbook-xml-version}
107 
108-        # xmlcatmgr as installed by MacPorts defaults to using
109-        # ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
110-        # SGML) if no catalog is specified, but we'll specify the path just in case
111-        # users have another installation of xmlcatmgr and happen to have it before
112-        # ${prefix}/bin in their PATH.
113-        set catalog.xml    ${prefix}/etc/xml/catalog
114-        set xml.args       "-c ${catalog.xml}"
115-        set catalog.sgml   ${prefix}/etc/sgml/catalog
116-        set sgml.args      "-s -c ${catalog.sgml}"
117+        xml.catalog "${install_dir}/catalog.xml"
118+        # SGML catalog support is only in the 4.x transitional versions...
119+        if {[vercmp ${docbook-xml-version} 5.0] < 0} {
120+            sgml.catalog "${install_dir}/docbook.cat"
121+        }
122 
123         destroot {
124-
125             set destroot_dir    ${destroot}${install_dir}
126             set destroot_files  [readdir ${worksrcpath}]
127             xinstall -m 755 -d ${destroot_dir}
128             foreach file ${destroot_files} {
129-
130                 copy ${worksrcpath}/${file} ${destroot_dir}
131             }
132         }
133-
134-        post-activate {
135-
136-            # XML catalog
137-            # Make the directory if it doesn't exist
138-            if {![file exists ${prefix}/etc/xml]} {
139-
140-                xinstall -m 755 -d ${prefix}/etc/xml
141-            }
142-
143-            # Create the catalog file if it doesn't exist
144-            if {![file exists ${catalog.xml}]} {
145-
146-                system "xmlcatmgr ${xml.args} create"
147-            }
148-
149-            # Add the nextCatalog entry to the catalog if it doesn't exist
150-            if {[catch {exec xmlcatmgr ${xml.args} lookup ${install_dir}/catalog.xml}]} {
151-
152-                system "xmlcatmgr ${xml.args} add nextCatalog ${install_dir}/catalog.xml"
153-            }
154-
155-            # SGML catalog
156-            # SGML catalog support is only in the 4.x transitional versions...
157-            if {[file exists ${install_dir}/docbook.cat]} {
158-                # Make the directory if it doesn't exist
159-                if {![file exists ${prefix}/etc/sgml]} {
160-
161-                    xinstall -m 755 -d ${prefix}/etc/sgml
162-                }
163-
164-                # Create the catalog file if it doesn't exist
165-                if {![file exists ${catalog.sgml}]} {
166-
167-                    system "xmlcatmgr ${sgml.args} create"
168-                }
169-
170-                # Add the CATALOG entry to the catalog if it doesn't exist
171-                if {[catch {exec xmlcatmgr ${sgml.args} lookup ${install_dir}/docbook.cat}]} {
172-
173-                    system "xmlcatmgr ${sgml.args} add CATALOG ${install_dir}/docbook.cat"
174-                }
175-            }
176-        }
177-
178-        # This will remove the catalog entry for this port.
179-        post-deactivate {
180-
181-            system "xmlcatmgr ${xml.args} remove nextCatalog ${install_dir}/catalog.xml"
182-            # Remove the CATALOG entry from the catalog
183-            # SGML catalog support is only in the 4.x transitional versions...
184-            system "xmlcatmgr ${sgml.args} remove CATALOG ${install_dir}/docbook.cat"
185-        }
186     }
187 }
188 
189 if {${name} == ${subport}} {
190-
191     revision            ${revision-docbook-xml}
192     use_configure       no
193     build               {}
194     distfiles
195     foreach {docbook-xml-version docbook-xml-checksums} ${docbook-xml-versions} {
196-
197         depends_lib-append  port:docbook-xml-${docbook-xml-version}
198     }
199     destroot {
200-
201         set docdir ${prefix}/share/doc/${name}
202         xinstall -d ${destroot}${docdir}
203         xinstall -m 0644 ${filespath}/README ${destroot}${docdir}
204diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile textproc/docbook-xsl/Portfile
205--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl/Portfile 2013-10-02 21:34:30.000000000 -0700
206+++ textproc/docbook-xsl/Portfile       2014-04-16 12:48:46.000000000 -0700
207@@ -1,10 +1,12 @@
208-# $Id: Portfile 111353 2013-09-19 07:21:56Z ryandesign@macports.org $
209+# $Id: Portfile 104648 2013-03-30 18:06:55Z devans@macports.org $
210 # -*- 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
211 
212 PortSystem      1.0
213+PortGroup       xmlcatalog 1.0
214 
215 name            docbook-xsl
216 version         1.78.1
217+revision        1
218 categories      textproc
219 license         MIT Permissive
220 description     The docbook xsl stylesheets
221@@ -42,6 +44,8 @@
222 set instxsldir  "share/xsl/${name}"
223 set instdocdir  "share/doc/${name}"
224 
225+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
226+
227 destroot {
228     foreach pathname "${instxsldir} ${instdocdir}" {
229         xinstall -m 755 -d ${destroot}${prefix}/${pathname}
230@@ -53,29 +57,6 @@
231         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
232     }
233 }
234-post-activate {
235-    # xmlcatmgr as installed by MacPorts defaults to using
236-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
237-    # SGML) if no catalog is specified, but we'll specify the path just in case
238-    # users have another installation of xmlcatmgr and happen to have it before
239-    # ${prefix}/bin in their PATH.
240-    set catalog.xml ${prefix}/etc/xml/catalog
241-
242-    # Make the directory if it doesn't exist
243-    if {![file exists ${prefix}/etc/xml]} {
244-        xinstall -m 755 -d ${prefix}/etc/xml
245-    }
246-
247-    # Create the catalog file if it doesn't exist
248-    if {![file exists ${catalog.xml}]} {
249-        system "xmlcatmgr create -c ${catalog.xml}"
250-    }
251-
252-    # Add the nextCatalog entry to the catalog if it doesn't exist
253-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
254-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
255-    }
256-}
257 
258 if {${registry.format} == "receipt_flat"} {
259     notes \
260@@ -87,10 +68,5 @@
261 ######################################################################"
262 }
263 
264-# This will remove the catalog entry for this port.
265-post-deactivate {
266-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
267-}
268-
269 livecheck.url       http://docbook.sourceforge.net/release/xsl/
270 livecheck.regex "=\"(\\d+(?:\\.\\d+)*)"
271diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile textproc/docbook-xsl-ns/Portfile
272--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook-xsl-ns/Portfile      2012-02-28 20:26:53.000000000 -0800
273+++ textproc/docbook-xsl-ns/Portfile    2013-06-23 14:02:46.000000000 -0700
274@@ -1,9 +1,12 @@
275+# -*- 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
276 # $Id: Portfile 81135 2011-07-26 00:29:03Z jmr@macports.org $
277 
278 PortSystem      1.0
279+PortGroup       xmlcatalog 1.0
280 
281 name            docbook-xsl-ns
282 version         1.76.1
283+revision        1
284 categories      textproc
285 license         MIT Permissive
286 description     DocBook XSL NS (namespaced) Stylesheets
287@@ -36,6 +39,7 @@
288                 RELEASE-NOTES.pdf RELEASE-NOTES.txt TODO VERSION NEWS COPYING"
289 set instxsldir  "share/xsl/${name}"
290 set instdocdir  "share/doc/${name}"
291+xml.catalog "${prefix}/${instxsldir}/catalog.xml"
292 
293 destroot {
294     foreach pathname "${instxsldir} ${instdocdir}" {
295@@ -48,33 +52,5 @@
296         copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
297     }
298 }
299-post-activate {
300-    # xmlcatmgr as installed by MacPorts defaults to using
301-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
302-    # SGML) if no catalog is specified, but we'll specify the path just in case
303-    # users have another installation of xmlcatmgr and happen to have it before
304-    # ${prefix}/bin in their PATH.
305-    set catalog.xml ${prefix}/etc/xml/catalog
306-
307-    # Make the directory if it doesn't exist
308-    if {![file exists ${prefix}/etc/xml]} {
309-        xinstall -m 755 -d ${prefix}/etc/xml
310-    }
311-
312-    # Create the catalog file if it doesn't exist
313-    if {![file exists ${catalog.xml}]} {
314-        system "xmlcatmgr create -c ${catalog.xml}"
315-    }
316-
317-    # Add the nextCatalog entry to the catalog if it doesn't exist
318-    if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
319-        system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
320-    }
321-}
322-
323-# This will remove the catalog entry for this port.
324-post-deactivate {
325-    system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
326-}
327 
328 livecheck.distname  ${name}
329diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook2X/Portfile textproc/docbook2X/Portfile
330--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/docbook2X/Portfile   2014-02-06 11:48:02.000000000 -0800
331+++ textproc/docbook2X/Portfile 2014-04-16 16:22:24.000000000 -0700
332@@ -1,11 +1,11 @@
333 # -*- 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
334-# $Id: Portfile 116250 2014-01-23 01:58:33Z larryv@macports.org $
335+# $Id: Portfile 97543 2012-09-08 16:31:47Z pixilla@macports.org $
336 
337 PortSystem          1.0
338 
339 name                docbook2X
340 version             0.8.8
341-revision            4
342+revision            5
343 categories          textproc
344 platforms           darwin
345 license             MIT
346diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile textproc/iso8879/Portfile
347--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/iso8879/Portfile     2012-02-28 20:26:52.000000000 -0800
348+++ textproc/iso8879/Portfile   2013-06-23 14:10:17.000000000 -0700
349@@ -1,66 +1,37 @@
350 # $Id: Portfile 86410 2011-10-25 11:15:36Z dports@macports.org $
351+# -*- 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
352 
353-PortSystem 1.0
354-name           iso8879
355-version                1986
356-revision       1
357-categories     textproc
358-license                Permissive
359-maintainers    nomaintainer
360-description    Character entity sets from ISO 8879:1986 (SGML)
361-platforms      darwin
362+PortSystem      1.0
363+PortGroup       xmlcatalog 1.0
364 
365-long_description $description
366-
367-master_sites   freebsd
368-
369-distname       isoENTS
370-checksums      md5 c8a9561212c1a2ec6e48919640de9c67
371-
372-use_zip                yes
373+name            iso8879
374+version         1986
375+revision        2
376+categories      textproc
377+license         Permissive
378+maintainers     nomaintainer
379+description     Character entity sets from ISO 8879:1986 (SGML)
380+platforms       darwin
381 
382-depends_run    port:xmlcatmgr
383+long_description $description
384 
385-use_configure  no
386-build          {}
387+master_sites    freebsd
388 
389-set install_dir        ${prefix}/share/sgml/${name}
390+distname        isoENTS
391+checksums       md5 c8a9561212c1a2ec6e48919640de9c67
392 
393-# xmlcatmgr as installed by MacPorts defaults to using
394-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
395-# SGML) if no catalog is specified, but we'll specify the path just in case
396-# users have another installation of xmlcatmgr and happen to have it before
397-# ${prefix}/bin in their PATH.
398-set catalog.sgml ${prefix}/etc/sgml/catalog
399-set xmlcatmgr.args "-s -c ${catalog.sgml}"
400+use_zip         yes
401 
402-destroot       {
403-       xinstall -m 755 -d ${destroot}${install_dir}
404-       xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
405-       eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
406-}
407+use_configure   no
408+build {}
409 
410-destroot.args  prefix=${destroot}${prefix}
411+set install_dir ${prefix}/share/sgml/${name}
412+sgml.catalog "${install_dir}/catalog"
413 
414-post-activate {
415-    # Make the directory if it doesn't exist
416-    if {![file exists ${prefix}/etc/sgml]} {
417-        xinstall -m 755 -d ${prefix}/etc/sgml
418-    }
419-
420-    # Create the catalog file if it doesn't exist
421-    if {![file exists ${catalog.sgml}]} {
422-        system "xmlcatmgr ${xmlcatmgr.args} create"
423-    }
424-
425-    # Add the CATALOG entry to the catalog if it doesn't exist
426-    if {[catch {exec xmlcatmgr ${xmlcatmgr.args} lookup ${install_dir}/catalog}]} {
427-        system "xmlcatmgr ${xmlcatmgr.args} add CATALOG ${install_dir}/catalog"
428-    }
429-}
430+destroot.args prefix=${destroot}${prefix}
431 
432-# This will remove the catalog entry for this port.
433-post-deactivate {
434-    # Remove the CATALOG entry from the catalog
435-    system "xmlcatmgr ${xmlcatmgr.args} remove CATALOG ${install_dir}/catalog"
436+destroot {
437+    xinstall -m 755 -d ${destroot}${install_dir}
438+    xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
439+    eval xinstall -m 644 [glob ${workpath}/ISO*] ${destroot}${install_dir}
440 }
441diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile textproc/openjade/Portfile
442--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/openjade/Portfile    2014-01-21 16:32:53.000000000 -0800
443+++ textproc/openjade/Portfile  2014-02-19 15:42:59.000000000 -0800
444@@ -2,21 +2,21 @@
445 # $Id: Portfile 115642 2014-01-07 19:12:38Z ryandesign@macports.org $
446 
447 PortSystem 1.0
448+PortGroup xmlcatalog 1.0
449 
450 name            openjade
451 version         1.3.2
452-revision        7
453+revision        8
454 categories      textproc
455 license         MIT
456 maintainers     fourpalms.org:lockhart openmaintainer
457 description     James Clark's implementation of DSSSL
458+long_description \
459+    OpenJade is an implementation of ISO/IEC 10179:1996 \
460+    standard DSSSL language.
461 homepage        http://openjade.sourceforge.net/
462 platforms       darwin freebsd
463-
464-long_description OpenJade is an implementation of ISO/IEC 10179:1996 \
465-                 standard DSSSL language.
466-
467-master_sites    sourceforge:project/openjade/openjade/${version}
468+master_sites    sourceforge
469 
470 checksums       md5 7df692e3186109cc00db6825b777201e
471 
472@@ -30,24 +30,18 @@
473 depends_lib     port:opensp
474 depends_run     port:xmlcatmgr
475 
476-# xmlcatmgr as installed by MacPorts defaults to using
477-# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
478-# SGML). For historic reasons, openjade expects the catalog to be in
479-# share/sgml/catalog. To avoid breaking existing setup, we simply add
480-# a reference to the root catalog (/etc/sgml/catalog) to openjade's
481-# catalog (/share/sgml/catalog)
482-set catalog.sgml      ${prefix}/etc/sgml/catalog
483-set catalog.openjade  ${prefix}/share/sgml/catalog
484-
485-configure.args  --enable-http --enable-html --enable-mif \
486-                --disable-dependency-tracking \
487-                --enable-default-catalog=${catalog.openjade} \
488-                --datadir=${prefix}/share/sgml/openjade \
489-                --mandir=${prefix}/share/man
490-
491-configure.env-append        LIBS="-L${prefix}/lib"
492-configure.cxxflags-append   "-isystem ${prefix}/include -fno-rtti"
493-configure.ldflags-delete    "-L${prefix}/lib"
494+set openjade.catalog ${prefix}/share/sgml/catalog
495+set openjade.rootcatalog ${prefix}/share/sgml/openjade/catalog
496+
497+sgml.catalog ${openjade.rootcatalog}
498+# Add the root catalog to the openjade catalog
499+sgml.addtocatalog "${openjade.catalog}" "${sgml.rootcatalog}"
500+
501+configure.args --enable-http --enable-html --enable-mif \
502+               --disable-dependency-tracking \
503+               --enable-default-catalog=${openjade.catalog} \
504+               --datadir=${prefix}/share/sgml/openjade \
505+               --mandir=${prefix}/share/man
506 
507 # Fix build failure on Tiger due to use of -isystem
508 compiler.blacklist    gcc-4.0 gcc-3.3
509@@ -58,6 +52,10 @@
510     set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
511 }
512 
513+configure.env-append      LIBS="-L${prefix}/lib"
514+configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
515+configure.ldflags-delete  "-L${prefix}/lib"
516+
517 post-configure  {
518     reinplace "s|^#pragma implementation||g" ${worksrcpath}/grove/Node.cxx
519     reinplace "s|^#pragma implementation||g" ${worksrcpath}/msggen.pl
520@@ -75,40 +73,7 @@
521 
522 destroot.target install install-man
523 
524-post-destroot   {
525+post-destroot {
526     system "install -d -m 755 ${destroot}${prefix}/share/sgml/openjade"
527     system "install -m 644 ${worksrcpath}/dsssl/* ${destroot}${prefix}/share/sgml/openjade"
528 }
529-
530-post-activate {
531-    # Make the directory if it doesn't exist
532-    if {![file exists ${prefix}/etc/sgml]} {
533-        xinstall -m 755 -d ${prefix}/etc/sgml
534-    }
535-
536-    # Create the root catalog file if it doesn't exist
537-    if {![file exists ${catalog.sgml}]} {
538-        system "xmlcatmgr -s -c ${catalog.sgml} create"
539-    }
540-
541-    # Create the openjade catalog file if it doesn't exist
542-    if {![file exists ${catalog.openjade}]} {
543-        system "xmlcatmgr -s -c ${catalog.openjade} create"
544-    }
545-
546-    # Add the root catalog to openjade's catalog
547-    if {[catch {exec xmlcatmgr -s -c ${catalog.openjade} lookup ${catalog.sgml}}]} {
548-        system "xmlcatmgr -s -c ${catalog.openjade} add CATALOG ${catalog.sgml}"
549-    }
550-
551-    # And add openjade's catalog to the root catalog
552-    if {[catch {exec xmlcatmgr -s -c ${catalog.sgml} lookup ${prefix}/share/sgml/openjade/catalog}]} {
553-        system "xmlcatmgr -s -c ${catalog.sgml} add CATALOG ${prefix}/share/sgml/openjade/catalog"
554-    }
555-}
556-
557-# This will remove the catalog entry for this port.
558-post-deactivate {
559-    # Remove the CATALOG entry from the catalog
560-    system "xmlcatmgr -s -c ${catalog.sgml} remove CATALOG ${prefix}/share/sgml/openjade/catalog"
561-}
562diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile textproc/sgml-common/Portfile
563--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/sgml-common/Portfile 2012-10-29 13:59:15.000000000 -0700
564+++ textproc/sgml-common/Portfile       2013-07-14 22:15:53.000000000 -0700
565@@ -1,29 +1,30 @@
566 # -*- 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
567 # $Id: Portfile 99124 2012-10-27 19:39:14Z ryandesign@macports.org $
568-
569-PortSystem          1.0
570+PortSystem 1.0
571+PortGroup xmlcatalog 1.0
572 
573 name                sgml-common
574 version             0.6.3
575 set openjade_version 1.3.2
576+revision            1
577 categories          textproc
578 platforms           darwin
579 license             GPL-2+
580 maintainers         fourpalms.org:lockhart openmaintainer
581 supported_archs     noarch
582-
583 # Actually - there is no homepage of this project, on that URL
584 # page you could get complete ISO 8879 listing as was on the
585 # old page - only part of it is included in sgml-common package.
586 homepage            http://www.w3.org/2003/entities/
587 description         A collection of entities and DTDs common to multiple packages.
588-long_description    The sgml-common package contains a collection of entities and DTDs \
589-                    that are useful for processing SGML, but that don't need to be \
590-                    included in multiple packages.  Sgml-common also includes an \
591-                    up-to-date Open Catalog file. \
592-                    Transcribed from the Fedora 15 RPM written originally by \
593-                    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
594-                    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
595+long_description \
596+    The sgml-common package contains a collection of entities and DTDs \
597+    that are useful for processing SGML, but that don't need to be \
598+    included in multiple packages.  Sgml-common also includes an \
599+    up-to-date Open Catalog file. \
600+    Transcribed from the Fedora 15 RPM written originally by \
601+    Tim Waugh <twaugh@redhat.com> based on work by Eric Bischoff \
602+    and with recent maintenance by Ondrej Vasik <ovasik@redhat.com>.
603 
604 master_sites        ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/:redhat \
605                     sourceforge:project/openjade/openjade/${openjade_version}:openjade
606@@ -41,28 +42,10 @@
607                     rmd160  3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
608                     sha256  1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
609 
610-depends_lib         port:perl5 \
611-                    port:libxml2 \
612-                    port:openjade \
613-                    port:docbook-dsssl \
614-                    port:docbook-sgml-4.2
615-
616-depends_run         port:xmlcatmgr
617-
618-set bindir ${prefix}/bin
619-set confdir ${prefix}/etc
620-set datadir ${prefix}/share
621-set sgmldir ${datadir}/sgml
622-set sgmlcatalog ${confdir}/sgml/catalog
623-set xmldir ${datadir}/xml
624-set xmlcatalog ${confdir}/xml/catalog
625-# xmlcatmgr as installed by MacPorts defaults to using
626-# ${prefix}/etc/xml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
627-# SGML) if no catalog is specified, but we'll specify the path just in case
628-# users have another installation of xmlcatmgr and happen to have it before
629-# ${prefix}/bin in their PATH.
630-set xml.args       "-c ${xmlcatalog}"
631-set sgml.args      "-s -c ${sgmlcatalog}"
632+depends_lib-append  port:perl5 \
633+                    port:libxml2
634+
635+set sgmldir ${prefix}/share/sgml
636 
637 patch.pre_args      -p1
638 patchfiles          patch-bin-install-catalog.in.diff \
639@@ -77,55 +60,11 @@
640 
641 use_configure       no
642 
643-build {
644-    # XML catalog
645-    # Make the directory if it doesn't exist
646-    if {![file exists ${confdir}/xml]} {
647-        xinstall -m 755 -d ${confdir}/xml
648-    }
649-
650-    # Create the catalog file if it doesn't exist
651-    if {![file exists ${xmlcatalog}]} {
652-        system "xmlcatmgr ${xml.args} create"
653-    }
654-
655-    # SGML catalog
656-    # Make the directory if it doesn't exist
657-    if {![file exists ${confdir}/sgml]} {
658-        xinstall -m 755 -d ${confdir}/sgml
659-    }
660-
661-    # Create the catalog file if it doesn't exist
662-    if {![file exists ${sgmlcatalog}]} {
663-        system "xmlcatmgr ${sgml.args} create"
664-    }
665-
666-    # Now put the common DocBook entries in it
667-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
668-    #     '-//OASIS//ENTITIES DocBook XML' \
669-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
670-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
671-    #     '-//OASIS//DTD DocBook XML' \
672-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
673-    # system "${bindir}/xmlcatalog --noout --add 'delegatePublic' \
674-    #     'ISO 8879:1986' \
675-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
676-    # system "${bindir}/xmlcatalog --noout --add 'delegateSystem' \
677-    #     'http://www.oasis-open.org/docbook/' \
678-    #     'file://${confdir}/sgml/docbook/xmlcatalog' ${worksrcpath}${xmlcatalog}"
679-    # system "${bindir}/xmlcatalog --noout --add 'delegateURI' \
680-    #     'http://www.oasis-open.org/docbook/' \
681-    #     'file://${confdir}/sgml/docbook/xmlcatalog'
682-       # ${worksrcpath}${xmlcatalog}"
683-    # Also create the common DocBook catalog
684-    # xinstall -d ${worksrcpath}${confdir}/sgml/docbook
685-    # system "${bindir}/xmlcatalog --noout --create \
686-    #     ${worksrcpath}${confdir}/sgml/docbook/xmlcatalog"
687-}
688+build {}
689 
690 destroot {
691-    xinstall -d ${destroot}${confdir}/sgml
692-    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${prefix}/etc/sgml/sgml.conf
693+    xinstall -d ${destroot}${sgml.confdir}
694+    xinstall ${worksrcpath}/config/sgml.conf ${destroot}${sgml.confdir}/sgml.conf
695     xinstall -d ${destroot}${sgmldir}
696     # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date:
697     xinstall -W ${workpath}/${openjade}/pubtext xml.dcl xml.soc html.dcl html.soc ${destroot}${sgmldir}
698diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile textproc/xhtml1/Portfile
699--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xhtml1/Portfile      2013-05-17 06:23:07.000000000 -0700
700+++ textproc/xhtml1/Portfile    2013-07-14 22:16:16.000000000 -0700
701@@ -2,22 +2,22 @@
702 # $Id: Portfile 106081 2013-05-14 14:12:58Z raimue@macports.org $
703 
704 PortSystem          1.0
705+PortGroup           xmlcatalog 1.0
706 
707 name                xhtml1
708 version             2.0
709+revision            1
710 categories          textproc
711 platforms           darwin
712 maintainers         nomaintainer
713 supported_archs     noarch
714-
715 description         A reformulation of HTML 4 in XML 1.0
716-
717-long_description    The Second Edition of XHTML 1.0, a reformulation \
718-                    of HTML 4 as an XML 1.0 application, and three DTDs \
719-                    corresponding to the ones defined by HTML 4. \
720-                    These DTDs are useful for validating or processing \
721-                    world wide web pages with XML tools.
722-
723+long_description \
724+    The Second Edition of XHTML 1.0, a reformulation \
725+    of HTML 4 as an XML 1.0 application, and three DTDs \
726+    corresponding to the ones defined by HTML 4. \
727+    These DTDs are useful for validating or processing \
728+    world wide web pages with XML tools.
729 homepage            http://www.w3.org/TR/xhtml1/
730 master_sites        http://www.w3.org/TR/xhtml1/
731 
732@@ -35,42 +35,23 @@
733 
734 set instdir         share/xml/html/4
735 
736+xml.entity "-//W3C//DTD XHTML 1.0 Strict//EN" "${prefix}/${instdir}/xhtml1-strict.dtd"
737+xml.entity "-//W3C//DTD XHTML 1.0 Transitional//EN" "${prefix}/${instdir}/xhtml1-transitional.dtd"
738+xml.entity "-//W3C//DTD XHTML 1.0 Frameset//EN" "${prefix}/${instdir}/xhtml1-frameset.dtd"
739+xml.entity "-//W3C//ENTITIES Latin 1 for XHTML//EN" "${prefix}/${instdir}/xhtml-lat1.ent"
740+xml.entity "-//W3C//ENTITIES Special for XHTML//EN" "${prefix}/${instdir}/xhtml-special.ent"
741+xml.entity "-//W3C//ENTITIES Symbols for XHTML//EN" "${prefix}/${instdir}/xhtml-symbol.ent"
742+
743+xml.rewrite System "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
744+xml.rewrite System "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
745+xml.rewrite URI "http://www.w3.org/TR/xhtml1/DTD/" "${prefix}/${instdir}/"
746+xml.rewrite URI "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/" "${prefix}/${instdir}/"
747+
748 destroot {
749     xinstall -m 755 -d ${destroot}${prefix}/${instdir}
750     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}
751 }
752 
753-post-activate {
754-    # xmlcatmgr as installed by MacPorts defaults to using
755-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
756-    # SGML) if no catalog is specified, but we'll specify the path just in case
757-    # users have another installation of xmlcatmgr and happen to have it before
758-    # ${prefix}/bin in their PATH.
759-    set catalog.xml ${prefix}/etc/xml/catalog
760-
761-    # Make the directory if it doesn't exist
762-    if {![file exists ${prefix}/etc/xml]} {
763-        xinstall -m 755 -d ${prefix}/etc/xml
764-    }
765-
766-    # Create the catalog file if it doesn't exist
767-    if {![file exists ${catalog.xml}]} {
768-        system "xmlcatmgr create -c ${catalog.xml}"
769-    }
770-
771-    # Add the entries to the catalog
772-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Strict//EN' '${prefix}/${instdir}/xhtml1-strict.dtd'"
773-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Transitional//EN' '${prefix}/${instdir}/xhtml1-transitional.dtd'"
774-    system "xmlcatmgr add public '-//W3C//DTD XHTML 1.0 Frameset//EN' '${prefix}/${instdir}/xhtml1-frameset.dtd'"
775-    system "xmlcatmgr add public '-//W3C//ENTITIES Latin 1 for XHTML//EN' '${prefix}/${instdir}/xhtml-lat1.ent'"
776-    system "xmlcatmgr add public '-//W3C//ENTITIES Special for XHTML//EN' '${prefix}/${instdir}/xhtml-special.ent'"
777-    system "xmlcatmgr add public '-//W3C//ENTITIES Symbols for XHTML//EN' '${prefix}/${instdir}/xhtml-symbol.ent'"
778-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
779-    system "xmlcatmgr add rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
780-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/' '${prefix}/${instdir}/'"
781-    system "xmlcatmgr add rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/' '${prefix}/${instdir}/'"
782-}
783-
784 if {${registry.format} == "receipt_flat"} {
785     notes \
786 "######################################################################
787@@ -90,18 +71,4 @@
788 ######################################################################"
789 }
790 
791-# This will remove the catalog entries for this port.
792-post-deactivate {
793-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Strict//EN'"
794-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Transitional//EN'"
795-    system "xmlcatmgr remove public '-//W3C//DTD XHTML 1.0 Frameset//EN'"
796-    system "xmlcatmgr remove public '-//W3C//ENTITIES Latin 1 for XHTML//EN'"
797-    system "xmlcatmgr remove public '-//W3C//ENTITIES Special for XHTML//EN'"
798-    system "xmlcatmgr remove public '-//W3C//ENTITIES Symbols for XHTML//EN'"
799-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/xhtml1/DTD/'"
800-    system "xmlcatmgr remove rewriteSystem 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
801-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/xhtml1/DTD/'"
802-    system "xmlcatmgr remove rewriteURI 'http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/'"
803-}
804-
805 livecheck.type      none
806diff -ur /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile textproc/xmlroff/Portfile
807--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/textproc/xmlroff/Portfile     2012-05-22 11:40:28.000000000 -0700
808+++ textproc/xmlroff/Portfile   2013-07-14 22:18:06.000000000 -0700
809@@ -2,20 +2,20 @@
810 # $Id: Portfile 93159 2012-05-16 18:10:00Z ryandesign@macports.org $
811 
812 PortSystem          1.0
813+PortGroup           xmlcatalog 1.0
814 
815 name                xmlroff
816 version             0.6.2
817+revision            1
818 categories          textproc
819 platforms           darwin
820 maintainers         nomaintainer
821 license             BSD
822-
823 description         An XSL formatter producing PDF and PostScript.
824-
825-long_description    Creates formatted output -- pages containing text in a \
826-                    variety of type styles and sizes -- from an input XML \
827-                    document and an XSL stylesheet.
828-
829+long_description \
830+    Creates formatted output -- pages containing text in a \
831+    variety of type styles and sizes -- from an input XML \
832+    document and an XSL stylesheet.
833 homepage            http://xmlroff.org/
834 master_sites        ${homepage}download/
835 
836@@ -43,33 +43,4 @@
837 configure.ldflags-append    "-framework CoreFoundation"
838 
839 # Specify catalog to add (catalog for xmlroff's libfo library)
840-set libfocatalog ${prefix}/share/xml/libfo-${version}/catalog.xml
841-
842-post-activate {
843-    # xmlcatmgr as installed by MacPorts defaults to using
844-    # ${prefix}/etc/xml/docbook (for XML) and ${prefix}/etc/xml/docbook (for
845-    # SGML) if no catalog is specified, but we'll specify the path just in case
846-    # users have another installation of xmlcatmgr and happen to have it before
847-    # ${prefix}/bin in their PATH.
848-    set catalog.xml ${prefix}/etc/xml/catalog
849-
850-    # Make the directory if it doesn't exist
851-    if {![file exists ${prefix}/etc/xml]} {
852-        xinstall -m 755 -d ${prefix}/etc/xml
853-    }
854-
855-    # Create the catalog file if it doesn't exist
856-    if {![file exists ${catalog.xml}]} {
857-        system "xmlcatmgr create -c ${catalog.xml}"
858-    }
859-
860-    # Add the nextCatalog entry to the catalog if it doesn't exist
861-    if {[catch {exec xmlcatmgr lookup ${libfocatalog}}]} {
862-        system "xmlcatmgr add nextCatalog ${libfocatalog}"
863-    }
864-}
865-
866-# This will remove the catalog entry for this port.
867-post-deactivate {
868-    system "xmlcatmgr remove nextCatalog ${libfocatalog}"
869-}
870+xml.catalog "${prefix}/share/xml/libfo-${version}/catalog.xml"