From owner-freebsd-doc Sat Nov 9 14:13:36 2002 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 35F7837B401 for ; Sat, 9 Nov 2002 14:13:33 -0800 (PST) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 128E043E77 for ; Sat, 9 Nov 2002 14:13:32 -0800 (PST) (envelope-from tmoestl@gmx.net) Received: (qmail 26195 invoked by uid 0); 9 Nov 2002 22:13:30 -0000 Received: from p5086febf.dip.t-dialin.net (HELO forge.local) (80.134.254.191) by mail.gmx.net (mp019-rz3) with SMTP; 9 Nov 2002 22:13:30 -0000 Received: from tmm by forge.local with local (Exim 4.10 #1) id 18AdrD-0000xw-00; Sat, 09 Nov 2002 23:13:35 +0100 Date: Sat, 9 Nov 2002 23:13:34 +0100 From: Thomas Moestl To: Greg Lewis Cc: doc@FreeBSD.ORG Subject: Re: Please review: small patches for building documentation on FreeBSD/sparc64 Message-ID: <20021109221334.GB316@crow.dom2ip.de> References: <20021106150326.GA334@crow.dom2ip.de> <20021107080342.A48030@misty.eyesbeyond.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="9amGYk9869ThD9tj" Content-Disposition: inline In-Reply-To: <20021107080342.A48030@misty.eyesbeyond.com> User-Agent: Mutt/1.4i Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, 2002/11/07 at 08:03:43 +1030, Greg Lewis wrote: > On Wed, Nov 06, 2002 at 04:03:26PM +0100, Thomas Moestl wrote: > > -.if ${MACHINE_ARCH} == "alpha" > > +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" > > Might it be better to convert this and similar logic to check for "i386" > and activate jade in that case (effectively making openjade the default)? > Particularly if people think ia64 is likely to also use openjade. Sounds reasonable. I've attached the new patches, which I would like to commit soonish unless there are objections. Thanks, - Thomas -- Thomas Moestl http://www.tu-bs.de/~y0015675/ http://people.FreeBSD.org/~tmm/ PGP fingerprint: 1C97 A604 2BD0 E492 51D0 9C0F 1FE6 4F1D 419C 776C --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="doc2.diff" Index: share/mk/doc.docbook.mk =================================================================== RCS file: /d/ncvs/doc/share/mk/doc.docbook.mk,v retrieving revision 1.70 diff -u -r1.70 doc.docbook.mk --- share/mk/doc.docbook.mk 28 Oct 2002 19:44:08 -0000 1.70 +++ share/mk/doc.docbook.mk 4 Nov 2002 11:30:54 -0000 @@ -105,7 +105,7 @@ # Which stylesheet type to use. 'dsssl' or 'xsl' STYLESHEET_TYPE?= dsssl -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} != "i386" OPENJADE= yes .endif Index: share/mk/doc.html.mk =================================================================== RCS file: /d/ncvs/doc/share/mk/doc.html.mk,v retrieving revision 1.12 diff -u -r1.12 doc.html.mk --- share/mk/doc.html.mk 7 Jul 2002 05:05:46 -0000 1.12 +++ share/mk/doc.html.mk 4 Nov 2002 11:30:54 -0000 @@ -51,7 +51,7 @@ IMAGES_LIB?= -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} != "i386" OPENJADE= yes .endif --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="rel2.diff" Index: Makefile.inc.docports =================================================================== RCS file: /d/ncvs/src/release/Makefile.inc.docports,v retrieving revision 1.15 diff -u -r1.15 Makefile.inc.docports --- Makefile.inc.docports 30 Oct 2002 09:20:50 -0000 1.15 +++ Makefile.inc.docports 6 Nov 2002 14:34:10 -0000 @@ -37,6 +37,7 @@ ports/graphics/scr2png \ ports/textproc/scr2txt \ ports/graphics/tiff \ + ports/lang/perl5 \ ports/print/freetype2 \ ports/print/ghostscript-gnu \ ports/textproc/docbook \ @@ -61,7 +62,7 @@ .if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 ) MINIMALDOCPORTS+= ports/textproc/sed_inplace .endif -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} != "i386" MINIMALDOCPORTS+= ports/textproc/openjade .else MINIMALDOCPORTS+= ports/textproc/jade --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ports-s2.diff" Index: textproc/docproj/Makefile =================================================================== RCS file: /d/ncvs/ports/textproc/docproj/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- textproc/docproj/Makefile 28 Oct 2002 19:40:54 -0000 1.39 +++ textproc/docproj/Makefile 4 Nov 2002 11:35:52 -0000 @@ -31,7 +31,7 @@ ${PREFIX}/bin/scr2png:${PORTSDIR}/graphics/scr2png \ ${PREFIX}/bin/scr2txt:${PORTSDIR}/textproc/scr2txt -.if defined(WITH_OPENJADE) || ${MACHINE_ARCH} == "alpha" +.if defined(WITH_OPENJADE) || ${MACHINE_ARCH} != "i386" RUN_DEPENDS+= openjade:${PORTSDIR}/textproc/openjade .else RUN_DEPENDS+= jade:${PORTSDIR}/textproc/jade Index: textproc/sgmlformat/Makefile =================================================================== RCS file: /d/ncvs/ports/textproc/sgmlformat/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- textproc/sgmlformat/Makefile 16 Jan 2002 00:44:36 -0000 1.24 +++ textproc/sgmlformat/Makefile 4 Nov 2002 11:35:55 -0000 @@ -19,7 +19,7 @@ .include -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} != "i386" WITH_OPENJADE= yes .endif --9amGYk9869ThD9tj-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message