texlive-tetex requires more recent tex-tetex to handle TeX formats.

4 files changed, 16 insertions, 37 deletions

diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index 3c2d7e0f643..5ba7ab0cc7a 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/13 22:43:23 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/14 21:26:23 minskim Exp $
 
 DISTNAME=	texlive-20110705-source
 PKGNAME=	texlive-tetex-2011
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -13,7 +13,7 @@ COMMENT=	Scripts included in teTeX
 
 CONFLICTS+=	teTeX-bin<=3.0nb22
 DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
-DEPENDS+=	tex-tetex>=3.0.27774:../../print/tex-tetex
+DEPENDS+=	tex-tetex>=3.0.27774nb1:../../print/tex-tetex
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/tetex
@@ -21,11 +21,6 @@ EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/tetex
 
-PKG_SYSCONFSUBDIR=	texmf
-
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/web2c
-CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf \
-		${PKG_SYSCONFDIR}/web2c/fmtutil.cnf
 FILES_SUBST+=	UPDMAP_SYS=${PREFIX}/bin/updmap-sys
 
 INSTALLATION_DIRS+=	share/texmf/web2c
@@ -35,11 +30,4 @@ TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
-
-post-install:
-.for f in fmtutil.cnf
-	${INSTALL_DATA} ${FILESDIR}/${f} \
-		${DESTDIR}${PREFIX}/share/texmf/web2c
-.endfor
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/texlive-tetex/PLIST b/print/texlive-tetex/PLIST
index f74ecaf7f73..583e5b24270 100644
--- a/print/texlive-tetex/PLIST
+++ b/print/texlive-tetex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/10/13 22:43:23 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/10/14 21:26:23 minskim Exp $
 bin/fontinst
 bin/ps2frag
 bin/pslatex
@@ -9,5 +9,3 @@ man/man1/ps2frag.1
 man/man1/pslatex.1
 man/man1/rubibtex.1
 man/man1/rumakeindex.1
-man/man5/fmtutil.cnf.5
-share/texmf/web2c/fmtutil.cnf
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index e7dfdf64d09..db89c8aa95f 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.12 2012/10/13 22:43:23 minskim Exp $
+$NetBSD: distinfo,v 1.13 2012/10/14 21:26:23 minskim Exp $
 
 SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
 RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
 Size (texlive-20110705-source.tar.xz) = 131207904 bytes
-SHA1 (patch-aa) = fd61fd7bf4c6cea8204234b3daed23031589ca45
-SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
-SHA1 (patch-ae) = e17e8579ccb4db6302119b046fa319ece06ed663
-SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
-SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
-SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
-SHA1 (patch-ai) = c194542cbed5e8a6af8f50f2b9873106a8b146fe
-SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b
-SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2
-SHA1 (patch-al) = 0b51e3aecd3a048132ffd02bacfb9a63f55051ef
+SHA1 (patch-aa) = d34fd7902ae9f934d3866c3b3475ec5d369cb894
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index c3481b419a0..6f1f309a89f 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
+$NetBSD: patch-aa,v 1.11 2012/10/14 21:26:24 minskim Exp $
 
 --- Makefile.in.orig	2011-06-16 14:01:09.000000000 +0000
 +++ Makefile.in
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
  
  scriptsdir = texmf/scripts/tetex
  nodist_bin_SCRIPTS = $(am__append_1)
-@@ -226,57 +212,30 @@ all_scripts = $(lua_scripts) $(perl_scri
+@@ -226,57 +212,29 @@ all_scripts = $(lua_scripts) $(perl_scri
  @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
  @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
  texmfdir = ${prefix}/$(scriptsdir)
@@ -64,13 +64,11 @@ $NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
 -	texlinks.man \
 -	thumbpdf.man \
 -	updmap.man
-+	rumakeindex.man
- 
- dist_man5_MANS = \
+-
+-dist_man5_MANS = \
 -	fmtutil.cnf.5 \
 -	updmap.cfg.5
-+	fmtutil.cnf.5
- 
+-
 -texconfdir = ${prefix}
 -nobase_dist_texconf_DATA = \
 -	texmf/texconfig/README \
@@ -82,6 +80,10 @@ $NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
 -texconfigdir = ${prefix}/texmf/texconfig
 -dist_texconfig_SCRIPTS = tcfmgr
 -dist_texconfig_DATA = tcfmgr.map
++	rumakeindex.man
++
++dist_man5_MANS =
++
 +texconfdir = ${prefix}/share
 +nobase_dist_texconf_DATA =
 +
@@ -106,7 +108,7 @@ $NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
  
  EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
  run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-@@ -810,7 +769,7 @@ info-am:
+@@ -810,7 +768,7 @@ info-am:
  
  install-data-am: install-dist_texconfigDATA \
  	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \