From e7f39d43bb2bff22f83581b327a0b4e006e96f62 Mon Sep 17 00:00:00 2001 From: minskim Date: Tue, 9 Dec 2008 19:43:37 +0000 Subject: TEXMFSYSVAR should be under VARBASE. Previously, TEXMFSYSVAR was placed under PREFIX, which was wrong because TEXMFSYSVAR stores variable *runtime* data. This change relocates TEXMFSYSVAR under VARBASE and move VARTEXFONTS to its default location inside the TEXMFSYSVAR tree. Bump PKGREVISION. --- print/teTeX3-bin/INSTALL | 9 +++------ print/teTeX3-bin/Makefile | 22 +++++++++++++++------- print/teTeX3-bin/Makefile.common | 9 +-------- print/teTeX3-bin/distinfo | 3 ++- print/teTeX3-bin/patches/patch-ao | 22 ++++++++++++++++++++++ 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 print/teTeX3-bin/patches/patch-ao diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL index 5aab6795a6a..5fd5ce77c6b 100644 --- a/print/teTeX3-bin/INSTALL +++ b/print/teTeX3-bin/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.7 2007/10/09 19:19:14 martti Exp $ +# $NetBSD: INSTALL,v 1.8 2008/12/09 19:43:37 minskim Exp $ PATH="@PREFIX@"/bin:"${PATH}" export PATH @@ -35,11 +35,10 @@ SELF=$0 ACTION=$1 : ${PKG_PREFIX=@PREFIX@} -TEXFONTS_DIR="@TEXFONTSDIR@" TEXMF_DISTDATADIR="${PKG_PREFIX}/share/texmf-dist" TEXMF_DATADIR="${PKG_PREFIX}/share/texmf" TEXMF_LOCALDATADIR="${PKG_PREFIX}/share/texmf-local" -TEXMF_VARDIR="${PKG_PREFIX}/share/texmf-var" +TEXMF_VARDIR="@VARBASE@/lib/texmf" exitcode=0 case $ACTION in @@ -63,7 +62,6 @@ REMOVE) # Remove the ls-R databases from the usual TeX directories # generated by mktexlsr. # - ${RM} -f ${TEXFONTS_DIR}/ls-R ${RM} -f ${TEXMF_DISTDATADIR}/ls-R ${RM} -f ${TEXMF_DATADIR}/ls-R ${RM} -f ${TEXMF_LOCALDATADIR}/ls-R @@ -172,9 +170,8 @@ exitcode=0 case $ACTION in FONTS) # Set the default texfonts directory to the specified directory. - VARTEXFONTS="${2-@VARTEXFONTS@}" ${TEST} ! -x ${TEXCONFIG} || - ${TEXCONFIG} font vardir "$VARTEXFONTS" + ${TEXCONFIG} font vardir "@VARBASE@/lib/texmf/fonts" ${TEST} ! -x ${TEXCONFIG} || ${TEXCONFIG} font rw ;; diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index fb557347366..7aa2c824889 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2008/12/09 05:16:21 minskim Exp $ +# $NetBSD: Makefile,v 1.33 2008/12/09 19:43:37 minskim Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} @@ -28,20 +28,28 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+= --without-texinfo --without-texi2html CONFIGURE_ARGS+= --with-xdvi-x-toolkit=xaw -BUILD_DEFS+= VARTEXFONTS -VARTEXFONTS?= ${VARBASE}/spool/texfonts -MAKE_FLAGS+= vartexfonts=${VARTEXFONTS:Q} +MAKE_FLAGS+= vartexfonts=${VARBASE:Q}/lib/texmf/fonts +SUBST_CLASSES+= texmfdir +SUBST_MESSAGE.texmfdir= Setting TEXMFSYSVAR. +SUBST_STAGE.texmfdir= pre-configure +SUBST_FILES.texmfdir= texk/kpathsea/texmf.in-teTeX +SUBST_SED.texmfdir+= -e 's,@VARBASE@,${VARBASE},' + +BUILD_DEFS+= VARBASE LOWER_PAPERSIZE_cmd= ${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]' LOWER_PAPERSIZE= ${LOWER_PAPERSIZE_cmd:sh} FILES_SUBST+= PAPERSIZE=${LOWER_PAPERSIZE:Q} -FILES_SUBST+= VARTEXFONTS=${VARTEXFONTS:Q} CONF_FILES+= ${PREFIX}/share/texmf/web2c/fmtutil.cnf.dist \ ${PREFIX}/share/texmf/web2c/fmtutil.cnf CONF_FILES+= ${PREFIX}/share/texmf/web2c/texmf.cnf.dist \ ${PREFIX}/share/texmf/web2c/texmf.cnf -OWN_DIRS+= ${PREFIX}/share/texmf-var ${PREFIX}/share/texmf-local +OWN_DIRS+= ${VARBASE}/lib/texmf ${PREFIX}/share/texmf-local +.for d in pk source tfm +OWN_DIRS_PERMS+= ${VARBASE}/lib/texmf/fonts/${d} \ + ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 +.endfor INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} INSTALL_MAKE_FLAGS+= texmf=${DESTDIR}${PREFIX}/share/texmf diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common index 1228cccfd5e..54660f87b84 100644 --- a/print/teTeX3-bin/Makefile.common +++ b/print/teTeX3-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2008/11/19 21:16:03 minskim Exp $ +# $NetBSD: Makefile.common,v 1.11 2008/12/09 19:43:37 minskim Exp $ TETEX_BIN_VERS= 3.0 DIST_SUBDIR= teTeX @@ -45,13 +45,6 @@ CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \ INSTALL_DATA=${INSTALL_DATA:Q} -TEXFONTSDIR= ${VARBASE}/spool/texfonts -FILES_SUBST+= TEXFONTSDIR=${TEXFONTSDIR} -OWN_DIRS+= ${TEXFONTSDIR} -OWN_DIRS_PERMS+= ${TEXFONTSDIR}/pk ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 -OWN_DIRS_PERMS+= ${TEXFONTSDIR}/source ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 -OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 - .include "../../graphics/png/buildlink3.mk" .include "../../fonts/t1lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo index 822a7593337..2394a2b482c 100644 --- a/print/teTeX3-bin/distinfo +++ b/print/teTeX3-bin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2008/08/24 20:35:37 tonnerre Exp $ +$NetBSD: distinfo,v 1.12 2008/12/09 19:43:37 minskim Exp $ SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc @@ -17,6 +17,7 @@ SHA1 (patch-ak) = ba06c10c1151173e04f3a6cc44d44a89f1933bb8 SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47 +SHA1 (patch-ao) = f40eb1ac8f9c1d5adaf6aac86d59a217b4c8411d SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7 SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77 diff --git a/print/teTeX3-bin/patches/patch-ao b/print/teTeX3-bin/patches/patch-ao new file mode 100644 index 00000000000..c6c82575aba --- /dev/null +++ b/print/teTeX3-bin/patches/patch-ao @@ -0,0 +1,22 @@ +$NetBSD: patch-ao,v 1.1 2008/12/09 19:43:37 minskim Exp $ + +--- texk/kpathsea/texmf.in-teTeX.orig 2005-02-05 16:04:35.000000000 -0800 ++++ texk/kpathsea/texmf.in-teTeX +@@ -72,7 +72,7 @@ TEXMFLOCAL = @texmf@-local + % TEXMFSYSVAR = $TEXMFMAIN + % For using a separate tree: + % TEXMFSYSVAR = @texmf@-var +-TEXMFSYSVAR = @texmf@-var ++TEXMFSYSVAR = @VARBASE@/lib/texmf + + % TEXMFSYSCONFIG, where texconfig-sys stores configuration data. + % With teTeX-3.0 or later, this must be set. +@@ -126,7 +126,7 @@ VARTEXFONTS = @vartexfonts@ + % + % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below + % one of the TEXMF directories (avoids overlapping ls-R files). +-TEXMFDBS = $TEXMF;$VARTEXFONTS ++TEXMFDBS = $TEXMF + + % It may be convenient to define TEXMF like this: + % TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME} -- cgit v1.2.3