[20729] trunk/dports/textproc/openjade

source_changes at macosforge.org source_changes at macosforge.org
Wed Nov 22 21:44:15 PST 2006


Revision: 20729
          http://trac.macosforge.org/projects/macports/changeset/20729
Author:   markd at macports.org
Date:     2006-11-22 21:44:15 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Closes #8657.  Comment out lines that forced gcc3.  Added freebsd patches.

Modified Paths:
--------------
    trunk/dports/textproc/openjade/Portfile

Added Paths:
-----------
    trunk/dports/textproc/openjade/files/patch-GroveApp.h
    trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx
    trunk/dports/textproc/openjade/files/patch-Node.h

Modified: trunk/dports/textproc/openjade/Portfile
===================================================================
--- trunk/dports/textproc/openjade/Portfile	2006-11-23 05:12:56 UTC (rev 20728)
+++ trunk/dports/textproc/openjade/Portfile	2006-11-23 05:44:15 UTC (rev 20729)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		openjade
 version		1.3.2
-revision	1
+revision	2
 categories	textproc
 maintainers	kevin at opendarwin.org
 description	James Clark's implementation of DSSSL
@@ -18,17 +18,17 @@
 checksums	md5 7df692e3186109cc00db6825b777201e
 
 patchfiles	patch-Makefile.lib.in patch-Makefile.prog.in patch-ltmain.sh \
-		patch-configure
+		patch-configure patch-GroveApp.h patch-GroveBuilder.cxx patch-Node.h
 
-depends_lib	lib:libosp.3:opensp
-depends_run	bin:mkcatalog:mkcatalog
+depends_lib	port:opensp
+depends_run	port:mkcatalog
 
 configure.args	--enable-http --enable-html --enable-mif \
 		--disable-dependency-tracking \
 		--enable-default-catalog=${prefix}/share/sgml/catalog \
 		--datadir=${prefix}/share/sgml/openjade
 
-configure.env	LDFLAGS="-L${prefix}/lib" LIBS="-L${prefix}/lib" CC=gcc-3.3 CXX=g++-3.3 \
+configure.env	LDFLAGS="-L${prefix}/lib" LIBS="-L${prefix}/lib" \
 		CXXFLAGS="-I${prefix}/include -fno-rtti" 
 		#CXXFLAGS="-I${prefix}/include -no-cpp-precomp -fno-common -fno-rtti" 
 
@@ -42,7 +42,7 @@
 		  reinplace "s|^#pragma interface||g" ${worksrcpath}/grove/Node.h
 		  reinplace "s|^#pragma interface||g" ${worksrcpath}/msggen.pl
 		  reinplace "s|^#pragma interface||g" ${worksrcpath}/spgrove/GroveApp.h
-		  reinplace "s|CXX=|CXX=g++-3.3|g" ${worksrcpath}/libtool
+#		  reinplace "s|CXX=|CXX=g++-3.3|g" ${worksrcpath}/libtool
 }
 
 destroot.target	install install-man

Added: trunk/dports/textproc/openjade/files/patch-GroveApp.h
===================================================================
--- trunk/dports/textproc/openjade/files/patch-GroveApp.h	                        (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-GroveApp.h	2006-11-23 05:44:15 UTC (rev 20729)
@@ -0,0 +1,14 @@
+--- 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 {

Added: trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx
===================================================================
--- trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx	                        (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-GroveBuilder.cxx	2006-11-23 05:44:15 UTC (rev 20729)
@@ -0,0 +1,42 @@
+--- 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

Added: trunk/dports/textproc/openjade/files/patch-Node.h
===================================================================
--- trunk/dports/textproc/openjade/files/patch-Node.h	                        (rev 0)
+++ trunk/dports/textproc/openjade/files/patch-Node.h	2006-11-23 05:44:15 UTC (rev 20729)
@@ -0,0 +1,26 @@
+--- 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;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061122/590285c6/attachment.html


More information about the macports-changes mailing list