From b346ef61b1f2307b71f5fbffff38eec66fef5043 Mon Sep 17 00:00:00 2001 From: danw Date: Fri, 10 Oct 2003 15:02:57 +0000 Subject: Darwin fix, take 2... don't compare ${OS_VERSION} as a number since that breaks the build on platforms where it's not strictly numeric (eg, "1.6.1_STABLE") --- print/teTeX-bin/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'print') diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile index 1a2c1afaad8..6f7e55034c3 100644 --- a/print/teTeX-bin/Makefile +++ b/print/teTeX-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2003/10/10 08:24:09 tron Exp $ +# $NetBSD: Makefile,v 1.49 2003/10/10 15:02:57 danw Exp $ DISTNAME= teTeX-src-1.0.7 PKGNAME= teTeX-bin-1.0.7 @@ -32,6 +32,14 @@ INFO_FILES= latex.info dvips.info web2c.info kpathsea.info INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= yes +CONFIG_GUESS_OVERRIDE= ${WRKSRC}/texk/config.guess +CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/config/config.guess +CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/libs/ncurses/config.guess +CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/texinfo/config.guess +CONFIG_SUB_OVERRIDE= ${WRKSRC}/texk/config.sub +CONFIG_SUB_OVERRIDE+= ${WRKSRC}/config/config.sub +CONFIG_SUB_OVERRIDE+= ${WRKSRC}/libs/ncurses/config.sub +CONFIG_SUB_OVERRIDE+= ${WRKSRC}/texinfo/config.sub CONFIGURE_ARGS+= --without-texinfo CONFIGURE_ARGS+= --without-dialog CONFIGURE_ARGS+= --disable-multiplatform @@ -63,6 +71,11 @@ CONFIGURE_ARGS+= --enable-a4 CONFIGURE_ARGS+= --enable-auto-core .endif +.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} == "6" +# Darwin 6.x's default (3.1ish) g++ has a bug that breaks the xpdf build +CXX= g++2 +.endif + CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" -- cgit v1.2.3