diff options
author | adam <adam@pkgsrc.org> | 2011-04-22 07:27:45 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2011-04-22 07:27:45 +0000 |
commit | bb091e3a08a125fe29c4aff4dd72b8c2d39f2b1a (patch) | |
tree | 17294b02aa33d9307edda8661acecf806c373af3 /textproc/openjade | |
parent | d564048c6961ae2c415401f724d9b153b9c6ecf3 (diff) | |
download | pkgsrc-bb091e3a08a125fe29c4aff4dd72b8c2d39f2b1a.tar.gz |
Fix building with Clang; added LICENSE; pkglint clean-up
Diffstat (limited to 'textproc/openjade')
-rw-r--r-- | textproc/openjade/Makefile | 23 | ||||
-rw-r--r-- | textproc/openjade/distinfo | 4 | ||||
-rw-r--r-- | textproc/openjade/patches/patch-jade_TeXFOTBuilder.cxx | 17 | ||||
-rw-r--r-- | textproc/openjade/patches/patch-jade_TransformFOTBuilder.cxx | 25 |
4 files changed, 56 insertions, 13 deletions
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile index 51d12b79699..288640f031b 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/09/29 09:01:41 abs Exp $ -# +# $NetBSD: Makefile,v 1.21 2011/04/22 07:27:45 adam Exp $ DISTNAME= openjade-1.3.2 PKGREVISION= 5 @@ -9,18 +8,18 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openjade/} MAINTAINER= kogule@mars.dti.ne.jp HOMEPAGE= http://openjade.sourceforge.net/ COMMENT= SGML/XML parser toolkit and DSSSL engine, successor to "jade" +LICENSE= mit PKG_DESTDIR_SUPPORT= user-destdir - -USE_TOOLS+= gmake perl -USE_LANGUAGES= c c++ -USE_LIBTOOL= YES -GNU_CONFIGURE= YES -MAKE_JOBS_SAFE= no - -CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q} -CONFIGURE_ARGS+= --enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \ - --datadir=${OPENJADE_DATA_DIR:Q} +MAKE_JOBS_SAFE= no + +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_TOOLS+= gmake perl +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --datadir=${OPENJADE_DATA_DIR} +CONFIGURE_ARGS+= --enable-default-catalog=${OPENJADE_DATA_DIR}/catalog +CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q} SGML_CATALOGS= ${PREFIX}/share/sgml/openjade/catalog diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo index ca88d1adfde..0302f04214f 100644 --- a/textproc/openjade/distinfo +++ b/textproc/openjade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2009/01/11 09:09:09 minskim Exp $ +$NetBSD: distinfo,v 1.11 2011/04/22 07:27:45 adam Exp $ SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 @@ -9,3 +9,5 @@ SHA1 (patch-ac) = 535d81d8c04e5133878e329b274a00b910c61c96 SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637 SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285 SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5 +SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4 +SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d diff --git a/textproc/openjade/patches/patch-jade_TeXFOTBuilder.cxx b/textproc/openjade/patches/patch-jade_TeXFOTBuilder.cxx new file mode 100644 index 00000000000..b7a3df73c3a --- /dev/null +++ b/textproc/openjade/patches/patch-jade_TeXFOTBuilder.cxx @@ -0,0 +1,17 @@ +$NetBSD: patch-jade_TeXFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $ + +Fix building with Clang. + +--- jade/TeXFOTBuilder.cxx.orig 2011-04-22 07:00:24.000000000 +0000 ++++ jade/TeXFOTBuilder.cxx +@@ -1873,8 +1873,8 @@ static OutputByteStream &operator<<(Outp + FOTBuilder *makeTeXFOTBuilder(OutputByteStream *os, Messenger *mgr, + const FOTBuilder::Extension *&ext) + { +- static const TeXFOTBuilder::PageFloatFlowObj pageFloat; +- static const TeXFOTBuilder::PageFootnoteFlowObj pageFootnote; ++ static TeXFOTBuilder::PageFloatFlowObj pageFloat; ++ static TeXFOTBuilder::PageFootnoteFlowObj pageFootnote; + static const FOTBuilder::Extension extensions[] = { + { + "UNREGISTERED::Sebastian Rahtz//Flow Object Class::page-float", diff --git a/textproc/openjade/patches/patch-jade_TransformFOTBuilder.cxx b/textproc/openjade/patches/patch-jade_TransformFOTBuilder.cxx new file mode 100644 index 00000000000..2b13e2cc5f1 --- /dev/null +++ b/textproc/openjade/patches/patch-jade_TransformFOTBuilder.cxx @@ -0,0 +1,25 @@ +$NetBSD: patch-jade_TransformFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $ + +Fix building with Clang. + +--- jade/TransformFOTBuilder.cxx.orig 2011-04-22 07:04:25.000000000 +0000 ++++ jade/TransformFOTBuilder.cxx +@@ -248,12 +248,12 @@ FOTBuilder *makeTransformFOTBuilder(CmdL + const Vector<StringC> &options, + const FOTBuilder::Extension *&ext) + { +- static const TransformFOTBuilder::ProcessingInstructionFlowObj pi; +- static const TransformFOTBuilder::ElementFlowObj element; +- static const TransformFOTBuilder::EmptyElementFlowObj emptyElement; +- static const TransformFOTBuilder::EntityFlowObj entity; +- static const TransformFOTBuilder::EntityRefFlowObj entityRef; +- static const TransformFOTBuilder::DocumentTypeFlowObj documentType; ++ static TransformFOTBuilder::ProcessingInstructionFlowObj pi; ++ static TransformFOTBuilder::ElementFlowObj element; ++ static TransformFOTBuilder::EmptyElementFlowObj emptyElement; ++ static TransformFOTBuilder::EntityFlowObj entity; ++ static TransformFOTBuilder::EntityRefFlowObj entityRef; ++ static TransformFOTBuilder::DocumentTypeFlowObj documentType; + static const FOTBuilder::Extension extensions[] = { + { + "UNREGISTERED::James Clark//Flow Object Class::processing-instruction", |