Date: Wed, 6 Nov 2002 16:03:26 +0100 From: Thomas Moestl <tmm@FreeBSD.org> To: doc@FreeBSD.org Subject: Please review: small patches for building documentation on FreeBSD/sparc64 Message-ID: <20021106150326.GA334@crow.dom2ip.de>
next in thread | raw e-mail | index | archive | help
--azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, I have attached a few small patches to the doc framework and related ports (maintainers CCed) to get documentation building (as part of release building) (mostly) working on FreeBSD/sparc64. The main change is that I decided to go with openjade on sparc64, mainly because alpha is using it (I also had some problems with it, but that may have been due to a linker bug which I have since fixed). Is there any reason to prefer jade over openjade? The remaining diffs correct a missing perl build dependency, and add lang/perl5 to the list of ports to check out in the DOMINIMALDOCPORTS case. There are two remaining problems: a checksum mismatch in the print/ghostscript-gnu port (I was unable to find an old version of the distfile, so I cannot correct this) and the bletcherous perl wrapper which breaks port dependencies (fatal in a release build setting). Can you please review these changes so that I can commit them? 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 --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="rel.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} == "alpha" || ${MACHINE_ARCH} == "sparc64" MINIMALDOCPORTS+= ports/textproc/openjade .else MINIMALDOCPORTS+= ports/textproc/jade --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="doc.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} == "alpha" || ${MACHINE_ARCH} == "sparc64" 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} == "alpha" || ${MACHINE_ARCH} == "sparc64" OPENJADE= yes .endif --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ports-s.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,8 @@ ${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} == "alpha" || \ + ${MACHINE_ARCH} == "sparc64" RUN_DEPENDS+= openjade:${PORTSDIR}/textproc/openjade .else RUN_DEPENDS+= jade:${PORTSDIR}/textproc/jade Index: textproc/openjade/Makefile =================================================================== RCS file: /d/ncvs/ports/textproc/openjade/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- textproc/openjade/Makefile 15 Mar 2002 09:48:11 -0000 1.33 +++ textproc/openjade/Makefile 4 Nov 2002 11:35:53 -0000 @@ -13,6 +13,7 @@ MAINTAINER= kuriyama@FreeBSD.org +BUILD_DEPENDS= perl:${PORTSDIR}/lang/perl5 RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog USE_GMAKE= YES 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} == "alpha" || ${MACHINE_ARCH} == "sparc64" WITH_OPENJADE= yes .endif --azLHFNyN32YCQGCU-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021106150326.GA334>