Date: Sat, 9 Nov 2002 23:13:34 +0100 From: Thomas Moestl <tmm@FreeBSD.ORG> To: Greg Lewis <glewis@eyesbeyond.com> Cc: doc@FreeBSD.ORG Subject: Re: Please review: small patches for building documentation on FreeBSD/sparc64 Message-ID: <20021109221334.GB316@crow.dom2ip.de> In-Reply-To: <20021107080342.A48030@misty.eyesbeyond.com> References: <20021106150326.GA334@crow.dom2ip.de> <20021107080342.A48030@misty.eyesbeyond.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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 <tmoestl@gmx.net> http://www.tu-bs.de/~y0015675/
<tmm@FreeBSD.org> http://people.FreeBSD.org/~tmm/
PGP fingerprint: 1C97 A604 2BD0 E492 51D0 9C0F 1FE6 4F1D 419C 776C
[-- Attachment #2 --]
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
[-- Attachment #3 --]
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
[-- Attachment #4 --]
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 <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} != "i386"
WITH_OPENJADE= yes
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021109221334.GB316>