pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/teTeX-bin Darwin fix, take 2... don't compare ${...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/289984f80462
branches:  trunk
changeset: 462721:289984f80462
user:      danw <danw%pkgsrc.org@localhost>
date:      Fri Oct 10 15:02:57 2003 +0000

description:
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")

diffstat:

 print/teTeX-bin/Makefile |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 4f4647fe4941 -r 289984f80462 print/teTeX-bin/Makefile
--- a/print/teTeX-bin/Makefile  Fri Oct 10 14:13:29 2003 +0000
+++ b/print/teTeX-bin/Makefile  Fri Oct 10 15:02:57 2003 +0000
@@ -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 @@
 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-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}"



Home | Main Index | Thread Index | Old Index