3 files changed, 26 insertions, 11 deletions

diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 466b6f295900..9b3715fc62bd 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -11,29 +11,42 @@ CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jadetex
 
-MAINTAINER=		nik
+MAINTAINER=		nik@FreeBSD.org
 
 BUILD_DEPENDS=		hugelatex:${PORTSDIR}/print/hugelatex
 LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=		tex:${PORTSDIR}/print/teTeX
 
-MAKE_ENV=		TEXMFCNF=${FILESDIR}:${PREFIX}/share/texmf/web2c
+MAKE_ENV=		TEXMFCNF=${FILESDIR}:${LOCALBASE}/share/texmf/web2c
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
-MESSAGE=		${WRKDIR}/pkg-message
 
-post-extract:
+MESSAGE=		${PKGDIR}/pkg-message
+PKGMESSAGE=		${WRKDIR}/pkg-message
+
+post-patch: patch-makefile patch-message
+
+patch-makefile:
 	@${ECHO} all: betterdefault > ${WRKSRC}/Makefile.tmp
 	@${ECHO} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp
 	@${CAT} ${WRKSRC}/Makefile >> ${WRKSRC}/Makefile.tmp
 	@${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile
 
+patch-message:
+	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
+
 do-install:
-	@(cd ${WRKSRC} && ${INSTALL_DATA} jadetex.fmt pdfjadetex.fmt `kpsewhich -expand-var '$$TEXMFMAIN'`/web2c && ${MKDIR} -m 555 `kpsewhich -expand-var '$$TEXMFMAIN'`/tex/jadetex && ${INSTALL_DATA} dsssl.def jadetex.ltx `kpsewhich -expand-var '$$TEXMFMAIN'`/tex/jadetex)
+	@cd ${WRKSRC}; TEXMFMAIN=$$(kpsewhich -expand-var '$$TEXMFMAIN'); \
+	 ${INSTALL_DATA} jadetex.fmt pdfjadetex.fmt $$TEXMFMAIN/web2c; \
+	 ${MKDIR} -m 555 $$TEXMFMAIN/tex/jadetex; \
+	 ${INSTALL_DATA} dsssl.def jadetex.ltx $$TEXMFMAIN/tex/jadetex
+
+post-install: rebuild-tex-database display-message
+
+rebuild-tex-database:
+	${LOCALBASE}/bin/mktexlsr
 
-post-install:
-	${PREFIX}/bin/mktexlsr
-	@${SED} -e 's,/usr/local,${PREFIX},' ${PKGMESSAGE} > ${MESSAGE}
-	@${CAT} ${MESSAGE}
+display-message:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/jadetex/pkg-message b/print/jadetex/pkg-message
index 4727809ad243..9300f8617768 100644
--- a/print/jadetex/pkg-message
+++ b/print/jadetex/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 /usr/local/share/texmf/web2c/texmf.cnf with any text
+editing the file %%LOCALBASE%%/share/texmf/web2c/texmf.cnf with any text
 editor.
 
 For example, to typeset the FreeBSD Handbook with JadeTeX, change the
@@ -11,6 +11,6 @@ following settings to the listed values:
 	  max_strings = 70000
 	  save_size = 10000
 
-If you change /usr/local/share/texmf/web2c/texmf.cnf, delete the word
+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/print/jadetex/pkg-plist b/print/jadetex/pkg-plist
index 31e35ac634bc..8f0fd83f8508 100644
--- a/print/jadetex/pkg-plist
+++ b/print/jadetex/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 share/texmf/tex/jadetex/dsssl.def
 share/texmf/tex/jadetex/jadetex.ltx
 share/texmf/web2c/jadetex.fmt
 share/texmf/web2c/pdfjadetex.fmt
 @dirrm share/texmf/tex/jadetex
+@exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr