Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 May 2013 08:44:32 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317588 - in head: Mk devel/tex-kpathsea devel/tex-web2c japanese/tex-ptex print print/tex-aleph print/tex-dvipdfmx print/tex-dvipdfmx/files print/tex-jadetex print/tex-luatex print/tex...
Message-ID:  <201305070844.r478iW3n013443@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Tue May  7 08:44:32 2013
New Revision: 317588
URL: http://svnweb.freebsd.org/changeset/ports/317588

Log:
  - Separate print/tex-dvipdfmx from print/texlive-base and add libpaper
    support.  dvipdfmx's default paper size can be set by
    ${LOCALBASE}/etc/papersize and/or PAPERSIZE environment variable as
    other programs like print/psutils do.
  
  - Use absolute pathname in {fmtutil,texconfig,updmap}-sys programs because
    manually-installed and/or old TeXLive files can prevent them from
    working. [1]
  
  - Fix pkg-plist in print/texlive-texmf.
  
  - Remove DIST_SUBDIR from Mk/bsd.tex.mk.
  
  Reported by:	bsam, Stephen Montgomery-Smith [1]

Added:
  head/print/tex-dvipdfmx/
     - copied from r317144, head/print/dvipdfmx/
  head/print/tex-dvipdfmx/files/m4-cho-libs.m4   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-Makefile.in   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-config.h.in   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure.ac   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-dvipdfmx-20120420-data-dvipdfmx.cfg   (contents, props changed)
  head/print/texlive-base/files/patch-texk-tetex-fmtutil-sys   (contents, props changed)
  head/print/texlive-base/files/patch-texk-tetex-texconfig-sys   (contents, props changed)
  head/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh   (contents, props changed)
Deleted:
  head/print/tex-dvipdfmx/files/patch-src-Makefile.in
  head/print/tex-dvipdfmx/files/patch-src-dvipdfmx.c
Modified:
  head/Mk/bsd.tex.mk
  head/devel/tex-kpathsea/Makefile
  head/devel/tex-web2c/Makefile
  head/japanese/tex-ptex/Makefile
  head/print/Makefile
  head/print/tex-aleph/Makefile
  head/print/tex-dvipdfmx/Makefile
  head/print/tex-dvipdfmx/distinfo
  head/print/tex-dvipdfmx/pkg-plist
  head/print/tex-jadetex/Makefile
  head/print/tex-luatex/Makefile
  head/print/tex-ptexenc/Makefile
  head/print/tex-xdvik/Makefile
  head/print/tex-xetex/Makefile
  head/print/tex-xmltex/Makefile
  head/print/texlive-base/Makefile
  head/print/texlive-base/pkg-plist
  head/print/texlive-infra/Makefile
  head/print/texlive-texmf/Makefile
  head/print/texlive-texmf/pkg-plist

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Tue May  7 08:42:29 2013	(r317587)
+++ head/Mk/bsd.tex.mk	Tue May  7 08:44:32 2013	(r317588)
@@ -41,13 +41,13 @@ TEX_MAINTAINER=	hrs@FreeBSD.org
 #  updmap:	font map regeneration
 #  fmtutil:	format regeneration
 #
-.if empty(USE_TEX:Mtetex-texmf) && \
-    empty(USE_TEX:Mtetex-base) && \
-    empty(USE_TEX:Mtetex)
-.if defined(MASTER_SITES) && !empty(MASTER_SITES)
-DIST_SUBDIR?=	TeX
-.endif
-.endif
+
+# default TeX distribution.  "tetex" or "texlive"
+TEX_DEFAULT?=	tetex
+#TEX_DEFAULT?=	texlive
+
+# normalize
+TEX_DEFAULT:=	${TEX_DEFAULT:L}
 
 TEXMFDIR?=	share/texmf
 TEXMFDISTDIR?=	share/texmf-dist
@@ -125,9 +125,8 @@ _USE_TEX_XDVIK=		xdvi:${PORTSDIR}/print/
 CONFLICTS_INSTALL+=	${CONFLICTS_TETEX}
 .endif
 .if !empty(USE_TEX:Mxdvipdfmx) || !empty(USE_TEX:Mtexlive)
-# XXX
-#_USE_TEX_DVIPDFMX=	dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
-#CONFLICTS_INSTALL+=	${CONFLICTS_TETEX}
+_USE_TEX_DVIPDFMX=	dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
+CONFLICTS_INSTALL+=	${CONFLICTS_TETEX}
 .endif
 .if !empty(USE_TEX:Mbase) || !empty(USE_TEX:Mtexlive)
 _USE_TEXLIVE_BASE=	tlmgr:${PORTSDIR}/print/texlive-base

Modified: head/devel/tex-kpathsea/Makefile
==============================================================================
--- head/devel/tex-kpathsea/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/devel/tex-kpathsea/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-20120701-source
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Path searching library for TeX

Modified: head/devel/tex-web2c/Makefile
==============================================================================
--- head/devel/tex-web2c/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/devel/tex-web2c/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${PORTVERSION}-source
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX implementation translating WEB to C

Modified: head/japanese/tex-ptex/Makefile
==============================================================================
--- head/japanese/tex-ptex/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/japanese/tex-ptex/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -2,14 +2,14 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.3
-DISTVERSION=	20120701
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION}-source
+DISTNAME=	texlive-${DISTVERSION_TEXLIVE}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
-EXTRACT_ONLY=	texlive-${DISTVERSION}-source${EXTRACT_SUFX}
+DIST_SUBDIR=	TeX
+EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE}-source${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX
@@ -27,7 +27,8 @@ EXTRACT_AFTER_ARGS_TEXMF= \
 	| ${TAR} -xf - -C ${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTNAME_TEXMF=	texlive-${DISTVERSION}-texmf
+DISTVERSION_TEXLIVE=	20120701
+DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/ptex \
 	texmf-dist/doc/platex \
@@ -96,7 +97,7 @@ pre-configure:
 	done
 
 pre-su-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
 .include <bsd.port.mk>

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -289,6 +289,7 @@
     SUBDIR += teTeX-texmf
     SUBDIR += tex
     SUBDIR += tex-aleph
+    SUBDIR += tex-dvipdfmx
     SUBDIR += tex-formats
     SUBDIR += tex-jadetex
     SUBDIR += tex-luatex

Modified: head/print/tex-aleph/Makefile
==============================================================================
--- head/print/tex-aleph/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-aleph/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -2,14 +2,14 @@
 
 PORTNAME=	aleph
 PORTVERSION=	0.0.r.4
-DISTVERSION=	20120701
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION}-source
+DISTNAME=	texlive-${DISTVERSION_TEXLIVE}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
-EXTRACT_ONLY=	texlive-${DISTVERSION}-source${EXTRACT_SUFX}
+DIST_SUBDIR=	TeX
+EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE}-source${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Engine including Omega and e-TeX features
@@ -27,7 +27,8 @@ EXTRACT_FILES=	\
 EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTNAME_TEXMF=	texlive-${DISTVERSION}-texmf
+DISTVERSION_TEXLIVE=	20120701
+DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/plain/config/aleph.ini \
 	texmf-dist/doc/aleph \
@@ -81,7 +82,7 @@ pre-configure:
 	done
 
 pre-su-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
 .include <bsd.port.mk>

Modified: head/print/tex-dvipdfmx/Makefile
==============================================================================
--- head/print/dvipdfmx/Makefile	Thu May  2 19:51:08 2013	(r317144)
+++ head/print/tex-dvipdfmx/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -1,55 +1,77 @@
-# New ports collection makefile for:    dvipdfmx
-# Date created:		8 March 2001
-# Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
-#
+# Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	dvipdfmx
-PORTVERSION=	20110311
+PORTVERSION=	20120420
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
-		http://project.ktug.or.kr/dvipdfmx/snapshot/latest/ \
-		http://project.ktug.or.kr/dvipdfmx/snapshot/archive/
-MASTER_SITE_SUBDIR=	dviware/dvipdfmx
-DIST_SUBDIR=	dvipdfmx
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+PKGNAMEPREFIX=	tex-
+DISTNAME=	texlive-${DISTVERSION_TEXMF}-source
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME_TEXMF}${EXTRACT_SUFX}
+DIST_SUBDIR=	TeX
+EXTRACT_ONLY=	texlive-${DISTVERSION_TEXMF}-source${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dvipdfm with Asian languages by CID-keyed font technology support
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	DVI Previewer(kpathsearch) for X
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		paper:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		kpsepath:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 
+USE_XZ=		yes
+USE_GMAKE=	yes
+USE_TEX=	kpathsea web2c texmf texhash
+TEXHASHDIR=	${TEXMFDISTDIR} ${TEXMFDIR}
+USES=		pkgconfig
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES= \
+	m4 \
+	build-aux \
+	texk/am \
+	texk/dvipdfmx \
+	texk/kpathsea
+EXTRACT_AFTER_ARGS_TEXMF= \
+	| ${TAR} -xf - -C ${PREFIX}/share \
+	--strip-components 1 --no-same-permission --no-same-owner \
+	${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
+DISTVERSION_TEXMF=	20120701
+DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXMF}-texmf
+EXTRACT_FILES_TEXMF= \
+	texmf-dist/fonts/map/dvipdfm/ \
+	texmf/dvipdfm/config/ \
+	texmf/dvipdfmx/ \
+	texmf/fonts/cmap/dvipdfmx/ \
+	texmf/fonts/map/dvipdfmx/ \
+	texmf/doc/dvipdfm/ \
+	texmf/doc/dvipdfmx/
+WRKSRC=	${WRKDIR}/${DISTNAME}/texk/dvipdfmx
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${LOCALBASE}/share
+CONFIGURE_ARGS= --with-paper \
+		--with-system-kpathsea \
+		--with-kpathsea-includes=${LOCALBASE}/include \
+		--with-kpathsea-libdir=${LOCALBASE}/lib \
+		--with-system-libpng \
+		--with-system-zlib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+= 	-lpaper -L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
-PLIST_SUB=	DVIPDFMXDIR=${DVIPDFMXDIR} \
-		FONTMAPDIR=${FONTMAPDIR} \
-		GLYPHMAPDIR=${GLYPHMAPDIR} \
-		FONTCMAPDIR=${FONTCMAPDIR} \
-		MKTEXLSR=${MKTEXLSR} \
-		ADOBECMAPDIR=${ADOBECMAPDIR}
-
-MAN1=		extractbb.1
-
-TEXMFDIR=	share/texmf
-DVIPDFMXDIR=	${TEXMFDIR}/dvipdfmx
-FONTMAPDIR=	${TEXMFDIR}/fonts/map/dvipdfmx
-GLYPHMAPDIR=	${TEXMFDIR}/fonts/map/glyphlist
-FONTCMAPDIR=	${TEXMFDIR}/fonts/cmap
-ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+NO_MANCOMPRESS=	yes
+MAN1=	dvipdfm.1 dvipdft.1 ebb.1 extractbb.1
+
+pre-su-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
 
 post-install:
-	${MKDIR} ${LOCALBASE}/${FONTCMAPDIR}
-	${LN} -s -f ${ADOBECMAPDIR} \
-		${LOCALBASE}/${FONTCMAPDIR}/adobe-cmaps
-	${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
+	${LN} -f -s ${LOCALBASE}/share/fonts/adobe-cmaps \
+		${PREFIX}/${TEXMFDIR}/fonts/cmap/adobe-cmaps
 
 .include <bsd.port.mk>

Modified: head/print/tex-dvipdfmx/distinfo
==============================================================================
--- head/print/dvipdfmx/distinfo	Thu May  2 19:51:08 2013	(r317144)
+++ head/print/tex-dvipdfmx/distinfo	Tue May  7 08:44:32 2013	(r317588)
@@ -1,2 +1,4 @@
-SHA256 (dvipdfmx/dvipdfmx-20110311.tar.gz) = ba7b052a17d8be4d94d64186fa77ddcce52ab5ee755b02e8444c56450ad2cbbe
-SIZE (dvipdfmx/dvipdfmx-20110311.tar.gz) = 616749
+SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81
+SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044
+SHA256 (TeX/texlive-20120701-texmf.tar.xz) = 987bdd2d4844e2791b185a132e18611e5b97d7747f08099042d0de33d36bc1ba
+SIZE (TeX/texlive-20120701-texmf.tar.xz) = 1428125120

Added: head/print/tex-dvipdfmx/files/m4-cho-libs.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/m4-cho-libs.m4	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,12 @@
+--- m4/cho-libs.m4.orig	2013-05-07 15:29:52.000000000 +0900
++++ m4/cho-libs.m4	2013-05-07 15:45:02.000000000 +0900
+@@ -60,7 +60,8 @@
+   [struct paper *p;],
+   [AC_MSG_RESULT(yes)
+    AC_SEARCH_LIBS([paperpswidth], [paper],
+-    [AC_DEFINE(HAVE_LIBPAPER, 1, [Define if you have libpaper])])],
++    [AC_DEFINE(HAVE_LIBPAPER, 1, [Define if you have libpaper])]m
++    [], [LIBS="-lpaper $LIBS"])],
+   [CPPFLAGS=$_cppflags
+    LDDFLAGS=$_ldflags
+    AC_MSG_RESULT(no)])

Added: head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-Makefile.in	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	2013-05-07 15:26:43.000000000 +0900
++++ Makefile.in	2013-05-07 15:26:58.000000000 +0900
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.12 from Makefile.am.
++# Makefile.in generated by automake 1.12.2 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -2080,7 +2079,7 @@
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+-	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	chmod -R a-w $(distdir); chmod u+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+ 	chmod a-w $(distdir)

Added: head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-config.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-config.h.in	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,12 @@
+--- config.h.in.orig	2013-05-07 15:17:21.000000000 +0900
++++ config.h.in	2013-05-07 15:17:26.000000000 +0900
+@@ -62,6 +62,9 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Define if you have libpaper */
++#undef HAVE_LIBPAPER
++
+ /* Define if you have libpng and its headers. */
+ #undef HAVE_LIBPNG
+ 

Added: head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,160 @@
+--- configure.orig	2012-04-26 20:02:04.000000000 +0900
++++ configure	2013-05-07 15:45:19.000000000 +0900
+@@ -786,6 +786,7 @@
+ with_zlib_includes
+ with_zlib_libdir
+ with_system_libpng
++with_paper
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -795,7 +796,8 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++CPPFLAGS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1450,6 +1452,7 @@
+   --with-zlib-libdir=DIR  zlib library installed in DIR
+   --with-system-libpng    use installed libpng headers and library (requires
+                           pkg-config)
++  --with-paper=DIR        use paper include/library files from DIR
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -3014,12 +3017,6 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
+-mkdir_p="$MKDIR_P"
+-case $mkdir_p in
+-  [\\/$]* | ?:[\\/]*) ;;
+-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -7716,6 +7713,12 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>;
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>;
++mkdir_p='$(MKDIR_P)'
++
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+@@ -15388,6 +15391,105 @@
+ fi
+ 
+ 
++eval CPPFLAGS=\"$LIBPAPER_INCLUDES \$CPPFLAGS\"
++eval LIBS=\"$LIBPAPER_LIBS \$LIBS\"
++
++_cppflags=$CPPFLAGS _ldflags=$LDFLAGS
++
++# Check whether --with-paper was given.
++if test "${with_paper+set}" = set; then :
++  withval=$with_paper; if test -d "$withval"; then
++     CPPFLAGS="$CPPFLAGS -I$withval/include"
++     LDFLAGS="$LDFLAGS -L$withval/lib"
++   fi
++fi
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
++$as_echo_n "checking for paper header files... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <paper.h>
++int
++main ()
++{
++struct paper *p;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
++$as_echo_n "checking for library containing paperpswidth... " >&6; }
++if ${ac_cv_search_paperpswidth+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char paperpswidth ();
++int
++main ()
++{
++return paperpswidth ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' paper; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_paperpswidth=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_paperpswidth+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_paperpswidth+:} false; then :
++
++else
++  ac_cv_search_paperpswidth=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5
++$as_echo "$ac_cv_search_paperpswidth" >&6; }
++ac_res=$ac_cv_search_paperpswidth
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
++m
++
++else
++  LIBS="-lpaper $LIBS"
++fi
++
++else
++  CPPFLAGS=$_cppflags
++   LDDFLAGS=$_ldflags
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
+ CPPFLAGS=$kpse_save_CPPFLAGS
+ LIBS=$kpse_save_LIBS
+ 

Added: head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure.ac	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2013-05-07 15:15:19.000000000 +0900
++++ configure.ac	2013-05-07 15:15:31.000000000 +0900
+@@ -67,6 +67,9 @@
+ KPSE_ADD_FLAGS([libpng])
+ CHO_CHECK_LIBPNG
+ 
++KPSE_ADD_FLAGS([libpaper])
++CHO_CHECK_LIBPAPER
++
+ KPSE_RESTORE_FLAGS
+ 
+ echo timestamp >config.force

Added: head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-dvipdfmx-20120420-data-dvipdfmx.cfg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-dvipdfmx-20120420-data-dvipdfmx.cfg	Tue May  7 08:44:32 2013	(r317588)
@@ -0,0 +1,17 @@
+--- dvipdfmx-20120420/data/dvipdfmx.cfg.orig	2013-05-07 16:24:18.000000000 +0900
++++ dvipdfmx-20120420/data/dvipdfmx.cfg	2013-05-07 16:27:28.000000000 +0900
+@@ -33,8 +33,13 @@
+ %%
+ %% papersize-spec is 'paper-format' or length-pair, e.g., 'a4', 'letter',
+ %% '20cm,30cm'. Recognized unit is 'cm', 'mm', 'bp', 'pt', 'in'.
++%%
++%% FreeBSD-specific: papersize-spec is configured via libpaper when the
++%% below "p" line is commented out.  PAPERSIZE environment variable
++%% and/or /usr/local/etc/papersize file is used.  See paperconfig(8) manual
++%% page for more detaul.
+ 
+-p  a4
++%% p  a4
+ 
+ %% Annotation Box Margin:
+ %%

Modified: head/print/tex-dvipdfmx/pkg-plist
==============================================================================
--- head/print/dvipdfmx/pkg-plist	Thu May  2 19:51:08 2013	(r317144)
+++ head/print/tex-dvipdfmx/pkg-plist	Tue May  7 08:44:32 2013	(r317588)
@@ -1,16 +1,48 @@
 @comment $FreeBSD$
+bin/dvipdfm
 bin/dvipdfmx
-bin/ebb-dvipdfmx
+bin/dvipdft
+bin/ebb
 bin/extractbb
-%%DVIPDFMXDIR%%/dvipdfmx.cfg
-@dirrm %%DVIPDFMXDIR%%
-%%FONTMAPDIR%%/cid-x.map
-@dirrm %%FONTMAPDIR%%
-%%GLYPHMAPDIR%%/glyphlist.txt
-%%GLYPHMAPDIR%%/pdfglyphlist.txt
-@dirrmtry %%GLYPHMAPDIR%%
-%%FONTCMAPDIR%%/adobe-cmaps
-%%FONTCMAPDIR%%/dvipdfmx/EUC-UCS2
-@dirrm %%FONTCMAPDIR%%/dvipdfmx
-@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
-@unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%
+%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-ec.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-texnansi.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-rm.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-math.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/.keep_me
+%%TEXMFDIR%%/dvipdfm/config/config
+%%TEXMFDIR%%/dvipdfm/config/config-win32
+%%TEXMFDIR%%/dvipdfmx/dvipdfmx.cfg
+%%TEXMFDIR%%/fonts/cmap/dvipdfmx/README
+%%TEXMFDIR%%/fonts/cmap/dvipdfmx/UTF8-UCS2
+%%TEXMFDIR%%/fonts/cmap/dvipdfmx/EUC-UCS2
+%%TEXMFDIR%%/fonts/cmap/adobe-cmaps
+%%TEXMFDIR%%/fonts/map/dvipdfmx/ckx.map
+%%TEXMFDIR%%/fonts/map/dvipdfmx/cid-x.map
+%%TEXMFDIR%%/fonts/map/dvipdfmx/updmap/.keep_me
+%%TEXMFDIR%%/doc/dvipdfm/mwicks.bb
+%%TEXMFDIR%%/doc/dvipdfm/something.eps
+%%TEXMFDIR%%/doc/dvipdfm/Makefile
+%%TEXMFDIR%%/doc/dvipdfm/dvipdfm.tex
+%%TEXMFDIR%%/doc/dvipdfm/dvipdfm.pdf
+%%TEXMFDIR%%/doc/dvipdfm/sample.tex
+%%TEXMFDIR%%/doc/dvipdfm/something.bb
+%%TEXMFDIR%%/doc/dvipdfm/mwicks.jpeg
+%%TEXMFDIR%%/doc/dvipdfm/something.fig
+%%TEXMFDIR%%/doc/dvipdfm/transistor.eps
+%%TEXMFDIR%%/doc/dvipdfm/transistor.pdf
+%%TEXMFDIR%%/doc/dvipdfm/transistor.fig
+%%TEXMFDIR%%/doc/dvipdfm/transistor.bb
+%%TEXMFDIR%%/doc/dvipdfm/something.pdf
+%%TEXMFDIR%%/doc/dvipdfmx/dvipdfmx-special.pdf
+%%TEXMFDIR%%/doc/dvipdfmx/dvipdfmx-special.tex
+@dirrm %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm
+@dirrm %%TEXMFDISTDIR%%/fonts/map/dvipdfm
+@dirrmtry %%TEXMFDISTDIR%%/fonts/map/dvipdfmx
+@dirrm %%TEXMFDIR%%/doc/dvipdfmx
+@dirrm %%TEXMFDIR%%/doc/dvipdfm
+@dirrmtry %%TEXMFDIR%%/fonts/map/dvipdfmx/updmap
+@dirrmtry %%TEXMFDIR%%/fonts/map/dvipdfmx
+@dirrm %%TEXMFDIR%%/fonts/cmap/dvipdfmx
+@dirrm %%TEXMFDIR%%/dvipdfm/config
+@dirrm %%TEXMFDIR%%/dvipdfm
+@dirrm %%TEXMFDIR%%/dvipdfmx

Modified: head/print/tex-jadetex/Makefile
==============================================================================
--- head/print/tex-jadetex/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-jadetex/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-20120701-texmf
+DIST_SUBDIR=	TeX
 EXTRACT_ONLY=
 
 MAINTAINER=	hrs@FreeBSD.org

Modified: head/print/tex-luatex/Makefile
==============================================================================
--- head/print/tex-luatex/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-luatex/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -8,6 +8,7 @@ PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${DISTVERSION_TEXMF}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
+DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	texlive-${DISTVERSION_TEXMF}-source${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org

Modified: head/print/tex-ptexenc/Makefile
==============================================================================
--- head/print/tex-ptexenc/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-ptexenc/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-20120701-source
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Library for Japanese pTeX and its tools

Modified: head/print/tex-xdvik/Makefile
==============================================================================
--- head/print/tex-xdvik/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-xdvik/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ PORTVERSION=	22.86
 CATEGORIES=	print
 MASTER_SITES=	SF/xdvi/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	tex-
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X

Modified: head/print/tex-xetex/Makefile
==============================================================================
--- head/print/tex-xetex/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-xetex/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -9,6 +9,7 @@ PKGNAMEPREFIX=	tex-
 DISTNAME=	web2c-29235
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:web2c \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}:texmf
+DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org

Modified: head/print/tex-xmltex/Makefile
==============================================================================
--- head/print/tex-xmltex/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/tex-xmltex/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-20120701-texmf
+DIST_SUBDIR=	TeX
 EXTRACT_ONLY=
 
 MAINTAINER=	hrs@FreeBSD.org

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/texlive-base/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -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
 	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 \

Added: head/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/texlive-base/files/patch-texk-tetex-fmtutil-sys	Tue May  7 08:44:32 2013	(r317588)
@@ -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+"$@"}

Added: head/print/texlive-base/files/patch-texk-tetex-texconfig-sys
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/texlive-base/files/patch-texk-tetex-texconfig-sys	Tue May  7 08:44:32 2013	(r317588)
@@ -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+"$@"}

Added: head/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh	Tue May  7 08:44:32 2013	(r317588)
@@ -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+"$@"}

Modified: head/print/texlive-base/pkg-plist
==============================================================================
--- head/print/texlive-base/pkg-plist	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/texlive-base/pkg-plist	Tue May  7 08:44:32 2013	(r317588)
@@ -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

Modified: head/print/texlive-infra/Makefile
==============================================================================
--- head/print/texlive-infra/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/texlive-infra/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -6,6 +6,7 @@ CATEGORIES=	print perl5
 MASTER_SITES=	ftp://tug.org/tex-archive/systems/texlive/tlnet/archive/
 PKGNAMESUFFIX=	-infra
 DISTNAME=	${PORTNAME}.infra
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Basic TeXLive infrastructure

Modified: head/print/texlive-texmf/Makefile
==============================================================================
--- head/print/texlive-texmf/Makefile	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/texlive-texmf/Makefile	Tue May  7 08:44:32 2013	(r317588)
@@ -2,10 +2,12 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20120701
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.tug.org/historic/systems/texlive/2012/
 PKGNAMESUFFIX=	-texmf
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
+DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, texmf Tree

Modified: head/print/texlive-texmf/pkg-plist
==============================================================================
--- head/print/texlive-texmf/pkg-plist	Tue May  7 08:42:29 2013	(r317587)
+++ head/print/texlive-texmf/pkg-plist	Tue May  7 08:44:32 2013	(r317588)
@@ -11857,10 +11857,6 @@
 %%TEXMFDISTDIR%%/fonts/map/glyphlist/glyphlist.txt
 %%TEXMFDISTDIR%%/fonts/map/glyphlist/texglyphlist.txt
 %%TEXMFDISTDIR%%/fonts/map/glyphlist/pdfglyphlist.txt
-%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-ec.map
-%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-texnansi.map
-%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-rm.map
-%%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-math.map
 %%TEXMFDISTDIR%%/fonts/map/fontname/urw.map
 %%TEXMFDISTDIR%%/fonts/map/fontname/supplier.map
 %%TEXMFDISTDIR%%/fonts/map/fontname/weight.map
@@ -22770,6 +22766,56 @@
 %%TEXMFDISTDIR%%/fonts/vf/arkandis/venturis/yvtbciw8t.vf
 %%TEXMFDISTDIR%%/fonts/vf/arkandis/venturis/yvtrijw8tc.vf
 %%TEXMFDISTDIR%%/fonts/vf/arkandis/venturis/yvtrci8t.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagd8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagdc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagdo8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagk8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagkc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/avantgar/pagko8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbkd8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbkdc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbkdi8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbkl8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbklc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/bookman/pbkli8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrb8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrbc8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrbo8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrr8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrrc8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/courier/pcrro8u.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvb8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvbc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvbn8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvbnc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvbo8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvbon8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvr8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvrc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvrn8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvrnc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvro8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/helvetic/phvron8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncb8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbi8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncr8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncri8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrv8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplb8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplbi8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplr8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/palatino/pplri8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmb8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmbc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmbi8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmr8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmrc8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/times/ptmri8z.vf
