From ba7d9b2f2cd8a72626f8f6fba43786ca5976f7dc Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 21 Dec 2009 20:32:17 +0000
Subject: - Narrow down directories scanned by mktexlsr(1). - Style clean-ups.

---
 print/jadetex/Makefile             | 48 ++++++++++++++++++--------------------
 print/jadetex/files/pkg-message.in | 14 +++++++++++
 print/jadetex/pkg-message          | 14 -----------
 print/jadetex/pkg-plist            | 10 ++++----
 4 files changed, 41 insertions(+), 45 deletions(-)
 create mode 100644 print/jadetex/files/pkg-message.in
 delete mode 100644 print/jadetex/pkg-message

(limited to 'print')

diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index d92e25c122d6..6f69d7fc63e7 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -5,44 +5,42 @@
 # $FreeBSD$
 #
 
-PORTNAME=		jadetex
-PORTVERSION=		3.13
-PORTREVISION=	3
-CATEGORIES=		print
-MASTER_SITES=		SF
+PORTNAME=	jadetex
+PORTVERSION=	3.13
+PORTREVISION=	4
+CATEGORIES=	print
+MASTER_SITES=	SF
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A TeX backend for Jade, for typesetting SGML documents
 
-BUILD_DEPENDS=		etex:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=		etex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS=	etex:${PORTSDIR}/print/teTeX-base
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	etex:${PORTSDIR}/print/teTeX-base
 
-TETEXBASE?=		${LOCALBASE}
+MAKE_ENV=	TEXMFCNF=${FILESDIR}:${TEXMFDIR}/web2c
 
-MAKE_ENV=		TEXMFCNF=${FILESDIR}:${TETEXBASE}/share/texmf/web2c
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+PLIST_SUB=	TEXMFDIR=share/texmf
 
-MESSAGE=		${PKGDIR}/pkg-message
-PKGMESSAGE=		${WRKDIR}/pkg-message
+MAN1=		jadetex.1 pdfjadetex.1
 
-MAN1=			jadetex.1 pdfjadetex.1
-
-pre-patch:
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
+TEXMFDIR?=	${LOCALBASE}/share/texmf
 
 do-install:
-	@cd ${WRKSRC}; TEXMFMAIN=${TETEXBASE}/share/texmf; \
-	 ${INSTALL_DATA} jadetex.fmt pdfjadetex.fmt $$TEXMFMAIN/web2c; \
-	 ${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/etex ${PREFIX}/bin/jadetex
-	@${LN} -sf ${PREFIX}/bin/pdfetex ${PREFIX}/bin/pdfjadetex
+	${MKDIR} -m 555 ${TEXMFDIR}/tex/jadetex
+	cd ${WRKSRC} && \
+	  ${INSTALL_DATA} jadetex.fmt pdfjadetex.fmt ${TEXMFDIR}/web2c && \
+	  ${INSTALL_DATA} dsssl.def jadetex.ltx ${TEXMFDIR}/tex/jadetex && \
+	  ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
+	${LN} -sf ${LOCALBASE}/bin/etex ${PREFIX}/bin/jadetex
+	${LN} -sf ${LOCALBASE}/bin/pdfetex ${PREFIX}/bin/pdfjadetex
 
 post-install: rebuild-tex-database display-message
 
 rebuild-tex-database:
-	${LOCALBASE}/bin/mktexlsr
+	${LOCALBASE}/bin/mktexlsr ${TEXMFDIR}
 
 display-message:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/jadetex/files/pkg-message.in b/print/jadetex/files/pkg-message.in
new file mode 100644
index 000000000000..9eabf806f705
--- /dev/null
+++ b/print/jadetex/files/pkg-message.in
@@ -0,0 +1,14 @@
+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
+editor.
+
+For example, to typeset the FreeBSD Handbook with JadeTeX, change the
+following settings to the listed values:
+
+	  hash_extra = 60000
+	  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/print/jadetex/pkg-message b/print/jadetex/pkg-message
deleted file mode 100644
index 9eabf806f705..000000000000
--- a/print/jadetex/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-editor.
-
-For example, to typeset the FreeBSD Handbook with JadeTeX, change the
-following settings to the listed values:
-
-	  hash_extra = 60000
-	  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/print/jadetex/pkg-plist b/print/jadetex/pkg-plist
index 243e8a993803..35b42b8aa77a 100644
--- a/print/jadetex/pkg-plist
+++ b/print/jadetex/pkg-plist
@@ -1,12 +1,10 @@
 @comment $FreeBSD$
-@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
+bin/jadetex
+bin/pdfjadetex
 share/texmf/tex/jadetex/dsssl.def
 share/texmf/tex/jadetex/jadetex.ltx
 share/texmf/web2c/jadetex.fmt
 share/texmf/web2c/pdfjadetex.fmt
 @dirrmtry share/texmf/tex/jadetex
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
+@exec %D/bin/mktexlsr %D/%%TEXMFDIR%%
+@unexec %D/bin/mktexlsr %D/%%TEXMFDIR%%
-- 
cgit v1.2.3