From owner-freebsd-doc@FreeBSD.ORG  Tue Apr  8 15:24:57 2003
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CD6BA37B401; Tue,  8 Apr 2003 15:24:57 -0700 (PDT)
Received: from shrike.submonkey.net (pc1-cdif2-5-cust38.cdif.cable.ntl.com
	[81.101.150.38])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E5D0643F3F; Tue,  8 Apr 2003 15:24:54 -0700 (PDT)
	(envelope-from setantae@submonkey.net)
Received: from setantae by shrike.submonkey.net with local (Exim 4.12)
	id 1931WQ-000FSi-00; Tue, 08 Apr 2003 23:24:54 +0100
Date: Tue, 8 Apr 2003 23:24:54 +0100
From: Ceri Davies <setantae@submonkey.net>
To: doc@FreeBSD.org, nik@FreeBSD.org
Message-ID: <20030408222454.GF49197@submonkey.net>
Mail-Followup-To: Ceri Davies <setantae@submonkey.net>,
	doc@FreeBSD.org, nik@FreeBSD.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="/Uq4LBwYP4y1W6pO"
Content-Disposition: inline
User-Agent: Mutt/1.5.4i
Sender: Ceri Davies <setantae@submonkey.net>
Subject: Patch to the textproc/docproj port
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2003 22:24:58 -0000


--/Uq4LBwYP4y1W6pO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline


In order to build with the STYLESHEET_TYPE set to xsl, the following patches
are necessary.  Any objections (specifically from Nik, as he's down as the
textproc/docproj maintainer) ?

Note that the tree still won't build with these patches, but it's stepping in
the right direction.

Thanks,

Ceri
-- 

--/Uq4LBwYP4y1W6pO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="docbookx.dtd"

Index: doc.docbook.mk
===================================================================
RCS file: /home/dcvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.79
diff -u -r1.79 doc.docbook.mk
--- doc.docbook.mk	8 Apr 2003 22:00:23 -0000	1.79
+++ doc.docbook.mk	8 Apr 2003 22:22:13 -0000
@@ -393,7 +393,7 @@
 # Better approaches to handling this would be most welcome
 
 ${DOC}.xml: ${SRCS}
-	echo '<!DOCTYPE book SYSTEM "/usr/local/share/xml/docbook/4.1.2/docbookx.dtd">' > ${DOC}.xml
+	echo '<!DOCTYPE book SYSTEM "/usr/local/share/xml/docbook/4.2/docbookx.dtd">' > ${DOC}.xml
 	${SX} -xlower -xndata ${MASTERDOC} 2> .sxerr | tail -n +2 >> ${DOC}.xml 
 	@-grep -v 'reference to internal SDATA entity' .sxerr
 

--/Uq4LBwYP4y1W6pO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=docproj

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/docproj/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	7 Mar 2003 06:11:39 -0000	1.41
+++ Makefile	8 Apr 2003 22:18:19 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docproj
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -30,7 +30,9 @@
 		${PREFIX}/bin/links:${PORTSDIR}/www/links1 \
 		${PREFIX}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
 		${PREFIX}/bin/scr2png:${PORTSDIR}/graphics/scr2png \
-		${PREFIX}/bin/scr2txt:${PORTSDIR}/textproc/scr2txt
+		${PREFIX}/bin/scr2txt:${PORTSDIR}/textproc/scr2txt \
+		${PREFIX}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		${PREFIX}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 
 .if defined(WITH_OPENJADE) || ${MACHINE_ARCH} != "i386"
 RUN_DEPENDS+=	openjade:${PORTSDIR}/textproc/openjade

--/Uq4LBwYP4y1W6pO--