+%%TEXMFDISTDIR%%/fonts/vf/cspsfonts-adobe/zapfchan/pzcmi8z.vf
 %%TEXMFDISTDIR%%/fonts/type1/gust/poltawski/antpr17.pfb
 %%TEXMFDISTDIR%%/fonts/type1/gust/poltawski/antpli12.pfb
 %%TEXMFDISTDIR%%/fonts/type1/gust/poltawski/antpbi8.pfm
@@ -96625,7 +96671,6 @@
 %%TEXMFDIR%%/texconfig/g/generic
 %%TEXMFDIR%%/texconfig/x/xterm
 %%TEXMFDIR%%/README
-%%TEXMFDIR%%/dvipdfmx/dvipdfmx.cfg
 %%TEXMFDIR%%/web2c/mktex.cnf
 %%TEXMFDIR%%/web2c/empty.tcx
 %%TEXMFDIR%%/web2c/il1-t1.tcx
@@ -96650,8 +96695,6 @@
 %%TEXMFDIR%%/web2c/cp1250cs.tcx
 %%TEXMFDIR%%/web2c/kam-cs.tcx
 %%TEXMFDIR%%/web2c/viscii-t5.tcx
-%%TEXMFDIR%%/dvipdfm/config/config
-%%TEXMFDIR%%/dvipdfm/config/config-win32
 %%TEXMFDIR%%/fonts/lig/afm2pl/ligtex.lig
 %%TEXMFDIR%%/fonts/lig/afm2pl/defpost.lig
 %%TEXMFDIR%%/fonts/lig/afm2pl/forge.lig
