pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/texlive-tetex Resolve conflicts between texlive-...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c52f2e7052eb
branches: trunk
changeset: 609943:c52f2e7052eb
user: minskim <minskim%pkgsrc.org@localhost>
date: Sat Oct 13 22:43:23 2012 +0000
description:
Resolve conflicts between texlive-tetex and TeX Live 2012 packages.
diffstat:
print/texlive-tetex/Makefile | 27 +---
print/texlive-tetex/PLIST | 41 +------
print/texlive-tetex/distinfo | 4 +-
print/texlive-tetex/patches/patch-aa | 96 ++++++++++----
print/texlive-tetex/patches/patch-ab | 69 ----------
print/texlive-tetex/patches/patch-ae | 99 ---------------
print/texlive-tetex/patches/patch-af | 19 --
print/texlive-tetex/patches/patch-ag | 18 --
print/texlive-tetex/patches/patch-ah | 16 --
print/texlive-tetex/patches/patch-ai | 223 -----------------------------------
print/texlive-tetex/patches/patch-aj | 15 --
print/texlive-tetex/patches/patch-ak | 40 ------
print/texlive-tetex/patches/patch-al | 58 ---------
13 files changed, 71 insertions(+), 654 deletions(-)
diffs (truncated from 858 to 300 lines):
diff -r 53e3c5162eeb -r c52f2e7052eb print/texlive-tetex/Makefile
--- a/print/texlive-tetex/Makefile Sat Oct 13 22:43:22 2012 +0000
+++ b/print/texlive-tetex/Makefile Sat Oct 13 22:43:23 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 13:45:48 asau Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/13 22:43:23 minskim Exp $
DISTNAME= texlive-20110705-source
PKGNAME= texlive-tetex-2011
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
@@ -12,9 +12,8 @@
COMMENT= Scripts included in teTeX
CONFLICTS+= teTeX-bin<=3.0nb22
-DEPENDS+= dialog>=1.0:../../misc/dialog
DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea
-DEPENDS+= tex-tetex>=3.0.24482:../../print/tex-tetex
+DEPENDS+= tex-tetex>=3.0.27774:../../print/tex-tetex
EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
${DISTNAME}/texk/tetex
@@ -29,26 +28,6 @@
${PKG_SYSCONFDIR}/web2c/fmtutil.cnf
FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys
-EVAL_PREFIX+= DIALOG_PREFIX=dialog
-EVAL_PREFIX+= KPSEWHICH_PREFIX=kpathsea
-EVAL_PREFIX+= UPDMAP_PREFIX=tex-tetex
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Setting paths to commands.
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= fmtutil fmtutil-sys kpsetool kpsewhere \
- tcfmgr texconfig texconfig-dialog texconfig-sys \
- texlinks
-SUBST_SED.paths= -e 's,@DIALOG@,${DIALOG_PREFIX}/bin/dialog,g' \
- -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' \
- -e 's,@FMTUTIL_SYS@,${PREFIX}/bin/fmtutil-sys,g' \
- -e 's,@KPSEWHICH@,${KPSEWHICH_PREFIX}/bin/kpsewhich,g' \
- -e 's,@LOCALBASE@,${LOCALBASE},g' \
- -e 's,@TEXCONFIG@,${PREFIX}/bin/texconfig,g' \
- -e 's,@TEXLINKS@,${PREFIX}/bin/texlinks,g' \
- -e 's,@UPDMAP@,${UPDMAP_PREFIX}/bin/updmap,g' \
- -e 's,@UPDMAP_SYS@,${UPDMAP_PREFIX}/bin/updmap-sys,g'
-
INSTALLATION_DIRS+= share/texmf/web2c
TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR}
diff -r 53e3c5162eeb -r c52f2e7052eb print/texlive-tetex/PLIST
--- a/print/texlive-tetex/PLIST Sat Oct 13 22:43:22 2012 +0000
+++ b/print/texlive-tetex/PLIST Sat Oct 13 22:43:23 2012 +0000
@@ -1,52 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2012/02/09 21:27:26 minskim Exp $
-bin/allcm
-bin/allec
-bin/allneeded
-bin/dvi2fax
-bin/dvired
-bin/fmtutil
-bin/fmtutil-sys
+@comment $NetBSD: PLIST,v 1.8 2012/10/13 22:43:23 minskim Exp $
bin/fontinst
-bin/kpsepath
-bin/kpsetool
-bin/kpsewhere
-bin/kpsexpand
-bin/mktexfmt
bin/ps2frag
bin/pslatex
bin/rubibtex
bin/rumakeindex
-bin/texconfig
-bin/texconfig-dialog
-bin/texconfig-sys
-bin/texlinks
-man/man1/allcm.1
-man/man1/allec.1
-man/man1/allneeded.1
-man/man1/dvi2fax.1
-man/man1/dvired.1
-man/man1/fmtutil-sys.1
-man/man1/fmtutil.1
man/man1/fontinst.1
-man/man1/kpsepath.1
-man/man1/kpsetool.1
-man/man1/kpsewhere.1
-man/man1/kpsexpand.1
-man/man1/mktexfmt.1
man/man1/ps2frag.1
man/man1/pslatex.1
man/man1/rubibtex.1
man/man1/rumakeindex.1
-man/man1/texconfig-sys.1
-man/man1/texconfig.1
-man/man1/texlinks.1
-man/man1/thumbpdf.1
man/man5/fmtutil.cnf.5
-share/texmf/texconfig/README
-share/texmf/texconfig/g/generic
-share/texmf/texconfig/generic
-share/texmf/texconfig/tcfmgr
-share/texmf/texconfig/tcfmgr.map
-share/texmf/texconfig/v/vt100
-share/texmf/texconfig/x/xterm
share/texmf/web2c/fmtutil.cnf
diff -r 53e3c5162eeb -r c52f2e7052eb print/texlive-tetex/distinfo
--- a/print/texlive-tetex/distinfo Sat Oct 13 22:43:22 2012 +0000
+++ b/print/texlive-tetex/distinfo Sat Oct 13 22:43:23 2012 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/02/09 21:27:26 minskim Exp $
+$NetBSD: distinfo,v 1.12 2012/10/13 22:43: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) = 284158bee8b825e4076f0f8fa5526d42b4182a55
+SHA1 (patch-aa) = fd61fd7bf4c6cea8204234b3daed23031589ca45
SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
SHA1 (patch-ae) = e17e8579ccb4db6302119b046fa319ece06ed663
SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
diff -r 53e3c5162eeb -r c52f2e7052eb print/texlive-tetex/patches/patch-aa
--- a/print/texlive-tetex/patches/patch-aa Sat Oct 13 22:43:22 2012 +0000
+++ b/print/texlive-tetex/patches/patch-aa Sat Oct 13 22:43:23 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2012/02/09 21:27:26 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
--- Makefile.in.orig 2011-06-16 14:01:09.000000000 +0000
+++ Makefile.in
-@@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@
+@@ -195,30 +195,16 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
@@ -15,8 +15,28 @@
+shell_scripts =
sh_scripts = \
- allcm \
-@@ -226,7 +224,7 @@ all_scripts = $(lua_scripts) $(perl_scri
+- allcm \
+- allneeded \
+- dvi2fax \
+- dvired \
+- fmtutil \
+- fmtutil-sys \
+ fontinst \
+- kpsetool \
+- kpsewhere \
+ ps2frag \
+ pslatex \
+ rubibtex \
+- rumakeindex \
+- texconfig \
+- texconfig-dialog \
+- texconfig-sys \
+- texlinks
++ rumakeindex
+
+ scriptsdir = texmf/scripts/tetex
+ nodist_bin_SCRIPTS = $(am__append_1)
+@@ -226,57 +212,30 @@ 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)
@@ -25,23 +45,26 @@
@WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts)
CLEANFILES = $(nodist_bin_SCRIPTS)
dist_man1_MANS = \
-@@ -235,7 +233,6 @@ dist_man1_MANS = \
- allneeded.man \
- dvi2fax.man \
- dvired.man \
+- allcm.man \
+- allec.man \
+- allneeded.man \
+- dvi2fax.man \
+- dvired.man \
- e2pall.man \
- fmtutil.man \
+- fmtutil.man \
fontinst.man \
- kpsetool.man \
-@@ -245,16 +242,13 @@ dist_man1_MANS = \
+- kpsetool.man \
+- kpsewhere.man \
+ ps2frag.man \
+ pslatex.man \
rubibtex.man \
- rumakeindex.man \
- texconfig.man \
+- rumakeindex.man \
+- texconfig.man \
- texdoctk.man \
- texlinks.man \
+- texlinks.man \
- thumbpdf.man \
- updmap.man
-+ thumbpdf.man
++ rumakeindex.man
dist_man5_MANS = \
- fmtutil.cnf.5 \
@@ -49,30 +72,41 @@
+ fmtutil.cnf.5
-texconfdir = ${prefix}
-+texconfdir = ${prefix}/share
- nobase_dist_texconf_DATA = \
- texmf/texconfig/README \
- texmf/texconfig/g/generic \
-@@ -262,7 +256,7 @@ nobase_dist_texconf_DATA = \
- texmf/texconfig/v/vt100 \
- texmf/texconfig/x/xterm
-
+-nobase_dist_texconf_DATA = \
+- texmf/texconfig/README \
+- texmf/texconfig/g/generic \
+- texmf/texconfig/generic \
+- texmf/texconfig/v/vt100 \
+- texmf/texconfig/x/xterm
+-
-texconfigdir = ${prefix}/texmf/texconfig
+-dist_texconfig_SCRIPTS = tcfmgr
+-dist_texconfig_DATA = tcfmgr.map
++texconfdir = ${prefix}/share
++nobase_dist_texconf_DATA =
++
+texconfigdir = ${prefix}/share/texmf/texconfig
- dist_texconfig_SCRIPTS = tcfmgr
- dist_texconfig_DATA = tcfmgr.map
++dist_texconfig_SCRIPTS =
++dist_texconfig_DATA =
web2cdir = ${prefix}/texmf/web2c
-@@ -275,8 +269,7 @@ bin_links = \
-
- man1_links = $(bin_links) \
- fmtutil:fmtutil-sys \
+ dist_web2c_DATA = fmtutil.cnf
+-bin_links = \
+- allcm:allec \
+- fmtutil:mktexfmt \
+- kpsetool:kpsexpand \
+- kpsetool:kpsepath
+-
+-man1_links = $(bin_links) \
+- fmtutil:fmtutil-sys \
- texconfig:texconfig-sys \
- updmap:updmap-sys
-+ texconfig:texconfig-sys
++bin_links =
++
++man1_links = $(bin_links)
EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-@@ -810,7 +803,7 @@ info-am:
+@@ -810,7 +769,7 @@ info-am:
install-data-am: install-dist_texconfigDATA \
install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
diff -r 53e3c5162eeb -r c52f2e7052eb print/texlive-tetex/patches/patch-ab
--- a/print/texlive-tetex/patches/patch-ab Sat Oct 13 22:43:22 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/09/20 03:33:43 minskim Exp $
-
---- texconfig-dialog.orig 2007-07-16 10:08:10.000000000 -0700
-+++ texconfig-dialog
-@@ -83,14 +83,7 @@ logexec()
- runDialog()
- {
- termCtl clear
-- if test -n "$DIALOG_PROG"; then
-- $DIALOG_PROG --title "TeX setup utility" ${1+"$@"}
-- runDialogRc=$?
-- else
-- TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO \
-- tcdialog --title "TeX setup utility" ${1+"$@"}
-- runDialogRc=$?
-- fi
-+ @DIALOG@ --title "TeX setup utility" ${1+"$@"}
- termCtl clear
- (exit $runDialogRc)
- return $runDialogRc
-@@ -105,7 +98,7 @@ findDialog()
- {
- for bin in whiptail dialog
- do
-- binLoc=`texconfig findprog $bin`
-+ binLoc=`@TEXCONFIG@ findprog $bin`
- case $binLoc in
- "") DIALOG_PROG="";;
- *) DIALOG_PROG=$binLoc; break;;
-@@ -243,7 +236,7 @@ Chosse a mode to be used when metafont g
- be differences between modes of the same resolution. See the comments in the file modes.mf for more details.
Home |
Main Index |
Thread Index |
Old Index