From 8856513a731d4821f583bf8641023ffb4ad71442 Mon Sep 17 00:00:00 2001
From: tonio <tonio@pkgsrc.org>
Date: Mon, 14 Nov 2005 21:57:00 +0000
Subject: Use TEX and PDFTEX as exported by the buildlink files

---
 print/teTeX-bin/buildlink3.mk  |  6 ++++--
 print/teTeX3-bin/buildlink3.mk |  5 ++++-
 print/tex-jadetex/Makefile     | 10 +---------
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'print')

diff --git a/print/teTeX-bin/buildlink3.mk b/print/teTeX-bin/buildlink3.mk
index 0d4d960838e..c0772f9d3d1 100644
--- a/print/teTeX-bin/buildlink3.mk
+++ b/print/teTeX-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/11/08 23:42:24 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/11/14 21:57:00 tonio Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -13,7 +13,9 @@ BUILDLINK_PACKAGES+=	teTeX-bin
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin-2.[0-9]*
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX-bin
-
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
+TEX=tex
+PDFTEX=pdftex
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index be5040f956c..36323a1b0e0 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/11/08 17:32:52 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/14 21:57:00 tonio Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -15,4 +15,7 @@ BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb2
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX3-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
+TEX=etex
+PDFTEX=pdfetex
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index a245a6fe679..a87d2a696f3 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/14 20:41:38 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/14 21:57:00 tonio Exp $
 #
 
 DISTNAME=	jadetex-3.13
@@ -19,14 +19,6 @@ INSTALLATION_DIRS=	bin
 
 .include "../../print/teTeX/module.mk"
 
-.if (${TEX_TYPE} == "teTeX3")
-TEX=etex
-PDFTEX=pdfetex
-.else
-TEX=tex
-PDFTEX=pdftex
-.endif
-
 do-install:
 	${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-jadetex
 	${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF}
-- 
cgit v1.2.3