4 files changed, 33 insertions, 16 deletions

diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 9191e019c606..15c95acd5025 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		jadetex
 PORTVERSION=		3.13
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jadetex
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	jadetex
 MAINTAINER=		nik@FreeBSD.org
 COMMENT=	A TeX backend for Jade, for typesetting SGML documents
 
-BUILD_DEPENDS=		tex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS=		etex:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=		tex:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=		etex:${PORTSDIR}/print/teTeX-base
 
 MAKE_ENV=		TEXMFCNF=${FILESDIR}:${LOCALBASE}/share/texmf/web2c
 
@@ -26,14 +26,6 @@ PKGMESSAGE=		${WRKDIR}/pkg-message
 
 MAN1=			jadetex.1 pdfjadetex.1
 
-post-patch: patch-makefile patch-message
-
-patch-makefile:
-	@${ECHO_CMD} all: betterdefault > ${WRKSRC}/Makefile.tmp
-	@${ECHO_CMD} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp
-	@${CAT} ${WRKSRC}/Makefile >> ${WRKSRC}/Makefile.tmp
-	@${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile
-
 pre-patch:
 	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
 
@@ -43,8 +35,8 @@ do-install:
 	 ${MKDIR} -m 555 $$TEXMFMAIN/tex/jadetex; \
 	 ${INSTALL_DATA} dsssl.def jadetex.ltx $$TEXMFMAIN/tex/jadetex; \
 	 ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
-	@${LN} -sf ${PREFIX}/bin/tex ${PREFIX}/bin/jadetex
-	@${LN} -sf ${PREFIX}/bin/pdftex ${PREFIX}/bin/pdfjadetex
+	@${LN} -sf ${PREFIX}/bin/etex ${PREFIX}/bin/jadetex
+	@${LN} -sf ${PREFIX}/bin/pdfetex ${PREFIX}/bin/pdfjadetex
 
 post-install: rebuild-tex-database display-message
 
diff --git a/print/jadetex/files/patch-Makefile b/print/jadetex/files/patch-Makefile
new file mode 100644
index 000000000000..f27504ff015a
--- /dev/null
+++ b/print/jadetex/files/patch-Makefile
@@ -0,0 +1,25 @@
+--- Makefile.orig	Tue Jan 11 05:58:14 2005
++++ Makefile	Tue Jan 11 05:59:21 2005
+@@ -1,13 +1,19 @@
++TEX?=		etex
++PDFTEX?=	pdfetex
++
++all: betterdefault
++betterdefault: jadetex.fmt pdfjadetex.fmt
++
+ default: basic
+ 
+ basic: jadetex.ltx
+-	tex jadetex.ins
++	${TEX} jadetex.ins
+ 
+ jadetex.fmt: basic
+-	tex -ini -progname=jadetex "&latex" jadetex.ini
++	${TEX} -ini -progname=jadetex "&latex" jadetex.ini
+ 
+ pdfjadetex.fmt: basic
+-	pdftex -ini -progname=pdfjadetex "&pdflatex" pdfjadetex.ini
++	${PDFTEX} -ini -progname=pdfjadetex "&pdflatex" pdfjadetex.ini
+ 
+ install: jadetex.fmt pdfjadetex.fmt
+ 	(TT=$$DESTDIR/`kpsewhich -expand-var '$$TEXMFMAIN'`; \
diff --git a/print/jadetex/pkg-descr b/print/jadetex/pkg-descr
index 9c75b2acab68..9419145f744a 100644
--- a/print/jadetex/pkg-descr
+++ b/print/jadetex/pkg-descr
@@ -13,7 +13,7 @@ To use JadeTex, run your SGML document, its Document Type Definition
 (DSSSL) specification, through jade with the "-t tex" option.  Then,
 to produce a DVI file, run
 
-   tex "&jadetex" <file>.tex
+   etex "&jadetex" <file>.tex
 
 To produce a PDF file, run
 
diff --git a/print/jadetex/pkg-plist b/print/jadetex/pkg-plist
index 00f0aad16276..8758f3254724 100644
--- a/print/jadetex/pkg-plist
+++ b/print/jadetex/pkg-plist
@@ -1,6 +1,6 @@
 @comment $FreeBSD$
-@exec ln -sf %D/bin/tex %D/bin/jadetex
-@exec ln -sf %D/bin/pdftex %D/bin/pdfjadetex
+@exec ln -sf %D/bin/etex %D/bin/jadetex
+@exec ln -sf %D/bin/pdfetex %D/bin/pdfjadetex
 @unexec rm -f %D/bin/jadetex
 @unexec rm -f %D/bin/pdfjadetex
 share/texmf/tex/jadetex/dsssl.def