Use texmf.mk to update texmf.cnf.

Bump PKGREVISION.

5 files changed, 36 insertions, 40 deletions

diff --git a/print/tex-hugelatex/DEINSTALL b/print/tex-hugelatex/DEINSTALL
index 0588dbe5896..0acecffd181 100644
--- a/print/tex-hugelatex/DEINSTALL
+++ b/print/tex-hugelatex/DEINSTALL
@@ -1,16 +1,11 @@
-# $NetBSD: DEINSTALL,v 1.2 2009/01/08 22:13:23 minskim Exp $
-
-TEXMF_CNF=@PKG_SYSCONFDIR@/texmf.cnf
+# $NetBSD: DEINSTALL,v 1.3 2009/01/11 09:13:00 minskim Exp $
 
 case ${STAGE} in
 DEINSTALL)
-	${AWK} '\
-BEGIN { do_print=1; } \
-/^%%% BEGIN hugelatex$/ { do_print=0; } \
-{ if (do_print) print $0; } \
-/^%%% END hugelatex$/ { do_print=1; }' ${TEXMF_CNF} > ${TEXMF_CNF}.tmp &&
-	${MV} ${TEXMF_CNF}.tmp ${TEXMF_CNF}
 	${RM} @VARBASE@/lib/texmf/web2c/hugelatex.fmt
 	${RM} @VARBASE@/lib/texmf/web2c/hugelatex.log
+	@MKTEXLSR@ @VARBASE@/lib/texmf
+	;;
+*)
 	;;
 esac
diff --git a/print/tex-hugelatex/INSTALL b/print/tex-hugelatex/INSTALL
index 007cfdafa7d..6116b880984 100644
--- a/print/tex-hugelatex/INSTALL
+++ b/print/tex-hugelatex/INSTALL
@@ -1,29 +1,13 @@
-# $NetBSD: INSTALL,v 1.3 2009/01/08 22:13:23 minskim Exp $
+# $NetBSD: INSTALL,v 1.4 2009/01/11 09:13:00 minskim Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	${CAT} >> @PKG_SYSCONFDIR@/texmf.cnf <<EOF
-%%% BEGIN hugelatex
-% added by hugelatex package
-main_memory.hugelatex = 1100000
-param_size.hugelatex = 1500
-stack_size.hugelatex = 1500
-hash_extra.hugelatex = 15000
-string_vacancies.hugelatex = 45000
-pool_free.hugelatex = 47500
-nest_size.hugelatex = 500
-save_size.hugelatex = 5000
-pool_size.hugelatex = 500000
-max_strings.hugelatex = 55000
-font_mem_size.hugelatex= 400000
-%%% END hugelatex
-EOF
-	cd @VARBASE@/lib/texmf/web2c
-	${MV} latex.fmt latex.fmt.BAK || ${TRUE}
-	${ECHO} "" | ${PREFIX}/bin/latex -ini -fmt=hugelatex -progname=hugelatex latex.ini || ${TRUE}
-	${MV} latex.fmt hugelatex.fmt
-	${MV} latex.log hugelatex.log
-	${MV} latex.fmt.BAK latex.fmt || ${TRUE}
+	@LATEX@ -ini -fmt=hugelatex -progname=hugelatex latex.ini
+	${MV} latex.fmt @VARBASE@/lib/texmf/web2c/hugelatex.fmt
+	${MV} latex.log @VARBASE@/lib/texmf/web2c/hugelatex.log
 	${RM} -f texsys.aux
+	@MKTEXLSR@ @VARBASE@/lib/texmf
+	;;
+*)
 	;;
 esac
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index 0b49fe83ee2..95868e81e71 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2009/01/08 22:13:23 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2009/01/11 09:13:00 minskim Exp $
 #
 
 DISTNAME=	hugelatex-2.0
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	# none
 DISTFILES=	# nada
@@ -11,22 +11,27 @@ DISTFILES=	# nada
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	LaTeX format files with large limits
 
+DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
+
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# nothing
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 
-PKG_SYSCONFSUBDIR=	texmf
+TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
+TEX_CONFIG_NAMES=	hugelatex
 
-FILES_SUBST+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
+EVAL_PREFIX+=	TETEX_BIN_PREFIX=teTeX-bin
+FILES_SUBST+=	LATEX=${TETEX_BIN_PREFIX:Q}/bin/latex
 
 CHECK_FILES_SKIP+=	${PKG_TEXMFPREFIX}/web2c/hugelatex.fmt
 CHECK_FILES_SKIP+=	${PKG_TEXMFPREFIX}/web2c/hugelatex.log
 
-
-.include "../../print/teTeX/module.mk"
+.include "../../print/kpathsea/texmf.mk"
 
 do-install:
-	${LN} -s latex ${PREFIX}/bin/hugelatex
+	${LN} -sf latex ${PREFIX}/bin/hugelatex
+	${INSTALL_DATA} ${FILESDIR}/texmf.hugelatex.cnf \
+		${PREFIX}/share/texmf/web2c/texmf.hugelatex.cnf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-hugelatex/PLIST b/print/tex-hugelatex/PLIST
index a52efa1f036..1bde806734c 100644
--- a/print/tex-hugelatex/PLIST
+++ b/print/tex-hugelatex/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2006/10/12 13:38:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/01/11 09:13:00 minskim Exp $
 bin/hugelatex
+share/texmf/web2c/texmf.hugelatex.cnf
diff --git a/print/tex-hugelatex/files/texmf.hugelatex.cnf b/print/tex-hugelatex/files/texmf.hugelatex.cnf
new file mode 100644
index 00000000000..78d34934406
--- /dev/null
+++ b/print/tex-hugelatex/files/texmf.hugelatex.cnf
@@ -0,0 +1,11 @@
+main_memory.hugelatex = 1100000
+param_size.hugelatex = 1500
+stack_size.hugelatex = 1500
+hash_extra.hugelatex = 15000
+string_vacancies.hugelatex = 45000
+pool_free.hugelatex = 47500
+nest_size.hugelatex = 500
+save_size.hugelatex = 5000
+pool_size.hugelatex = 500000
+max_strings.hugelatex = 55000
+font_mem_size.hugelatex= 400000