 @@ -1,24 +1,24 @@
-# $NetBSD: package.mk,v 1.3 2010/01/28 21:57:17 minskim Exp $
+# $NetBSD: package.mk,v 1.4 2010/01/29 01:58:13 minskim Exp $
+#
 # This Makefile fragment is inteded to be included by packages that build
 # TeX Live packages.
+#
 # Package-settable variables:
+#
 # REPLACE_TEXLUA
 #	A list of texlua scripts to be installed, relative to ${WRKSRC}.
+#
-# TEX_FORMAT_NAMES
+# TEX_FORMATS
 #	See ../../print/texlive-tetex/format.mk.
+#
 # TEX_HYPHEN_DAT
 #	See ../../print/texlive-tetex/hyphen.mk.
+#
 # TEX_HYPHEN_DEF
 #	See ../../print/texlive-tetex/hyphen.mk.
+#
 # TEX_MAP_FILES
 #	See ../../print/texlive-tetex/map.mk.
+#
 # TEX_MIXEDMAP_FILES
 #	See ../../print/texlive-tetex/map.mk.
 @@ -111,28 +111,28 @@ _texlive-install:
 			${INSTALL_DATA} $$script ${DESTDIR}${PREFIX}/info; \
 		done; \
 	fi
 	if [ -d ${WRKSRC}/man ]; then \
 		${FIND} ${WRKSRC}/man -name \*.orig -exec ${RM} {} \; ; \
 		${INSTALL_MAN_DIR} -p ${DESTDIR}${PREFIX}/${PKGMANDIR}; \
 		for f in ${WRKSRC}/man/*; do \
 			d=${DESTDIR}${PREFIX}/${PKGMANDIR}/`${BASENAME} $$f`; \
 			${INSTALL_MAN_DIR} $$d; \
 			${INSTALL_MAN} $$f/* $$d; \
 		done; \
 	fi
-.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
+.if !empty(TEX_FORMATS) || !empty(TEX_FORMAT_NAMES)
 .include "../../print/kpathsea/texmf.mk"
 .endif
 .if !empty(TEX_FORMAT_NAMES)
 .  include "../../print/texlive-tetex/format.mk"
 .endif
 .if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
 .  include "../../print/kpathsea/texmf.mk"
 .endif
 .if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
 .  include "../../print/texlive-tetex/hyphen.mk"
 .endif
 .if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES)
 .  include "../../print/texlive-tetex/map.mk"
 .endif
 post-extract: _texlive-set-permission _texlive-info _texlive-man
 do-install: _texlive-install

 @@ -1,25 +1,28 @@
-# $NetBSD: format.mk,v 1.2 2010/01/28 22:37:32 minskim Exp $
+# $NetBSD: format.mk,v 1.3 2010/01/29 01:58:13 minskim Exp $
+#
 # This Makefile fragment is intended to be included by packages that
 # install TeX format files.  It creates format files at
 # (de)installation time.
+#
 # The following variable can be defined:
+#
-#    TEX_FORMAT_NAMES - A list of format names.
+#    TEX_FORMATS - A list of parameters to build formats
+#
 #    TEX_FORMAT_NAMES (for TeX Live 2008 only) - A list of format names.
+#
 .if !defined(TEX_FORMAT_MK)
 TEX_FORMAT_MK=		# defined
 DEPENDS+=		texlive-tetex>=2008:../../print/texlive-tetex
 TEX_TEXMF_DIRS+=	${VARBASE}/lib/texmf
 EVAL_PREFIX+=		TETEX_PREFIX=texlive-tetex
 FILES_SUBST+=		FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
 FILES_SUBST+=		FORMAT_NAMES=${TEX_FORMAT_NAMES:Q}
 FILES_SUBST+=		FORMATS=${TEX_FORMATS:Q}
 INSTALL_TEMPLATES+=	../../print/texlive-tetex/files/format-install.tmpl
 DEINSTALL_TEMPLATES+=	../../print/texlive-tetex/files/format-deinstall.tmpl
 .endif	# TEX_FORMAT_MK

 @@ -1,22 +1,47 @@
-# $NetBSD: format-deinstall.tmpl,v 1.3 2010/01/28 22:37:33 minskim Exp $
+# $NetBSD: format-deinstall.tmpl,v 1.4 2010/01/29 01:58:13 minskim Exp $
+#
 # Delete format files.
+#
 FMTUTIL_CNF=${PKG_SYSCONFBASE}/texmf/web2c/fmtutil.cnf
 case ${STAGE} in
 DEINSTALL)
 	formats=@FORMATS@
 	if [ "$formats" != "" ]; then
 		${ECHO} $formats |
 		while read format engine junk; do
 		  ${GREP} -v "^${format}[[:space:]][[:space:]]*${engine}[[:space:]]" ${FMTUTIL_CNF} > \
 			${FMTUTIL_CNF}.tmp &&
 		  ${MV} ${FMTUTIL_CNF}.tmp ${FMTUTIL_CNF}
 		  case "$engine" in
 		    mpost)
 		      fmtfile="$format.mem"
 		      texengine=metapost
 		      ;;
 		    mf*)
 		      fmtfile="$format.base"
 		      texengine=metafont
 		      ;;
 		    *)
 		      fmtfile="$format.fmt"
 		      texengine=$engine
 		      ;;
 		  esac
 			@RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$fmtfile
 			@RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$format.log
 		done
 	fi
 	format_names="@FORMAT_NAMES@"
 	for f in $format_names ; do
 		@CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
 		@GREP@ "^[^#]" |
 		while read format engine junk; do
 		  ${GREP} -v "^${format}[[:space:]][[:space:]]*${engine}[[:space:]]" ${FMTUTIL_CNF} > \
 			${FMTUTIL_CNF}.tmp &&
 		  ${MV} ${FMTUTIL_CNF}.tmp ${FMTUTIL_CNF}
 		  case "$engine" in
 		    mpost)
 		      if [ "$format" = "mpost" ]; then
 		        fmtfile="mp*.mem"
 		      else

 @@ -1,22 +1,30 @@
-# $NetBSD: format-install.tmpl,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: format-install.tmpl,v 1.2 2010/01/29 01:58:13 minskim Exp $
+#
 # Create format files.
+#
 FMTUTIL_CNF=${PKG_SYSCONFBASE}/texmf/web2c/fmtutil.cnf
 case ${STAGE} in
 POST-INSTALL)
 	formats=@FORMATS@
 	if [ "$formats" != "" ]; then
 		${ECHO} $formats >> ${FMTUTIL_CNF}
 		${ECHO} $formats |
 		while read format engine junk; do
 			@FMTUTIL_SYS@ --byfmt $format
 		done
 	fi
 	format_names="@FORMAT_NAMES@"
 	for f in $format_names ; do
 		${GREP} -v "^#" @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
 		${GREP} "...." >> ${FMTUTIL_CNF}
 		@CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
 		@GREP@ "^[^#]" |
 		while read format engine junk; do
 			@FMTUTIL_SYS@ --byfmt $format
 		done
 	done
         ;;
 *)
 	;;