- Fix dependency (japanese/ptex -> japanese/ptex-tetex).

- Some style changes.

Approved by:	linimon (mentor)

3 files changed, 12 insertions, 17 deletions

diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index d058e0942f08..4a668eaec963 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -7,35 +7,33 @@
 
 PORTNAME=		jadetex
 PORTVERSION=		3.13
+PORTREVISION=		1
 CATEGORIES=		japanese print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	jadetex
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=		-ptex
 DISTNAME=		jadetex-${PORTVERSION}
 
 MAINTAINER=		hrs@FreeBSD.org
 COMMENT=		A pTeX backend for Jade, for typesetting SGML documents
 
-BUILD_DEPENDS=		ptex:${PORTSDIR}/japanese/ptex
+BUILD_DEPENDS=		ptex:${PORTSDIR}/japanese/ptex-tetex
 LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=		ptex:${PORTSDIR}/japanese/ptex
+RUN_DEPENDS=		ptex:${PORTSDIR}/japanese/ptex-tetex
 
-MESSAGE=		${PKGDIR}/pkg-message
 PKGMESSAGE=		${WRKDIR}/pkg-message
+PKGMESSAGE_SUB=		LOCALBASE=${LOCALBASE}
 
 pre-patch:
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
+	${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		< ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 
-post-install: rebuild-tex-database display-message
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_MAN} ${WRKSRC}/README.jadetex-ptex ${DOCSDIR}${PKGNAMESUFFIX}
+	${INSTALL_MAN} ${WRKSRC}/README.jadetex-ptex ${DOCSDIR}${PKGNAMESUFFIX}/
 .endif
-
-rebuild-tex-database:
 	${LOCALBASE}/bin/mktexlsr
-
-display-message:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/jadetex-ptex/pkg-message b/japanese/jadetex-ptex/pkg-message
index 9300f8617768..49b8b0bed991 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/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
@@ -11,6 +11,3 @@ following settings to the listed values:
 	  max_strings = 70000
 	  save_size = 10000
 
-If you change %%LOCALBASE%%/share/texmf/web2c/texmf.cnf, delete the word
-"original" on line 1 of the file.  This will prevent future
-installations of TeX from overwriting changes you've made.
diff --git a/japanese/jadetex-ptex/pkg-plist b/japanese/jadetex-ptex/pkg-plist
index e0af92e1c2d3..743d2ba4e447 100644
--- a/japanese/jadetex-ptex/pkg-plist
+++ b/japanese/jadetex-ptex/pkg-plist
@@ -4,8 +4,8 @@
 share/texmf/tex/jadetex/dsssl-ptex.def
 share/texmf/tex/jadetex/jadetex-ptex.ltx
 share/texmf/web2c/jadetex-ptex.fmt
-%%PORTDOCS%%share/doc/jadetex-ptex/README.jadetex-ptex
-%%PORTDOCS%%@dirrm share/doc/jadetex-ptex
+%%PORTDOCS%%%%DOCSDIR%%/README.jadetex-ptex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr
 @unexec rmdir %D/share/texmf/tex/jadetex 2> /dev/null || true