* Fix our netbsd-doc-print package to properly handle the italian

   version of Federico Lupi's guide by including italian language in
   the right file. Hint:
   http://lists.oasis-open.org/archives/docbook/200002/msg00214.html

 * While there, install the jadetex files not in the textproc/jade
   package, but in the print/jadetex package. That's where we also
   build and install the jadetex.fmt file, so things actually fit
   together.

 * Bump some pkg versions:
   print/jadetex		-> jadetex-2.20nb1
   textproc/jade		-> jade-1.2.1nb3
   meta-pkgs/netbsd-doc		-> netbsd-doc-1.2
   meta-pkgs/netbsd-doc-print	-> netbsd-doc-print-1.1

8 files changed, 46 insertions, 17 deletions

diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index b87c9882e1a..9b4e8959359 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/02 17:07:03 hubertf Exp $
 #
 
-DISTNAME=	netbsd-doc-print-1.0
+DISTNAME=	netbsd-doc-print-1.1
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,9 +9,9 @@ DISTFILES=	# empty
 MAINTAINER=	hubertf@netbsd.org
 COMMENT=	Meta-pkg including all pkgs to convert SGML->PDF/PS
 
-DEPENDS+=	jadetex>=2.20:../../print/jadetex
+DEPENDS+=	jadetex>=2.20nb1:../../print/jadetex
 DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
-DEPENDS+=	netbsd-doc-1.1:../netbsd-doc
+DEPENDS+=	netbsd-doc-1.2:../netbsd-doc
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/meta-pkgs/netbsd-doc/Makefile b/meta-pkgs/netbsd-doc/Makefile
index db6d38c8dee..a11e4a9403c 100644
--- a/meta-pkgs/netbsd-doc/Makefile
+++ b/meta-pkgs/netbsd-doc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/02 17:07:02 hubertf Exp $
 #
 
-DISTNAME=	netbsd-doc-1.1
+DISTNAME=	netbsd-doc-1.2
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,7 +10,7 @@ MAINTAINER=	hubertf@netbsd.org
 COMMENT=	Meta-pkg including all pkgs to convert SGML->HTML
 
 DEPENDS+=	opensp>=1.4:../../textproc/opensp
-DEPENDS+=	jade>=1.2.1:../../textproc/jade
+DEPENDS+=	jade>=1.2.1nb3:../../textproc/jade
 DEPENDS+=	docbook>=4.0:../../textproc/docbook
 DEPENDS+=	iso8879-1986:../../textproc/iso8879
 DEPENDS+=	iso12083-1993:../../textproc/iso12083
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index dc8fe381800..85e4c39b557 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:51:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/02 17:07:02 hubertf Exp $
 #
 
 DISTNAME=	jadetex-2.20
+PKGNAME=	${DISTNAME}nb1
 CATEGORIES=	print
 MASTER_SITES=	http://www.tug.org/applications/jadetex/
 EXTRACT_SUFX=	.zip
@@ -37,5 +38,14 @@ do-install:
 	for i in ${WRKSRC}/test/* ; do \
 		${INSTALL_MAN} $$i ${PREFIX}/share/examples/jadetex; \
 	done
+	:
+	: Complete the set that the textproc/jade pkg started. We
+	: use our files here as that is what the jadetex.fmt file is
+	: really made from:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml/jade
+	${INSTALL_DATA} ${WRKSRC}/jadetex.dtx ${PREFIX}/share/sgml/jade
+	${INSTALL_DATA} ${WRKSRC}/jadetex.ini ${PREFIX}/share/sgml/jade
+	${INSTALL_DATA} ${WRKSRC}/jadetex.ins ${PREFIX}/share/sgml/jade
+	${INSTALL_DATA} ${WRKSRC}/pdfjadetex.ini ${PREFIX}/share/sgml/jade
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/jadetex/distinfo b/print/jadetex/distinfo
index 78f060ae287..46ead6e0b09 100644
--- a/print/jadetex/distinfo
+++ b/print/jadetex/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:51 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/02 17:07:02 hubertf Exp $
 
 SHA1 (jadetex-2.20.zip) = 235d90328e6d5d7e231a7908ebfb1b132c3f6892
 Size (jadetex-2.20.zip) = 152421 bytes
+SHA1 (patch-aa) = c59aeec58f8def3e1a608e6a46ead1281f7ce96a
diff --git a/print/jadetex/patches/patch-aa b/print/jadetex/patches/patch-aa
new file mode 100644
index 00000000000..c7fa0a97736
--- /dev/null
+++ b/print/jadetex/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2001/09/02 17:07:02 hubertf Exp $
+
+per http://lists.oasis-open.org/archives/docbook/200002/msg00214.html
+
+
+--- jadetex.dtx.orig	Tue Jun 20 10:13:31 2000
++++ jadetex.dtx
+@@ -130,7 +130,7 @@
+ \def\TeXFOTversion{0.0} 
+ \makeatletter
+ \ifx\pushocplist\@undefined
+- \RequirePackage[portuguese,brazil,spanish,german,frenchb,english]{babel}[1997/01/23]
++ \RequirePackage[portuguese,brazil,spanish,german,frenchb,english,italian]{babel}[1997/01/23]
+  \RequirePackage[implicit=true,colorlinks,linkcolor=black,bookmarks=true]{hyperref}[2000/03/01]
+  \def\PDFBorders{0 0 0}
+  \RequirePackage[dsssl]{inputenc}[1997/12/20]
diff --git a/print/jadetex/pkg/PLIST b/print/jadetex/pkg/PLIST
index 300641b4156..0b4bbdc0e31 100644
--- a/print/jadetex/pkg/PLIST
+++ b/print/jadetex/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/11/27 22:59:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/09/02 17:07:02 hubertf Exp $
 bin/jadetex
 bin/pdfjadetex
 @exec cp %D/share/texmf/web2c/texmf.cnf %D/share/texmf/web2c/texmf.cnf-before-jadetex
@@ -50,6 +50,11 @@ share/examples/jadetex/span.tex
 share/examples/jadetex/tables.sgm
 share/examples/jadetex/test-tables.sgm
 share/examples/jadetex/test-tables.tex
+share/sgml/jade/jadetex.dtx
+share/sgml/jade/jadetex.ini
+share/sgml/jade/jadetex.ins
+share/sgml/jade/pdfjadetex.ini
+@dirrm share/sgml/jade
 @dirrm share/examples/jadetex
 @dirrm share/texmf/tex/jadetex
 @unexec %D/bin/mktexlsr
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 0b53e5c1f55..b712429ad44 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/06/25 03:47:38 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/02 17:07:01 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp
 #
 
 DISTNAME=	jade-1.2.1
-PKGNAME=	jade-1.2.1nb2
+PKGNAME=	jade-1.2.1nb3
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.jclark.com/pub/jade/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/jade/ \
@@ -40,6 +40,7 @@ post-install:
 	${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/jadetex!!!
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
 
 .include "../../devel/gettext-lib/buildlink.mk"
diff --git a/textproc/jade/pkg/PLIST b/textproc/jade/pkg/PLIST
index 41c8fc91a61..60a3a457d2d 100644
--- a/textproc/jade/pkg/PLIST
+++ b/textproc/jade/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/05/10 09:59:44 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/09/02 17:07:01 hubertf Exp $
 bin/jade
 bin/nsgmls
 bin/sgmlnorm
@@ -173,10 +173,6 @@ share/sgml/jade/demo.dsl
 share/sgml/jade/demo.sgm
 share/sgml/jade/dsssl.dtd
 share/sgml/jade/fot.dtd
-share/sgml/jade/jadetex.dtx
-share/sgml/jade/jadetex.ini
-share/sgml/jade/jadetex.ins
-share/sgml/jade/pdfjadetex.ini
 share/sgml/jade/style-sheet.dtd
 @dirrm share/sgml/jade
 @dirrm share/sgml