5 files changed, 44 insertions, 16 deletions

diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 6e5872183eeb..d87148626466 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,10 +2,12 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20120701
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMESUFFIX=	-base
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, base binaries
@@ -33,6 +35,7 @@ EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
 		${DISTNAME}/texk/kpathsea \
 		${DISTNAME}/texk/ptexenc \
 		${DISTNAME}/texk/xdvik \
+		${DISTNAME}/texk/dvipdfmx \
 		${DISTNAME}/libs/freetype \
 		${DISTNAME}/libs/freetype2 \
 		${DISTNAME}/libs/gd \
@@ -89,23 +92,29 @@ MAN1=	afm2pl.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 bbox.1 bg5conv.1	\
 	context.1 ctxtools.1 detex.1 deweb.1 disdvi.1 dt2dv.1 dv2dt.1	\
 	dvi2fax.1 dvi2tty.1 dvibook.1 dviconcat.1 dvidvi.1 dvigif.1	\
 	dvihp.1 dvilj.1 dvilj2p.1 dvilj4.1 dvilj4l.1 dvilj6.1		\
-	dvipdfm.1 dvipdft.1 dvipng.1 dvipos.1 dvips.1 dvired.1		\
-	dviselect.1 dvisvgm.1 dvitodvi.1 e2pall.1 ebb.1 extconv.1	\
-	extractbb.1 fmtutil-sys.1 fmtutil.1 fontinst.1 hbf2gf.1		\
-	kpsepath.1 kpsetool.1 kpsewhere.1 kpsexpand.1 lacheck.1		\
-	m-tx.1 mag.1 makeindex.1 mendex.1 mkindex.1 mktexfmt.1		\
-	mmafm.1 mmpfb.1 mptopdf.1 otfinfo.1 otftotfm.1 pdfclose.1	\
-	pdfopen.1 pfb2pfa.1 pk2bm.1 pmx2pdf.1 pmxab.1 prepmx.1		\
-	ps2eps.1 ps2frag.1 ps2pk.1 pslatex.1 pstopdf.1 rubibtex.1	\
-	rumakeindex.1 scor2prt.1 sjisconv.1 t1ascii.1 t1asm.1		\
-	t1binary.1 t1disasm.1 t1dotlessj.1 t1lint.1 t1mac.1		\
-	t1rawafm.1 t1reencode.1 t1testpage.1 t1unmac.1			\
+	dvipng.1 dvipos.1 dvips.1 dvired.1 dviselect.1 dvisvgm.1	\
+	dvitodvi.1 e2pall.1 extconv.1 fmtutil-sys.1 fmtutil.1		\
+	fontinst.1 hbf2gf.1 kpsepath.1 kpsetool.1 kpsewhere.1		\
+	kpsexpand.1 lacheck.1 m-tx.1 mag.1 makeindex.1 mendex.1		\
+	mkindex.1 mktexfmt.1 mmafm.1 mmpfb.1 mptopdf.1 otfinfo.1	\
+	otftotfm.1 pdfclose.1 pdfopen.1 pfb2pfa.1 pk2bm.1 pmx2pdf.1	\
+	pmxab.1 prepmx.1 ps2eps.1 ps2frag.1 ps2pk.1 pslatex.1		\
+	pstopdf.1 rubibtex.1 rumakeindex.1 scor2prt.1 sjisconv.1	\
+	t1ascii.1 t1asm.1 t1binary.1 t1disasm.1 t1dotlessj.1 t1lint.1	\
+	t1mac.1 t1rawafm.1 t1reencode.1 t1testpage.1 t1unmac.1		\
 	texconfig-sys.1 texconfig.1 texdoctk.1 texexec.1 texlinks.1	\
 	texmfstart.1 thumbpdf.1 tpic2pdftex.1 ttf2pk.1 ttf2tfm.1	\
 	ttfdump.1 ttftotype42.1 updmap-sys.1 updmap.1 vlna.1
 MAN5=	fmtutil.cnf.5 updmap.cfg.5
 INFO=	dvipng dvips
 
+post-patch:
+	cd ${WRKSRC} && \
+		${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
+		texk/tetex/fmtutil-sys \
+		texk/tetex/texconfig-sys \
+		texk/tetex/updmap-sys.sh
+
 post-install:
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/web2c
 	${INSTALL_DATA} ${PREFIX}/${TEXMFDIR}/web2c/fmtutil.cnf \
diff --git a/print/texlive-base/files/patch-texk-tetex-fmtutil-sys b/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
new file mode 100644
index 000000000000..45a82652d0f4
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
@@ -0,0 +1,8 @@
+--- texk/tetex/fmtutil-sys.orig	2013-05-07 13:20:06.000000000 +0900
++++ texk/tetex/fmtutil-sys	2013-05-07 13:20:52.000000000 +0900
+@@ -26,4 +26,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec fmtutil ${1+"$@"}
++exec %%PREFIX%%/bin/fmtutil ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-tetex-texconfig-sys b/print/texlive-base/files/patch-texk-tetex-texconfig-sys
new file mode 100644
index 000000000000..a8fe8f5fee88
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-tetex-texconfig-sys
@@ -0,0 +1,8 @@
+--- texk/tetex/texconfig-sys.orig	2013-05-07 13:24:39.000000000 +0900
++++ texk/tetex/texconfig-sys	2013-05-07 13:24:50.000000000 +0900
+@@ -28,4 +28,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec texconfig ${1+"$@"}
++exec %%PREFIX%%/bin/texconfig ${1+"$@"}
diff --git a/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh b/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
new file mode 100644
index 000000000000..14fc3372a92d
--- /dev/null
+++ b/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
@@ -0,0 +1,8 @@
+--- texk/tetex/updmap-sys.sh.orig	2013-05-07 13:25:38.000000000 +0900
++++ texk/tetex/updmap-sys.sh	2013-05-07 13:25:50.000000000 +0900
+@@ -27,4 +27,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec updmap ${1+"$@"}
++exec %%PREFIX%%/bin/updmap ${1+"$@"}
diff --git a/print/texlive-base/pkg-plist b/print/texlive-base/pkg-plist
index 5d27e5c0ff59..d2069c6b1900 100644
--- a/print/texlive-base/pkg-plist
+++ b/print/texlive-base/pkg-plist
@@ -60,9 +60,6 @@ bin/dvilj2p
 bin/dvilj4
 bin/dvilj4l
 bin/dvilj6
-bin/dvipdfm
-bin/dvipdfmx
-bin/dvipdft
 bin/dvipng
 bin/dvipos
 bin/dvips
@@ -71,14 +68,12 @@ bin/dviselect
 bin/dvisvgm
 bin/dvitodvi
 bin/e2pall
-bin/ebb
 bin/ebong
 bin/epspdf
 bin/epspdftk
 bin/epstopdf
 bin/exceltex
 bin/extconv
-bin/extractbb
 bin/fig4latex
 bin/findhyph
 bin/fmtutil