<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128893] trunk/dports/textproc/openjade</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128893">128893</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-11-29 06:01:29 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>openjade: Rename patchfiles per lint.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocopenjadePortfile">trunk/dports/textproc/openjade/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextprocopenjadefilespatchGroveApphdiff">trunk/dports/textproc/openjade/files/patch-GroveApp.h.diff</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchGroveBuildercxxdiff">trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx.diff</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchNodehdiff">trunk/dports/textproc/openjade/files/patch-Node.h.diff</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchclangdiff">trunk/dports/textproc/openjade/files/patch-clang.diff</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchdelete_la_filesdiff">trunk/dports/textproc/openjade/files/patch-delete_la_files.diff</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchopenjadegetoptperldiff">trunk/dports/textproc/openjade/files/patch-openjade-getoptperl.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportstextprocopenjadefilesclangpatch">trunk/dports/textproc/openjade/files/clang.patch</a></li>
<li><a href="#trunkdportstextprocopenjadefilesdelete_la_filespatch">trunk/dports/textproc/openjade/files/delete_la_files.patch</a></li>
<li><a href="#trunkdportstextprocopenjadefilesopenjadegetoptperlpatch">trunk/dports/textproc/openjade/files/openjade-getoptperl.patch</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchGroveApph">trunk/dports/textproc/openjade/files/patch-GroveApp.h</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchGroveBuildercxx">trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx</a></li>
<li><a href="#trunkdportstextprocopenjadefilespatchNodeh">trunk/dports/textproc/openjade/files/patch-Node.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocopenjadePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/openjade/Portfile (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/Portfile 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/Portfile 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> checksums rmd160 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 \
</span><span class="cx"> sha256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
</span><span class="cx">
</span><del>-patchfiles clang.patch \
- patch-GroveApp.h \
- patch-GroveBuilder.cxx \
- patch-Node.h \
- openjade-getoptperl.patch \
- delete_la_files.patch
</del><ins>+patchfiles patch-clang.diff \
+ patch-GroveApp.h.diff \
+ patch-GroveBuilder.cxx.diff \
+ patch-Node.h.diff \
+ patch-openjade-getoptperl.diff \
+ patch-delete_la_files.diff
</ins><span class="cx">
</span><span class="cx"> depends_lib port:opensp
</span><span class="cx"> depends_run port:xmlcatmgr
</span></span></pre></div>
<a id="trunkdportstextprocopenjadefilesclangpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/clang.patch (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/clang.patch 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/clang.patch 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,245 +0,0 @@
</span><del>-diff -Nurd -x'*~' Makefile.comm.in Makefile.comm.in
---- Makefile.comm.in 2002-12-01 06:56:47.000000000 -0500
-+++ Makefile.comm.in 2007-04-23 03:55:18.000000000 -0400
-@@ -29,7 +29,7 @@
-
- LIBS=@LIBS@
- DEFS=@DEFS@ -DDEFAULT_SCHEME_BUILTINS=\"${datadir}/builtins.dsl\"
--INCS=-I$(srcdir) -I$(srcdir)/../include -I$(spincludedir) -I$(spincludedir)/.. $(INCLUDE)
-+INCS=-I$(srcdir) -I$(srcdir)/../include $(INCLUDE) -I$(spincludedir) -I$(spincludedir)/..
- CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS)
- CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS)
- LDFLAGS=@LDFLAGS@
-diff -Nurd -x'*~' Makefile.lib.in Makefile.lib.in
---- Makefile.lib.in 2002-01-22 06:57:53.000000000 -0500
-+++ Makefile.lib.in 2007-04-23 03:40:08.000000000 -0400
-@@ -23,7 +23,7 @@
- echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
-
- lib$(LIB).la: $(LT_OBJS)
-- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
-+ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
- -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
-
- install:
-diff -Nurd -x'*~' Makefile.prog.in Makefile.prog.in
---- Makefile.prog.in 2002-01-22 06:57:53.000000000 -0500
-+++ Makefile.prog.in 2007-04-23 03:40:08.000000000 -0400
-@@ -12,14 +12,14 @@
-
- ALL_LIBS = $(XLIBS) $(LIBS)
- Makefile.lt:
-- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
-+ echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
-
- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
-
- all: $(PROG)
-
- $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
-- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(LIBS)
-
- install: $(PROG)
- -test -d $(DESTDIR)$(bindir) || \
-diff -Nurd -x'*~' config/ltmain.sh config/ltmain.sh
---- config/ltmain.sh 2002-01-17 08:45:52.000000000 -0500
-+++ config/ltmain.sh 2007-04-23 03:40:08.000000000 -0400
-@@ -2858,6 +2858,11 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval cmds=\"$archive_cmds\"
- fi
- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
-@@ -3913,10 +3918,10 @@
-
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
-- if test "$installed" = no && test $need_relink = yes; then
-- $echo >> $output "\
--relink_command=\"$relink_command\""
-- fi
-+# if test "$installed" = no && test $need_relink = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+# fi
- done
- fi
-
-diff -Nurd -x'*~' configure configure
---- configure 2002-12-01 11:18:40.000000000 -0500
-+++ configure 2007-04-23 03:40:08.000000000 -0400
-@@ -3063,8 +3063,8 @@
-
-
- case "${host}" in
-- *-*-darwin*)
-- LINKFLAGS="-no-undefined"
-+ *darwin*)
-+ LINKFLAGS="-allow-undefined"
- ;;
- *)
- if test "$GXX"
-@@ -7907,11 +7907,11 @@
- ;;
-
- darwin* | rhapsody*)
-- allow_undefined_flag='-undefined suppress'
-+ allow_undefined_flag='-undefined suppress -flat_namespace'
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
-+ archive_cmds='$CXX $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libs $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
-@@ -9366,6 +9366,10 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC
-
-+# The c++ compiler
-+
-+CXX=$ac_ct_CXX
-+
- # The linker used to build libraries.
- LD=$lt_LD
-
-diff -Nurd -x'*~' spgrove/Makefile.sub spgrove/Makefile.sub
---- spgrove/Makefile.sub 2002-11-15 17:46:50.000000000 -0500
-+++ spgrove/Makefile.sub 2007-04-23 03:43:23.000000000 -0400
-@@ -1,8 +1,7 @@
- LTVERSION=0:1:0
- LIB=ospgrove
- INCLUDE=-I$(srcdir)/../grove
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
-- -L$(TOP)/lib -L$(TOP)/lib/.libs \
-+DEPLIBS=-lm \
- $(LIB_THREADS)
- OBJS=GroveApp.o GroveBuilder.o SdNode.o
- GENSRCS=grove_inst.cxx
-diff -Nurd -x'*~' style/Makefile.sub style/Makefile.sub
---- style/Makefile.sub 2002-11-15 17:46:50.000000000 -0500
-+++ style/Makefile.sub 2007-04-23 03:44:04.000000000 -0400
-@@ -1,8 +1,6 @@
- LTVERSION=0:1:0
- LIB=ostyle
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
-- -L$(TOP)/lib -L$(TOP)/lib/.libs \
-- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs
-+DEPLIBS=-lm
- OBJS=LangObj.o \
- Collector.o \
- DssslApp.o \
-diff -Naur jade/TeXFOTBuilder.cxx jade/TeXFOTBuilder.cxx
---- jade/TeXFOTBuilder.cxx 2002-01-15 10:35:37.000000000 +0000
-+++ jade/TeXFOTBuilder.cxx 2011-03-30 09:39:46.000000000 +0000
-@@ -75,6 +75,7 @@
- virtual void end(TeXFOTBuilder &) const = 0;
- };
- class PageFloatFlowObj : public TeXCompoundExtensionFlowObj {
-+ public:
- void start(TeXFOTBuilder &fotb, const NodePtr &) const {
- fotb.startPageFloat(nic_);
- }
-@@ -88,12 +89,14 @@
- value.convertString(nic_.placement);
- }
- ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
-+ PageFloatFlowObj() {}
- private:
- PageFloatNIC nic_;
- StringC name_;
- StringC placement;
- };
- class PageFootnoteFlowObj : public TeXCompoundExtensionFlowObj {
-+ public:
- void start(TeXFOTBuilder &fotb, const NodePtr &) const {
- fotb.startPageFootnote();
- }
-@@ -101,6 +104,7 @@
- fotb.endPageFootnote();
- }
- ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
-+ PageFootnoteFlowObj() {}
- private:
- };
- //////////////////////////////////////////////////////////////////////
-diff -Naur jade/TransformFOTBuilder.cxx jade/TransformFOTBuilder.cxx
---- jade/TransformFOTBuilder.cxx 2002-12-01 14:55:51.000000000 +0000
-+++ jade/TransformFOTBuilder.cxx 2011-03-30 09:38:48.000000000 +0000
-@@ -51,6 +51,7 @@
- value.convertString(name_);
- }
- ExtensionFlowObj *copy() const { return new EntityRefFlowObj(*this); }
-+ EntityRefFlowObj() {}
- private:
- StringC name_;
- };
-@@ -66,10 +67,12 @@
- value.convertString(data_);
- }
- ExtensionFlowObj *copy() const { return new ProcessingInstructionFlowObj(*this); }
-+ ProcessingInstructionFlowObj() {}
- private:
- StringC data_;
- };
- class EmptyElementFlowObj : public TransformExtensionFlowObj {
-+ public:
- void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
- if (nic_.gi.size() > 0)
- fotb.emptyElement(nic_);
-@@ -98,10 +101,12 @@
- }
- }
- ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
-+ EmptyElementFlowObj() {}
- private:
- ElementNIC nic_;
- };
- class ElementFlowObj : public TransformCompoundExtensionFlowObj {
-+ public:
- void start(TransformFOTBuilder &fotb, const NodePtr &nd) const {
- if (nic_.gi.size() > 0)
- fotb.startElement(nic_);
-@@ -133,10 +138,12 @@
- }
- }
- ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
-+ ElementFlowObj() {}
- private:
- ElementNIC nic_;
- };
- class EntityFlowObj : public TransformCompoundExtensionFlowObj {
-+ public:
- void start(TransformFOTBuilder &fotb, const NodePtr &) const {
- fotb.startEntity(systemId_);
- }
-@@ -150,10 +157,12 @@
- value.convertString(systemId_);
- }
- ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
-+ EntityFlowObj() {}
- private:
- StringC systemId_;
- };
- class DocumentTypeFlowObj : public TransformExtensionFlowObj {
-+ public:
- void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
- fotb.documentType(nic_);
- }
-@@ -174,6 +183,7 @@
- }
- }
- ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
-+ DocumentTypeFlowObj() {}
- private:
- DocumentTypeNIC nic_;
- };
-
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilesdelete_la_filespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/delete_la_files.patch (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/delete_la_files.patch 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/delete_la_files.patch 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- Makefile.prog.in.orig 2013-09-02 18:50:59.000000000 -0700
-+++ Makefile.prog.in 2013-09-02 18:52:56.000000000 -0700
-@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
-
- ALL_LIBS = $(XLIBS) $(LIBS)
- Makefile.lt:
-- echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
-+ echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'|sed 's|libosp\.la|libosp.dylib|'` >Makefile.lt
-
- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
-
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilesopenjadegetoptperlpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/openjade-getoptperl.patch (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/openjade-getoptperl.patch 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/openjade-getoptperl.patch 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl
---- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200
-+++ ./msggen.pl 2012-08-10 10:38:28.019081661 +0200
-@@ -4,6 +4,7 @@
- # See the file COPYING for copying permission.
-
- use POSIX;
-+use Getopt::Std;
-
- # Package and version.
- $package = 'openjade';
-@@ -18,8 +19,7 @@ $gen_c = 0;
- undef $opt_l;
- undef $opt_p;
- undef $opt_t;
--do 'getopts.pl';
--&Getopts('l:p:t:');
-+getopts('l:p:t:');
- $module = $opt_l;
- $pot_file = $opt_p;
-
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchGroveApph"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/patch-GroveApp.h (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-GroveApp.h 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/patch-GroveApp.h 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- spgrove/GroveApp.h.orig Sun May 2 21:57:37 1999
-+++ spgrove/GroveApp.h Tue Aug 5 11:27:44 2003
-@@ -7,9 +7,9 @@
- #pragma interface
- #endif
-
--#include "ParserApp.h"
-+#include <OpenSP/ParserApp.h>
- #include "GroveBuilder.h"
--#include "HashTable.h"
-+#include <OpenSP/HashTable.h>
-
- #ifdef SP_NAMESPACE
- namespace SP_NAMESPACE {
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchGroveApphdifffromrev128890trunkdportstextprocopenjadefilespatchGroveApph"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-GroveApp.h.diff (from rev 128890, trunk/dports/textproc/openjade/files/patch-GroveApp.h) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-GroveApp.h.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-GroveApp.h.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- spgrove/GroveApp.h.orig Sun May 2 21:57:37 1999
++++ spgrove/GroveApp.h Tue Aug 5 11:27:44 2003
+@@ -7,9 +7,9 @@
+ #pragma interface
+ #endif
+
+-#include "ParserApp.h"
++#include <OpenSP/ParserApp.h>
+ #include "GroveBuilder.h"
+-#include "HashTable.h"
++#include <OpenSP/HashTable.h>
+
+ #ifdef SP_NAMESPACE
+ namespace SP_NAMESPACE {
</ins></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchGroveBuildercxx"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>---- spgrove/GroveBuilder.cxx.orig Sun Nov 17 03:01:12 2002
-+++ spgrove/GroveBuilder.cxx Tue Aug 5 11:27:44 2003
-@@ -4,26 +4,24 @@
- // FIXME location for SgmlDocument node.
-
- #include "config.h"
--#include "Boolean.h"
-+#include <OpenSP/Boolean.h>
- #include "Node.h"
--#include "Resource.h"
--#include "Ptr.h"
--#include "xnew.h"
--#include "Event.h"
-+#include <OpenSP/Resource.h>
-+#include <OpenSP/Ptr.h>
-+#include <OpenSP/xnew.h>
-+#include <OpenSP/Event.h>
- #include "GroveBuilder.h"
--#include "ErrorCountEventHandler.h"
--#include "OutputCharStream.h"
--#include "MessageFormatter.h"
--#include "Dtd.h"
--#include "Syntax.h"
--#include "Attribute.h"
--#include "Vector.h"
-+#include <OpenSP/ErrorCountEventHandler.h>
-+#include <OpenSP/OutputCharStream.h>
-+#include <OpenSP/MessageFormatter.h>
-+#include <OpenSP/Dtd.h>
-+#include <OpenSP/Syntax.h>
-+#include <OpenSP/Attribute.h>
-+#include <OpenSP/Vector.h>
- #include "LocNode.h"
- #include "SdNode.h"
- #include "threads.h"
--#include "macros.h"
--#include <assert.h>
--#include <stdio.h>
-+#include <OpenSP/macros.h>
-
- #ifdef _MSC_VER
- #pragma warning ( disable : 4250 ) // inherits via dominance
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchGroveBuildercxxdifffromrev128890trunkdportstextprocopenjadefilespatchGroveBuildercxx"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx.diff (from rev 128890, trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+--- spgrove/GroveBuilder.cxx.orig Sun Nov 17 03:01:12 2002
++++ spgrove/GroveBuilder.cxx Tue Aug 5 11:27:44 2003
+@@ -4,26 +4,24 @@
+ // FIXME location for SgmlDocument node.
+
+ #include "config.h"
+-#include "Boolean.h"
++#include <OpenSP/Boolean.h>
+ #include "Node.h"
+-#include "Resource.h"
+-#include "Ptr.h"
+-#include "xnew.h"
+-#include "Event.h"
++#include <OpenSP/Resource.h>
++#include <OpenSP/Ptr.h>
++#include <OpenSP/xnew.h>
++#include <OpenSP/Event.h>
+ #include "GroveBuilder.h"
+-#include "ErrorCountEventHandler.h"
+-#include "OutputCharStream.h"
+-#include "MessageFormatter.h"
+-#include "Dtd.h"
+-#include "Syntax.h"
+-#include "Attribute.h"
+-#include "Vector.h"
++#include <OpenSP/ErrorCountEventHandler.h>
++#include <OpenSP/OutputCharStream.h>
++#include <OpenSP/MessageFormatter.h>
++#include <OpenSP/Dtd.h>
++#include <OpenSP/Syntax.h>
++#include <OpenSP/Attribute.h>
++#include <OpenSP/Vector.h>
+ #include "LocNode.h"
+ #include "SdNode.h"
+ #include "threads.h"
+-#include "macros.h"
+-#include <assert.h>
+-#include <stdio.h>
++#include <OpenSP/macros.h>
+
+ #ifdef _MSC_VER
+ #pragma warning ( disable : 4250 ) // inherits via dominance
</ins></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchNodeh"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/openjade/files/patch-Node.h (128892 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-Node.h 2014-11-29 13:57:30 UTC (rev 128892)
+++ trunk/dports/textproc/openjade/files/patch-Node.h 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>---- grove/Node.h.orig Mon Oct 21 06:47:24 2002
-+++ grove/Node.h Tue Aug 5 11:27:44 2003
-@@ -8,7 +8,8 @@
- #endif
-
- #include <stddef.h>
--#include "IList.h"
-+#include <limits.h>
-+#include <OpenSP/IList.h>
-
- #ifdef SP_USE_DLL
- #ifdef BUILD_LIBGROVE
-@@ -34,10 +35,10 @@
- #endif
-
- #ifdef SP_MULTI_BYTE
--#ifdef SP_WCHAR_T_USHORT
--typedef wchar_t GroveChar;
--#else
-+#if UINT_MAX >= 0xffffffffL /* 2^32 - 1 */
- typedef unsigned int GroveChar;
-+#else
-+typedef unsigned long GroveChar;
- #endif
- #else /* not SP_MULTI_BYTE */
- typedef unsigned char GroveChar;
</del></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchNodehdifffromrev128890trunkdportstextprocopenjadefilespatchNodeh"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-Node.h.diff (from rev 128890, trunk/dports/textproc/openjade/files/patch-Node.h) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-Node.h.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-Node.h.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+--- grove/Node.h.orig Mon Oct 21 06:47:24 2002
++++ grove/Node.h Tue Aug 5 11:27:44 2003
+@@ -8,7 +8,8 @@
+ #endif
+
+ #include <stddef.h>
+-#include "IList.h"
++#include <limits.h>
++#include <OpenSP/IList.h>
+
+ #ifdef SP_USE_DLL
+ #ifdef BUILD_LIBGROVE
+@@ -34,10 +35,10 @@
+ #endif
+
+ #ifdef SP_MULTI_BYTE
+-#ifdef SP_WCHAR_T_USHORT
+-typedef wchar_t GroveChar;
+-#else
++#if UINT_MAX >= 0xffffffffL /* 2^32 - 1 */
+ typedef unsigned int GroveChar;
++#else
++typedef unsigned long GroveChar;
+ #endif
+ #else /* not SP_MULTI_BYTE */
+ typedef unsigned char GroveChar;
</ins></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchclangdifffromrev128890trunkdportstextprocopenjadefilesclangpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-clang.diff (from rev 128890, trunk/dports/textproc/openjade/files/clang.patch) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-clang.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-clang.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,245 @@
</span><ins>+diff -Nurd -x'*~' Makefile.comm.in Makefile.comm.in
+--- Makefile.comm.in 2002-12-01 06:56:47.000000000 -0500
++++ Makefile.comm.in 2007-04-23 03:55:18.000000000 -0400
+@@ -29,7 +29,7 @@
+
+ LIBS=@LIBS@
+ DEFS=@DEFS@ -DDEFAULT_SCHEME_BUILTINS=\"${datadir}/builtins.dsl\"
+-INCS=-I$(srcdir) -I$(srcdir)/../include -I$(spincludedir) -I$(spincludedir)/.. $(INCLUDE)
++INCS=-I$(srcdir) -I$(srcdir)/../include $(INCLUDE) -I$(spincludedir) -I$(spincludedir)/..
+ CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS)
+ CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS)
+ LDFLAGS=@LDFLAGS@
+diff -Nurd -x'*~' Makefile.lib.in Makefile.lib.in
+--- Makefile.lib.in 2002-01-22 06:57:53.000000000 -0500
++++ Makefile.lib.in 2007-04-23 03:40:08.000000000 -0400
+@@ -23,7 +23,7 @@
+ echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
+
+ lib$(LIB).la: $(LT_OBJS)
+- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
++ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+ -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
+
+ install:
+diff -Nurd -x'*~' Makefile.prog.in Makefile.prog.in
+--- Makefile.prog.in 2002-01-22 06:57:53.000000000 -0500
++++ Makefile.prog.in 2007-04-23 03:40:08.000000000 -0400
+@@ -12,14 +12,14 @@
+
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++ echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+
+ all: $(PROG)
+
+ $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
+- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(LIBS)
+
+ install: $(PROG)
+ -test -d $(DESTDIR)$(bindir) || \
+diff -Nurd -x'*~' config/ltmain.sh config/ltmain.sh
+--- config/ltmain.sh 2002-01-17 08:45:52.000000000 -0500
++++ config/ltmain.sh 2007-04-23 03:40:08.000000000 -0400
+@@ -2858,6 +2858,11 @@
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval cmds=\"$archive_expsym_cmds\"
+ else
++ if test "x$verstring" = "x0.0"; then
++ tmp_verstring=
++ else
++ tmp_verstring="$verstring"
++ fi
+ eval cmds=\"$archive_cmds\"
+ fi
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+@@ -3913,10 +3918,10 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test $need_relink = yes; then
+- $echo >> $output "\
+-relink_command=\"$relink_command\""
+- fi
++# if test "$installed" = no && test $need_relink = yes; then
++# $echo >> $output "\
++#relink_command=\"$relink_command\""
++# fi
+ done
+ fi
+
+diff -Nurd -x'*~' configure configure
+--- configure 2002-12-01 11:18:40.000000000 -0500
++++ configure 2007-04-23 03:40:08.000000000 -0400
+@@ -3063,8 +3063,8 @@
+
+
+ case "${host}" in
+- *-*-darwin*)
+- LINKFLAGS="-no-undefined"
++ *darwin*)
++ LINKFLAGS="-allow-undefined"
+ ;;
+ *)
+ if test "$GXX"
+@@ -7907,11 +7907,11 @@
+ ;;
+
+ darwin* | rhapsody*)
+- allow_undefined_flag='-undefined suppress'
++ allow_undefined_flag='-undefined suppress -flat_namespace'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
++ archive_cmds='$CXX $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libs $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
+ # We need to add '_' to the symbols in $export_symbols first
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+ hardcode_direct=yes
+@@ -9366,6 +9366,10 @@
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC
+
++# The c++ compiler
++
++CXX=$ac_ct_CXX
++
+ # The linker used to build libraries.
+ LD=$lt_LD
+
+diff -Nurd -x'*~' spgrove/Makefile.sub spgrove/Makefile.sub
+--- spgrove/Makefile.sub 2002-11-15 17:46:50.000000000 -0500
++++ spgrove/Makefile.sub 2007-04-23 03:43:23.000000000 -0400
+@@ -1,8 +1,7 @@
+ LTVERSION=0:1:0
+ LIB=ospgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
+- -L$(TOP)/lib -L$(TOP)/lib/.libs \
++DEPLIBS=-lm \
+ $(LIB_THREADS)
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
+ GENSRCS=grove_inst.cxx
+diff -Nurd -x'*~' style/Makefile.sub style/Makefile.sub
+--- style/Makefile.sub 2002-11-15 17:46:50.000000000 -0500
++++ style/Makefile.sub 2007-04-23 03:44:04.000000000 -0400
+@@ -1,8 +1,6 @@
+ LTVERSION=0:1:0
+ LIB=ostyle
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
+- -L$(TOP)/lib -L$(TOP)/lib/.libs \
+- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs
++DEPLIBS=-lm
+ OBJS=LangObj.o \
+ Collector.o \
+ DssslApp.o \
+diff -Naur jade/TeXFOTBuilder.cxx jade/TeXFOTBuilder.cxx
+--- jade/TeXFOTBuilder.cxx 2002-01-15 10:35:37.000000000 +0000
++++ jade/TeXFOTBuilder.cxx 2011-03-30 09:39:46.000000000 +0000
+@@ -75,6 +75,7 @@
+ virtual void end(TeXFOTBuilder &) const = 0;
+ };
+ class PageFloatFlowObj : public TeXCompoundExtensionFlowObj {
++ public:
+ void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+ fotb.startPageFloat(nic_);
+ }
+@@ -88,12 +89,14 @@
+ value.convertString(nic_.placement);
+ }
+ ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
++ PageFloatFlowObj() {}
+ private:
+ PageFloatNIC nic_;
+ StringC name_;
+ StringC placement;
+ };
+ class PageFootnoteFlowObj : public TeXCompoundExtensionFlowObj {
++ public:
+ void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+ fotb.startPageFootnote();
+ }
+@@ -101,6 +104,7 @@
+ fotb.endPageFootnote();
+ }
+ ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
++ PageFootnoteFlowObj() {}
+ private:
+ };
+ //////////////////////////////////////////////////////////////////////
+diff -Naur jade/TransformFOTBuilder.cxx jade/TransformFOTBuilder.cxx
+--- jade/TransformFOTBuilder.cxx 2002-12-01 14:55:51.000000000 +0000
++++ jade/TransformFOTBuilder.cxx 2011-03-30 09:38:48.000000000 +0000
+@@ -51,6 +51,7 @@
+ value.convertString(name_);
+ }
+ ExtensionFlowObj *copy() const { return new EntityRefFlowObj(*this); }
++ EntityRefFlowObj() {}
+ private:
+ StringC name_;
+ };
+@@ -66,10 +67,12 @@
+ value.convertString(data_);
+ }
+ ExtensionFlowObj *copy() const { return new ProcessingInstructionFlowObj(*this); }
++ ProcessingInstructionFlowObj() {}
+ private:
+ StringC data_;
+ };
+ class EmptyElementFlowObj : public TransformExtensionFlowObj {
++ public:
+ void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+ if (nic_.gi.size() > 0)
+ fotb.emptyElement(nic_);
+@@ -98,10 +101,12 @@
+ }
+ }
+ ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
++ EmptyElementFlowObj() {}
+ private:
+ ElementNIC nic_;
+ };
+ class ElementFlowObj : public TransformCompoundExtensionFlowObj {
++ public:
+ void start(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+ if (nic_.gi.size() > 0)
+ fotb.startElement(nic_);
+@@ -133,10 +138,12 @@
+ }
+ }
+ ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
++ ElementFlowObj() {}
+ private:
+ ElementNIC nic_;
+ };
+ class EntityFlowObj : public TransformCompoundExtensionFlowObj {
++ public:
+ void start(TransformFOTBuilder &fotb, const NodePtr &) const {
+ fotb.startEntity(systemId_);
+ }
+@@ -150,10 +157,12 @@
+ value.convertString(systemId_);
+ }
+ ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
++ EntityFlowObj() {}
+ private:
+ StringC systemId_;
+ };
+ class DocumentTypeFlowObj : public TransformExtensionFlowObj {
++ public:
+ void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+ fotb.documentType(nic_);
+ }
+@@ -174,6 +183,7 @@
+ }
+ }
+ ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
++ DocumentTypeFlowObj() {}
+ private:
+ DocumentTypeNIC nic_;
+ };
+
</ins></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchdelete_la_filesdifffromrev128890trunkdportstextprocopenjadefilesdelete_la_filespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-delete_la_files.diff (from rev 128890, trunk/dports/textproc/openjade/files/delete_la_files.patch) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-delete_la_files.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-delete_la_files.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- Makefile.prog.in.orig 2013-09-02 18:50:59.000000000 -0700
++++ Makefile.prog.in 2013-09-02 18:52:56.000000000 -0700
+@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
+
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+- echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++ echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'|sed 's|libosp\.la|libosp.dylib|'` >Makefile.lt
+
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+
</ins></span></pre></div>
<a id="trunkdportstextprocopenjadefilespatchopenjadegetoptperldifffromrev128890trunkdportstextprocopenjadefilesopenjadegetoptperlpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/textproc/openjade/files/patch-openjade-getoptperl.diff (from rev 128890, trunk/dports/textproc/openjade/files/openjade-getoptperl.patch) (0 => 128893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/files/patch-openjade-getoptperl.diff (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-openjade-getoptperl.diff 2014-11-29 14:01:29 UTC (rev 128893)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl
+--- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200
++++ ./msggen.pl 2012-08-10 10:38:28.019081661 +0200
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+
+ use POSIX;
++use Getopt::Std;
+
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@ $gen_c = 0;
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+
</ins></span></pre>
</div>
</div>
</body>
</html>