summaryrefslogtreecommitdiff
path: root/print/teTeX-bin
diff options
context:
space:
mode:
authordanw <danw@pkgsrc.org>2003-10-10 01:11:20 +0000
committerdanw <danw@pkgsrc.org>2003-10-10 01:11:20 +0000
commit7af744c5db6cd7477e18058e314c3f39042661f1 (patch)
tree0667166a3b5d2b446d054c119ae3a2dc9057829c /print/teTeX-bin
parenteac7b88330f1680c21fd3dd98ce22d9f21cc7b18 (diff)
downloadpkgsrc-7af744c5db6cd7477e18058e314c3f39042661f1.tar.gz
fixes for Darwin. PR 20514
Diffstat (limited to 'print/teTeX-bin')
-rw-r--r--print/teTeX-bin/Makefile15
-rw-r--r--print/teTeX-bin/distinfo4
-rw-r--r--print/teTeX-bin/patches/patch-aa6
3 files changed, 19 insertions, 6 deletions
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 766187d01d8..822ea2f3b0f 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/08/09 11:20:37 seb Exp $
+# $NetBSD: Makefile,v 1.47 2003/10/10 01:11:20 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} >= 6.0
+# 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}"
diff --git a/print/teTeX-bin/distinfo b/print/teTeX-bin/distinfo
index 4a06e933f98..76c50ff32e6 100644
--- a/print/teTeX-bin/distinfo
+++ b/print/teTeX-bin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/10/10 01:11:20 danw Exp $
SHA1 (teTeX/teTeX-src-1.0.7.tar.gz) = ce6ff8a3bffe1fcb04349ad9dd0300e3f410d826
Size (teTeX/teTeX-src-1.0.7.tar.gz) = 8040192 bytes
-SHA1 (patch-aa) = 3f027e2e7c9056bf77b6b537242cc0c584f2c1d7
+SHA1 (patch-aa) = 513d1f17c0877394919679ad8064f12345064f04
SHA1 (patch-ab) = 535bd62875a5fab3fd62a356a51a3467a3865f06
SHA1 (patch-ac) = e26e5696af3887e1a81bc106e0a5a30ddecdc77e
SHA1 (patch-ad) = dbe002d474d8bdf9ffc7533b61e774be295f479d
diff --git a/print/teTeX-bin/patches/patch-aa b/print/teTeX-bin/patches/patch-aa
index 05c8091e575..253158d1634 100644
--- a/print/teTeX-bin/patches/patch-aa
+++ b/print/teTeX-bin/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/03 13:54:56 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/10/10 01:11:20 danw Exp $
Note that POSIX uses SIGCHLD ...! - HF
@@ -8,7 +8,7 @@ Note that POSIX uses SIGCHLD ...! - HF
fatal (setmode, setmode (cs_pipe[1], O_BINARY) == -1);
#endif
-+#ifdef __NetBSD__
++#ifndef SIGCLD
+ old = signal (SIGCHLD, child_died);
+#else
old = signal (SIGCLD, child_died);
@@ -20,7 +20,7 @@ Note that POSIX uses SIGCHLD ...! - HF
fatal (close, close (sc_pipe[1]) == -1);
fatal (close, close (cs_pipe[0]) == -1);
fatal (close, close (cs_pipe[1]) == -1);
-+#ifdef __NetBSD__
++#ifndef SIGCLD
+ fatal (signal, signal (SIGCHLD, old) == SIG_ERR);
+#else
fatal (signal, signal (SIGCLD, old) == SIG_ERR);