[115260] trunk/dports/textproc/openjade
jeremyhu at macports.org
jeremyhu at macports.org
Mon Dec 30 01:24:37 PST 2013
Revision: 115260
https://trac.macports.org/changeset/115260
Author: jeremyhu at macports.org
Date: 2013-12-30 01:24:36 -0800 (Mon, 30 Dec 2013)
Log Message:
-----------
openjade: Build with clang
Build fix comes from Jack Howard by way of fink:
http://sourceforge.net/p/fink/package-submissions/3983/
Modified Paths:
--------------
trunk/dports/textproc/openjade/Portfile
Added Paths:
-----------
trunk/dports/textproc/openjade/files/clang.patch
Removed Paths:
-------------
trunk/dports/textproc/openjade/files/patch-Makefile.lib.in
trunk/dports/textproc/openjade/files/patch-Makefile.prog.in
trunk/dports/textproc/openjade/files/patch-configure
trunk/dports/textproc/openjade/files/patch-ltmain.sh
Modified: trunk/dports/textproc/openjade/Portfile
===================================================================
--- trunk/dports/textproc/openjade/Portfile 2013-12-30 09:19:08 UTC (rev 115259)
+++ trunk/dports/textproc/openjade/Portfile 2013-12-30 09:24:36 UTC (rev 115260)
@@ -5,7 +5,7 @@
name openjade
version 1.3.2
-revision 5
+revision 6
categories textproc
license MIT
maintainers fourpalms.org:lockhart openmaintainer
@@ -20,10 +20,7 @@
checksums md5 7df692e3186109cc00db6825b777201e
-patchfiles patch-Makefile.lib.in \
- patch-Makefile.prog.in \
- patch-ltmain.sh \
- patch-configure \
+patchfiles clang.patch \
patch-GroveApp.h \
patch-GroveBuilder.cxx \
patch-Node.h \
@@ -33,22 +30,6 @@
depends_lib port:opensp
depends_run port:xmlcatmgr
-platform darwin {
- if {${os.major} >= 13} {
- # TODO: Test Mavericks once the clang build failures are addressed
-
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
-# TeXFOTBuilder.cxx:1876:48: error: default initialization of an object of const type 'const TeXFOTBuilder::PageFloatFlowObj' requires a user-provided default constructor
-compiler.blacklist *clang*
-
# xmlcatmgr as installed by MacPorts defaults to using
# ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
# SGML). For historic reasons, openjade expects the catalog to be in
Added: trunk/dports/textproc/openjade/files/clang.patch
===================================================================
--- trunk/dports/textproc/openjade/files/clang.patch (rev 0)
+++ trunk/dports/textproc/openjade/files/clang.patch 2013-12-30 09:24:36 UTC (rev 115260)
@@ -0,0 +1,245 @@
+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_;
+ };
+
Deleted: trunk/dports/textproc/openjade/files/patch-Makefile.lib.in
===================================================================
--- trunk/dports/textproc/openjade/files/patch-Makefile.lib.in 2013-12-30 09:19:08 UTC (rev 115259)
+++ trunk/dports/textproc/openjade/files/patch-Makefile.lib.in 2013-12-30 09:24:36 UTC (rev 115260)
@@ -1,11 +0,0 @@
---- Makefile.lib.in.orig Tue Jan 22 06:57:53 2002
-+++ Makefile.lib.in Tue Jun 11 15:54:36 2002
-@@ -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:
Deleted: trunk/dports/textproc/openjade/files/patch-Makefile.prog.in
===================================================================
--- trunk/dports/textproc/openjade/files/patch-Makefile.prog.in 2013-12-30 09:19:08 UTC (rev 115259)
+++ trunk/dports/textproc/openjade/files/patch-Makefile.prog.in 2013-12-30 09:24:36 UTC (rev 115260)
@@ -1,19 +0,0 @@
---- Makefile.prog.in.orig Tue Jan 22 06:57:53 2002
-+++ Makefile.prog.in Tue Jun 11 15:54:36 2002
-@@ -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) || \
Deleted: trunk/dports/textproc/openjade/files/patch-configure
===================================================================
--- trunk/dports/textproc/openjade/files/patch-configure 2013-12-30 09:19:08 UTC (rev 115259)
+++ trunk/dports/textproc/openjade/files/patch-configure 2013-12-30 09:24:36 UTC (rev 115260)
@@ -1,38 +0,0 @@
---- configure.orig Fri Jan 25 10:36:25 2002
-+++ configure Tue Jun 11 15:59:35 2002
-@@ -2877,8 +2877,8 @@
- test "$INSTALL" = "./config/install-sh -c" && INSTALL=`pwd`"/config/install-sh -c"
-
- case "${host}" in
-- *-*-darwin*)
-- LINKFLAGS="-no-undefined"
-+ *darwin*)
-+ LINKFLAGS="-allow-undefined"
- ;;
- *)
- if test "$GXX"
-@@ -7835,11 +7835,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
-@@ -9286,6 +9286,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
Deleted: trunk/dports/textproc/openjade/files/patch-ltmain.sh
===================================================================
--- trunk/dports/textproc/openjade/files/patch-ltmain.sh 2013-12-30 09:19:08 UTC (rev 115259)
+++ trunk/dports/textproc/openjade/files/patch-ltmain.sh 2013-12-30 09:24:36 UTC (rev 115260)
@@ -1,28 +0,0 @@
---- config/ltmain.sh.orig Thu Jan 17 08:45:52 2002
-+++ config/ltmain.sh Tue Jun 11 15:58:17 2002
-@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131230/5226554d/attachment.html>
More information about the macports-changes
mailing list