@@ -96660,11 +96703,6 @@
 %%TEXMFDIR%%/fonts/lig/afm2pl/bound.lig
 %%TEXMFDIR%%/fonts/lig/afm2pl/default.lig
 %%TEXMFDIR%%/fonts/cmap/README
-%%TEXMFDIR%%/fonts/cmap/dvipdfmx/README
-%%TEXMFDIR%%/fonts/cmap/dvipdfmx/UTF8-UCS2
-%%TEXMFDIR%%/fonts/cmap/dvipdfmx/EUC-UCS2
-%%TEXMFDIR%%/fonts/map/dvipdfmx/ckx.map
-%%TEXMFDIR%%/fonts/map/dvipdfmx/cid-x.map
 %%TEXMFDIR%%/fonts/map/dvips/updmap/psfonts_pk.map
 %%TEXMFDIR%%/fonts/map/dvips/updmap/psfonts.map
 %%TEXMFDIR%%/fonts/map/dvips/updmap/builtin35.map
@@ -96967,27 +97005,11 @@
 %%TEXMFDIR%%/doc/ttf2pk/ttf2pk.txt
 %%TEXMFDIR%%/doc/ttf2pk/ttf2tfm.txt
 %%TEXMFDIR%%/doc/hbf2gf/hbf2gf.pdf
-%%TEXMFDIR%%/doc/dvipdfmx/dvipdfmx-special.pdf
-%%TEXMFDIR%%/doc/dvipdfmx/dvipdfmx-special.tex
 %%TEXMFDIR%%/doc/kpathsea/kpathsea.html
 %%TEXMFDIR%%/doc/kpathsea/kpathsea.pdf
 %%TEXMFDIR%%/doc/web2c/web2c.pdf
 %%TEXMFDIR%%/doc/web2c/web2c.html
 %%TEXMFDIR%%/doc/vlna/vlna.pdf
-%%TEXMFDIR%%/doc/dvipdfm/mwicks.bb
-%%TEXMFDIR%%/doc/dvipdfm/something.eps
-%%TEXMFDIR%%/doc/dvipdfm/Makefile
-%%TEXMFDIR%%/doc/dvipdfm/dvipdfm.tex
-%%TEXMFDIR%%/doc/dvipdfm/dvipdfm.pdf
-%%TEXMFDIR%%/doc/dvipdfm/sample.tex
-%%TEXMFDIR%%/doc/dvipdfm/something.bb
-%%TEXMFDIR%%/doc/dvipdfm/mwicks.jpeg
-%%TEXMFDIR%%/doc/dvipdfm/something.fig
-%%TEXMFDIR%%/doc/dvipdfm/transistor.eps
-%%TEXMFDIR%%/doc/dvipdfm/transistor.pdf
-%%TEXMFDIR%%/doc/dvipdfm/transistor.fig
-%%TEXMFDIR%%/doc/dvipdfm/transistor.bb
-%%TEXMFDIR%%/doc/dvipdfm/something.pdf
 %%TEXMFDIR%%/doc/texdoc/texdoc.pdf
 %%TEXMFDIR%%/doc/texdoc/News
 %%TEXMFDIR%%/doc/texdoc/texdoc.tex
