- Fix web2c directory (s,web2c-ptex,web2c/ptex,).

- Some style changes.
- Bump PORTREVISION.

4 files changed, 18 insertions, 11 deletions

diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index 0df2564765c1..cda8b12de4a7 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		jadetex
 PORTVERSION=		3.13
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		japanese print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,14 @@ RUN_DEPENDS=		ptex:${PORTSDIR}/japanese/ptex-tetex
 PKGMESSAGE=		${WRKDIR}/pkg-message
 PKGMESSAGE_SUB=		LOCALBASE=${LOCALBASE}
 
-PLIST_SUB=		PKGNAMESUFFIX=${PKGNAMESUFFIX}
+PLIST_SUB=		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
+			MKTEXLSR=${MKTEXLSR} \
+			TEXMFDIR=${TEXMFDIR} \
+			TEXMFLOCALDIR=${TEXMFLOCALDIR}
+
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+TEXMFDIR=	share/texmf
+TEXMFLOCALDIR=	share/texmf-local
 
 pre-patch:
 	${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
diff --git a/japanese/jadetex-ptex/files/patch-Makefile b/japanese/jadetex-ptex/files/patch-Makefile
index eeebbba7a736..8343c5351243 100644
--- a/japanese/jadetex-ptex/files/patch-Makefile
+++ b/japanese/jadetex-ptex/files/patch-Makefile
@@ -3,7 +3,7 @@ Index: Makefile
 RCS file: /home/cvs/private/hrs/jadetex-ptex/Makefile,v
 retrieving revision 1.1.1.1
 retrieving revision 1.7
-diff -d -u -I\$FreeBSD: /tmp/pcvs/ports/japanese/jadetex-ptex/files/patch-Makefile,v 1.2 2004-10-30 10:47:46 hrs Exp $ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1.1.1 -r1.7
+diff -d -u -I\$FreeBSD: /tmp/pcvs/ports/japanese/jadetex-ptex/files/patch-Makefile,v 1.3 2005-02-10 17:52:30 hrs Exp $ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1.1.1 -r1.7
 --- Makefile	10 Jun 2003 15:24:06 -0000	1.1.1.1
 +++ Makefile	30 Oct 2004 10:26:07 -0000	1.7
 @@ -1,27 +1,71 @@
@@ -63,7 +63,7 @@ diff -d -u -I\$FreeBSD: /tmp/pcvs/ports/japanese/jadetex-ptex/files/patch-Makefi
 +TEXMFMAIN_X!=	kpsewhich -expand-var '$$TEXMFMAIN'
 +TEXMFLOCAL?=	${TEXMFLOCAL_X}
 +TEXMFMAIN?=	${TEXMFMAIN_X}
-+WEB2CDIR?=	${TEXMFMAIN}/web2c-ptex
++WEB2CDIR?=	${TEXMFMAIN}/web2c/ptex
 +JADETEXDIR?=	${TEXMFLOCAL}/ptex/jadetex
 +
 +install: ${PROGNAME_JADETEX}.ltx dsssl-ptex.def
diff --git a/japanese/jadetex-ptex/pkg-message b/japanese/jadetex-ptex/pkg-message
index 49b8b0bed991..444535597b2b 100644
--- a/japanese/jadetex-ptex/pkg-message
+++ b/japanese/jadetex-ptex/pkg-message
@@ -1,6 +1,6 @@
 JadeTeX uses quite a lot of TeX's resources.  You may find it
 necessary to increase the size of some of TeX's resource pools by
-editing the file %%LOCALBASE%%/share/texmf/web2c-ptex/texmf.cnf with any text
+editing the file %%LOCALBASE%%/share/texmf/web2c/ptex/texmf.cnf with any text
 editor.
 
 For example, to typeset the FreeBSD Handbook with JadeTeX, change the
diff --git a/japanese/jadetex-ptex/pkg-plist b/japanese/jadetex-ptex/pkg-plist
index f9678c0baaa9..43147873e6ca 100644
--- a/japanese/jadetex-ptex/pkg-plist
+++ b/japanese/jadetex-ptex/pkg-plist
@@ -1,11 +1,11 @@
 @comment $FreeBSD$
 @exec ln -s -f %D/bin/ptex %D/bin/jadetex-ptex
 @unexec rm -f %D/bin/jadetex-ptex
-share/texmf-local/ptex/jadetex/dsssl-ptex.def
-share/texmf-local/ptex/jadetex/jadetex-ptex.ltx
-share/texmf/web2c-ptex/jadetex-ptex.fmt
+%%TEXMFLOCALDIR%%/ptex/jadetex/dsssl-ptex.def
+%%TEXMFLOCALDIR%%/ptex/jadetex/jadetex-ptex.ltx
+%%TEXMFDIR%%/web2c/ptex/jadetex-ptex.fmt
 %%PORTDOCS%%%%DOCSDIR%%%%PKGNAMESUFFIX%%/README.jadetex-ptex
 %%PORTDOCS%%@dirrm %%DOCSDIR%%%%PKGNAMESUFFIX%%
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
-@unexec rmdir %D/share/texmf-local/ptex/jadetex 2> /dev/null || true
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%
+@unexec rmdir %D/%%TEXMFLOCALDIR%%/ptex/jadetex 2> /dev/null || true