cygport patches for TeX Live

cygport patches for TeX Live

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]

Now that setup.exe supports perpetual postinstall scripts, I'd like to 
streamline the TeX Live postinstall process.  I'm attaching two perpetual 
postinstall scripts that I'd like to use (one before the ordinary postinstall 
scripts and one after), as well as four cygport patches.

With these changes, I was able to reduce the total postinstall time for a 
complete TeX Live install from 48 minutes to 14 minutes on my system.

Here's a summary of the changes and the reasons for them.

1. The most time-consuming command in the current postinstall process is 
mktexlsr, which is run many times.  The proposed changes reduce this to one 
call, at the beginning; all remaining postinstall commands keep the ls-R files 
up to date at minimal cost.

2. Another somewhat time-consuming command is updmap.  Each call (even just to 
enable or disable a map) takes at least 2-3 seconds.  If several maps are 
enabled/disabled at once, there's no noticeable increase in time.  The proposed 
changes use just one call to updmap to enable all maps.

3. Similarly, there are a lot of unnecessary calls to fc-cache.  I've reduced 
that to a single call, at the end.

I'm open to suggestions as to better ways to do all this.

Ken

[-- Attachment #2: 0p_texlive_prep.sh --]
[-- Type: text/plain, Size: 409 bytes --]

postinstalldir=/etc/texmf/postinstall

for f in ${postinstalldir}/*.lsr
do
    if [ -f ${f} ]
    then
	/usr/bin/mktexlsr
	for g in ${postinstalldir}/*.lsr
	do
	    mv -f ${g} ${g}.done
	done
    fi
    break
done

if [ -f ${postinstalldir}/texlive.refresh_fmts ]
then
    /usr/bin/fmtutil-sys --refresh
    mv -f ${postinstalldir}/texlive.refresh_fmts \
       ${postinstalldir}/texlive.refresh_fmts.done
fi

[-- Attachment #3: 0001-prep_texlive-remove-references-to-usr-share-texmf.patch --]
[-- Type: text/plain, Size: 1096 bytes --]

From 408d371b734ab7295adfaf1d1ad9e4fa9481ce7c Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Tue, 25 Nov 2014 09:27:52 -0500
Subject: [PATCH 1/4] prep_texlive: remove references to /usr/share/texmf

This is no longer used as of TeX Live 2013.
---
 lib/src_postinst.cygpart | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 9963b63..86870f5 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -371,7 +371,7 @@ __prep_texlive() {
 		_EOF
 	fi
 
-	for d in /usr/share/texmf{-dist,}/fonts/{opentype,truetype,type1}
+	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
 	do
 		if [ -d ${D}${d} ]
 		then
@@ -655,14 +655,10 @@ __prepetc() {
 		__prep_freedesktop_mime || error "Shared Mime Info postinstall failed"
 	fi
 
-	for d in /usr/share/texmf{,-dist}
-	do
-		if [ -d ${D}${d} ]
-		then
-			__prep_texlive
-			break
-		fi
-	done
+	if [-d /usr/share/texmf-dist ]
+	then
+	    __prep_texlive
+	fi
 
 	if [ -d ${D}/usr/share/xsessions ]
 	then
-- 
2.1.1


[-- Attachment #4: 0002-prep_texlive-remove-calls-to-mktexlsr.patch --]
[-- Type: text/plain, Size: 1481 bytes --]

From 8b7624d5d064bc19c4a513592d0d559201c648c0 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:35:13 -0500
Subject: [PATCH 2/4] prep_texlive: remove calls to mktexlsr

Instead create a marker file in /etc/texmf/postinstall indicating that
mktexlsr should be run by a perpetual postinstall script.
---
 lib/src_postinst.cygpart | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 86870f5..a769ffc 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -328,11 +328,9 @@ __prep_mateconf_schemas() {
 __prep_texlive() {
 	local d fmt fmts map maps
 
-	dodir /etc/postinstall /etc/preremove
+	dodir /etc/postinstall /etc/preremove /etc/texmf/postinstall
 
-	cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-		/usr/bin/mktexlsr
-	_EOF
+	/usr/bin/touch /etc/texmf/postinstall/${PN}.lsr
 
 	fmts=$(__config_get texlive_fmts)
 	maps=$(__config_get texlive_maps)
@@ -351,7 +349,6 @@ __prep_texlive() {
 		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
 			/usr/bin/updmap-sys --nohash --syncwithtrees
 			/usr/bin/updmap-sys --nohash
-			/usr/bin/mktexlsr
 		_EOF
 	fi
 	if [ -n "${fmts#0}" ]
@@ -366,9 +363,6 @@ __prep_texlive() {
 				/usr/bin/fmtutil-sys --disablefmt $fmt
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/mktexlsr
-		_EOF
 	fi
 
 	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
-- 
2.1.1


[-- Attachment #5: 0003-prep_texlive-remove-calls-to-fc-cache.patch --]
[-- Type: text/plain, Size: 848 bytes --]

From fdb63bef25522127109bbbf36a932fc825ec6172 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:53:29 -0500
Subject: [PATCH 3/4] prep_texlive: remove calls to fc-cache

Instead, create a file in /etc/texmf/postinstall listing the font
directories on which fc-cache should be run by a perpetual postinstall
script.
---
 lib/src_postinst.cygpart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index a769ffc..5d915b1 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -369,8 +369,8 @@ __prep_texlive() {
 	do
 		if [ -d ${D}${d} ]
 		then
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/fc-cache -f $d
+			cat >> ${D}/etc/texmf/postinstall/${PN}.fc <<-_EOF
+				${d}
 			_EOF
 		fi
 	done
-- 
2.1.1


[-- Attachment #6: 0004-prep_texlive-group-enable-disable-commands-in-calls-.patch --]
[-- Type: text/plain, Size: 1586 bytes --]

From f642dfdbbb2ad47612ebb31cdd1b4e1372946daa Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 28 Nov 2014 10:47:49 -0500
Subject: [PATCH 4/4] prep_texlive: group enable/disable commands in calls to
 updmap

In postinstall scripts we remove the updmap calls completely and
instead create a file of commands in /etc/texmf/postinstall, to be run
by a perpetual postinstall script.  In preremove scripts we just group
the commands into a single call to updmap, since setup.exe doesn't yet
support perpetual preremove scripts.
---
 lib/src_postinst.cygpart | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 5d915b1..818ccef 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -337,19 +337,19 @@ __prep_texlive() {
 
 	if [ -n "${maps#0}" ]
 	then
+		cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
+			/usr/bin/updmap-sys --nohash --nomkmap \\
+		_EOF
 		for map in $maps
 		do
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --enable $map
-			_EOF
 			cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --disable ${map#*=}
+				--disable ${map#*=} \\
+			_EOF
+			cat >> ${D}/etc/texmf/postinstall/${PN}.map <<-_EOF
+				--enable $map
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/updmap-sys --nohash --syncwithtrees
-			/usr/bin/updmap-sys --nohash
-		_EOF
+		echo >> ${D}/etc/preremove/${PN}.sh
 	fi
 	if [ -n "${fmts#0}" ]
 	then
-- 
2.1.1


[-- Attachment #7: zp_texlive_finish.sh --]
[-- Type: text/plain, Size: 486 bytes --]

postinstalldir=/etc/texmf/postinstall

maps=$(cat ${postinstalldir}/*.map)
if [ -n "${maps}" ]
then
    /usr/bin/updmap-sys --nohash --nomkmap ${maps}
    for f in ${postinstalldir}/*.map
    do
	mv -f ${f} ${f}.done
    done
    echo y | /usr/bin/updmap-sys --syncwithtrees
    /usr/bin/updmap-sys
fi

fc_dirs=$(sort -u ${postinstalldir}/*.fc)
if [ -n "${fc_dirs}" ]
then
    /usr/bin/fc-cache -f ${fc_dirs}
    for f in ${postinstalldir}/*.fc
    do
	mv -f ${f} ${f}.done
    done
fi

Re: cygport patches for TeX Live

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]

On 12/16/2014 5:49 PM, Ken Brown wrote:
> Now that setup.exe supports perpetual postinstall scripts, I'd like to
> streamline the TeX Live postinstall process.  I'm attaching two perpetual
> postinstall scripts that I'd like to use (one before the ordinary postinstall
> scripts and one after), as well as four cygport patches.
>
> With these changes, I was able to reduce the total postinstall time for a
> complete TeX Live install from 48 minutes to 14 minutes on my system.
>
> Here's a summary of the changes and the reasons for them.
>
> 1. The most time-consuming command in the current postinstall process is
> mktexlsr, which is run many times.  The proposed changes reduce this to one
> call, at the beginning; all remaining postinstall commands keep the ls-R files
> up to date at minimal cost.
>
> 2. Another somewhat time-consuming command is updmap.  Each call (even just to
> enable or disable a map) takes at least 2-3 seconds.  If several maps are
> enabled/disabled at once, there's no noticeable increase in time.  The proposed
> changes use just one call to updmap to enable all maps.
>
> 3. Similarly, there are a lot of unnecessary calls to fc-cache.  I've reduced
> that to a single call, at the end.
>
> I'm open to suggestions as to better ways to do all this.

Sorry, there was a stupid mistake in one of the patches.  The corrected one is 
attached.

Ken

[-- Attachment #2: 0002-prep_texlive-remove-calls-to-mktexlsr.patch --]
[-- Type: text/plain, Size: 1485 bytes --]

From 8b7624d5d064bc19c4a513592d0d559201c648c0 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:35:13 -0500
Subject: [PATCH 2/4] prep_texlive: remove calls to mktexlsr

Instead create a marker file in /etc/texmf/postinstall indicating that
mktexlsr should be run by a perpetual postinstall script.
---
 lib/src_postinst.cygpart | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 86870f5..a769ffc 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -328,11 +328,9 @@ __prep_mateconf_schemas() {
 __prep_texlive() {
 	local d fmt fmts map maps
 
-	dodir /etc/postinstall /etc/preremove
+	dodir /etc/postinstall /etc/preremove /etc/texmf/postinstall
 
-	cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-		/usr/bin/mktexlsr
-	_EOF
+	/usr/bin/touch ${D}/etc/texmf/postinstall/${PN}.lsr
 
 	fmts=$(__config_get texlive_fmts)
 	maps=$(__config_get texlive_maps)
@@ -351,7 +349,6 @@ __prep_texlive() {
 		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
 			/usr/bin/updmap-sys --nohash --syncwithtrees
 			/usr/bin/updmap-sys --nohash
-			/usr/bin/mktexlsr
 		_EOF
 	fi
 	if [ -n "${fmts#0}" ]
@@ -366,9 +363,6 @@ __prep_texlive() {
 				/usr/bin/fmtutil-sys --disablefmt $fmt
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/mktexlsr
-		_EOF
 	fi
 
 	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
-- 
2.1.1

Re: cygport patches for TeX Live

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

On 12/16/2014 6:08 PM, Ken Brown wrote:
> Sorry, there was a stupid mistake in one of the patches.  The corrected
> one is attached.

This is embarrassing, but there was a mistake in a second patch also. 
I'm reattaching the complete set of cygport patches, corrected.

I had made some minor changes after testing, and foolishly didn't bother 
testing again before sending the patches.

Sorry

Ken


[-- Attachment #2: 0001-prep_texlive-remove-references-to-usr-share-texmf.patch --]
[-- Type: text/plain, Size: 1097 bytes --]

From 9cb676f9e1e062f49d1364e7e60d8eb44be78907 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Tue, 25 Nov 2014 09:27:52 -0500
Subject: [PATCH 1/4] prep_texlive: remove references to /usr/share/texmf

This is no longer used as of TeX Live 2013.
---
 lib/src_postinst.cygpart | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 9963b63..03311b9 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -371,7 +371,7 @@ __prep_texlive() {
 		_EOF
 	fi
 
-	for d in /usr/share/texmf{-dist,}/fonts/{opentype,truetype,type1}
+	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
 	do
 		if [ -d ${D}${d} ]
 		then
@@ -655,14 +655,10 @@ __prepetc() {
 		__prep_freedesktop_mime || error "Shared Mime Info postinstall failed"
 	fi
 
-	for d in /usr/share/texmf{,-dist}
-	do
-		if [ -d ${D}${d} ]
-		then
-			__prep_texlive
-			break
-		fi
-	done
+	if [ -d /usr/share/texmf-dist ]
+	then
+	    __prep_texlive
+	fi
 
 	if [ -d ${D}/usr/share/xsessions ]
 	then
-- 
2.1.1


[-- Attachment #3: 0002-prep_texlive-remove-calls-to-mktexlsr.patch --]
[-- Type: text/plain, Size: 1476 bytes --]

From 83b5ab484f9fe5e2550f6851cfa074d730d4b8bb Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:35:13 -0500
Subject: [PATCH 2/4] prep_texlive: remove calls to mktexlsr

Instead create a marker file in /etc/texmf/postinstall indicating that
mktexlsr should be run by a perpetual postinstall script.
---
 lib/src_postinst.cygpart | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 03311b9..9e4a910 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -328,11 +328,9 @@ __prep_mateconf_schemas() {
 __prep_texlive() {
 	local d fmt fmts map maps
 
-	dodir /etc/postinstall /etc/preremove
+	dodir /etc/postinstall /etc/preremove /etc/texmf/postinstall
 
-	cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-		/usr/bin/mktexlsr
-	_EOF
+	touch ${D}/etc/texmf/postinstall/${PN}.lsr
 
 	fmts=$(__config_get texlive_fmts)
 	maps=$(__config_get texlive_maps)
@@ -351,7 +349,6 @@ __prep_texlive() {
 		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
 			/usr/bin/updmap-sys --nohash --syncwithtrees
 			/usr/bin/updmap-sys --nohash
-			/usr/bin/mktexlsr
 		_EOF
 	fi
 	if [ -n "${fmts#0}" ]
@@ -366,9 +363,6 @@ __prep_texlive() {
 				/usr/bin/fmtutil-sys --disablefmt $fmt
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/mktexlsr
-		_EOF
 	fi
 
 	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
-- 
2.1.1


[-- Attachment #4: 0003-prep_texlive-remove-calls-to-fc-cache.patch --]
[-- Type: text/plain, Size: 848 bytes --]

From 5a2d076c5b55014342104d5327b80b62b9cf6f06 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:53:29 -0500
Subject: [PATCH 3/4] prep_texlive: remove calls to fc-cache

Instead, create a file in /etc/texmf/postinstall listing the font
directories on which fc-cache should be run by a perpetual postinstall
script.
---
 lib/src_postinst.cygpart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 9e4a910..a486d44 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -369,8 +369,8 @@ __prep_texlive() {
 	do
 		if [ -d ${D}${d} ]
 		then
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/fc-cache -f $d
+			cat >> ${D}/etc/texmf/postinstall/${PN}.fc <<-_EOF
+				${d}
 			_EOF
 		fi
 	done
-- 
2.1.1


[-- Attachment #5: 0004-prep_texlive-group-enable-disable-commands-in-calls-.patch --]
[-- Type: text/plain, Size: 1586 bytes --]

From 547c70536ad878aa04b77b97cf7b4e7d8db758da Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 28 Nov 2014 10:47:49 -0500
Subject: [PATCH 4/4] prep_texlive: group enable/disable commands in calls to
 updmap

In postinstall scripts we remove the updmap calls completely and
instead create a file of commands in /etc/texmf/postinstall, to be run
by a perpetual postinstall script.  In preremove scripts we just group
the commands into a single call to updmap, since setup.exe doesn't yet
support perpetual preremove scripts.
---
 lib/src_postinst.cygpart | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index a486d44..0fb3a48 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -337,19 +337,19 @@ __prep_texlive() {
 
 	if [ -n "${maps#0}" ]
 	then
+		cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
+			/usr/bin/updmap-sys --nohash --nomkmap \\
+		_EOF
 		for map in $maps
 		do
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --enable $map
-			_EOF
 			cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --disable ${map#*=}
+				--disable ${map#*=} \\
+			_EOF
+			cat >> ${D}/etc/texmf/postinstall/${PN}.map <<-_EOF
+				--enable $map
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/updmap-sys --nohash --syncwithtrees
-			/usr/bin/updmap-sys --nohash
-		_EOF
+		echo >> ${D}/etc/preremove/${PN}.sh
 	fi
 	if [ -n "${fmts#0}" ]
 	then
-- 
2.1.1

Re: cygport patches for TeX Live

[Achim Gratz]

Ken Brown writes:
> +	if [ -d /usr/share/texmf-dist ]

Looks like you'd want
	if [ -d ${D}/usr/share/texmf-dist ]
here.

> In postinstall scripts we remove the updmap calls completely and
> instead create a file of commands in /etc/texmf/postinstall, to be run
> by a perpetual postinstall script.  In preremove scripts we just group
> the commands into a single call to updmap, since setup.exe doesn't yet
> support perpetual preremove scripts.

I don't really like the idea of using /etc directly for this, what if
every package starts doing that?  If /usr/share/<package>/postinstall
doesn't work, we should at least create a subdirectory in /etc for this
purpose.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Waldorf MIDI Implementation & additional documentation:
http://Synth.Stromeko.net/Downloads.html#WaldorfDocs

Re: cygport patches for TeX Live

[Marco Atzeri]

On 12/18/2014 9:22 AM, Achim Gratz wrote:
> Ken Brown writes:
>> +	if [ -d /usr/share/texmf-dist ]
>
> Looks like you'd want
> 	if [ -d ${D}/usr/share/texmf-dist ]
> here.
>
>> In postinstall scripts we remove the updmap calls completely and
>> instead create a file of commands in /etc/texmf/postinstall, to be run
>> by a perpetual postinstall script.  In preremove scripts we just group
>> the commands into a single call to updmap, since setup.exe doesn't yet
>> support perpetual preremove scripts.
>
> I don't really like the idea of using /etc directly for this, what if
> every package starts doing that?  If /usr/share/<package>/postinstall

/usr/share/postinstall/<package>

please

> doesn't work, we should at least create a subdirectory in /etc for this
> purpose.
>
>
> Regards,
> Achim.
>

Re: cygport patches for TeX Live

[Marco Atzeri]

On 12/18/2014 10:40 AM, Marco Atzeri wrote:
> On 12/18/2014 9:22 AM, Achim Gratz wrote:
>> Ken Brown writes:
>>> +    if [ -d /usr/share/texmf-dist ]
>>
>> Looks like you'd want
>>     if [ -d ${D}/usr/share/texmf-dist ]
>> here.
>>
>>> In postinstall scripts we remove the updmap calls completely and
>>> instead create a file of commands in /etc/texmf/postinstall, to be run
>>> by a perpetual postinstall script.  In preremove scripts we just group
>>> the commands into a single call to updmap, since setup.exe doesn't yet
>>> support perpetual preremove scripts.
>>
>> I don't really like the idea of using /etc directly for this, what if
>> every package starts doing that?  If /usr/share/<package>/postinstall
>
> /usr/share/postinstall/<package>

brain still starting

/etc/postinstall/<package>

> please
>
>> doesn't work, we should at least create a subdirectory in /etc for this
>> purpose.
>>
>>
>> Regards,
>> Achim.
>>

Re: cygport patches for TeX Live

[Achim Gratz]

Marco Atzeri writes:
>> /usr/share/postinstall/<package>
>
> brain still starting
>
> /etc/postinstall/<package>

I'm not sure that setup.exe is equipped to deal with that at the
moment.  At the very least I would think it would search these
sub-directories, so please don't (right now, anyway).


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf microQ V2.22R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

Re: cygport patches for TeX Live

[Ken Brown]

On 12/18/2014 3:22 AM, Achim Gratz wrote:
> Ken Brown writes:
>> +	if [ -d /usr/share/texmf-dist ]
>
> Looks like you'd want
> 	if [ -d ${D}/usr/share/texmf-dist ]
> here.

Thanks.  I hope this is the last of the careless mistakes.

>> In postinstall scripts we remove the updmap calls completely and
>> instead create a file of commands in /etc/texmf/postinstall, to be run
>> by a perpetual postinstall script.  In preremove scripts we just group
>> the commands into a single call to updmap, since setup.exe doesn't yet
>> support perpetual preremove scripts.
>
> I don't really like the idea of using /etc directly for this, what if
> every package starts doing that?  If /usr/share/<package>/postinstall
> doesn't work, we should at least create a subdirectory in /etc for this
> purpose.

I used /etc/texmf because that directory is already created by TeX Live and is 
used for various configuration files.  But I'm not wedded to that.  If we want 
to settle on a standard place for packages to put postinstall marker files, I'll 
go with whatever the consensus is.

Re: cygport patches for TeX Live

[Ken Brown]

On 12/18/2014 8:11 AM, Ken Brown wrote:
> On 12/18/2014 3:22 AM, Achim Gratz wrote:
>> I don't really like the idea of using /etc directly for this, what if
>> every package starts doing that?  If /usr/share/<package>/postinstall
>> doesn't work, we should at least create a subdirectory in /etc for this
>> purpose.
>
> I used /etc/texmf because that directory is already created by TeX Live and is
> used for various configuration files.  But I'm not wedded to that.  If we want
> to settle on a standard place for packages to put postinstall marker files, I'll
> go with whatever the consensus is.

I just took a look at the FHS 
(http://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard), and it strikes me 
that /var/lib/<package> might be a good place for marker files.  It seems to fit 
better than /etc/<package> or /usr/share/<package>.

So I could use /var/lib/texmf/postinstall for TeX Live postinstall markers. 
Note that /var/lib/texmf is already created and used by TeX Live for other data. 
  In the TeX Live internals, this directory is $TEXMFSYSVAR, whereas /etc/texmf 
is $TEXMFSYSCONFIG:

$ kpsewhich -var-value=TEXMFSYSVAR
/var/lib/texmf

$ kpsewhich -var-value=TEXMFSYSCONFIG
/etc/texmf

Ken

Re: cygport patches for TeX Live

[Yaakov Selkowitz]

On 2014-12-18 07:11, Ken Brown wrote:
> On 12/18/2014 3:22 AM, Achim Gratz wrote:
>> Ken Brown writes:
>>> +    if [ -d /usr/share/texmf-dist ]
>>
>> Looks like you'd want
>>     if [ -d ${D}/usr/share/texmf-dist ]
>> here.
>
> Thanks.  I hope this is the last of the careless mistakes.

Patch 0001 applied with that fix.  As for the others, it seems that 
depends on where the "postinstall markers" end up.


Yaakov

Re: cygport patches for TeX Live

[Ken Brown]

On 1/5/2015 2:51 AM, Yaakov Selkowitz wrote:
> On 2014-12-18 07:11, Ken Brown wrote:
>> On 12/18/2014 3:22 AM, Achim Gratz wrote:
>>> Ken Brown writes:
>>>> +    if [ -d /usr/share/texmf-dist ]
>>>
>>> Looks like you'd want
>>>     if [ -d ${D}/usr/share/texmf-dist ]
>>> here.
>>
>> Thanks.  I hope this is the last of the careless mistakes.
>
> Patch 0001 applied with that fix.  As for the others, it seems that depends on
> where the "postinstall markers" end up.

Do you have an opinion about that?  I suggested /etc/texmf/postinstall or 
/var/lib/texmf/postinstall, but Achim had other ideas.  The only precedent we 
have so far is Achim's new _autorebase, which uses /etc/rebase.

Ken

Re: cygport patches for TeX Live

[Achim Gratz]

Ken Brown writes:
> Do you have an opinion about that?  I suggested /etc/texmf/postinstall
> or /var/lib/texmf/postinstall, but Achim had other ideas.  The only
> precedent we have so far is Achim's new _autorebase, which uses
> /etc/rebase.

Even for this I think /etc is the wrong place and I'd consider moving it
elsewhere.  Something in /var on the other hand sounds OK to me.
LSB/FHS seems to suggest /var/lib for this purpose unless there is yet
another more specific requirement I didn't find while browsing it.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

Re: cygport patches for TeX Live

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 850 bytes --]

On 1/5/2015 12:52 PM, Achim Gratz wrote:
> Ken Brown writes:
>> Do you have an opinion about that?  I suggested /etc/texmf/postinstall
>> or /var/lib/texmf/postinstall, but Achim had other ideas.  The only
>> precedent we have so far is Achim's new _autorebase, which uses
>> /etc/rebase.
>
> Even for this I think /etc is the wrong place and I'd consider moving it
> elsewhere.  Something in /var on the other hand sounds OK to me.
> LSB/FHS seems to suggest /var/lib for this purpose unless there is yet
> another more specific requirement I didn't find while browsing it.

In view of https://cygwin.com/ml/cygwin-apps/2015-01/msg00034.html, I'll use 
/var/lib/texmf/postinstall for the postinstall markers.  I'm attaching revised 
cygport patches.

I'm also attaching, for reference, the corresponding revised perpetual 
postinstall scripts.

Ken

[-- Attachment #2: 0001-prep_texlive-remove-calls-to-mktexlsr.patch --]
[-- Type: text/plain, Size: 1479 bytes --]

From 13b65df78a27fde439b263ee3a0dbaf3dbba1c85 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:35:13 -0500
Subject: [PATCH 1/3] prep_texlive: remove calls to mktexlsr

Instead create a marker file indicating that mktexlsr should be run by
a perpetual postinstall script.
---
 lib/src_postinst.cygpart | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index ba9a8b3..44737a9 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -327,12 +327,11 @@ __prep_mateconf_schemas() {
 
 __prep_texlive() {
 	local d fmt fmts map maps
+	local markerdir=/var/lib/texmf/postinstall
 
-	dodir /etc/postinstall /etc/preremove
+	dodir /etc/postinstall /etc/preremove ${markerdir}
 
-	cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-		/usr/bin/mktexlsr
-	_EOF
+	touch ${D}${markerdir}/${PN}.lsr
 
 	fmts=$(__config_get texlive_fmts)
 	maps=$(__config_get texlive_maps)
@@ -351,7 +350,6 @@ __prep_texlive() {
 		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
 			/usr/bin/updmap-sys --nohash --syncwithtrees
 			/usr/bin/updmap-sys --nohash
-			/usr/bin/mktexlsr
 		_EOF
 	fi
 	if [ -n "${fmts#0}" ]
@@ -366,9 +364,6 @@ __prep_texlive() {
 				/usr/bin/fmtutil-sys --disablefmt $fmt
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/mktexlsr
-		_EOF
 	fi
 
 	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
-- 
2.1.4


[-- Attachment #3: 0002-prep_texlive-remove-calls-to-fc-cache.patch --]
[-- Type: text/plain, Size: 812 bytes --]

From 3a7b3e72c39e46d78d321e703f0a3f412a934015 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 26 Nov 2014 07:53:29 -0500
Subject: [PATCH 2/3] prep_texlive: remove calls to fc-cache

Instead, create a file listing the font directories on which fc-cache
should be run by a perpetual postinstall script.
---
 lib/src_postinst.cygpart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 44737a9..33cdd36 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -370,8 +370,8 @@ __prep_texlive() {
 	do
 		if [ -d ${D}${d} ]
 		then
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/fc-cache -f $d
+			cat >> ${D}${markerdir}/${PN}.fc <<-_EOF
+				${d}
 			_EOF
 		fi
 	done
-- 
2.1.4


[-- Attachment #4: 0003-prep_texlive-group-enable-disable-commands-in-calls-.patch --]
[-- Type: text/plain, Size: 1572 bytes --]

From 57832312e6527b596089041b88b11b3f5b38f8c8 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 28 Nov 2014 10:47:49 -0500
Subject: [PATCH 3/3] prep_texlive: group enable/disable commands in calls to
 updmap

In postinstall scripts we remove the updmap calls completely and
instead create a file of commands in a marker directory, to be run by
a perpetual postinstall script.  In preremove scripts we just group
the commands into a single call to updmap, since setup.exe doesn't yet
support perpetual preremove scripts.
---
 lib/src_postinst.cygpart | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 33cdd36..a715bc5 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -338,19 +338,19 @@ __prep_texlive() {
 
 	if [ -n "${maps#0}" ]
 	then
+		cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
+			/usr/bin/updmap-sys --nohash --nomkmap \\
+		_EOF
 		for map in $maps
 		do
-			cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --enable $map
-			_EOF
 			cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
-				/usr/bin/updmap-sys --nohash --nomkmap --disable ${map#*=}
+				--disable ${map#*=} \\
+			_EOF
+			cat >> ${D}${markerdir}/${PN}.map <<-_EOF
+				--enable $map
 			_EOF
 		done
-		cat >> ${D}/etc/postinstall/${PN}.sh <<-_EOF
-			/usr/bin/updmap-sys --nohash --syncwithtrees
-			/usr/bin/updmap-sys --nohash
-		_EOF
+		echo >> ${D}/etc/preremove/${PN}.sh
 	fi
 	if [ -n "${fmts#0}" ]
 	then
-- 
2.1.4


[-- Attachment #5: 0p_texlive_prep.dash --]
[-- Type: text/plain, Size: 397 bytes --]

#! /bin/dash

markerdir=/var/lib/texmf/postinstall

for f in ${markerdir}/*.lsr
do
    if [ -f ${f} ]
    then
	/usr/bin/mktexlsr
	for g in ${markerdir}/*.lsr
	do
	    mv -f ${g} ${g}.done
	done
    fi
    break
done

if [ -f ${markerdir}/texlive.refresh_fmts ]
then
    /usr/bin/fmtutil-sys --refresh
    mv -f ${markerdir}/texlive.refresh_fmts \
       ${markerdir}/texlive.refresh_fmts.done
fi

[-- Attachment #6: zp_texlive_finish.dash --]
[-- Type: text/plain, Size: 479 bytes --]

#! /bin/dash

markerdir=/var/lib/texmf/postinstall

maps=$(cat ${markerdir}/*.map)
if [ -n "${maps}" ]
then
    /usr/bin/updmap-sys --nohash --nomkmap ${maps}
    for f in ${markerdir}/*.map
    do
	mv -f ${f} ${f}.done
    done
    echo y | /usr/bin/updmap-sys --syncwithtrees
    /usr/bin/updmap-sys
fi

fc_dirs=$(sort -u ${markerdir}/*.fc)
if [ -n "${fc_dirs}" ]
then
    /usr/bin/fc-cache -f ${fc_dirs}
    for f in ${markerdir}/*.fc
    do
	mv -f ${f} ${f}.done
    done
fi

Re: cygport patches for TeX Live

[Yaakov Selkowitz]

On Thu, 2015-01-15 at 16:46 -0500, Ken Brown wrote:
> On 1/5/2015 12:52 PM, Achim Gratz wrote:
> > Ken Brown writes:
> >> Do you have an opinion about that?  I suggested /etc/texmf/postinstall
> >> or /var/lib/texmf/postinstall, but Achim had other ideas.  The only
> >> precedent we have so far is Achim's new _autorebase, which uses
> >> /etc/rebase.
> >
> > Even for this I think /etc is the wrong place and I'd consider moving it
> > elsewhere.  Something in /var on the other hand sounds OK to me.
> > LSB/FHS seems to suggest /var/lib for this purpose unless there is yet
> > another more specific requirement I didn't find while browsing it.
> 
> In view of https://cygwin.com/ml/cygwin-apps/2015-01/msg00034.html, I'll use 
> /var/lib/texmf/postinstall for the postinstall markers.  I'm attaching revised 
> cygport patches.

I applied and pushed patches 1 and 3; given the texlive/fontconfig
discussion, does 2 still apply?

--
Yaakov

Re: cygport patches for TeX Live

[Ken Brown]

On 2/11/2015 7:50 PM, Yaakov Selkowitz wrote:
> On Thu, 2015-01-15 at 16:46 -0500, Ken Brown wrote:
>> On 1/5/2015 12:52 PM, Achim Gratz wrote:
>>> Ken Brown writes:
>>>> Do you have an opinion about that?  I suggested /etc/texmf/postinstall
>>>> or /var/lib/texmf/postinstall, but Achim had other ideas.  The only
>>>> precedent we have so far is Achim's new _autorebase, which uses
>>>> /etc/rebase.
>>>
>>> Even for this I think /etc is the wrong place and I'd consider moving it
>>> elsewhere.  Something in /var on the other hand sounds OK to me.
>>> LSB/FHS seems to suggest /var/lib for this purpose unless there is yet
>>> another more specific requirement I didn't find while browsing it.
>>
>> In view of https://cygwin.com/ml/cygwin-apps/2015-01/msg00034.html, I'll use
>> /var/lib/texmf/postinstall for the postinstall markers.  I'm attaching revised
>> cygport patches.
>
> I applied and pushed patches 1 and 3; given the texlive/fontconfig
> discussion, does 2 still apply?

Not as it stands.  But for users who have chosen to make the TeX Live fonts 
available to fontconfig (by creating a symlink as discussed in the other 
thread), I think I should keep the font caches up to date.  I'll send a revised 
patch tomorrow that does this.

Ken

Re: cygport patches for TeX Live

[Ken Brown]

On 2/11/2015 11:10 PM, Ken Brown wrote:
> On 2/11/2015 7:50 PM, Yaakov Selkowitz wrote:
>> On Thu, 2015-01-15 at 16:46 -0500, Ken Brown wrote:
>>> On 1/5/2015 12:52 PM, Achim Gratz wrote:
>>>> Ken Brown writes:
>>>>> Do you have an opinion about that?  I suggested /etc/texmf/postinstall
>>>>> or /var/lib/texmf/postinstall, but Achim had other ideas.  The only
>>>>> precedent we have so far is Achim's new _autorebase, which uses
>>>>> /etc/rebase.
>>>>
>>>> Even for this I think /etc is the wrong place and I'd consider
>>>> moving it
>>>> elsewhere.  Something in /var on the other hand sounds OK to me.
>>>> LSB/FHS seems to suggest /var/lib for this purpose unless there is yet
>>>> another more specific requirement I didn't find while browsing it.
>>>
>>> In view of https://cygwin.com/ml/cygwin-apps/2015-01/msg00034.html,
>>> I'll use
>>> /var/lib/texmf/postinstall for the postinstall markers.  I'm
>>> attaching revised
>>> cygport patches.
>>
>> I applied and pushed patches 1 and 3; given the texlive/fontconfig
>> discussion, does 2 still apply?
>
> Not as it stands.  But for users who have chosen to make the TeX Live
> fonts available to fontconfig (by creating a symlink as discussed in the
> other thread), I think I should keep the font caches up to date.  I'll
> send a revised patch tomorrow that does this.

On second thought, that patch is OK as is.  I'll just change the texlive 
perpetual postinstall script so that it only calls fc-cache if the 
symlink /etc/fonts/conf.d/09-texlive.conf exists.

Ken

Re: cygport patches for TeX Live

[Yaakov Selkowitz]

On Thu, 2015-02-12 at 06:58 -0500, Ken Brown wrote:
> On 2/11/2015 11:10 PM, Ken Brown wrote:
> > On 2/11/2015 7:50 PM, Yaakov Selkowitz wrote:
> >> On Thu, 2015-01-15 at 16:46 -0500, Ken Brown wrote:
> >>> In view of https://cygwin.com/ml/cygwin-apps/2015-01/msg00034.html,
> >>> I'll use
> >>> /var/lib/texmf/postinstall for the postinstall markers.  I'm
> >>> attaching revised
> >>> cygport patches.
> >>
> >> I applied and pushed patches 1 and 3; given the texlive/fontconfig
> >> discussion, does 2 still apply?
> >
> > Not as it stands.  But for users who have chosen to make the TeX Live
> > fonts available to fontconfig (by creating a symlink as discussed in the
> > other thread), I think I should keep the font caches up to date.  I'll
> > send a revised patch tomorrow that does this.
> 
> On second thought, that patch is OK as is.  I'll just change the texlive 
> perpetual postinstall script so that it only calls fc-cache if the 
> symlink /etc/fonts/conf.d/09-texlive.conf exists.

OK, applied and pushed.

--
Yaakov

Re: cygport patches for TeX Live

[Yaakov Selkowitz]

On 2016-04-15 12:33, Ken Brown wrote:
> I'm attaching three patches that I used in preparing the recent test
> release of the TeX Live collections.  The first is self-explanatory. The
> second and third reflect the fact that I'm now shipping .tlpobj files
> and maintaining /usr/share/tlpkg/texlive.tlpdb, so that tlmgr knows what
> collections and packages are installed.

Applied and pushed.

-- 
Yaakov

cygport patches for TeX Live

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

Yaakov,

I'm attaching three patches that I used in preparing the recent test 
release of the TeX Live collections.  The first is self-explanatory. 
The second and third reflect the fact that I'm now shipping .tlpobj 
files and maintaining /usr/share/tlpkg/texlive.tlpdb, so that tlmgr 
knows what collections and packages are installed.

Let me know if there are any questions.

Thanks.

Ken

[-- Attachment #2: 0001-prep_texlive-drop-preparation-for-fc-cache-calls.patch --]
[-- Type: text/plain, Size: 1094 bytes --]

From 457d553eb79130656d26656909da08f00d1c02c3 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 11 Mar 2016 09:34:16 -0500
Subject: [PATCH 1/3] prep_texlive: drop preparation for fc-cache calls

This is now handled by a perpetual postinstall script in
libfontconfig1.
---
 lib/src_postinst.cygpart | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 8c065c0..eca5b99 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -228,7 +228,7 @@ __prep_gtk_icon_theme() {
 #****
 
 __prep_texlive() {
-	local d fmt fmts format formats map maps
+	local fmt fmts format formats map maps
 	local markerdir=/var/lib/texmf/postinstall
 
 	dodir /etc/postinstall /etc/preremove ${markerdir}
@@ -278,16 +278,6 @@ __prep_texlive() {
 			_EOF
 		done
 	fi
-
-	for d in /usr/share/texmf-dist/fonts/{opentype,truetype,type1}
-	do
-		if [ -d ${D}${d} ]
-		then
-			cat >> ${D}${markerdir}/${PN}.fc <<-_EOF
-				${d}
-			_EOF
-		fi
-	done
 }
 
 #****P* Postinstall/X Sessions
-- 
2.8.0


[-- Attachment #3: 0002-texlive-update-for-tlmgr.patch --]
[-- Type: text/plain, Size: 2149 bytes --]

From 35274609cdcfb95f681b85a234fb079c90f39b1d Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Mon, 28 Mar 2016 16:30:33 -0400
Subject: [PATCH 2/3] texlive: update for tlmgr

---
 cygclass/texlive.cygclass |  7 ++++---
 lib/src_postinst.cygpart  | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/cygclass/texlive.cygclass b/cygclass/texlive.cygclass
index c1a2055..13f68fc 100644
--- a/cygclass/texlive.cygclass
+++ b/cygclass/texlive.cygclass
@@ -158,6 +158,8 @@ texlive_install() {
 	for pkg in $pkgs
 	do
 		tlpobj="tlpkg/tlpobj/$pkg.tlpobj"
+		insinto /usr/share/tlpkg/tlpobj
+		doins $tlpobj
 		for f in $(grep '^ ' $tlpobj)
 		do
 			case $f in
@@ -191,10 +193,9 @@ texlive_install() {
 				continue ;;
 			RELOC/*)
 				src=${f#RELOC/}; dst=texmf-dist/${src} ;;
-			texmf/*|texmf-dist/*|tlpkg/TeXLive/*) # used by updmap
+			texmf/*|texmf-dist/*|tlpkg/*)
 				src=$f; dst=$f ;;
-			*)	# we don't use tlmgr, so tlpkg files aren't used
-				continue ;;
+			*)	continue ;;
 			esac
 
 			if [ "$(head -c 2 $src)" = '#!' -o "$(head -c 4 $src)" = 'eval' ]
diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index eca5b99..e4b2eb3 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -228,7 +228,7 @@ __prep_gtk_icon_theme() {
 #****
 
 __prep_texlive() {
-	local fmt fmts format formats map maps
+	local fmt fmts format formats map maps tlp tlps
 	local markerdir=/var/lib/texmf/postinstall
 
 	dodir /etc/postinstall /etc/preremove ${markerdir}
@@ -278,6 +278,29 @@ __prep_texlive() {
 			_EOF
 		done
 	fi
+
+	if [ -d ${D}/usr/share/tlpkg/tlpobj ]
+	then
+		pushd ${D}/usr/share/tlpkg/tlpobj
+		tlps=$(ls *.tlpobj 2>/dev/null | sed -e 's/\.tlpobj//')
+		popd
+	fi
+	if [ -n "${tlps}" ]
+	then
+		cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
+			/usr/libexec/update_tlpdb remove \\
+		_EOF
+		for tlp in $tlps
+		do
+			cat >> ${D}/etc/preremove/${PN}.sh <<-_EOF
+				$tlp \\
+			_EOF
+			cat >> ${D}${markerdir}/${PN}.tlp <<-_EOF
+				$tlp
+			_EOF
+		done
+		echo >> ${D}/etc/preremove/${PN}.sh
+	fi
 }
 
 #****P* Postinstall/X Sessions
-- 
2.8.0


[-- Attachment #4: 0003-texlive-include-collection-.tlpobj-for-tlmgr.patch --]
[-- Type: text/plain, Size: 985 bytes --]

From 986f36ba20551fbb74a3ee585807944f30ca1f6e Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Sun, 10 Apr 2016 13:57:19 -0400
Subject: [PATCH 3/3] texlive: include collection .tlpobj for tlmgr

---
 cygclass/texlive.cygclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cygclass/texlive.cygclass b/cygclass/texlive.cygclass
index 13f68fc..f67a627 100644
--- a/cygclass/texlive.cygclass
+++ b/cygclass/texlive.cygclass
@@ -58,10 +58,13 @@
 #  mirror instead of from stable release repository mirrors, which are frozen
 #  during the pretest phase.
 #****
-if ! defined TEXLIVE_TEXMF_PKGS && ! defined TEXLIVE_ARCH_PKGS && ! defined TEXLIVE_DOC_PKGS
-then
-	TEXLIVE_TEXMF_PKGS=${PN#texlive-}
-fi
+
+# For the sake of tlmgr we want to include the .tlpobj file for the
+# collection.
+case ${PN} in
+*-doc)	;;
+*)	TEXLIVE_TEXMF_PKGS+=" ${PN#texlive-}" ;;
+esac
 
 #****o* texlive.cygclass/CATEGORY (texlive)
 #  DEFINITION
-- 
2.8.0