@@ -104728,6 +104750,8 @@
 @dirrm %%TEXMFDISTDIR%%/fonts/ofm/public/cm-lgc
 @dirrm %%TEXMFDISTDIR%%/fonts/ofm/public
 @dirrm %%TEXMFDISTDIR%%/fonts/ofm
+@dirrm %%TEXMFDISTDIR%%/fonts/misc/cns
+@dirrm %%TEXMFDISTDIR%%/fonts/misc
 @dirrm %%TEXMFDISTDIR%%/fonts/map/vtex/mnsymbol
 @dirrm %%TEXMFDISTDIR%%/fonts/map/vtex/cm-super
 @dirrm %%TEXMFDISTDIR%%/fonts/map/vtex/antiqua
@@ -104908,9 +104932,6 @@
 @dirrm %%TEXMFDISTDIR%%/fonts/map/dvips/adfsymbols
 @dirrm %%TEXMFDISTDIR%%/fonts/map/dvips/adforn
 @dirrm %%TEXMFDISTDIR%%/fonts/map/dvips
-@dirrm %%TEXMFDISTDIR%%/fonts/map/dvipdfmx
-@dirrm %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm
-@dirrm %%TEXMFDISTDIR%%/fonts/map/dvipdfm
 @dirrm %%TEXMFDISTDIR%%/fonts/map
 @dirrm %%TEXMFDISTDIR%%/fonts/fea/context
 @dirrm %%TEXMFDISTDIR%%/fonts/fea
@@ -105437,8 +105458,6 @@
 @dirrm %%TEXMFDIR%%/doc/extconv
 @dirrm %%TEXMFDIR%%/doc/dvips
 @dirrm %%TEXMFDIR%%/doc/dvipng
-@dirrm %%TEXMFDIR%%/doc/dvipdfmx
-@dirrm %%TEXMFDIR%%/doc/dvipdfm
 @dirrm %%TEXMFDIR%%/doc/chktex
 @dirrm %%TEXMFDIR%%/doc/cefsconv
 @dirrm %%TEXMFDIR%%/doc/cefconv
@@ -105541,8 +105560,6 @@
 @dirrm %%TEXMFDIR%%/fonts/map/dvips/updmap
 @dirrm %%TEXMFDIR%%/fonts/map/dvips/tetex
 @dirrm %%TEXMFDIR%%/fonts/map/dvips
-@dirrm %%TEXMFDIR%%/fonts/map/dvipdfmx/updmap
-@dirrm %%TEXMFDIR%%/fonts/map/dvipdfmx
 @dirrm %%TEXMFDIR%%/fonts/map
 @dirrm %%TEXMFDIR%%/fonts/lig/afm2pl
 @dirrm %%TEXMFDIR%%/fonts/lig
@@ -105552,7 +105569,6 @@
 @dirrm %%TEXMFDIR%%/fonts/enc/dvips/afm2pl
 @dirrm %%TEXMFDIR%%/fonts/enc/dvips
 @dirrm %%TEXMFDIR%%/fonts/enc
-@dirrm %%TEXMFDIR%%/fonts/cmap/dvipdfmx
 @dirrm %%TEXMFDIR%%/fonts/cmap
 @dirrm %%TEXMFDIR%%/fonts
 @dirrm %%TEXMFDIR%%/dvips/tetex
@@ -105561,9 +105577,6 @@
 @dirrm %%TEXMFDIR%%/dvips/config
 @dirrm %%TEXMFDIR%%/dvips/base
 @dirrm %%TEXMFDIR%%/dvips
-@dirrm %%TEXMFDIR%%/dvipdfmx
-@dirrm %%TEXMFDIR%%/dvipdfm/config
-@dirrm %%TEXMFDIR%%/dvipdfm
 @dirrm %%TEXMFDIR%%/doc
 @dirrm %%TEXMFDIR%%/chktex
 @dirrm %%TEXMFDIR%%/asymptote/GUI



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305070844.r478iW3n013443>