svn commit: r360642 - in head: Keywords Mk japanese/tex-ptex print/tex-aleph print/tex-dvipdfmx print/tex-dvipsk print/tex-formats print/tex-jadetex print/tex-luatex print/tex-mfpic print/tex-xdvik...

Baptiste Daroussin bapt at FreeBSD.org
Fri Jul 4 17:35:23 UTC 2014 

Author: bapt
Date: Fri Jul  4 17:35:18 2014
New Revision: 360642
URL: http://svnweb.freebsd.org/changeset/ports/360642
QAT: https://qat.redports.org/buildarchive/r360642/

Log:
  Support stage for texlive, given it is impossible to rebuild the fmt files into
  the stage then they are now rebuild in post-installation, like it is done in
  other package system

Added:
  head/Keywords/fmtutil.yaml   (contents, props changed)
Modified:
  head/Mk/bsd.tex.mk
  head/japanese/tex-ptex/Makefile
  head/print/tex-aleph/Makefile
  head/print/tex-aleph/pkg-plist
  head/print/tex-dvipdfmx/Makefile
  head/print/tex-dvipdfmx/pkg-plist
  head/print/tex-dvipsk/Makefile
  head/print/tex-dvipsk/pkg-plist
  head/print/tex-formats/Makefile
  head/print/tex-jadetex/Makefile
  head/print/tex-luatex/Makefile
  head/print/tex-mfpic/Makefile
  head/print/tex-xdvik/Makefile
  head/print/tex-xdvik/pkg-plist
  head/print/tex-xetex/Makefile
  head/print/tex-xmltex/Makefile
  head/print/tex-xmltex/pkg-plist
  head/print/texlive-base/Makefile
  head/print/texlive-base/pkg-plist
  head/print/texlive-texmf/Makefile

