Add a mixture of Debian, FreeBSD and self made patches to make this

package build with the new toolchain. Bump the version number to 1.2.1nb4.

6 files changed, 66 insertions, 13 deletions

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 8589cf3679c..d0d3cf8bd34 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/10/05 10:02:53 tron Exp $
-# FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp
-#
+# $NetBSD: Makefile,v 1.16 2001/10/14 12:19:16 tron Exp $
 
 DISTNAME=	jade-1.2.1
-PKGNAME=	jade-1.2.1nb3
+PKGNAME=	jade-1.2.1nb4
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.jclark.com/pub/jade/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/jade/ \
@@ -14,12 +12,17 @@ MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.jclark.com/jade/
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
+PATCH_SITES=		http://ftp.debian.org/debian/pool/main/j/jade/
+PATCHFILES=		jade_1.2.1-18.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 CONFLICTS+=	sp-[0-9]*
 
-USE_BUILDLINK_ONLY=	yes
-GNU_CONFIGURE=		yes
-#USE_LIBINTL=		yes
-USE_LIBTOOL=		yes
+USE_BUILDLINK_ONLY=	YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+#USE_LIBINTL=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
 JADE_CATALOG_DIR=	${PREFIX}/share/sgml/jade/catalog
@@ -30,18 +33,24 @@ CONFIGURE_ARGS+=	--enable-mif
 
 CXXFLAGS+=		${CFLAGS}
 
+post-patch:
+	@${CHMOD} -R +w ${WRKSRC}
+	@${FIND} ${WRKSRC} -name '*.orig' -size 0c -type f | ${XARGS} ${RM}
+
 post-install:
 	@for prog in jade nsgmls sgmlnorm spam spent sx; do		\
 		${ECHO_MSG} "strip ${PREFIX}/bin/$${prog}";		\
 		strip ${PREFIX}/bin/$${prog};				\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/include/sp
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/sp
+	${INSTALL_DATA} ${WRKSRC}/include/*.cxx ${WRKSRC}/include/*.h \
+	  ${PREFIX}/include/sp
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jade
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${PREFIX}/share/doc/jade
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml/jade
-	${RM} ${WRKSRC}/dsssl/*jadetex.*	# installed by print/tex-jadetex!!!
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
+# Installed by print/tex-jadetex
+	${RM} ${PREFIX}/share/sgml/jade/*jadetex.*
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index 63509a83ff1..37dd6ec8b29 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.4 2001/08/29 15:36:28 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/10/14 12:19:16 tron Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 Size (jade-1.2.1.tar.gz) = 1092062 bytes
+SHA1 (jade_1.2.1-18.diff.gz) = b3d00e797239d061ef6063b44e9d3e14055da940
+Size (jade_1.2.1-18.diff.gz) = 121329 bytes
 SHA1 (patch-aa) = 11457de7520b6f1f473fb9b81aa9593d0987846b
 SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
 SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f
+SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f
+SHA1 (patch-af) = ef312d2f090bc32cdac60296d6b85940205da2a3
+SHA1 (patch-ag) = e6772fab67961e12ee8870a15763cde466b60636
diff --git a/textproc/jade/patches/patch-ae b/textproc/jade/patches/patch-ae
new file mode 100644
index 00000000000..b5ae63b912a
--- /dev/null
+++ b/textproc/jade/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/10/14 12:19:16 tron Exp $
+
+--- lib/assert.cxx.orig	Wed Apr 25 12:42:54 2001
++++ lib/assert.cxx	Wed Apr 25 12:43:26 2001
+@@ -6,7 +6,7 @@
+ #include "macros.h"
+ 
+ #ifdef __GNUG__
+-void exit (int __status) __THROW __attribute__ ((__noreturn__));
++void exit (int __status) throw () __attribute__ ((__noreturn__));
+ #endif
+ 
+ #ifdef SP_NAMESPACE
diff --git a/textproc/jade/patches/patch-af b/textproc/jade/patches/patch-af
new file mode 100644
index 00000000000..16148ce5709
--- /dev/null
+++ b/textproc/jade/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $
+
+--- spgrove/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
++++ spgrove/Makefile.sub	Sun Oct 14 13:58:15 2001
+@@ -1,6 +1,6 @@
+ LIB=spgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS)
++DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp $(LIB_THREADS)
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
+ GENSRCS=grove_inst.cxx
+ 
diff --git a/textproc/jade/patches/patch-ag b/textproc/jade/patches/patch-ag
new file mode 100644
index 00000000000..052fdafaf92
--- /dev/null
+++ b/textproc/jade/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $
+
+--- style/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
++++ style/Makefile.sub	Sun Oct 14 14:01:26 2001
+@@ -1,6 +1,6 @@
+ LIB=style
+-DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp 	\
+-  -L$(TOP)/spgrove/.libs -lspgrove
++DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp 	\
++  -L$(TOP)/spgrove -lspgrove
+ OBJS=Collector.o \
+   DssslApp.o \
+   DssslSpecEventHandler.o \
diff --git a/textproc/jade/pkg/PLIST b/textproc/jade/pkg/PLIST
index 60a3a457d2d..2d69e9a33d9 100644
--- a/textproc/jade/pkg/PLIST
+++ b/textproc/jade/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2001/09/02 17:07:01 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/10/14 12:19:17 tron Exp $
 bin/jade
 bin/nsgmls
 bin/sgmlnorm
@@ -76,7 +76,6 @@ include/sp/MessageReporter.h
 include/sp/MessageTable.h
 include/sp/Mode.h
 include/sp/NCVector.h
-include/sp/NCVector.sed
 include/sp/Named.h
 include/sp/NamedResource.h
 include/sp/NamedResourceTable.h
@@ -167,10 +166,12 @@ share/doc/jade/dsssl2.htm
 share/doc/jade/jade.htm
 share/doc/jade/mif.htm
 share/doc/jade/transform.htm
+share/sgml/jade/FOT.tex
 share/sgml/jade/Makefile.jadetex
 share/sgml/jade/catalog
 share/sgml/jade/demo.dsl
 share/sgml/jade/demo.sgm
+share/sgml/jade/demoMaster.tex
 share/sgml/jade/dsssl.dtd
 share/sgml/jade/fot.dtd
 share/sgml/jade/style-sheet.dtd