pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/tex-hugelatex Don't build hugelatex configuratio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/afb9c45ec9b5
branches:  trunk
changeset: 519924:afb9c45ec9b5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Oct 12 13:38:35 2006 +0000

description:
Don't build hugelatex configuration at do-install time, but in the
INSTALL script. Use magic markers and remove the texmf.cnf fragment
at DEINSTALL time. This fixes the deinstallation when other packages
modify it and are installed afterwards, but removed out-of-order.
Bump revision.

Addresses PR 32376 and PR 34003 (the latter indirectly from myself).

diffstat:

 print/tex-hugelatex/DEINSTALL           |  16 ++++++++++++++++
 print/tex-hugelatex/INSTALL             |  29 +++++++++++++++++++++++++++++
 print/tex-hugelatex/Makefile            |  20 +++++++-------------
 print/tex-hugelatex/PLIST               |   7 +------
 print/tex-hugelatex/files/texmf.cnf-add |  15 ---------------
 5 files changed, 53 insertions(+), 34 deletions(-)

diffs (126 lines):

diff -r 1cbbc973812d -r afb9c45ec9b5 print/tex-hugelatex/DEINSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/tex-hugelatex/DEINSTALL     Thu Oct 12 13:38:35 2006 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/10/12 13:38:35 joerg Exp $
+
+TEXMF_CNF=@PKG_TEXMFPREFIX@/web2c/texmf.cnf
+
+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} @PKG_TEXMFPREFIX@/web2c/hugelatex.fmt
+       ${RM} @PKG_TEXMFPREFIX@/web2c/hugelatex.log
+       ;;
+esac
diff -r 1cbbc973812d -r afb9c45ec9b5 print/tex-hugelatex/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/tex-hugelatex/INSTALL       Thu Oct 12 13:38:35 2006 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: INSTALL,v 1.1 2006/10/12 13:38:35 joerg Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+       ${CAT} >> @PKG_TEXMFPREFIX@/web2c/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 @PKG_TEXMFPREFIX@/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}
+       ${RM} -f texsys.aux
+       ;;
+esac
diff -r 1cbbc973812d -r afb9c45ec9b5 print/tex-hugelatex/Makefile
--- a/print/tex-hugelatex/Makefile      Thu Oct 12 13:35:33 2006 +0000
+++ b/print/tex-hugelatex/Makefile      Thu Oct 12 13:38:35 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/07/27 00:09:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/12 13:38:35 joerg Exp $
 #
 
 DISTNAME=      hugelatex-2.0
 PKGNAME=       tex-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  # none
 DISTFILES=     # nada
@@ -16,21 +16,15 @@
 NO_CHECKSUM=   yes
 NO_BUILD=      yes
 
-TEXMF_CNF=     ${PKG_TEXMFPREFIX}/web2c/texmf.cnf
+FILES_SUBST+=  PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
+
+CHECK_FILES_SKIP+=     ${PKG_TEXMFPREFIX}/web2c/hugelatex.fmt
+CHECK_FILES_SKIP+=     ${PKG_TEXMFPREFIX}/web2c/hugelatex.log
+
 
 .include "../../print/teTeX/module.mk"
 
 do-install:
-       ${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-hugelatex
-       ${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF}
-       cd `dirname ${TEXMF_CNF}`; \
-       ${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} ; \
-       ${RM} -f texsys.aux
-       ${RM} -f ${PREFIX}/bin/hugelatex
        ${LN} -s latex ${PREFIX}/bin/hugelatex
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1cbbc973812d -r afb9c45ec9b5 print/tex-hugelatex/PLIST
--- a/print/tex-hugelatex/PLIST Thu Oct 12 13:35:33 2006 +0000
+++ b/print/tex-hugelatex/PLIST Thu Oct 12 13:38:35 2006 +0000
@@ -1,7 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/13 05:30:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/12 13:38:35 joerg Exp $
 bin/hugelatex
-${PKG_TEXMFPREFIX}/web2c/hugelatex.fmt
-${PKG_TEXMFPREFIX}/web2c/hugelatex.log
-@exec cp %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf-before-hugelatex
-${PKG_TEXMFPREFIX}/web2c/texmf.cnf
-@unexec mv %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf-before-hugelatex %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf
diff -r 1cbbc973812d -r afb9c45ec9b5 print/tex-hugelatex/files/texmf.cnf-add
--- a/print/tex-hugelatex/files/texmf.cnf-add   Thu Oct 12 13:35:33 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-% hugelatex settings
-% 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
-



Home | Main Index | Thread Index | Old Index