[prev in list] [next in list] [prev in thread] [next in thread]
List: opencsw-devel
Subject: [csw-devel] SF.net SVN: gar:[19119] csw/mgar/pkg/texlive/trunk
From: pfelecan () users ! sourceforge ! net
Date: 2012-08-30 13:25:23
Message-ID: E1T74kN-0006yD-FP () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 19119
http://gar.svn.sourceforge.net/gar/?rev=19119&view=rev
Author: pfelecan
Date: 2012-08-30 13:25:23 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
texlive/trunk:
- adapt configuration to Open CSW file system layout
- activate all the possible formats and add the corresponding symbolic
links
- change post installation merge strategy
Modified Paths:
--------------
csw/mgar/pkg/texlive/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/texlive/trunk/files/0003-Adapt-texmf-configuration.patch
csw/mgar/pkg/texlive/trunk/files/0004-Activate-formats.patch
Modified: csw/mgar/pkg/texlive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texlive/trunk/Makefile 2012-08-30 13:21:43 UTC (rev 19118)
+++ csw/mgar/pkg/texlive/trunk/Makefile 2012-08-30 13:25:23 UTC (rev 19119)
@@ -21,9 +21,14 @@
DISTNAME = $(DISTNAMEPREFIX)-source
DISTFILES = $(DISTNAME).tar.xz
DISTFILES += $(DISTNAMEPREFIX)-extra.tar.xz
-DISTFILES += $(DISTNAMEPREFIX)-texmf.tar.xz
+TEXMFARPREFIX = $(DISTNAMEPREFIX)-texmf
+TEXMFAR = $(TEXMFARPREFIX).tar.xz
+DISTFILES += $(TEXMFAR)
+NOEXTRACT += $(TEXMFAR)
PATCHFILES += 0001-Fix-lacheck-buffer-overflow.patch
PATCHFILES += 0002-Fix-ICU-link-edit.patch
+PATCHFILES += 0003-Adapt-texmf-configuration.patch
+PATCHFILES += 0004-Activate-formats.patch
PACKAGING_PLATFORMS = solaris10-sparc
PACKAGING_PLATFORMS += solaris10-i386
@@ -101,18 +106,52 @@
cd $(OBJDIR)/texk/ptexenc && gsed --in-place --expression='s;-L/opt/csw/lib;;g' \
libptexenc.la $(MAKECOOKIE)
-# install the texmf and texmf-dist but exclude those components
-# provided by the source archive:
-post-install-modulated: xdup = --exclude=texmf/doc/xindy/alphabets-doc.pdf
-post-install-modulated: xdup += --exclude=texmf/doc/xindy/tex2xindy.pdf
-post-install-modulated: xdup += --exclude=texmf/doc/xindy/texindy.pdf
-post-install-modulated: xdup += --exclude=texmf/doc/xindy/xindy.pdf
-post-install-modulated: xdup += --exclude=texmf/dvipdfmx/dvipdfmx.cfg
-post-install-modulated: xdup += \
--exclude=texmf/xindy/modules/tex/inputenc/cp1250.xdy
-post-install-modulated: xdup += --exclude=texmf/xindy/modules/tex/inputenc/cp437.xdy
-post-install-modulated: xdup += --exclude=texmf/xindy/modules/tex/inputenc/cp850.xdy
+# install the texmf and texmf-dist
post-install-modulated:
- gtar --directory=$(WORKDIR)/$(DISTNAMEPREFIX)-texmf --create $(xdup) --file=- . | \
gtar --directory=$(DESTDIR)/$(datadir) --extract --file=- + : merge source and \
distributed texmf tree + gtar --directory=$(DESTDIR)/$(datadir) --extract \
--file=$(DOWNLOADDIR)/$(TEXMFAR) + gtar --directory=$(DESTDIR)/$(datadir) --create \
--file=- texmf texmf-dist | gtar --directory=$(DESTDIR)/$(datadir)/$(TEXMFARPREFIX) \
--extract --file=- + rm -rf $(DESTDIR)/$(datadir)/texmf \
$(DESTDIR)/$(datadir)/texmf-dist + mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf \
$(DESTDIR)/$(datadir) + mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf-dist \
$(DESTDIR)/$(datadir) + rm -rf $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)
+ : create additional hierarchy to reflect texmf.cnf
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(datadir)/texmf-local
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(localstatedir)/lib/texmf-var
+ ginstall --directory --mode=u=rwx,go=rx \
$(DESTDIR)/$(localstatedir)/cache/texmf-fonts + ginstall --directory \
--mode=u=rwx,go=rx $(DESTDIR)/$(sysconfdir)/texmf + : create all the available \
formats: + PATH=$(DESTDIR)/$(bindir):${PATH} LD_LIBRARY_PATH=$(DESTDIR)/$(libdir) \
fmtutil-sys --all + : create symbolic links for available formats:
+ cd $(DESTDIR)/$(bindir) && ln -s -f aleph lamed
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex amstex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cslatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcslatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex csplain
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcsplain
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex eplain
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex jadetex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfjadetex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex latex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdflatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f luatex dvilualatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f luatex lualatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f luatex dviluatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfmex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex utf8mex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mllatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mltex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex etex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfetex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyramstex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyrtex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyrtexinfo
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex texsis
+ cd $(DESTDIR)/$(bindir) && ln -s -f euptex uplatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f xetex xelatex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex xmltex
+ cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfxmltex
$(MAKECOOKIE)
# this is private and not available publicly
Added: csw/mgar/pkg/texlive/trunk/files/0003-Adapt-texmf-configuration.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0003-Adapt-texmf-configuration.patch \
(rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0003-Adapt-texmf-configuration.patch 2012-08-30 \
13:25:23 UTC (rev 19119) @@ -0,0 +1,82 @@
+From b0ea9184681898bf7d3f581753f95375b9584621 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan@opencsw.org>
+Date: Wed, 29 Aug 2012 10:07:31 +0200
+Subject: [PATCH] Adapt texmf configuration
+
+---
+ texk/kpathsea/texmf.cnf | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/texk/kpathsea/texmf.cnf b/texk/kpathsea/texmf.cnf
+index d8569d2..903f681 100644
+--- a/texk/kpathsea/texmf.cnf
++++ b/texk/kpathsea/texmf.cnf
+@@ -51,7 +51,7 @@
+ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+ % Kpathsea sets SELFAUTOLOC (the directory with the binary),
+ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
+-TEXMFROOT = $SELFAUTOPARENT
++TEXMFROOT = $SELFAUTODIR/share
+
+ % The tree containing runtime files related to the specific
+ % distribution and version.
+@@ -61,13 +61,13 @@ TEXMFMAIN = $TEXMFROOT/texmf
+ TEXMFDIST = $TEXMFROOT/texmf-dist
+
+ % Local additions to the distribution trees.
+-TEXMFLOCAL = $TEXMFROOT/../texmf-local
++TEXMFLOCAL = $TEXMFROOT/texmf-local
+
+ % TEXMFSYSVAR, where *-sys store cached runtime data.
+-TEXMFSYSVAR = $TEXMFROOT/texmf-var
++TEXMFSYSVAR = $SELFAUTOPARENT/../var/opt/csw/lib/texmf-var
+
+ % TEXMFSYSCONFIG, where *-sys store configuration data.
+-TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
++TEXMFSYSCONFIG = $SELFAUTOPARENT/../etc/opt/csw/texmf
+
+ % Per-user texmf tree(s) -- organized per the TDS, as usual. To define
+ % more than one per-user tree, set this to a list of directories in
+@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
+ TEXMFHOME = ~/texmf
+
+ % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
+-TEXMFVAR = ~/.texlive2012/texmf-var
++TEXMFVAR = ~/.texmf-var
+
+ % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
+-TEXMFCONFIG = ~/.texlive2012/texmf-config
++TEXMFCONFIG = ~/.texmf-config
+
+ % List all the texmf trees.
+ %
+@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2012/texmf-config
+ % versions should take precedence over those -- although it is generally
+ % a source of confusion to have different versions of a package
+ % installed, whatever the trees, so try to avoid it.
+-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
++TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+
+ % Where to look for ls-R files. There need not be an ls-R in the
+ % directories in this path, but if there is one, Kpathsea will use it.
+@@ -113,7 +113,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+ % Where generated fonts may be written. This tree is used when the sources
+ % were found in a system tree and either that tree wasn't writable, or the
+ % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
+-VARTEXFONTS = $TEXMFVAR/fonts
++VARTEXFONTS = $SELFAUTOPARENT/../var/opt/csw/cache/texmf-fonts
+
+ % On some systems, there will be a system tree which contains all the font
+ % files that may be created as well as the formats. For example
+@@ -326,7 +326,7 @@ TEXPSHEADERS.gsftopk = \
.;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}/ + % OSFONTDIR is to provide \
a convenient hook for allowing TeX to find + % fonts installed on the system (outside \
of TeX). An empty default + % value would add "//" to the search paths, so we give \
it a dummy value. +-OSFONTDIR = /please/set/osfontdir/in/the/environment
++OSFONTDIR = /usr/share/fonts
+
+ % PostScript Type 1 outline fonts.
+ T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
+--
+1.7.11.3
+
Added: csw/mgar/pkg/texlive/trunk/files/0004-Activate-formats.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0004-Activate-formats.patch \
(rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0004-Activate-formats.patch 2012-08-30 13:25:23 \
UTC (rev 19119) @@ -0,0 +1,48 @@
+From 61cb8c637555772955bd00db2c5f1fc3cb90bdd9 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan@opencsw.org>
+Date: Thu, 30 Aug 2012 09:09:38 +0200
+Subject: [PATCH] Activate formats
+
+---
+ texk/tetex/fmtutil.cnf | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/texk/tetex/fmtutil.cnf b/texk/tetex/fmtutil.cnf
+index 8e1ab82..fa07176 100644
+--- a/texk/tetex/fmtutil.cnf
++++ b/texk/tetex/fmtutil.cnf
+@@ -45,11 +45,11 @@ amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+ # from context:
+ cont-en pdftex cont-usr.tex -8bit *cont-en.ini
+ cont-en xetex cont-usr.tex -8bit *cont-en.ini
+-#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
+-#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini
+-#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini
+-#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
+-#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini
++cont-de pdftex cont-usr.tex -8bit *cont-de.ini
++cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini
++cont-it pdftex cont-usr.tex -8bit *cont-it.ini
++cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
++cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini
+ #
+ # from cslatex:
+ cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
+@@ -102,9 +102,11 @@ eptex eptex language.def *eptex.ini
+ platex eptex language.dat *platex.ini
+ #
+ # from t2:
+-#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
+-#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
+-#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
++cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
++cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
++# Peter OCSW: this doesn't build when merging installed texmf over upstream
++# one (the reverse works)
++# cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
+ #
+ # from tex:
+ tex tex - tex.ini
+--
+1.7.11.3
+
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic