Update to 1.3.2:

Changes in OpenJade 1.3.2 (December 2002)

* Build against OpenSP 1.5

* Minor fixes to MIF backend

* Correct typo in definition of "attribute" in builtin.dsl (Toby Speight)

* Fix quoted of ampersand in XML/SGML transformations (Toby Speight)

Changes in OpenJade 1.3.1 (January 2002)

* Support for newer GNU source configuration tools (autoconf, libtool, automake)

* Support for newer GNU and Microsoft compilers

* Support for more/up to date platforms (Mac OS X, Darwin, BSD, Cygwin etc.)

* Numerous bug fixes to TeX backend for improved table support and two
  sided output. Two new external procedures two control double sided
  output (required by jadetex 3.4 or greater).

  "UNREGISTERED::OpenJade//Characteristic::page-two-side?"
  "UNREGISTERED::OpenJade//Characteristic::two-side-start-on-right?"

* Support for XML Byte Order Marks

Closes PR 22901.

7 files changed, 57 insertions, 147 deletions

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 58c49f38b97..4d76960f7b0 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/07/24 19:45:28 jlam Exp $
-# FreeBSD Id: ports/textproc/openjade/Makefile,v 1.30 2001/03/04 21:39:19 lioux Exp
+# $NetBSD: Makefile,v 1.4 2003/09/23 08:35:52 wiz Exp $
+#
 
-DISTNAME=	openjade-1.3
+DISTNAME=	openjade-1.3.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -9,12 +9,9 @@ MAINTAINER=	kogule@mars.dti.ne.jp
 HOMEPAGE=	http://openjade.sourceforge.net/
 COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
-PERL5_REQD=	5.6.0
-BUILD_DEPENDS+=	perl>=5.6.0:../../lang/perl5:build
-
-CONFLICTS+=	opensp-[0-9]*
-
+USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
+USE_PERL5=	build
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
@@ -24,13 +21,6 @@ CONFIGURE_ARGS+=	--enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \
 OPENJADE_DATA_DIR=	${PREFIX}/share/sgml/openjade
 OPENJADE_DOC_DIR=	${PREFIX}/share/doc/openjade
 
-# People say this software is not optimization safe.
-CFLAGS=	-O0
-
-# Building with Shared Libraries cannot handle MessageReporterMessages'
-# static member variables under NetBSD 1.5.
-CONFIGURE_ARGS+=	--disable-shared
-
 post-install:
 	${INSTALL_DATA_DIR} ${OPENJADE_DATA_DIR}/pubtext
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${OPENJADE_DATA_DIR}
@@ -43,4 +33,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${OPENJADE_DOC_DIR}/jadedoc
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/images/* ${OPENJADE_DOC_DIR}/jadedoc/images
 
+.include "../../textproc/opensp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/openjade/PLIST b/textproc/openjade/PLIST
index 773c2ecd821..2cf91b5b20f 100644
--- a/textproc/openjade/PLIST
+++ b/textproc/openjade/PLIST
@@ -1,54 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:28 zuntum Exp $
-bin/onsgmls
+@comment $NetBSD: PLIST,v 1.2 2003/09/23 08:35:52 wiz Exp $
 bin/openjade
-bin/osgmlnorm
-bin/ospam
-bin/ospent
-bin/osx
-lib/libosp.la
-lib/libosp.a
-lib/libogrove.la
 lib/libogrove.a
-lib/libospgrove.la
+lib/libogrove.la
+lib/libogrove.so
+lib/libogrove.so.0
+lib/libogrove.so.0.1
 lib/libospgrove.a
-lib/libostyle.la
+lib/libospgrove.la
+lib/libospgrove.so
+lib/libospgrove.so.0
+lib/libospgrove.so.0.1
 lib/libostyle.a
-share/sgml/openjade/ChangeLog
-share/sgml/openjade/Makefile.jadetex
-share/sgml/openjade/builtins.dsl
-share/sgml/openjade/catalog
-share/sgml/openjade/demo.dsl
-share/sgml/openjade/demo.sgm
-share/sgml/openjade/dsssl.dtd
-share/sgml/openjade/extensions.dsl
-share/sgml/openjade/fot.dtd
-share/sgml/openjade/jadetex.dtx
-share/sgml/openjade/jadetex.ini
-share/sgml/openjade/jadetex.ins
-share/sgml/openjade/pdfjadetex.ini
-share/sgml/openjade/style-sheet.dtd
-share/sgml/openjade/unicode.sty
-share/sgml/openjade/pubtext/HTML32.dcl
-share/sgml/openjade/pubtext/HTML32.dtd
-share/sgml/openjade/pubtext/HTML32.soc
-share/sgml/openjade/pubtext/HTML4-f.dtd
-share/sgml/openjade/pubtext/HTML4-s.dtd
-share/sgml/openjade/pubtext/HTML4.dcl
-share/sgml/openjade/pubtext/HTML4.dtd
-share/sgml/openjade/pubtext/HTML4.soc
-share/sgml/openjade/pubtext/HTMLlat1.ent
-share/sgml/openjade/pubtext/HTMLspec.ent
-share/sgml/openjade/pubtext/HTMLsym.ent
-share/sgml/openjade/pubtext/ISOlat1.ent
-share/sgml/openjade/pubtext/ISOlat1.sgm
-share/sgml/openjade/pubtext/html-1.dtd
-share/sgml/openjade/pubtext/html-1s.dtd
-share/sgml/openjade/pubtext/html-s.dtd
-share/sgml/openjade/pubtext/html.dcl
-share/sgml/openjade/pubtext/html.dtd
-share/sgml/openjade/pubtext/html.soc
-share/sgml/openjade/pubtext/xml.dcl
-share/sgml/openjade/pubtext/xml.soc
+lib/libostyle.la
+lib/libostyle.so
+lib/libostyle.so.0
+lib/libostyle.so.0.1
 share/doc/openjade/doc/archform.htm
 share/doc/openjade/doc/build.htm
 share/doc/openjade/doc/catalog.htm
@@ -72,18 +38,49 @@ share/doc/openjade/jadedoc/autoconf.htm
 share/doc/openjade/jadedoc/contributors.htm
 share/doc/openjade/jadedoc/copying.txt
 share/doc/openjade/jadedoc/dsssl2.htm
+share/doc/openjade/jadedoc/images/background.gif
+share/doc/openjade/jadedoc/images/dsssltitle.gif
+share/doc/openjade/jadedoc/images/space.gif
+share/doc/openjade/jadedoc/images/top-of-page.gif
 share/doc/openjade/jadedoc/index.htm
 share/doc/openjade/jadedoc/mif.htm
 share/doc/openjade/jadedoc/rtf.htm
 share/doc/openjade/jadedoc/tex.htm
 share/doc/openjade/jadedoc/transform.htm
 share/doc/openjade/jadedoc/xmlfo.htm
-share/doc/openjade/jadedoc/images/background.gif
-share/doc/openjade/jadedoc/images/dsssltitle.gif
-share/doc/openjade/jadedoc/images/space.gif
-share/doc/openjade/jadedoc/images/top-of-page.gif
+share/sgml/openjade/README.jadetex
+share/sgml/openjade/builtins.dsl
+share/sgml/openjade/catalog
+share/sgml/openjade/demo.dsl
+share/sgml/openjade/demo.sgm
+share/sgml/openjade/dsssl.dtd
+share/sgml/openjade/extensions.dsl
+share/sgml/openjade/fot.dtd
+share/sgml/openjade/pubtext/HTML32.dcl
+share/sgml/openjade/pubtext/HTML32.dtd
+share/sgml/openjade/pubtext/HTML32.soc
+share/sgml/openjade/pubtext/HTML4-f.dtd
+share/sgml/openjade/pubtext/HTML4-s.dtd
+share/sgml/openjade/pubtext/HTML4.dcl
+share/sgml/openjade/pubtext/HTML4.dtd
+share/sgml/openjade/pubtext/HTML4.soc
+share/sgml/openjade/pubtext/HTMLlat1.ent
+share/sgml/openjade/pubtext/HTMLspec.ent
+share/sgml/openjade/pubtext/HTMLsym.ent
+share/sgml/openjade/pubtext/ISOlat1.ent
+share/sgml/openjade/pubtext/ISOlat1.sgm
+share/sgml/openjade/pubtext/html-1.dtd
+share/sgml/openjade/pubtext/html-1s.dtd
+share/sgml/openjade/pubtext/html-s.dtd
+share/sgml/openjade/pubtext/html.dcl
+share/sgml/openjade/pubtext/html.dtd
+share/sgml/openjade/pubtext/html.soc
+share/sgml/openjade/pubtext/xml.dcl
+share/sgml/openjade/pubtext/xml.soc
+share/sgml/openjade/style-sheet.dtd
 @dirrm share/sgml/openjade/pubtext
 @dirrm share/sgml/openjade
+@unexec ${RMDIR} %D/share/sgml 2>/dev/null || ${TRUE}
 @dirrm share/doc/openjade/doc
 @dirrm share/doc/openjade/jadedoc/images
 @dirrm share/doc/openjade/jadedoc
diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index f9662b6e80c..6371875e097 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/01/10 16:11:39 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/09/23 08:35:52 wiz Exp $
 
-SHA1 (openjade-1.3.tar.gz) = 971b43152272e3add4534255c441628538a416e3
-Size (openjade-1.3.tar.gz) = 1165688 bytes
-SHA1 (patch-aa) = 28a3262a6f40668a35feb96525135efd3d50a819
-SHA1 (patch-ab) = fd8cb20d1c7bb76738d45398a4f2ce5d6d7616fa
-SHA1 (patch-ac) = 1742175ec89ea8e796b4e874a488225850cf78e1
-SHA1 (patch-ad) = ee2cdceb20ae8c7dd4dfa646d9da7e853f26b02d
+SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
+Size (openjade-1.3.2.tar.gz) = 894834 bytes
diff --git a/textproc/openjade/patches/patch-aa b/textproc/openjade/patches/patch-aa
deleted file mode 100644
index 5498291b548..00000000000
--- a/textproc/openjade/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 10:52:27 agc Exp $
-
---- style/LangObj.cxx~	Fri Jul  2 07:49:58 1999
-+++ style/LangObj.cxx	Tue May 16 12:59:00 2000
-@@ -12,11 +12,11 @@
- #include <string.h>
- #include <ctype.h>
- #include <string.h>
--#include <wchar.h>
--#include <wctype.h>
- 
- #ifdef SP_HAVE_LOCALE
- #include <locale.h>
-+#include <wchar.h>
-+#include <wctype.h>
- #endif
- 
- #ifdef DSSSL_NAMESPACE
diff --git a/textproc/openjade/patches/patch-ab b/textproc/openjade/patches/patch-ab
deleted file mode 100644
index b8580609682..00000000000
--- a/textproc/openjade/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 10:52:27 agc Exp $
-
---- configure.orig	Wed Sep  1 16:25:58 1999
-+++ configure	Tue May 16 15:39:23 2000
-@@ -1943,15 +1943,15 @@
- rm -f conftest*
- fi
- 
--if eval "test \"`echo '$ac_cv_func_'setlocale`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define SP_HAVE_LOCALE 1
--EOF
--
--else
--  echo "$ac_t""no" 1>&6
--fi
-+# if eval "test \"`echo '$ac_cv_func_'setlocale`\" = yes"; then
-+#   echo "$ac_t""yes" 1>&6
-+#   cat >> confdefs.h <<\EOF
-+# #define SP_HAVE_LOCALE 1
-+# EOF
-+#
-+# else
-+#   echo "$ac_t""no" 1>&6
-+# fi
- 
- echo $ac_n "checking for gettext""... $ac_c" 1>&6
- echo "configure:1958: checking for gettext" >&5
diff --git a/textproc/openjade/patches/patch-ac b/textproc/openjade/patches/patch-ac
deleted file mode 100644
index 35429ac229b..00000000000
--- a/textproc/openjade/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 10:52:27 agc Exp $
-
---- style/Interpreter.cxx.orig	Thu Oct  1 07:14:54 1998
-+++ style/Interpreter.cxx
-@@ -184,7 +184,8 @@
-   };
-   size_t nUnits = dsssl2() ? SIZEOF(units) : SIZEOF(units) - 1;
-   for (size_t i = 0; i < nUnits; i++) {
--    Unit *unit = lookupUnit(makeStringC(units[i].name));
-+    StringC temp = makeStringC(units[i].name); /* temp var to work around */
-+    Unit *unit = lookupUnit(temp);	       /* compiler prob(?) */
-     long n = unitsPerInch_ * units[i].numer;
-     if (n % units[i].denom == 0)
-       unit->setValue(long(n / units[i].denom));
diff --git a/textproc/openjade/patches/patch-ad b/textproc/openjade/patches/patch-ad
deleted file mode 100644
index 148e322e6bd..00000000000
--- a/textproc/openjade/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/01/10 16:11:40 wiz Exp $
-
---- lib/parser_inst.m4.orig	Fri Aug 20 09:05:33 1999
-+++ lib/parser_inst.m4
-@@ -166,7 +166,7 @@ __instantiate(Vector<Transition>)
- __instantiate(Vector<LeafContentToken*>)
- __instantiate(Vector<size_t>)
-  // we really just want to test if size_t == unsigned int
--#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
-+#if defined(__NetBSD__) && (defined(__alpha__) || defined(__arm__) || defined(__vax__) || defined(__sparc__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sh5__))
- __instantiate(Vector<unsigned int>)
- #endif
-