Added: head/Keywords/fmtutil.yaml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Keywords/fmtutil.yaml	Fri Jul  4 17:35:18 2014	(r360642)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+#
+# MAINTAINER:   portmgr at FreeBSD.org
+
+actions: []
+post-install: |
+   fmtutil-sys --missing >/dev/null
+post-deinstall: |
+   set -- %@
+   for f in $@; do
+        rm -f $f
+        rmdir -p ${f%/*} 2>/dev/null
+   done

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/Mk/bsd.tex.mk	Fri Jul  4 17:35:18 2014	(r360642)
@@ -178,7 +178,9 @@ ${_C}_DEPENDS+=	${TEX_${_C}_DEPENDS:O:u}
 .PHONY:	do-texhash
 do-texhash:
 . if !empty(USE_TEX:Mtexhash-bootstrap)
+.if defined(NO_STAGE)
 	@${LOCALBASE}/bin/mktexlsr ${TEXHASHDIRS:S,^,${PREFIX}/,}
+.endif
 	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/mktexlsr " \
 		"${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST}
 	@for D in ${TEXHASHDIRS}; do \
@@ -209,6 +211,9 @@ post-install-script: do-texhash
 . for F in ${TEX_FORMATS}
 do-fmtutil: do-fmtutil-$F post-install-$F
 do-fmtutil-$F:
+.if !defined(NO_STAGE)
+	@${ECHO_CMD} "@fmtutil ${TEX_FORMAT_${F:tu}_FILES:S@^@${LOCALBASE}/@}" >> ${TMPPLIST}
+.endif
 .if defined(NO_STAGE)
 	@${TEST} -n '${TEX_FORMAT_${F:tu}}'
 	@${TEST} -r ${LOCALBASE}/${FMTUTIL_CNF}
@@ -224,19 +229,6 @@ do-fmtutil-$F:
 			${LOCALBASE}/bin/fmtutil-sys --byfmt $$format; \
 		done
 	@${LOCALBASE}/bin/mktexlsr ${TEXMFVARDIR:S,^,${PREFIX}/,}
-.else
-	@exec < ${LOCALBASE}/${FMTUTIL_CNF} && \
-		(${GREP} -v "\#$F\$$"; \
-			${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}}) \
-			> ${WRKDIR}/fmtutil.cnf
-	@${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}} | \
-		while read format dum; do \
-		${SETENV} PATH=${PATH}:${LOCALBASE}/bin:${STAGEDIR}/${PREFIX}/bin \
-			TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} \
-			${LOCALBASE}/bin/fmtutil-sys --byfmt $$format \
-			--cnffile ${WRKDIR}/fmtutil.cnf \
-			--fmtdir ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c; \
-		done
 .endif
 	@${ECHO_CMD} "@exec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
@@ -247,16 +239,21 @@ do-fmtutil-$F:
 		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"${GREP} -v \"\#$F\$$\" " \
 		"> ${LOCALBASE}/${FMTUTIL_CNF}" >> ${TMPPLIST}
+.if defined(NO_STAGE)
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_FILES}
 _PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS}
+.endif
+_PLIST_FILES+=	${TEX_FORMAT_${F:tu}_BIN}
 . endfor
 post-install-script: do-fmtutil
 
 PLIST_FILES=	${_PLIST_FILES:O:u}
-PLIST_DIRSTRY=	${_PLIST_DIRSTRY:O:u} \
-		${TEXMFVARDIR}/web2c \
+PLIST_DIRSTRY=	${_PLIST_DIRSTRY:O:u} 
+.if defined(NO_STAGE)
+PLIST_DIRSTRY=	${TEXMFVARDIR}/web2c \
 		${TEXMFVARDIR}
 .endif
+.endif
 
 .if !empty(USE_TEX:Mupdmap)
 .PHONY:	do-updmap
@@ -281,7 +278,8 @@ TEX_FORMAT_ALEPH_FILES=	\
 	${TEXMFVARDIR}/web2c/aleph/aleph.log \
 	${TEXMFVARDIR}/web2c/aleph/aleph.fmt \
 	${TEXMFVARDIR}/web2c/aleph/lamed.log \
-	${TEXMFVARDIR}/web2c/aleph/lamed.fmt \
+	${TEXMFVARDIR}/web2c/aleph/lamed.fmt
+TEX_FORMAT_ALEPH_BIN=	\
 	bin/lamed
 TEX_FORMAT_ALEPH_DIRS=	\
 	${TEXMFVARDIR}/web2c/aleph
@@ -292,7 +290,8 @@ TEX_FORMAT_AMSTEX?= \
 	"amstex pdftex - -translate-file=cp227.tcx *amstex.ini"
 TEX_FORMAT_AMSTEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/amstex.log \
-	${TEXMFVARDIR}/web2c/pdftex/amstex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/amstex.fmt
+TEX_FORMAT_AMSTEX_BIN= \
 	bin/amstex
 TEX_FORMAT_AMSTEX_DIRS= \
 	${TEXMFVARDIR}/web2c/pdftex
@@ -320,7 +319,8 @@ TEX_FORMAT_CSLATEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/cslatex.log \
 	${TEXMFVARDIR}/web2c/pdftex/cslatex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.fmt
+TEX_FORMAT_CSLATEX_BIN= \
 	bin/cslatex \
 	bin/pdfcslatex
 TEX_FORMAT_CSLATEX_DIRS= \
@@ -333,7 +333,8 @@ TEX_FORMAT_EPLAIN?= \
 	"eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini"
 TEX_FORMAT_EPLAIN_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/eplain.log \
-	${TEXMFVARDIR}/web2c/pdftex/eplain.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/eplain.fmt
+TEX_FORMAT_EPLAIN_BIN= \
 	bin/eplain
 TEX_FORMAT_EPLAIN_DIRS= \
 	${TEXMFVARDIR}/web2c/pdftex
@@ -347,7 +348,8 @@ TEX_FORMAT_JADETEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/jadetex.log \
 	${TEXMFVARDIR}/web2c/pdftex/jadetex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/pdfjadetex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdfjadetex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdfjadetex.fmt
+TEX_FORMAT_JADETEX_BIN= \
 	bin/jadetex \
 	bin/pdfjadetex
 TEX_FORMAT_JADETEX_DIRS= \
@@ -363,7 +365,8 @@ TEX_FORMAT_LATEX-BIN_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/latex.log \
 	${TEXMFVARDIR}/web2c/pdftex/latex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/pdflatex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdflatex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdflatex.fmt
+TEX_FORMAT_LATEX-BIN_BIN= \
 	bin/latex \
 	bin/pdflatex
 TEX_FORMAT_LATEX-BIN_DIRS= \
@@ -385,7 +388,8 @@ TEX_FORMAT_LUATEX_FILES= \
 	${TEXMFVARDIR}/web2c/luatex/luatex.log \
 	${TEXMFVARDIR}/web2c/luatex/luatex.fmt \
 	${TEXMFVARDIR}/web2c/luatex/lualatex.log \
-	${TEXMFVARDIR}/web2c/luatex/lualatex.fmt \
+	${TEXMFVARDIR}/web2c/luatex/lualatex.fmt
+TEX_FORMAT_LUATEX_BIN= \
 	bin/dviluatex \
 	bin/dvilualatex \
 	bin/lualatex
@@ -416,7 +420,8 @@ TEX_FORMAT_MEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/pdfmex.log \
 	${TEXMFVARDIR}/web2c/pdftex/pdfmex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/utf8mex.log \
-	${TEXMFVARDIR}/web2c/pdftex/utf8mex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/utf8mex.fmt
+TEX_FORMAT_MEX_BIN= \
 	bin/mex \
 	bin/pdfmex \
 	bin/utf8mex
@@ -434,7 +439,8 @@ TEX_FORMAT_MLTEX_FILES=	\
 	${TEXMFVARDIR}/web2c/pdftex/mllatex.log \
 	${TEXMFVARDIR}/web2c/pdftex/mllatex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/mltex.log \
-	${TEXMFVARDIR}/web2c/pdftex/mltex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/mltex.fmt
+TEX_FORMAT_MLTEX_BIN= \
 	bin/mltex \
 	bin/mllatex
 TEX_FORMAT_MLTEX_DIRS= \
@@ -463,7 +469,8 @@ TEX_FORMAT_PDFTEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/etex.log \
 	${TEXMFVARDIR}/web2c/pdftex/etex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/pdfetex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdfetex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdfetex.fmt
+TEX_FORMAT_PDFTEX_BIN= \
 	bin/pdfetex
 TEX_FORMAT_PDFTEX_DIRS= \
 	${TEXMFVARDIR}/web2c/pdftex
@@ -480,7 +487,8 @@ TEX_FORMAT_PTEX_FILES= \
 	${TEXMFVARDIR}/web2c/eptex/ptex.log \
 	${TEXMFVARDIR}/web2c/eptex/ptex.fmt \
 	${TEXMFVARDIR}/web2c/eptex/platex.log \
-	${TEXMFVARDIR}/web2c/eptex/platex.fmt \
+	${TEXMFVARDIR}/web2c/eptex/platex.fmt
+TEX_FORMAT_PTEX_BIN= \
 	bin/platex
 TEX_FORMAT_PTEX_DIRS= \
 	${TEXMFVARDIR}/web2c/ptex \
@@ -502,7 +510,8 @@ TEX_FORMAT_TEXSIS?= \
 	"texsis pdftex - -translate-file=cp227.tcx texsis.ini"
 TEX_FORMAT_TEXSIS_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/texsis.log \
-	${TEXMFVARDIR}/web2c/pdftex/texsis.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/texsis.fmt
+TEX_FORMAT_TEXSIS_BIN= \
 	bin/texsis
 TEX_FORMAT_TEXSIS_DIRS= \
 	${TEXMFVARDIR}/web2c/pdftex
@@ -519,7 +528,8 @@ TEX_FORMAT_UPTEX_FILES=	\
 	${TEXMFVARDIR}/web2c/uptex/uptex.log \
 	${TEXMFVARDIR}/web2c/uptex/uptex.fmt \
 	${TEXMFVARDIR}/web2c/euptex/uplatex.log \
-	${TEXMFVARDIR}/web2c/euptex/uplatex.fmt \
+	${TEXMFVARDIR}/web2c/euptex/uplatex.fmt
+TEX_FORMAT_UPTEX_BIN= \
 	bin/uplatex
 TEX_FORMAT_UPTEX_DIRS=	\
 	${TEXMFVARDIR}/web2c/euptex \
@@ -537,7 +547,8 @@ TEX_FORMAT_XETEX_FILES=	\
 	${TEXMFVARDIR}/web2c/xetex/xelatex.log \
 	${TEXMFVARDIR}/web2c/xetex/xelatex.fmt \
 	${TEXMFVARDIR}/web2c/xetex/cont-en.log \
-	${TEXMFVARDIR}/web2c/xetex/cont-en.fmt \
+	${TEXMFVARDIR}/web2c/xetex/cont-en.fmt
+TEX_FORMAT_XETEX_BIN=	\
 	bin/xelatex
 TEX_FORMAT_XETEX_DIRS=	\
 	${TEXMFVARDIR}/web2c/xetex
@@ -551,7 +562,8 @@ TEX_FORMAT_XMLTEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/xmltex.log \
 	${TEXMFVARDIR}/web2c/pdftex/xmltex.fmt \
 	${TEXMFVARDIR}/web2c/pdftex/pdfxmltex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdfxmltex.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdfxmltex.fmt
+TEX_FORMAT_XMLTEX_BIN= \
 	bin/xmltex \
 	bin/pdfxmltex
 TEX_FORMAT_XMLTEX_DIRS= \

Modified: head/japanese/tex-ptex/Makefile
==============================================================================
--- head/japanese/tex-ptex/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/japanese/tex-ptex/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	ja-tex-
@@ -24,7 +24,7 @@ EXTRACT_FILES=	\
 	libs/xpdf \
 	texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF= \
-	| ${TAR} -xf - -C ${PREFIX}/share \
+	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTVERSION_TEXLIVE=	20120701
@@ -89,14 +89,13 @@ CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	ptex uptex
 
-NO_STAGE=	yes
 pre-configure:
 	for D in libs/obsdcompat libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done
 
-pre-su-install:
+pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 

Modified: head/print/tex-aleph/Makefile
==============================================================================
--- head/print/tex-aleph/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-aleph/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	aleph
 PORTVERSION=	0.0.r.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -24,7 +24,7 @@ EXTRACT_FILES=	\
 	libs/obsdcompat \
 	libs/xpdf \
 	texk/web2c
-EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${PREFIX}/share \
+EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTVERSION_TEXLIVE=	20120701
@@ -75,7 +75,6 @@ MLINKS=	aleph.1 lamed.1 \
 	dvitype.1 odvitype.1 \
 	tangle.1 otangle.1
 
-NO_STAGE=	yes
 pre-configure:
 	for D in libs/obsdcompat libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
@@ -86,4 +85,7 @@ pre-su-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
+post-install:
+	${RM} -f ${STAGEDIR}${PREFIX}/man/man1/*
+
 .include <bsd.port.mk>

Modified: head/print/tex-aleph/pkg-plist
==============================================================================
--- head/print/tex-aleph/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-aleph/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -8,6 +8,10 @@ bin/otp2ocp
 bin/outocp
 bin/mkocp
 bin/mkofm
+bin/ofm2opl
+bin/opl2ofm
+bin/ovf2ovp
+bin/ovp2ovf
 %%TEXMFDISTDIR%%/tex/plain/config/aleph.ini
 %%TEXMFDISTDIR%%/doc/aleph/base/readme.txt
 %%TEXMFDISTDIR%%/doc/aleph/base/News

Modified: head/print/tex-dvipdfmx/Makefile
==============================================================================
--- head/print/tex-dvipdfmx/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-dvipdfmx/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvipdfmx
 PORTVERSION=	20120420
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -33,7 +33,7 @@ EXTRACT_FILES= \
 	texk/dvipdfmx \
 	texk/kpathsea
 EXTRACT_AFTER_ARGS_TEXMF= \
-	| ${TAR} -xf - -C ${PREFIX}/share \
+	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 	--strip-components 1 --no-same-permission --no-same-owner \
 	${EXCLUDE_FILES_TEXMF:S,^,--exclude ${DISTNAME_TEXMF}/,} \
 	${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
@@ -60,20 +60,18 @@ CONFIGURE_ARGS= --with-paper \
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+= 	-lpaper -L${LOCALBASE}/lib
 
-NO_MANCOMPRESS=	yes
-MAN1=	dvipdfm.1 dvipdft.1 ebb.1 extractbb.1
-
-NO_STAGE=	yes
-pre-su-install:
+pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXMF}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
-	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}/fonts/map/dvipdfmx \
-		${PREFIX}/${TEXMFDIR}/fonts/map/dvipdfmx/updmap
-	${TOUCH} ${PREFIX}/${TEXMFDISTDIR}/fonts/map/dvipdfmx/.keep_me \
-		${PREFIX}/${TEXMFDIR}/fonts/map/dvipdfmx/updmap/.keep_me
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/map/dvipdfmx \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/fonts/map/dvipdfmx/updmap
+	${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/map/dvipdfmx/.keep_me \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/fonts/map/dvipdfmx/updmap/.keep_me
 
 post-install:
 	${LN} -f -s ${LOCALBASE}/share/fonts/adobe-cmaps \
-		${PREFIX}/${TEXMFDIR}/fonts/cmap/adobe-cmaps
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/fonts/cmap/adobe-cmaps
+	${RM} -f ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/map/glyphlist/glyphlist.txt \
+		${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/map/glyphlist/pdfglyphlist.txt
 
 .include <bsd.port.mk>

Modified: head/print/tex-dvipdfmx/pkg-plist
==============================================================================
--- head/print/tex-dvipdfmx/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-dvipdfmx/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -3,6 +3,10 @@ bin/dvipdfmx
 bin/dvipdft
 bin/ebb
 bin/extractbb
+man/man1/dvipdfm.1.gz
+man/man1/dvipdft.1.gz
+man/man1/ebb.1.gz
+man/man1/extractbb.1.gz
 %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-ec.map
 %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-texnansi.map
 %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-rm.map

Modified: head/print/tex-dvipsk/Makefile
==============================================================================
--- head/print/tex-dvipsk/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-dvipsk/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.992
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -31,7 +31,7 @@ EXTRACT_FILES= \
 	texk/lcdf-typetools \
 	texk/kpathsea
 EXTRACT_AFTER_ARGS_TEXMF= \
-	| ${TAR} -xf - -C ${PREFIX}/share \
+	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 	--strip-components 1 --no-same-permission --no-same-owner \
 	${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTVERSION_TEXMF=	20120701
@@ -56,16 +56,13 @@ CONFIGURE_ARGS= --with-paper \
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+= 	-lpaper -L${LOCALBASE}/lib
 
-NO_MANCOMPRESS=	yes
-MAN1=	afm2tfm.1 dvips.1
 INFO=	dvips
 
-NO_STAGE=	yes
-pre-su-install:
+pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXMF}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/texlive-${DISTVERSION_TEXMF}-source/texk/lcdf-typetools/7t.enc ${PREFIX}/${TEXMFDISTDIR}/fonts/enc/dvips/base/7t.enc
+	${INSTALL_DATA} ${WRKDIR}/texlive-${DISTVERSION_TEXMF}-source/texk/lcdf-typetools/7t.enc ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/fonts/enc/dvips/base/7t.enc
 
 .include <bsd.port.mk>

Modified: head/print/tex-dvipsk/pkg-plist
==============================================================================
--- head/print/tex-dvipsk/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-dvipsk/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -1,5 +1,7 @@
 bin/afm2tfm
 bin/dvips
+man/man1/afm2tfm.1.gz
+man/man1/dvips.1.gz
 %%TEXMFDISTDIR%%/fonts/map/dvips/gfsneohellenic/gfsneohellenic.map
 %%TEXMFDISTDIR%%/fonts/map/dvips/adfsymbols/ArrowsADF.map
 %%TEXMFDISTDIR%%/fonts/map/dvips/adfsymbols/BulletsADF.map

Modified: head/print/tex-formats/Makefile
==============================================================================
--- head/print/tex-formats/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-formats/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	formats
 PORTVERSION=	20120701
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	#empty
 PKGNAMEPREFIX=	tex-

Modified: head/print/tex-jadetex/Makefile
==============================================================================
--- head/print/tex-jadetex/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-jadetex/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,6 +2,7 @@
 
 PORTNAME=	jadetex
 PORTVERSION=	3.13
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -15,7 +16,7 @@ COMMENT=	TeX backend for Jade, DSSSL pro
 USE_XZ=		yes
 USE_TEX=	texlive texmf pdftex xmltex fmtutil
 TEXHASHDIRS=	${TEXMFDISTDIR}
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${PREFIX}/share \
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES= \
@@ -26,7 +27,6 @@ NO_WRKSRC=	yes
 NO_BUILD=	yes
 TEX_FORMATS=	jadetex
 
-NO_STAGE=	yes
 do-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS}

Modified: head/print/tex-luatex/Makefile
==============================================================================
--- head/print/tex-luatex/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-luatex/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -2,7 +2,7 @@
 
 PORTNAME=	luatex
 PORTVERSION=	0.70.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -31,7 +31,7 @@ EXTRACT_FILES=	\
 	libs/obsdcompat \
 	libs/xpdf \
 	texk/web2c
-EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${PREFIX}/share \
+EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTVERSION_TEXMF=20120701
@@ -86,14 +86,13 @@ CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	luatex
 
-NO_STAGE=	yes
 pre-configure:
 	for D in libs/obsdcompat libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done
 
-pre-su-install:
+pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXMF}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 

Modified: head/print/tex-mfpic/Makefile
==============================================================================
--- head/print/tex-mfpic/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-mfpic/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}106
 DIST_SUBDIR=	teTeX
 
 MAINTAINER=	hrs at FreeBSD.org
-COMMENT=	A TeX package that supports drawing pictures
+COMMENT=	TeX package that supports drawing pictures
 
 USES=		zip
 USE_TEX=	latex
@@ -41,18 +41,14 @@ DOC_FILES=	README changes.txt install.tx
 		doc/mfpdoc.sty doc/mfpguide.pdf doc/mfpguide.tex \
 		doc/mfpic-doc.pdf doc/mfpic-doc.tex
 
-NO_STAGE=	yes
 do-build:
 	cd ${WRKDIR} && ${YES_CMD} | ${TEX_BIN} mfpic.ins
 
 do-install:
 	cd ${WRKDIR} && \
-		${INSTALL_DATA} ${CLASS_FILES} ${PREFIX}/${CLASSDIR} && \
-		${INSTALL_DATA} ${MP_FILES} ${PREFIX}/${MPDIR} && \
-		${INSTALL_DATA} ${MF_FILES} ${PREFIX}/${MFDIR} && \
-		${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/${DDIR}
-
-post-install:
-	@${MKTEXLSR} ${LOCALBASE}/${TEXMFDIR}
+		${INSTALL_DATA} ${CLASS_FILES} ${STAGEDIR}${PREFIX}/${CLASSDIR} && \
+		${INSTALL_DATA} ${MP_FILES} ${STAGEDIR}${PREFIX}/${MPDIR} && \
+		${INSTALL_DATA} ${MF_FILES} ${STAGEDIR}${PREFIX}/${MFDIR} && \
+		${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${PREFIX}/${DDIR}
 
 .include <bsd.port.mk>

Modified: head/print/tex-xdvik/Makefile
==============================================================================
--- head/print/tex-xdvik/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-xdvik/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -43,23 +43,15 @@ PLIST_SUB=	TEXMFDIR=${TEXMFDIR} TEXMFCON
 CONFLICTS_INSTALL=	xdvi-[0-9]* xdvi-*-[0-9]* *-xdvi-[0-9]* \
 			xdvik-[0-9]* ja-xdvik-*-[0-9]*
 
-MAN1=		xdvi.1
-
 PORTDOCS=	BUGS CHANGES INSTALL README README.CVS README.coding \
 		README.config README.cross README.distro README.hacking \
 		README.layout README.xdvik README_maintainer TODO
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/${DISTNAME} && \
-		${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/print/tex-xdvik/pkg-plist
==============================================================================
--- head/print/tex-xdvik/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-xdvik/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -1,5 +1,6 @@
 bin/xdvi
 bin/xdvi-motif
+man/man1/xdvi.1.gz
 %%TEXMFDIR%%/xdvi/XDvi
 %%TEXMFDIR%%/xdvi/config.xdvi
 %%TEXMFDIR%%/xdvi/pixmaps/toolbar.xpm

Modified: head/print/tex-xetex/Makefile
==============================================================================
--- head/print/tex-xetex/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-xetex/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -33,7 +33,7 @@ EXTRACT_FILES= \
 	libs/harfbuzz \
 	texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF= \
-	| ${TAR} -xf - -C ${PREFIX}/share \
+	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTNAME_TEXMF=	texlive-20120701-texmf
@@ -79,14 +79,14 @@ CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	xetex
 
-NO_STAGE=	yes
 pre-configure:
 	for D in libs/harfbuzz libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done
 
-pre-su-install:
+pre-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-20120701-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 

Modified: head/print/tex-xmltex/Makefile
==============================================================================
--- head/print/tex-xmltex/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-xmltex/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -12,10 +12,10 @@ EXTRACT_ONLY=
 MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Non-validating XML parser, written in TeX
 
-USE_XZ=		yes
+USES=		tar:xz
 USE_TEX=	texlive texmf pdftex fmtutil
 TEXHASHDIRS=	${TEXMFDISTDIR}
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${PREFIX}/share \
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES= \
@@ -26,7 +26,6 @@ NO_WRKSRC=	yes
 NO_BUILD=	yes
 TEX_FORMATS=	xmltex
 
-NO_STAGE=	yes
 do-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS}

Modified: head/print/tex-xmltex/pkg-plist
==============================================================================
--- head/print/tex-xmltex/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/tex-xmltex/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -43,6 +43,7 @@
 @dirrm %%TEXMFDISTDIR%%/doc/otherformats/xmltex/xmlplay
 @dirrm %%TEXMFDISTDIR%%/doc/otherformats/xmltex/base
 @dirrm %%TEXMFDISTDIR%%/doc/otherformats/xmltex
+ at dirrm %%TEXMFDISTDIR%%/doc/otherformats
 @dirrm %%TEXMFDISTDIR%%/tex/xmltex/xmlplay
 @dirrm %%TEXMFDISTDIR%%/tex/xmltex/passivetex
 @dirrm %%TEXMFDISTDIR%%/tex/xmltex/config

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/texlive-base/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libicuio.so:${PORTSDIR}/dev
 		libpoppler.so:${PORTSDIR}/graphics/poppler
 
 USE_TEX=	texlive web2c kpathsea ptexenc texhash-bootstrap
-USES=		gmake pkgconfig perl5 tar:xz
+USES=		gmake pkgconfig perl5 shebangfix tar:xz
 USE_AUTOTOOLS=	autoconf
 USE_GHOSTSCRIPT=yes
 USE_PERL5=	run
@@ -97,6 +97,20 @@ CFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/ptexenc
 PLIST_SUB=	INSTALL_DATA="${INSTALL_DATA}"
 
+SHEBANG_FILES=	texk/texlive/linked_scripts/*/*.pl \
+		texk/texlive/linked_scripts/findhyph/findhyph \
+		texk/texlive/linked_scripts/de-macro/de-macro \
+		texk/texlive/linked_scripts/uptex/convbkmk.rb \
+		texk/texlive/linked_scripts/accfonts/vpl2vpl \
+		texk/texlive/linked_scripts/exceltex/exceltex \
+		texk/texlive/linked_scripts/texdirflatten/texdirflatten \
+		texk/texlive/linked_scripts/bibexport/bibexport.sh \
+		texk/texlive/linked_scripts/urlbst/urlbst \
+		texk/texlive/linked_scripts/accfonts/mkt1font \
+		texk/texlive/linked_scripts/splitindex/perl/splitindex.pl \
+		texk/texlive/linked_scripts/accfonts/vpl2ovp \
+		texk/texlive/linked_scripts/installfont/installfont-tl
+
 INFO=	dvipng
 
 post-patch:
@@ -109,8 +123,11 @@ post-patch:
 post-install-fmtutil:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c
 	${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFLOCALDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}
 	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/web2c/fmtutil.cnf \
 		${STAGEDIR}${PREFIX}/${FMTUTIL_CNF}
+	${CHMOD} 644 ${STAGEDIR}${PREFIX}/${TEXMFDIR}/web2c/fmtutil.cnf
 
 post-install: post-install-fmtutil
 .ORDER: post-install-fmtutil do-texhash

Modified: head/print/texlive-base/pkg-plist
==============================================================================
--- head/print/texlive-base/pkg-plist	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/texlive-base/pkg-plist	Fri Jul  4 17:35:18 2014	(r360642)
@@ -417,8 +417,7 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDIR%%/scripts/texlive/tlmgr.pl
 %%TEXMFDIR%%/web2c/fmtutil.cnf
 %%TEXMFCONFIGDIR%%/web2c/.keep_me
- at exec %%INSTALL_DATA%% %D/%%TEXMFDIR%%/web2c/fmtutil.cnf %D/%%FMTUTIL_CNF%%
- at unexec /bin/rm -f %D/%%FMTUTIL_CNF%%
+%%FMTUTIL_CNF%%
 @dirrmtry %%TEXMFCONFIGDIR%%/web2c
 @dirrmtry %%TEXMFCONFIGDIR%%
 @dirrmtry %%TEXMFDISTDIR%%/scripts/accfonts

Modified: head/print/texlive-texmf/Makefile
==============================================================================
--- head/print/texlive-texmf/Makefile	Fri Jul  4 16:07:17 2014	(r360641)
+++ head/print/texlive-texmf/Makefile	Fri Jul  4 17:35:18 2014	(r360642)
@@ -175,5 +175,11 @@ do-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/$$D/doc && \
 		${TOUCH} ${STAGEDIR}${PREFIX}/$$D/doc/.keep_me; \
 	done
+	${RM} -f ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/ls-R \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/ls-R \
+		${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/checkcites/checkcites.lua \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/scripts/texdoc/texdoc.tlu \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/scripts/texlive/rungs.tlu \
+		${STAGEDIR}${PREFIX}/${TEXMFDIR}/scripts/texlive/tlmgr.pl
 
 .include <bsd.port.mk>

More information about the svn-ports-all mailing list