summaryrefslogtreecommitdiff
path: root/Master/tlpkg/etc/2009.combined.patch
blob: 080aa93a62358f1391d086866050dff6a1c6063b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
Index: tlpkg/TeXLive/TLPDB.pm
===================================================================
--- tlpkg/TeXLive/TLPDB.pm	(revision 12171)
+++ tlpkg/TeXLive/TLPDB.pm	(working copy)
@@ -788,7 +788,7 @@
 read-only function; you cannot change the root of the TLPDB using this
 function.
 
-See C<00texlive-installation.config.tlpsrc> for a description of the
+See C<00texlive.installation.tlpsrc> for a description of the
 special value C<__MASTER>.
 
 =cut
@@ -1111,11 +1111,11 @@
 
 sub _set_option_value {
   my ($self,$key,$value) = @_;
-  my $pkg = $self->{'tlps'}{'00texlive-installation.config'};
+  my $pkg = $self->{'tlps'}{'00texlive.installation'};
   my @newdeps;
   if (!defined($pkg)) {
     $pkg = new TeXLive::TLPOBJ;
-    $pkg->name("00texlive-installation.config");
+    $pkg->name("00texlive.installation");
     $pkg->category("TLCore");
     push @newdeps, "$key:$value";
   } else {
@@ -1133,20 +1133,20 @@
     }
   }
   $pkg->depends(@newdeps);
-  $self->{'tlps'}{'00texlive-installation.config'} = $pkg;
+  $self->{'tlps'}{'00texlive.installation'} = $pkg;
 }
 
 sub _option_value {
   my ($self,$key) = @_;
-  if (defined($self->{'tlps'}{'00texlive-installation.config'})) {
-    foreach my $d ($self->{'tlps'}{'00texlive-installation.config'}->depends) {
+  if (defined($self->{'tlps'}{'00texlive.installation'})) {
+    foreach my $d ($self->{'tlps'}{'00texlive.installation'}->depends) {
       if ($d =~ m!^$key:(.*)$!) {
         return "$1";
       }
     }
     return;
   }
-  tlwarn("00texlive-installation.config not found, cannot read option $key.\n");
+  tlwarn("00texlive.installation not found, cannot read option $key.\n");
   return;
 }
 
@@ -1179,6 +1179,11 @@
   if (@_) { $self->_set_option_value("opt_create_symlinks", shift); }
   return $self->_option_value("opt_create_symlinks"); 
 }
+sub option_system_integration { 
+  my $self = shift; 
+  if (@_) { $self->_set_option_value("opt_system_integration", shift); }
+  return $self->_option_value("opt_system_integration"); 
+}
 sub option_install_docfiles { 
   my $self = shift;
   if (@_) { $self->_set_option_value("opt_install_docfiles", shift); }
@@ -1239,26 +1244,64 @@
 =cut
 sub fmtutil_cnf_lines {
   my $self = shift;
-  my %fmtcnffiles;
-  foreach my $p ($self->list_packages) {
-    my $obj = $self->get_package ($p);
-    die "$0: No TeX Live package named $p, strange" if ! $obj;
+  my @fmtlines = ();
+  
+  foreach my $pkg ($self->list_packages) {
+    my $obj = $self->get_package ($pkg);
+    die "No TeX Live package named $pkg, too strange" if ! $obj;
+    my $first = 1;
     foreach my $e ($obj->executes) {
-      if ($e =~ m/BuildFormat (.*)$/) {
-        $fmtcnffiles{$1} = 1;
-      } 
-      # others are ignored here
+      if ($e =~ m/AddFormat\s+(.*)\s*/) {
+        my $name;
+        my $engine;
+        my $patterns = "-";
+        my $options = "";
+        my $mode = "";
+        if ($first) {
+          push @fmtlines, "# from $pkg:\n";
+          $first = 0;
+        }
+        foreach my $p (&TeXLive::TLUtils::quotewords('\s+', 0, "$1")) {
+        # foreach my $p (split(' ', $1)) {
+          my ($a, $b);
+          if ($p =~ m/^(name|engine|mode|patterns|options)=(.*)$/) {
+            $a = $1;
+            $b = $2;
+          } else {
+            die "Unknown format directive in $pkg: $e";
+          }
+          if ($a eq "name") { 
+            die "AddFormat line needs name=something: $pkg, $e" unless $b;
+            $name = $b; next; 
+          }
+          if ($a eq "engine") { 
+            die "AddFormat line needs engine=something: $pkg, $e" unless $b;
+            $engine = $b; next;
+          }
+          if ($a eq "patterns") { 
+            $patterns = ( $b ? $b : "-");
+            next; 
+          }
+          if ($a eq "mode") { 
+            if ($b eq "disabled") {
+              $mode = "#! ";
+            } else {
+              $mode = "";
+            }
+            next; 
+          }
+          if ($a eq "options") { 
+            $options = ( $b ? $b : "");
+            next;
+          }
+          # should not be reached at all
+          die "Unknown language directive in $pkg: $e";
+        }
+        push @fmtlines, "$mode$name $engine $patterns $options\n";
+      }
     }
   }
-  my @formatlines;
-  foreach my $f (sort keys %fmtcnffiles) {
-    open(INFILE,"<$self->{'root'}/texmf/fmtutil/format.$f.cnf")
-      or tlwarn("Cannot open $self->{'root'}/texmf/fmtutil/format.$f.cnf\nThe generated fmtutil.cnf file might be incomplete.\nError: $!\n");
-    @tmp = <INFILE>;
-    close(INFILE);
-    push @formatlines, @tmp;
-  }
-  return(@formatlines);
+  return @fmtlines;
 }
 
 =item C<< $tlpdb->updmap_cfg_lines >>
Index: tlpkg/TeXLive/TLConfig.pm
===================================================================
--- tlpkg/TeXLive/TLConfig.pm	(revision 12171)
+++ tlpkg/TeXLive/TLConfig.pm	(working copy)
@@ -11,6 +11,7 @@
   use vars qw( @ISA @EXPORT_OK @EXPORT );
   @ISA = qw(Exporter);
   @EXPORT_OK = qw(
+    $ReleaseYear
     @MetaCategories
     @NormalCategories
     @Categories
@@ -28,10 +29,15 @@
     $WinSpecialUpdatePackagesRegexp
     @CriticalPackagesList
     @AllowedConfigOptions
+    $WindowsMainMenuName
   );
   @EXPORT = @EXPORT_OK;
 }
 
+# the year of our release, will be used in the location of the
+# network packges, and in menu names, and probably many other places
+$ReleaseYear = 2009;
+
 # Meta Categories do not ship files, but call only for other packages
 our @MetaCategories = qw/Collection Scheme/;
 our $MetaCategoriesRegexp = '(Collection|Scheme)';
@@ -57,14 +63,14 @@
 
 our $Archive = "archive";
 our $TeXLiveServerURL = "http://mirror.ctan.org";
-our $TeXLiveServerPath = "systems/texlive/tlnet/2008";
+our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear";
 our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath";
 
 our $WinSpecialUpdatePackagesRegexp = 
   '^(texlive\.infra|luatex|bin-tlperl\.win32$|bin-texlive|bin-kpathsea)';
 
 
-our @CriticalPackagesList = qw/texlive.infra bin-texlive/;
+our @CriticalPackagesList = qw/texlive.infra/;
 
 our @AllowedConfigOptions = qw/
   available_architectures
@@ -82,6 +88,8 @@
   autobackup
   /;
 
+our $WindowsMainMenuName = "TeX Live $ReleaseYear";
+
 1;
 
 
@@ -163,7 +171,7 @@
 
 =item C<@TeXLive::TLConfig::AllowedConfigOptions>
 
-A list of a config options that can be set in 00texlive-installation.config.
+A list of a config options that can be set in 00texlive.installation.
 
 =back
 
Index: tlpkg/TeXLive/TLPostActions.pm
===================================================================
--- tlpkg/TeXLive/TLPostActions.pm	(revision 12171)
+++ tlpkg/TeXLive/TLPostActions.pm	(working copy)
@@ -20,48 +20,13 @@
 use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info
                         touch tlwarn);
 use TeXLive::TLWinGoo;
+use TeXLive::TLConfig;
 
-my $mainmenu = "TeX Live 2008";
+my $mainmenu = $TeXLive::TLConfig::WindowsMainMenuName;
 
 our %PostInstall;
 our %PostRemove;
 
-# NOT ENABLED !!!!!
-# context post install actions
-sub do_install_bin_context {
-  my ($texdir, $texdirw, $texmfsysvar) = @_;
-  # set up texmfcnf.lua
-  my $TMF = "$texdirw/texmf/web2c/texmfcnf.lua";
-  if (! -r $TMF) {
-    open(TMF, ">$TMF") || die "open($TMF) failed: $!\n";
-    print TMF 'local conf = {}', "\n";
-    print TMF "conf.TEXMFCACHE = \"$texmfsysvar\"\n";
-    #print TMP "conf.CACHEINTDS = 't'\n";
-    print TMF "return conf\n";
-    close(TMF) || warn "close($TMF) failed: $!";
-  }
-  # update the luatools cache
-  system("luatools", "--generate");
-  # build the context formats based on luatex
-  system("context", "--make", "--compile", "cont-en");
-  # update the font cache
-  system("mtxrun", "--script", "fonts", "--reload");
-}
-#
-# That has to be sorted out and maybe changed at a later time, so do NOT
-# enable that for now.
-###$PostInstall{"bin-context"} = \&do_install_bin_context;
-
-
-# ATM do the same for luatex as for context
-sub do_install_luatex {
-  do_install_bin_context(@_);
-}
-#
-# SEE ABOVE
-# $PostInstall{"luatex"} = \&do_install_luatex;
-
-
 # xetex
 #
 sub do_install_xetex {
@@ -125,7 +90,7 @@
           }
         }
         foreach (@lines) {
-          $_ =~ s!c:/Program Files/texlive/2008!$texdir!;
+          $_ =~ s!c:/Program Files/texlive/$TeXLive::TLConfig::ReleaseYear!$texdir!;
           $_ =~ s!c:/windows/fonts!$winfontdir! if win32();
           # hack around fc-cache problem in from_dvd case:
           #if (win32() and (uc($texdir) ne uc($texdirw)) and
@@ -149,136 +114,13 @@
 }
 $PostInstall{"xetex"} = \&do_install_xetex;
 
-#
-# bin-dviout.win32
-#
-sub do_install_bin_dviout_win32 {
-  my ($texdir, $texdirw) = @_;
-  if (win32()) {
-    my $texdir_bsl = conv_to_w32_path($texdir);
-    add_menu_shortcut(
-      $mainmenu,
-      'DVIOUT Dvi Viewer',
-      $texdir.'/tlpkg/dviout/dviout.exe', # for the icon
-      'wscript',
-      $texdir_bsl."\\bin\\win32\\dviout.vbs",
-      '',
-    );
-  }
-}
-sub do_remove_bin_dviout_win32 {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu, 'DVIOUT Dvi Viewer');
-  }
-}
-$PostInstall{'bin-dviout.win32'} = \&do_install_bin_dviout_win32;
-$PostRemove{'bin-dviout.win32'} = \&do_remove_bin_dviout_win32;
 
-
 #
-# bin-texdoc
-#
-sub do_install_bin_texdoc {
-  my ($texdir, $texdirw) = @_;
-  if (win32()) {
-    #add_desktop_shortcut(
-    #  $texdirw,
-    #  'TeXdoc GUI',
-    #  '', # $vars{'TEXDIR'}.'/tlpkg/doc/notes.ico', # the icon
-    #  $texdir.'/bin/win32/texdoctk.bat',
-    #  '', # no args
-    #  'batgui', # any non-null value to hide command-prompt
-    #);
-    add_menu_shortcut(
-      $mainmenu,
-      'TeXdoc GUI',
-      '', # $vars{'TEXDIR'}.'/tlpkg/doc/notes.ico', # the icon
-      $texdir.'/bin/win32/texdoctk.bat',
-      '', # no args
-      'batgui', # any non-null value to hide command-prompt
-    );
-  }
-}
-sub do_remove_bin_texdoc {
-  my ($texdir) = @_;
-  if (win32()) {
-    # remove_desktop_shortcut('TeXdoc GUI');
-    remove_menu_shortcut($mainmenu, 'TeXdoc GUI');
-  }
-}
-$PostInstall{'bin-texdoc'} = \&do_install_bin_texdoc;
-$PostRemove{'bin-texdoc'} = \&do_remove_bin_texdoc;
-
-#
-# bin-tlpsv.win32
-#
-sub do_install_bin_tlpsv_win32 {
-  my ($texdir, $texdirw) = @_;
-  if (win32()) {
-    add_desktop_shortcut(
-      $texdirw,
-      'PS_View',
-      $texdir.'/tlpkg/tlpsv/psv.exe', # icon, not prog!
-      $texdir.'/bin/win32/psv.bat',
-      '', # no args
-      'batgui', # any non-null value to hide command-prompt
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'PS_View',
-      $texdir.'/tlpkg/tlpsv/psv.exe', # icon, not prog!
-      $texdir.'/bin/win32/psv.bat',
-      '', # no args
-      'batgui', # any non-null value to hide command-prompt
-    );
-    #register_extension(".ps", "PostScript");
-    #register_extension(".eps", "PostScript");
-    ##register_file_type("PostScript", '"'.$texdir.'/bin/win32/psv.bat"');
-    #register_file_type("PostScript",
-    #  '"'.$texdir.'/tlpkg/tlpsv/gswxlua.exe" -g '.
-    #  '"'.$texdir.'/tlpkg/tlgs/bin/gsdll32.dll" -l '.
-    #  '"'.$texdir.'/tlpkg/tlpsv/psv.wx.lua" -p '.
-    #  '"'.$texdir.'/tlpkg/tlpsv/psv_view.ps" -sINPUT="%1"');
-    #update_assocs();
-  }
-}
-sub do_remove_bin_tlpsv_win32 {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_desktop_shortcut('PS_View');
-    remove_menu_shortcut($mainmenu, 'PS_View');
-    #unregister_extension(".ps");
-    #unregister_extension(".eps");
-    #unregister_file_type("PostScript");
-    #update_assocs();
-  }
-}
-$PostRemove{'bin-tlpsv.win32'} = \&do_remove_bin_tlpsv_win32;
-$PostInstall{'bin-tlpsv.win32'} = \&do_install_bin_tlpsv_win32;
-
-#
 # bin-texlive
 #
 sub do_install_bin_texlive {
   my ($texdir, $texdirw) = @_;
   if (win32()) {
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manager',
-      '', # $texdir.'/tlpkg/doc/dummy.ico',
-      $texdir.'/bin/win32/tlmgr.bat',
-      'gui',
-      'batgui',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'Release notes',
-      '',
-      'http://tug.org/texlive/windows.html',
-      '',
-      '',
-    );
     if (uc(TeXLive::TLWinGoo::win_which_dir('tex.exe')) ne
           uc($texdir.'/bin/win32') or
         uc(TeXLive::TLWinGoo::win_which_dir('pdftex.exe')) ne
@@ -296,7 +138,6 @@
        '',
       );
       add_desktop_shortcut(
-        $texdirw,
         'TeX Live Prompt',
         '',
         $ENV{'COMSPEC'},
@@ -309,8 +150,6 @@
 sub do_remove_bin_texlive {
   my ($texdir) = @_;
   if (win32()) {
-    remove_menu_shortcut($mainmenu, 'TeX Live Manager');
-    remove_menu_shortcut($mainmenu, 'Release notes');
     remove_menu_shortcut($mainmenu, 'TeX Live Prompt');
     remove_desktop_shortcut('TeX Live Prompt');
   }
@@ -318,431 +157,6 @@
 $PostInstall{'bin-texlive'} = \&do_install_bin_texlive;
 $PostRemove{'bin-texlive'} = \&do_remove_bin_texlive;
 
-#
-# texlive.infra
-# ships all the readme.html/readme.XX.html files, and the index of all
-# documents
-sub do_install_texlive_infra {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_infra: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Toplevel Readme Index',
-      '', # default pdf icon
-      $texdir.'/index.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_infra {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Toplevel Readme Index');
-  }
-}
-$PostInstall{'texlive.infra'} = \&do_install_texlive_infra;
-$PostRemove{'texlive.infra'} = \&do_remove_texlive_infra;
-
-#
-# texlive-en
-#
-sub do_install_texlive_en {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_en: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (en) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/english/texlive-en/texlive-en.html',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (en) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/english/texlive-en/texlive-en.pdf',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_en {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (en) (HTML)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (en) (PDF)');
-  }
-}
-$PostInstall{'texlive-en'} = \&do_install_texlive_en;
-$PostRemove{'texlive-en'} = \&do_remove_texlive_en;
-
-#
-# texlive-cz
-#
-sub do_install_texlive_cz {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_cz: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (cz) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.pdf',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (cz) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_cz {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (cz) (PDF)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (cz) (HTML)');
-  }
-}
-$PostInstall{'texlive-cz'} = \&do_install_texlive_cz;
-$PostRemove{'texlive-cz'} = \&do_remove_texlive_cz;
-
-#
-# texlive-fr
-#
-sub do_install_texlive_fr {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_fr: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (fr) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/french/texlive-fr/texlive-fr.pdf',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (fr) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/french/texlive-fr/texlive-fr.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_fr {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (fr) (HTML)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (fr) (PDF)');
-  }
-}
-$PostInstall{'texlive-fr'} = \&do_install_texlive_fr;
-$PostRemove{'texlive-fr'} = \&do_remove_texlive_fr;
-
-#
-# texlive-de
-#
-sub do_install_texlive_de {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_de: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (de) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/german/texlive-de/texlive-de.pdf',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (de) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/german/texlive-de/texlive-de.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_de {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (de) (PDF)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (de) (HTML)');
-  }
-}
-$PostInstall{'texlive-de'} = \&do_install_texlive_de;
-$PostRemove{'texlive-de'} = \&do_remove_texlive_de;
-
-#
-# texlive-pl
-#
-sub do_install_texlive_pl {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_pl: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (pl) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/polish/texlive-pl/texlive-pl.pdf',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (pl) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/polish/texlive-pl/texlive-pl.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_pl {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (pl) (PDF)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (pl) (HTML)');
-  }
-}
-$PostInstall{'texlive-pl'} = \&do_install_texlive_pl;
-$PostRemove{'texlive-pl'} = \&do_remove_texlive_pl;
-
-#
-# texlive-ru
-#
-sub do_install_texlive_ru {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_ru: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (ru) (PDF)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/russian/texlive-ru/texlive-ru.pdf',
-      '',
-      '',
-    );
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (ru) (HTML)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/russian/texlive-ru/texlive-ru.html',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_ru {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (ru) (HTML)');
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (ru) (PDF)');
-  }
-}
-$PostInstall{'texlive-ru'} = \&do_install_texlive_ru;
-$PostRemove{'texlive-ru'} = \&do_remove_texlive_ru;
-
-#
-# texlive-zh-cn
-#
-sub do_install_texlive_zh_cn {
-  my ($texdir) = @_;
-  if (win32()) {
-    if (!defined($texdir)) {
-      tlwarn("do_install_texlive_zh_cn: texdir not defined, returning\n");
-      return;
-    }
-    add_menu_shortcut(
-      $mainmenu,
-      'TeX Live Manual (zh-cn)',
-      '', # default pdf icon
-      $texdir.'/texmf-doc/doc/chinese/texlive-zh-cn/texlive-zh-cn.pdf',
-      '',
-      '',
-    );
-  }
-}
-sub do_remove_texlive_zh_cn {
-  my ($texdir) = @_;
-  if (win32()) {
-    remove_menu_shortcut($mainmenu,'TeX Live Manual (zh-cn)');
-  }
-}
-$PostInstall{'texlive-zh-cn'} = \&do_install_texlive_zh_cn;
-$PostRemove{'texlive-zh-cn'} = \&do_remove_texlive_zh_cn;
-
-
-#
-# FROM HERE ON ONLY DISABLED POST INSTALL AND REMOVE ACTIONS!!!!!!!
-#
-
-# disabled
-sub do_bin_xdvi {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  copy ("$TEXDIR/texmf/xdvi/XDvi", "$TEXMFSYSVAR/xdvi");
-}
-# $PostInstall{"bin-xdvi"} = \&do_bin_xdvi;
-
-
-# disabled
-sub do_plain {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # install some copies from texmf(-dist) into texmf-var
-  copy ("$TEXDIR/texmf-dist/tex/generic/config/language.def",
-        "$TEXMFSYSVAR/tex/generic/config");
-}
-# $PostInstall{"plain"} = \&do_plain;
-
-
-# disabled
-sub do_bin_dvipsk {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # those files must exist
-  copy ("$TEXDIR/texmf/dvips/config/config.ps",
-        "$TEXMFSYSVAR/dvips/config");
-}
-# $PostInstall{"bin-dvipsk"} = \&do_bin_dvipsk;
-
-# disabled
-sub do_bin_dvipdfm {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # fix up dvipdfm config file to contain the right # piping command
-  mkdirhier("$TEXMFSYSVAR/dvipdfm/config");
-  open(DVIPDFMCONFIGDIST, "<$TEXDIR/texmf/dvipdfm/config/config")
-    or die("Cannot open $TEXDIR/texmf/dvipdfm/config/config");
-  open(DVIPDFMCONFIGINST, ">$TEXMFSYSVAR/dvipdfm/config/config")
-    or die("Cannot open $TEXMFSYSVAR/dvipdfm/config/config");
-  while (<DVIPDFMCONFIGDIST>) {
-    if (m/^D /) {
-      print DVIPDFMCONFIGINST 'D "epstopdf --outfile=%o --nocompress %i"', "\n";
-    } else {
-      print DVIPDFMCONFIGINST;
-    }
-  }
-  close(DVIPDFMCONFIGDIST);
-  close(DVIPDFMCONFIGINST);
-}
-# $PostInstall{"bin-dvipdfm"} = \&do_bin_dvipdfm;
-
-# disabled
-sub do_bin_dvipdfmx {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # dvipdfmx.cfg
-  open(DVIPDFMCONFIGDIST, "<$TEXDIR/texmf/dvipdfmx/dvipdfmx.cfg")
-    or die("Cannot open $TEXDIR/texmf/dvipdfmx/dvipdfmx.cfg");
-  open(DVIPDFMCONFIGINST, ">$TEXMFSYSVAR/dvipdfmx/dvipdfmx.cfg")
-    or die("Cannot open $TEXMFSYSVAR/dvipdfmx/dvipdfmx.cfg");
-  while (<DVIPDFMCONFIGDIST>) {
-    # current dvipdfmx.cfg already contains the right rungs incantation
-    # so do just copy the file to texmf-var
-    #if (m/^D /) {
-    #  print DVIPDFMCONFIGINST "%$_";
-    #  print DVIPDFMCONFIGINST "\n%% GhostScript (TeX Live (Unix and Win32)):\n";
-    #  print DVIPDFMCONFIGINST 'D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"', "\n\n";
-    #} else {
-      print DVIPDFMCONFIGINST;
-    #}
-  }
-  close(DVIPDFMCONFIGDIST);
-  close(DVIPDFMCONFIGINST);
-}
-# $PostInstall{"bin-dvipdfmx"} = \&do_bin_dvipdfmx;
-
-
-# disabled
-sub do_bin_kpathsea {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  copy ("$TEXDIR/texmf/web2c/mktex.cnf",
-        "$TEXMFSYSVAR/web2c");
-}
-# $PostInstall{"bin-kpathsea"} = \&do_bin_kpathsea;
-
-# disabled
-sub do_bin_pdftex {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # the old installer copied from CDDIR, but shouldn't this be installed
-  # in ANY case since it is in bin-pdftex???
-  copy ("$TEXDIR/texmf/tex/generic/config/pdftexconfig.tex",
-        "$TEXMFSYSVAR/tex/generic/config");
-}
-# $PostInstall{"bin-pdftex"} = \&do_bin_pdftex;
-
-# disabled
-sub do_context {
-  my ($TEXDIR, $TEXMFSYSVAR) = @_;
-  if (!defined($TEXMFSYSVAR)) {
-    $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`;
-    chomp($TEXMFSYSVAR);
-  }
-  # old installer did this, should we do this, TOO????
-  copy ("$TEXDIR/texmf-dist/tex/context/config/cont-usr.tex",
-        "$TEXMFSYSVAR/tex/context/config");
-}
-# $PostInstall{"context"} = \&do_context;
-
-
 1;
 
 
Index: tlpkg/TeXLive/TLPSRC.pm
===================================================================
--- tlpkg/TeXLive/TLPSRC.pm	(revision 12171)
+++ tlpkg/TeXLive/TLPSRC.pm	(working copy)
@@ -30,6 +30,7 @@
     srcpatterns => $params{'srcpatterns'},
     docpatterns => $params{'docpatterns'},
     binpatterns => $params{'binpatterns'},
+    postactions => $params{'postactions'},
     executes    => defined($params{'executes'}) ? $params{'executes'} : [],
     depends     => defined($params{'depends'}) ? $params{'depends'} : [],
   };
@@ -67,6 +68,7 @@
   my $catalogue = "";
   my (@executes, @depends);
   my (@runpatterns, @docpatterns, @binpatterns, @srcpatterns);
+  my (@postactions);
   my $started = 0;
   my $finished = 0;
   my $savedline = "";
@@ -132,6 +134,9 @@
       } elsif ($line =~ /^depend\s+(.*)\s*$/) {
         push @depends, $1 if ($1 ne "");
         next;
+      } elsif ($line =~ /^postaction\s+(.*)\s*$/) {
+        push @postactions, $1 if ($1 ne "");
+        next;
       } else {
         tlwarn("$srcfile:$.: unknown tlpsrc directive, please fix: $line\n");
       }
@@ -149,6 +154,7 @@
   $self->docpatterns(@docpatterns) if @docpatterns;
   $self->executes(@executes) if @executes;
   $self->depends(@depends) if @depends;
+  $self->postactions(@postactions) if @postactions;
 }
 
 
@@ -175,6 +181,11 @@
       print $fd "execute $_\n";
     }
   }
+  if (defined($self->{'postactions'})) {
+    foreach (@{$self->{'postactions'}}) {
+      print $fd "postaction $_\n";
+    }
+  }
   if (defined($self->{'srcpatterns'}) && (@{$self->{'srcpatterns'}})) {
     foreach (sort @{$self->{'srcpatterns'}}) {
       print $fd "srcpattern $_\n";
@@ -213,6 +224,7 @@
   $tlp->longdesc($self->{'longdesc'}) if (defined($self->{'longdesc'}));
   $tlp->catalogue($self->{'catalogue'}) if (defined($self->{'catalogue'}));
   $tlp->executes(@{$self->{'executes'}}) if (defined($self->{'executes'}));
+  $tlp->postactions(@{$self->{'postactions'}}) if (defined($self->{'postactions'}));
   $tlp->depends(@{$self->{'depends'}}) if (defined($self->{'depends'}));
   $tlp->revision(0);
   my $filemax;
@@ -540,6 +552,11 @@
   if (@_) { @{ $self->{'executes'} } = @_ }
   return @{ $self->{'executes'} };
 }
+sub postactions {
+  my $self = shift;
+  if (@_) { @{ $self->{'postactions'} } = @_ }
+  return @{ $self->{'postactions'} };
+}
 
 format multilineformat =
 longdesc ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~
@@ -580,7 +597,7 @@
 
 where I<key> can be C<name>, C<category>, C<shortdesc>, C<longdesc>,
 C<catalogue>, C<runpattern>, C<srcpattern>, C<docpattern>, C<binpattern>,
-C<execute>, or C<depend>.
+C<execute>, C<postaction>, or C<depend>.
 
 Continuation lines are supported via a trailing backslash.  That is, if
 the C<.tlpsrc> file contains two physical lines like this:
@@ -638,7 +655,7 @@
 is only "lzma", which generates .tar.lzma files. zip can be supported.
 release/NNNN specifies the release number as used in the installer.
 
-=item B<00texlive-installation.config>
+=item B<00texlive.installation>
 
 This package serves a double purpose:
 
@@ -737,12 +754,49 @@
 C<lefthyphenmin>, C<righthyphenmin> (both integers), and C<synonyms> (a
 comma-separated list of alias names for that hyphenation).
 
-=item C<execute BuildFormat> I<format>
+=item C<execute AddFormat name=I<fmt> engine=I<eng> [I<var>...]>
 
-build the format I<format>, as specified in the C<fmtutil.cnf> file.
+activates the format with name I<fmt> based on the engine I<eng>. The 
+additional variables I<var> are:
+C<mode> which can only be equal to C<disable> in which case the format
+will only be mentioned but disabled (prefixed with C<#!>;
+C<patterns> which gives the patterns file, if not present C<-> is used;
+C<options> which gives the additional options for the C<fmtutil.cnf> file.
 
 =back
 
+=item <postaction>
+
+gives a free from entry of post install and removal actions to be
+executed. The difference to the C<execute> statement is that 
+C<postaction> is concerned with system integration, i.e., adjusting
+things outside the installation directory, while C<execute> touches
+only things within the installation.
+
+Currently the following C<postaction>s are understood:
+
+=over 4
+
+=item C<postaction shortcut name=I<name> type=menu|desktop icon=I<path> cmd=I<cmd> args=I<args> hide=0|1>
+
+On W32 creates a shortcut either in the main TeX Live menu or on the
+desktop. Please see the documentation of TeXLive::TLWinGoo for details
+on the parameters.
+
+=item C<postaction filetype name=I<name> cmd=I<cmd>>
+
+On W32 associates the file type I<name> with the command I<cmd>.
+
+=item C<postaction fileassoc extension=I<.ext> filetype=I<name>>
+
+On W32 declares files with the extenstion I<.ext> of file type I<name>.
+
+=item C<postaction code I<arg>>
+
+TODO TODO I don't know how we want to do that
+
+=back
+
 =item C<(src|run|doc|bin)pattern> I<pattern>
 
 adds a pattern (next section) to the respective list of patterns.
Index: tlpkg/TeXLive/TLPOBJ.pm
===================================================================
--- tlpkg/TeXLive/TLPOBJ.pm	(revision 12171)
+++ tlpkg/TeXLive/TLPOBJ.pm	(working copy)
@@ -29,6 +29,7 @@
     docfiles    => defined($params{'docfiles'}) ? $params{'docfiles'} : [],
     docsize   => $params{'docsize'},
     executes    => defined($params{'executes'}) ? $params{'executes'} : [],
+    postactions => defined($params{'postactions'}) ? $params{'postactions'} : [],
     # note that binfiles is a HASH with keys of $arch!
     binfiles    => defined($params{'binfiles'}) ? $params{'binfiles'} : {},
     binsize     => defined($params{'binsize'}) ? $params{'binsize'} : {},
@@ -92,6 +93,7 @@
            ($lastcmd eq "docfiles") ||
            ($lastcmd eq "srcfiles") ||
            ($lastcmd eq "executes") ||
+           ($lastcmd eq "postaction") ||
            ($lastcmd eq "depend") ) {
         $line =~ s/^ /${lastcmd}continued /;
       } else {
@@ -216,6 +218,10 @@
         push @{$self->{'executes'}}, "$2" unless "$2" eq "";
         $lastcmd = "execute";
         next;
+      } elsif ($line =~ /^postaction(continued)?\s*(.*)\s*/o) {
+        push @{$self->{'postactions'}}, "$2" unless "$2" eq "";
+        $lastcmd = "postaction";
+        next;
       } elsif ($line =~ /^depend(continued)?\s*(.*)\s*/o) {
         push @{$self->{'depends'}}, "$2" unless "$2" eq "";
         $lastcmd = "depend";
@@ -316,6 +322,11 @@
       print $fd "execute $_\n";
     }
   }
+  if (defined($self->{'postactions'})) {
+    foreach (@{$self->{'postactions'}}) {
+      print $fd "postaction $_\n";
+    }
+  }
   if (defined($self->{'containersize'})) {
     print $fd "containersize $self->{'containersize'}\n";
   }
@@ -388,6 +399,11 @@
       print $fd "execute $_\n";
     }
   }
+  if (defined($self->{'postactions'})) {
+    foreach (@{$self->{'postactions'}}) {
+      print $fd "postaction $_\n";
+    }
+  }
   if (defined($self->{'docfiles'}) && (@{$self->{'docfiles'}})) {
     print $fd "docfiles\n";
     foreach (sort @{$self->{'docfiles'}}) {
@@ -837,7 +853,7 @@
       } else {
         push @maps, "disable $3";
       }
-    } elsif ($e =~ m/^BuildFormat\s+([^\s]+)\s*$/) {
+    } elsif ($e =~ m/^AddFormat\s+([^\s]+)\s*$/) {
       push @formats, $1;
     } elsif ($e =~ m/^AddHyphen\s+(.*)\s*$/) {
       push @dats, $1;
@@ -1026,6 +1042,11 @@
   if (@_) { $self->{'executes'} = [ @_ ] }
   return @{ $self->{'executes'} };
 }
+sub postactions {
+  my $self = shift;
+  if (@_) { $self->{'postactions'} = [ @_ ] }
+  return @{ $self->{'postactions'} };
+}
 sub containerdir {
   my @self = shift;
   if (@_) { $_containerdir = $_[0] }
Index: tlpkg/TeXLive/TLMedia.pm
===================================================================
--- tlpkg/TeXLive/TLMedia.pm	(revision 12171)
+++ tlpkg/TeXLive/TLMedia.pm	(working copy)
@@ -208,6 +208,9 @@
         info("running post install action for $pkg\n");
         &{$PostInstall{$pkg}}($totlpdb->root);
       }
+      #
+      # Run the post installation code in the postaction tlpsrc entries
+      &TeXLive::TLUtils::do_postaction_code("install", $tlpobj);
     }
     return \%ret;
   }
Index: tlpkg/TeXLive/TLUtils.pm
===================================================================
--- tlpkg/TeXLive/TLUtils.pm	(revision 12171)
+++ tlpkg/TeXLive/TLUtils.pm	(working copy)
@@ -56,6 +56,7 @@
   TeXLive::TLUtils::create_language_def($tlpdb,$dest,$localconf);
   TeXLive::TLUtils::install_packages($from_tlpdb,$media,$to_tlpdb,$what,$opt_src, $opt_doc)>);
   TeXLive::TLUtils::install_package($what, $filelistref, $target, $platform);
+  TeXLive::TLUtils::do_postaction_code($how, $tlpobj);
 
 =head2 Miscellaneous
 
@@ -1224,7 +1225,111 @@
   return 1;
 }
 
+=item C<do_postaction_code($how, $tlpobj)>
 
+Evaluates the C<postaction> code in the C<$tlpobj> 
+MISSING DOCUMENTATION TODO TODO
+
+Returns 1 on success, and 0 on failure.
+
+=cut
+
+sub do_postaction_code {
+  my ($how, $tlpobj) = @_;
+  my $ret = 1;
+  if (!defined($tlpobj)) {
+    tlwarn("do_postaction_code: didn't get a tlpobj\n");
+    return 0;
+  }
+  debug("running postaction $how code for " . $tlpobj->name . "\n")
+    if $tlpobj->postactions;
+  for my $pa ($tlpobj->postactions) {
+    if ($pa =~ m/^\s*shortcut\s+(.*)\s*$/) {
+      $ret &&= _do_postaction_shortcut($how, $tlpobj, $1);
+    } elsif ($pa =~ m/\s*filetype\s+(.*)\s*$/) {
+      $ret &&= _do_postaction_filetype($how, $tlpobj, $1);
+    } elsif ($pa =~ m/\s*fileassoc\s+(.*)\s*$/) {
+      $ret &&= _do_postaction_fileassoc($how, $tlpobj, $1);
+    } elsif ($pa =~ m/\s*code\s+(.*)\s*$/) {
+      $ret &&= _do_postaction_code($how, $tlpobj, $1);
+    } else {
+      tlwarn("do_postaction_code: don't know how to do $pa\n");
+      $ret = 0;
+    }
+  }
+  # nothing to do
+  return $ret;
+}
+
+sub _do_postaction_shortcut {
+  my ($how, $tlpobj, $pa) = @_;
+  return 1 unless win32();
+  my @words = quotewords('\s+', 0, "$pa");
+  my $type;
+  my $icon = '';
+  my $cmd = '';
+  my $args = '';
+  my $name;
+  my $hide = '0';
+  while (@words) {
+    $_ = shift @words;
+    if (/^type=(.*)$/) {
+      $type = $1;
+      if (($type ne "menu") && ($type ne "desktop")) {
+        tlwarn("type of shortcut postaction $type is unknown (menu, desktop)\n");
+        return 0;
+      }
+    } elsif (/^name=(.*)$/) {
+      $name = $1;
+    } elsif (/^icon=(.*)$/) {
+      $icon = $1;
+    } elsif (/^cmd=(.*)$/) {
+      $cmd = $1;
+    } elsif (/^args=(.*)$/) {
+      $args = $1;
+    } elsif (/^hide=(.*)$/) {
+      $hide = $1;
+      if (($hide ne "0") && ($hide ne "1")) {
+        tlwarn("hide of shortcut postaction $hide is unknown (0, 1)\n");
+        return 0;
+      }
+    } else {
+      tlwarn("Unknown tag for postaction shortcut $pa: $_\n");
+      return 0;
+    }
+  }
+  if ($how eq "install") {
+    my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+    chomp($texdir);
+    my $texdir_bsl = conv_to_w32_path($texdir);
+    $icon =~ s!^TEXDIR/!$texdir/!;
+    $args =~ s!^TEXDIR/!$texdir/!;
+    $args = conv_to_w32_path($args);
+    if ($type eq "menu") {
+      add_menu_shortcut($TeXLive::TLConfig::WindowsMainMenuName, 
+                        $name, $icon, $cmd, $args, $hide);
+    } elsif ($type eq "desktop") {
+      add_desktop_shortcut($name, $icon, $cmd, $args, $hide);
+    } else {
+      tlwarn("Unknown type of shortcut: $type\n");
+      return 0;
+    }
+  } elsif ($how eq "remove") {
+    if ($type eq "menu") {
+      remove_menu_shortcut($TeXLive::TLConfig::WindowsMainMenuName, $name);
+    } elsif ($type eq "desktop") {
+      remove_desktop_shortcut($name);
+    } else {
+      tlwarn("Unknown type of shortcut: $type\n");
+      return 0;
+    }
+  } else {
+    tlwarn("Unknown mode $how\n");
+    return 0;
+  }
+  return 1;
+}
+
 =item C<untar($tarfile,$targetdir, $remove_tarfile)>
 
 Unpacked C<$tarfile> in C<$targetdir> (changing directories to
Index: tlpkg/TeXLive/TLWinGoo.pm
===================================================================
--- tlpkg/TeXLive/TLWinGoo.pm	(revision 12171)
+++ tlpkg/TeXLive/TLWinGoo.pm	(working copy)
@@ -58,7 +58,6 @@
     $prog, $args, $batgui);
   TeXLive::TLWinGoo::add_menu_shortcut($place, $name, $icon,
     $prog, $args, $batgui);
-  TeXLive::TLWinGoo::init_unshortbat($texdir);
   TeXLive::TLWinGoo::remove_desktop_shortcut($name);
   TeXLive::TLWinGoo::remove_menu_shortcut($place, $name);
 
@@ -104,7 +103,6 @@
     &add_menu_shortcut
     &remove_desktop_shortcut
     &remove_menu_shortcut
-    &init_unshortbat
     &create_uninstaller
     &unregister_uninstaller
   );
@@ -862,8 +860,7 @@
 
 =pod
 
-=item C<add_desktop_shortcut($texdir, $name, $icon,
-  $prog, $args, $batgui)>
+=item C<add_desktop_shortcut($name, $icon, $prog, $args, $batgui)>
 
 Add a desktop shortcut, with name $name and icon $icon, pointing to
 program $prog with parameters $args (a string).  Use a non-null
@@ -871,14 +868,10 @@
 batchfile. Then the inevitable command prompt will be hidden
 rightaway, leaving only the gui program visible.
 
-The parameter $texdir is merely used to locate the batchfile
-unshort.bat for uninstalling desktop shortcuts, which needs to be
-updated.
-
 =cut
 
 sub add_desktop_shortcut {
-  my ($texdir, $name, $icon, $prog, $args, $batgui) = @_;
+  my ($name, $icon, $prog, $args, $batgui) = @_;
 
   # create shortcut
   my ($shc, $shpath, $shfile);
@@ -889,15 +882,6 @@
   $shc->{'ShowCmd'} = $batgui ? SW_SHOWMINNOACTIVE : SW_SHOWNORMAL;
   $shfile = desktop_path().'/'.$name.'.lnk';
   $shc->Save($shfile);
-
-  # update batchfile for uninstalling shortcuts
-  if (open UNSHORT, ">>$texdir/tlpkg/installer/unshort.bat") {
-    $shfile =~ s!/!\\!g;
-    print UNSHORT 'del "'.$shfile."\" 2>nul\n";
-    close UNSHORT;
-  } else {
-    warn "Cannot open $texdir/tlpkg/installer/unshort.bat for appending: $!";
-  }
 }
 
 =pod
@@ -937,39 +921,16 @@
 
 =pod
 
-=item C<init_unshortbat($texdir)>
-
-Reinitialize unshort.bat, the shortcuts uninstaller.
-
-=cut
-
-sub init_unshortbat {
-  my $texdirw = shift;
-  my $menupath = menu_path();
-  $menupath =~ s!/!\\!g;
-
-  # batchfile for uninstalling shortcuts
-  if (open UNSHORT, ">$texdirw/tlpkg/installer/unshort.bat") {
-    print UNSHORT 'rmdir /s /q "'.$menupath."\\TeX Live 2008\" 2>nul\n";
-    close UNSHORT;
-  } else {
-    warn "Cannot create $texdirw/tlpkg/installer/unshort.bat: $!";
-  }
-}
-
-=pod
-
 =item C<remove_desktop_shortcut($name)>
 
-For uninstallation of an individual package. We leave unshort.bat
-alone because redundant entries are no big deal.
+For uninstallation of an individual package. 
 
 =cut
 
 sub remove_desktop_shortcut {
   my $name = shift;
   unlink desktop_path().'/'.$name.'.lnk';
-}
+} 
 
 =pod
 
@@ -1040,7 +1001,6 @@
 set PERL5LIB=
 \"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\"
 if errorlevel 1 exit
-call \"$tdw\\tlpkg\\installer\\unshort.bat\"
 copy \"$tdw\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\"
 rem pause
 \"\%TEMP\%\\uninst2.bat\"
Index: tlpkg/installer/install-menu-perltk.pl
===================================================================
--- tlpkg/installer/install-menu-perltk.pl	(revision 12171)
+++ tlpkg/installer/install-menu-perltk.pl	(working copy)
@@ -62,7 +62,6 @@
 my $texmfhometext;
 my $texdirtext;
 my $langcoltext;
-my $symlinktext;
 my $optletterstate;
 my $optfmtstate;
 my $optsrcstate;
@@ -70,6 +69,7 @@
 my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
 my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
 my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
+my $sysintyesno = ( $vars{'option_sysint'} ? $text{'yes'} : $text{'no'} );
 my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
 
 $::run_menu = \&run_menu_perltk;
@@ -258,15 +258,13 @@
     $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
+  $row++;
+  $fr->Label(-text => $labels{'sysint'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+  $fr->Label(-anchor => 'w', -textvariable => \$sysintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
   if (unix()) {
-    $row++;
-    # Symlinks
-    $fr->Label(-text => "------- $text{'sysint'} -------")->grid(-row => $row, -column => 1,-columnspan => 3);
-
-    $row++;
-    $fr->Label(-text => $labels{'symlink'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-    $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m");
     $fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+  } else {
+    $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
   # install/cancel buttons
@@ -596,7 +594,7 @@
 
 sub menu_select_symlink {
   our ($lbin,$lman,$linfo);
-  our $osym = $vars{'option_symlinks'};
+  our $osym = $vars{'option_sysint'};
   our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
   sub set_unset_buttons {
     $lbin = ($osym ? $vars{'sys_bin'} : '');
@@ -630,8 +628,8 @@
       $vars{'sys_info'} = $linfo;
       $vars{'sys_man'} = $lman;
     }
-    $vars{'option_symlinks'} = $osym;
-    menu_update_texts();
+    $vars{'option_sysint'} = $osym;
+    toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno);
   }
   my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'});
   $sw->transient($mainwindow);
@@ -695,10 +693,6 @@
   $w->configure(-text => $t, @_);
 }
 
-sub menu_set_symlink_text {
-  menu_set_text($symlinktext, (($vars{'option_symlinks'})?$text{'yes'}:$text{'no'}));
-}
-
 sub menu_set_schemebutton_text {
   menu_set_text($schemebutton, "$vars{'selected_scheme'}");
 }
@@ -762,7 +756,6 @@
   $optfmtstate = ($vars{'option_fmt'} ? $text{'yes'} : $text{'no'});
   $optsrcstate = ($vars{'option_src'} ? $text{'yes'} : $text{'no'});
   $optdocstate = ($vars{'option_doc'} ? $text{'yes'} : $text{'no'});
-  if (unix()) { menu_set_symlink_text; };
 }
 
 sub callback_select_scheme {
Index: tlpkg/installer/install-translations.pl
===================================================================
--- tlpkg/installer/install-translations.pl	(revision 12171)
+++ tlpkg/installer/install-translations.pl	(working copy)
@@ -52,7 +52,7 @@
 }
 
 
-our %text = (title      => 'TeX Live 2008 Installation',
+our %text = (title      => 'TeX Live 2009 Installation',
              basicinfo  => 'Basic Information',
              custom     => 'Further Customization',
              dirsetup   => "Directory setup",
@@ -93,7 +93,7 @@
              welcome => 'Welcome to TeX Live!',
              next       => 'Next >',
              prev       => '< Back',
-             wizhello   => "Welcome to the installation of TeX Live 2008\n"
+             wizhello   => "Welcome to the installation of TeX Live 2009\n"
                . "http://tug.org/texlive\n\n"
                . "This wizard will guide you through the installation.\n\n"
                . "For an advanced, customizable installation, please consult\n"
@@ -101,7 +101,7 @@
              destfolder => 'Destination folder:',
              advcustom  => 'Advanced customization',
              pathinfo   => "The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.",
-             readyinst  => "We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
+             readyinst  => "We are ready to install TeX Live 2009.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
              instshort  => 'Install',
              wizard     => 'Go to Wizard',
     );
@@ -121,6 +121,7 @@
                optdoc   =>  'Install font/macro doc tree',
                optsrc   =>  'Install font/macro source tree',
                symlink  =>  'Create symlinks in system directories',
+               sysint   =>  'System integration',
     );
 
 if (($::lang ne "en") && ($::lang ne "C")) {
Index: tlpkg/installer/install-menu-text.pl
===================================================================
--- tlpkg/installer/install-menu-text.pl	(revision 12171)
+++ tlpkg/installer/install-menu-text.pl	(working copy)
@@ -675,7 +675,7 @@
 
 
 sub options_menu {
-  my $b_symlinks=button($vars{'option_symlinks'});
+  my $b_sysint=button($vars{'option_sysint'});
   my $b_doc=button($vars{'option_doc'});
   my $b_src=button($vars{'option_src'});
   my $b_fmt=button($vars{'option_fmt'});
@@ -685,9 +685,9 @@
   my $sys_man=$vars{'sys_man'};
   my $sys_info=$vars{'sys_info'};
 
-  my $t_sys_bin=($vars{'option_symlinks'})? $vars{'sys_bin'}:'';
-  my $t_sys_man=($vars{'option_symlinks'})? $vars{'sys_man'}:'';
-  my $t_sys_info=($vars{'option_symlinks'})? $vars{'sys_info'}:'';
+  my $t_sys_bin=($vars{'option_sysint'})? $vars{'sys_bin'}:'';
+  my $t_sys_man=($vars{'option_sysint'})? $vars{'sys_man'}:'';
+  my $t_sys_info=($vars{'option_sysint'})? $vars{'sys_info'}:'';
 
   my %command=(
     'self' => \&options_menu,
@@ -709,14 +709,21 @@
   if ($vars{'src_splitting_supported'} and !$vars{'from_dvd'}) {
     print " <S> install font/macro source tree:           $b_src\n";
   }
-  if (unix() && !$vars{'from_dvd'}) {
-    print <<"EOF";
- <L> create symlinks in standard directories:  $b_symlinks
+  if (!$vars{'from_dvd'}) {
+    if (unix()) {
+      print <<"EOF";
+ <L> create symlinks in standard directories:  $b_sysint
             binaries to: $t_sys_bin
             manpages to: $t_sys_man
                 info to: $t_sys_info
 EOF
 ;
+    } else {
+      print <<"EOF";
+ <L> do system integration:                    $b_sysint
+EOF
+;
+    }
   }
   other_options qw(R Q diskspace);
   my $answer = prompt 'Enter command';
@@ -726,8 +733,8 @@
       my $home = getenv('HOME');
       $home = getenv('USERPROFILE') if (win32());
       $home ||= '~';
-      toggle 'option_symlinks';
-      if ($vars{'option_symlinks'}) {
+      toggle 'option_sysint';
+      if ($vars{'option_sysint'}) {
         print "New value for binary directory [$sys_bin]: ";
         chomp($answer=<STDIN>);
         $vars{'sys_bin'} =  "$answer" if (length $answer);
@@ -751,8 +758,15 @@
       }
       return $command{'self'};
     }
+  } else {
+    if (("\u$answer" eq 'L') and !$vars{'from_dvd'}) {
+      my $home = getenv('HOME');
+      $home = getenv('USERPROFILE') if (win32());
+      $home ||= '~';
+      toggle 'option_sysint';
+      return $command{'self'};
+    }
   }
-
   if ("\u$answer" eq 'P') {
     toggle 'option_letter';
     return $command{'self'};
@@ -802,7 +816,7 @@
 sub main_menu {
   my $this_platform=platform_desc($vars{'this_platform'});
 
-  my $b_symlinks=button($vars{'option_symlinks'});
+  my $b_sysint=button($vars{'option_sysint'});
   my $b_doc=button($vars{'option_doc'});
   my $b_src=button($vars{'option_src'});
   my $b_fmt=button($vars{'option_fmt'});
@@ -913,9 +927,7 @@
     if ($vars{'src_splitting_supported'}) {
       print "   $b_src install macro/font source tree\n";
     }
-    if (unix()) {
-      print "   $b_symlinks create symlinks in standard directories\n";
-    }
+    print "   $b_sysint system integration\n";
   }
 
   if ($vars{'from_dvd'}) {
Index: tlpkg/tlpsrc/bin-tex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-tex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-tex.tlpsrc	(working copy)
@@ -1,7 +1,6 @@
 name bin-tex
 category TLCore
 depend bin-kpathsea
-execute BuildFormat tex
-runpattern f texmf/fmtutil/format.tex.cnf
+execute AddFormat name=tex engine=tex options="tex.ini"
 docpattern f texmf/doc/man/man1/tex.*
 binpattern f bin/${ARCH}/tex
Index: tlpkg/tlpsrc/bin-mex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-mex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-mex.tlpsrc	(working copy)
@@ -2,10 +2,9 @@
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat mex
-execute BuildFormat utf8mex
-runpattern f texmf/fmtutil/format.mex.cnf
-runpattern f texmf/fmtutil/format.utf8mex.cnf
+execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini"
+execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini"
+execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini"
 binpattern f bin/${ARCH}/mex
 binpattern f bin/${ARCH}/pdfmex
 binpattern f bin/${ARCH}/utf8mex
Index: tlpkg/tlpsrc/texlive-de.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-de.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-de.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-de
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (de) (PDF)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.pdf
+postaction shortcut type=menu name="TeX Live Manual (de) (HTML)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.html
Index: tlpkg/tlpsrc/00texlive.installer.tlpsrc
===================================================================
--- tlpkg/tlpsrc/00texlive.installer.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/00texlive.installer.tlpsrc	(working copy)
@@ -7,7 +7,7 @@
 longdesc used *except* to build the installer archives, so it's ok.
 longdesc
 longdesc For information on the 00texlive prefix see
-longdesc   00texlive-installation.config(.tlpsrc)
+longdesc   00texlive.installation(.tlpsrc)
 category TLCore
 runpattern f install-tl
 runpattern f tlpkg/installer/install-tl.html
Index: tlpkg/tlpsrc/pdftex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/pdftex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/pdftex.tlpsrc	(working copy)
@@ -1,8 +1,9 @@
 name pdftex
 category TLCore
 depend bin-kpathsea
-execute BuildFormat pdftex
-runpattern f texmf/fmtutil/format.pdftex.cnf
+execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini"
+execute AddFormat name=pdfetex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
+execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
 runpattern f texmf/fonts/map/pdftex/updmap/*
 runpattern f texmf/tex/generic/config/pdftex*.tex
 runpattern f texmf/tex/generic/pdftex/*
Index: tlpkg/tlpsrc/bin-csplain.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-csplain.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-csplain.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-csplain
 category TLCore
 depend bin-tex
-execute BuildFormat csplain
-runpattern f texmf/fmtutil/format.csplain.cnf
+execute AddFormat name=csplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
+execute AddFormat name=pdfcsplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
 binpattern f bin/${ARCH}/csplain
 binpattern f bin/${ARCH}/pdfcsplain
Index: tlpkg/tlpsrc/bin-metapost.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-metapost.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-metapost.tlpsrc	(working copy)
@@ -1,8 +1,8 @@
 name bin-metapost
 category TLCore
 depend bin-kpathsea
-execute BuildFormat metapost
-runpattern f texmf/fmtutil/format.metapost.cnf
+execute AddFormat name=mpost engine=mpost options="-translate-file=cp227.tcx mpost.mp"
+execute AddFormat name=mfplain engine=mpost options="-translate-file=cp227.tcx mfplain.ini"
 docpattern f texmf/doc/man/man1/dmp.*
 docpattern f texmf/doc/man/man1/dvitomp.*
 docpattern f texmf/doc/man/man1/makempx.*
Index: tlpkg/tlpsrc/00texlive.config.tlpsrc
===================================================================
--- tlpkg/tlpsrc/00texlive.config.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/00texlive.config.tlpsrc	(working copy)
@@ -9,8 +9,8 @@
 longdesc is only "lzma", which generates .tar.lzma files. zip can be supported.
 longdesc release/NNNN specifies the release number as used in the installer.
 longdesc For information on the 00texlive prefix see
-longdesc   00texlive-installation.config(.tlpsrc)
+longdesc   00texlive.installation(.tlpsrc)
 depend container_split_src_files
 depend container_split_doc_files
 depend container_format/lzma
-depend release/2008
+depend release/2009
Index: tlpkg/tlpsrc/texlive-fr.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-fr.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-fr.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-fr
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (fr) (PDF)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.pdf
+postaction shortcut type=menu name="TeX Live Manual (fr) (HTML)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.html
Index: tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-zh-cn.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-zh-cn.tlpsrc	(working copy)
@@ -1,2 +1,3 @@
 name texlive-zh-cn
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (zh-cn) (PDF)" cmd=TEXDIR/texmf-doc/doc/chinese/texlive-zh-cn/texlive-zh-cn.pdf
Index: tlpkg/tlpsrc/bin-dviout.win32.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-dviout.win32.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-dviout.win32.tlpsrc	(working copy)
@@ -2,3 +2,4 @@
 category TLCore
 binpattern d/win32 tlpkg/dviout
 binpattern f bin/win32/dviout.vbs
+postaction shortcut type=menu name="DVIOUT Dvi Viewer" cmd=wscript args=TEXDIR/bin/win32/dviout.vbs hide=1
Index: tlpkg/tlpsrc/bin-context.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-context.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-context.tlpsrc	(working copy)
@@ -1,9 +1,15 @@
 name bin-context
 category TLCore
 depend pdftex
-execute BuildFormat context
+execute AddFormat name=cont-en engine=pdftex patterns=cont-usr.tex options="-8bit *cont-en.ini"
+execute AddFormat name=cont-cz mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-cz.ini"
+execute AddFormat name=cont-de mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-de.ini"
+execute AddFormat name=cont-nl mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-nl.ini"
+execute AddFormat name=cont-uk mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-uk.ini"
+execute AddFormat name=cont-en engine=xetex patterns=cont-usr.tex options="-8bit *cont-en.ini"
+execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex"
+execute AddFormat name=metafun engine=mpost options="-translate-file=cp227.tcx metafun.mp"
 runpattern f texmf-dist/tex/mptopdf/config/mptopdf.ini
-runpattern f texmf/fmtutil/format.context.cnf
 docpattern f texmf/doc/man/man1/ctxtools.*
 docpattern f texmf/doc/man/man1/makempy.*
 docpattern f texmf/doc/man/man1/mptopdf.*
Index: tlpkg/tlpsrc/bin-mltex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-mltex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-mltex.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-mltex
 category TLCore
 depend bin-latex
-execute BuildFormat mltex
-runpattern f texmf/fmtutil/format.mltex.cnf
+execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini"
+execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex mllatex.ini"
 binpattern f bin/${ARCH}/mllatex
 binpattern f bin/${ARCH}/mltex
Index: tlpkg/tlpsrc/luatex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/luatex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/luatex.tlpsrc	(working copy)
@@ -1,8 +1,8 @@
 name luatex
 category TLCore
-execute BuildFormat luatex
+execute AddFormat name=luatex engine=luatex options="luatex.ini"
+execute AddFormat name=pdfluatex engine=luatex options="pdfluatex.ini"
 docpattern d texmf-dist/doc/luatex
-runpattern f texmf/fmtutil/format.luatex.cnf
 binpattern f/!hppa-hpux bin/${ARCH}/luatex
 binpattern f/!hppa-hpux bin/${ARCH}/pdfluatex
 binpattern f/!hppa-hpux bin/${ARCH}/texlua
Index: tlpkg/tlpsrc/bin-cslatex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-cslatex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-cslatex.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-cslatex
 category TLCore
 depend bin-latex
-execute BuildFormat cslatex
-runpattern f texmf/fmtutil/format.cslatex.cnf
+execute AddFormat name=cslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
+execute AddFormat name=pdfcslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
 binpattern f bin/${ARCH}/cslatex
 binpattern f bin/${ARCH}/pdfcslatex
Index: tlpkg/tlpsrc/bin-texdoc.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-texdoc.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-texdoc.tlpsrc	(working copy)
@@ -12,3 +12,4 @@
 binpattern f bin/${ARCH}/texdoctk
 binpattern f bin/win32/texdocc
 binpattern f bin/win32/tl-w32-texdoc-wrapper.texlua
+postaction shortcut type=menu name="TeXdoc GUI" cmd="TEXDIR/bin/win32/texdoctk.bat" hide=1
Index: tlpkg/tlpsrc/bin-latex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-latex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-latex.tlpsrc	(working copy)
@@ -4,12 +4,14 @@
 depend pdftex
 depend latexconfig
 depend latex-fonts
-execute BuildFormat latex
+execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini"
+execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini"
+execute AddFormat name=lualatex engine=luatex patterns=language.dat options="lualatex.ini"
+execute AddFormat name=pdflualatex engine=luatex patterns=language.dat options="pdflualatex.ini"
 binpattern f bin/${ARCH}/latex
 binpattern f/!hppa-hpux bin/${ARCH}/lualatex
 binpattern f bin/${ARCH}/pdflatex
 binpattern f/!hppa-hpux bin/${ARCH}/pdflualatex
 docpattern f texmf/doc/man/man1/latex.*
 docpattern f texmf/doc/man/man1/pdflatex.*
-runpattern f texmf/fmtutil/format.latex.cnf
 runpattern d texmf/tex/latex/config
Index: tlpkg/tlpsrc/bin-omega.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-omega.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-omega.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-omega
 category TLCore
-execute BuildFormat omega
-runpattern f texmf/fmtutil/format.omega.cnf
+execute AddFormat name=omega engine=omega options="omega.ini"
+execute AddFormat name=lambda engine=omega patterns=language.dat options="lambda.ini"
 docpattern f texmf/doc/man/man1/lambda.*
 docpattern f texmf/doc/man/man1/omega.*
 binpattern f bin/${ARCH}/lambda
Index: tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc	(working copy)
@@ -5,3 +5,5 @@
 runpattern f bin/win32/psv.bat
 runpattern f texmf/scripts/texlive/psv.tlu
 runpattern d tlpkg/tlpsv
+postaction shortcut type=menu name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1
+postaction shortcut type=desktop name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1
Index: tlpkg/tlpsrc/bin-xmltex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-xmltex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-xmltex.tlpsrc	(working copy)
@@ -2,7 +2,7 @@
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat xmltex
-runpattern f texmf/fmtutil/format.xmltex.cnf
+execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="&latex xmltex.ini"
+execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="&pdflatex pdfxmltex.ini"
 binpattern f bin/${ARCH}/pdfxmltex
 binpattern f bin/${ARCH}/xmltex
Index: tlpkg/tlpsrc/texlive-ru.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-ru.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-ru.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-ru
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (ru) (PDF)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.pdf
+postaction shortcut type=menu name="TeX Live Manual (ru) (HTML)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.html
Index: tlpkg/tlpsrc/bin-texlive.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-texlive.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-texlive.tlpsrc	(working copy)
@@ -1,27 +1,11 @@
 name bin-texlive
 category TLCore
 shortdesc executables and files maintained as part of TeX Live
-longdesc This packages contains the binaries of the TeX Live tools (notably
-longdesc tlmgr). Together with texlive.infra, it provides all the basic TeX
-longdesc Live infrastructure.
+longdesc This packages contains the binaries of the TeX Live tools. 
 depend texlive.infra
-runpattern f texmf/fmtutil/fmtutil-hdr.cnf
 runpattern d texmf/scripts/texlive/lua
-runpattern d texmf/scripts/texlive/tlmgrgui
-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-config1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-arch1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
 runpattern f texmf/scripts/texlive/rungs.tlu
 runpattern f texmf/scripts/texlive/test-tlpdb.tlu
 runpattern f texmf/scripts/texlive/texconf.tlu
-runpattern f texmf/scripts/texlive/tlmgr.pl
-runpattern !f texmf/scripts/texlive/tlmgr1.pl
-runpattern f texmf/scripts/texlive/uninstall-win32.pl
-runpattern f texmf/web2c/updmap-hdr.cfg
-docpattern f texmf/doc/man/man1/tlmgr.*
-binpattern f bin/${ARCH}/tlmgr
 binpattern f bin/${ARCH}/rungs
-binpattern f bin/win32/tl-w32-wrapper.texlua
 binpattern f bin/win32/symlinks4cygwin.sh
-binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
Index: tlpkg/tlpsrc/t2.tlpsrc
===================================================================
--- tlpkg/tlpsrc/t2.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/t2.tlpsrc	(working copy)
@@ -1,5 +1,5 @@
 name t2
 category Package
-execute BuildFormat cyramstex
-execute BuildFormat cyrtex
-execute BuildFormat cyrtexinfo
+execute AddFormat name=cyramstex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyramstx.ini"
+execute AddFormat name=cyrtex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtex.ini"
+execute AddFormat name=cyrtexinfo mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtxinf.ini"
Index: tlpkg/tlpsrc/bin-texsis.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-texsis.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-texsis.tlpsrc	(working copy)
@@ -1,6 +1,5 @@
 name bin-texsis
 category TLCore
 depend bin-tex
-execute BuildFormat texsis
-runpattern f texmf/fmtutil/format.texsis.cnf
+execute AddFormat name=texsis engine=pdftex options="-translate-file=cp227.tcx texsis.ini"
 binpattern f bin/${ARCH}/texsis
Index: tlpkg/tlpsrc/texlive-en.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-en.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-en.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-en
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (en) (PDF)" cmd=TEXDIR/texmf-doc/doc/english/texlive-en/texlive-en.pdf
+postaction shortcut type=menu name="TeX Live Manual (en) (HTML)" cmd=TEXDIR/texmf-doc/doc/english/texlive-en/texlive-en.html
Index: tlpkg/tlpsrc/bin-physe.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-physe.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-physe.tlpsrc	(working copy)
@@ -1,6 +1,5 @@
 name bin-physe
 category TLCore
 depend bin-tex
-execute BuildFormat physe
-runpattern f texmf/fmtutil/format.physe.cnf
+execute AddFormat name=physe engine=pdftex options="physe.ini"
 binpattern f bin/${ARCH}/physe
Index: tlpkg/tlpsrc/bin-phyzzx.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-phyzzx.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-phyzzx.tlpsrc	(working copy)
@@ -1,6 +1,5 @@
 name bin-phyzzx
 category TLCore
 depend bin-tex
-execute BuildFormat phyzzx
-runpattern f texmf/fmtutil/format.phyzzx.cnf
+execute AddFormat name=phyzzx engine=pdftex options="physe.ini"
 binpattern f bin/${ARCH}/phyzzx
Index: tlpkg/tlpsrc/bin-eplain.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-eplain.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-eplain.tlpsrc	(working copy)
@@ -1,8 +1,7 @@
 name bin-eplain
 category TLCore
 depend pdftex
-execute BuildFormat eplain
-runpattern f texmf/fmtutil/format.eplain.cnf
+execute AddFormat name=eplain engine=pdftex options="-translate-file=cp227.tcx *eplain.ini"
 docpattern f texmf/doc/info/eplain.info
 docpattern f texmf/doc/man/man1/eplain.*
 binpattern f bin/${ARCH}/eplain
Index: tlpkg/tlpsrc/texlive-cz.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-cz.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-cz.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-cz
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (cz) (PDF)" cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.pdf
+postaction shortcut type=menu name="TeX Live Manual (cz) (HTML)" cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.html
Index: tlpkg/tlpsrc/bin-jadetex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-jadetex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-jadetex.tlpsrc	(working copy)
@@ -2,7 +2,7 @@
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat jadetex
-runpattern f texmf/fmtutil/format.jadetex.cnf
+execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="&latex jadetex.ini"
+execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="&pdflatex pdfjadetex.ini"
 binpattern f bin/${ARCH}/jadetex
 binpattern f bin/${ARCH}/pdfjadetex
Index: tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
===================================================================
--- tlpkg/tlpsrc/00texlive-installation.config.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/00texlive-installation.config.tlpsrc	(working copy)
@@ -1,30 +0,0 @@
-name 00texlive-installation.config
-category TLCore
-longdesc This package serves two purposes:
-longdesc
-longdesc 1. at installation time the present values are taken as default for
-longdesc    the installer
-longdesc
-longdesc 2. on an installed system it serves as a configuration file.
-longdesc    We have to remember these settings for additional package
-longdesc    installation, removal, etc.
-longdesc
-longdesc The value of __MASTER__ for the location field tells the
-longdesc installer to use the present directory itself.  For example,
-longdesc the DVD can be mounted anywhere and we want the installer to work.
-longdesc
-longdesc Concerning the 00* names:
-longdesc All packages starting with 00texlive are considered virtual packages
-longdesc in the sense that no containers are generated and these packages
-longdesc are never split into .src and .doc sub-packages in the tlpdb.
-
-depend platform:
-depend location:__MASTER__
-depend opt_paper:a4
-depend opt_create_formats:1
-depend opt_create_symlinks:0
-depend opt_sys_bin:/usr/local/bin
-depend opt_sys_info:/usr/local/info
-depend opt_sys_man:/usr/local/man
-depend opt_install_docfiles:1
-depend opt_install_srcfiles:1
Index: tlpkg/tlpsrc/texlive-pl.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive-pl.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive-pl.tlpsrc	(working copy)
@@ -1,2 +1,4 @@
 name texlive-pl
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (pl) (PDF)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.pdf
+postaction shortcut type=menu name="TeX Live Manual (pl) (HTML)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.html
Index: tlpkg/tlpsrc/bin-amstex.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-amstex.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-amstex.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-amstex
 category TLCore
 depend bin-tex
-execute BuildFormat amstex
-runpattern f texmf/fmtutil/format.amstex.cnf
+execute AddFormat name=amstex engine=pdftex options="-translate-file=cp227.tcx *amstex.ini"
+execute AddFormat name=pdfamstex mode=disabled engine=pdftex options="-translate-file=cp227.tcx *pdfamstex.ini"
 docpattern f texmf/doc/man/man1/amstex.*
 binpattern f bin/${ARCH}/amstex
Index: tlpkg/tlpsrc/bin-aleph.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-aleph.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-aleph.tlpsrc	(working copy)
@@ -1,7 +1,7 @@
 name bin-aleph
 category TLCore
 depend bin-omega
-execute BuildFormat aleph
-runpattern f texmf/fmtutil/format.aleph.cnf
+execute AddFormat name=aleph engine=aleph options=*aleph.ini
+execute AddFormat name=lamed engine=aleph patterns=language.dat options=*lambda.ini
 binpattern f bin/${ARCH}/aleph
 binpattern f bin/${ARCH}/lamed
Index: tlpkg/tlpsrc/00texlive.installation.tlpsrc
===================================================================
--- tlpkg/tlpsrc/00texlive.installation.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/00texlive.installation.tlpsrc	(working copy)
@@ -1,4 +1,4 @@
-name 00texlive-installation.config
+name 00texlive.installation
 category TLCore
 longdesc This package serves two purposes:
 longdesc
@@ -22,7 +22,7 @@
 depend location:__MASTER__
 depend opt_paper:a4
 depend opt_create_formats:1
-depend opt_create_symlinks:0
+depend opt_system_integration:0
 depend opt_sys_bin:/usr/local/bin
 depend opt_sys_info:/usr/local/info
 depend opt_sys_man:/usr/local/man

Property changes on: tlpkg/tlpsrc/00texlive.installation.tlpsrc
___________________________________________________________________
Added: svn:mergeinfo

Index: tlpkg/tlpsrc/00texlive.core.tlpsrc
===================================================================
--- tlpkg/tlpsrc/00texlive.core.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/00texlive.core.tlpsrc	(working copy)
@@ -6,7 +6,7 @@
 longdesc and containers are not built; they exist only in the
 longdesc full DVD image.
 longdesc For information on the 00texlive prefix see
-longdesc   00texlive-installation.config(.tlpsrc)
+longdesc   00texlive.installation(.tlpsrc)
 runpattern d tlpkg/archive
 runpattern d tlpkg/doc
 runpattern d tlpkg/libexec
Index: tlpkg/tlpsrc/bin-metafont.tlpsrc
===================================================================
--- tlpkg/tlpsrc/bin-metafont.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/bin-metafont.tlpsrc	(working copy)
@@ -1,8 +1,7 @@
 name bin-metafont
 category TLCore
 depend bin-kpathsea
-execute BuildFormat metafont
-runpattern f texmf/fmtutil/format.metafont.cnf
+execute AddFormat name=mf engine=mf-nowin options="-translate-file=cp227.tcx mf.ini"
 docpattern f texmf/doc/man/man1/mf-nowin.*
 docpattern f texmf/doc/man/man1/mf.*
 binpattern f bin/${ARCH}/mf
Index: tlpkg/tlpsrc/texlive.infra.tlpsrc
===================================================================
--- tlpkg/tlpsrc/texlive.infra.tlpsrc	(revision 12171)
+++ tlpkg/tlpsrc/texlive.infra.tlpsrc	(working copy)
@@ -36,3 +36,17 @@
 binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
 powerpc-linux,i386-freebsd,x86_64-linux \
   tlpkg/installer/wget/wget.${ARCH}
+# former tlmgr stuff
+runpattern f texmf/fmtutil/fmtutil-hdr.cnf
+runpattern d texmf/scripts/texlive/tlmgrgui
+runpattern f texmf/scripts/texlive/tlmgr.pl
+runpattern f texmf/scripts/texlive/uninstall-win32.pl
+runpattern f texmf/web2c/updmap-hdr.cfg
+docpattern f texmf/doc/man/man1/tlmgr.*
+binpattern f bin/${ARCH}/tlmgr
+binpattern f bin/win32/tl-w32-wrapper.texlua
+binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
+# post actions
+postaction shortcut type=menu name="TeX Live Toplevel Readme Index" cmd=TEXDIR/index.html
+postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr.bat args=gui hide=1
+postaction shortcut type=menu name="Release notes" cmd="http://tug.org/texlive/windows.html"
Index: tlpkg/bin/tl-update-tlcritical
===================================================================
--- tlpkg/bin/tl-update-tlcritical	(revision 12171)
+++ tlpkg/bin/tl-update-tlcritical	(working copy)
@@ -34,7 +34,7 @@
 # update normal containers.
 echo "$0: running tl-update-containers (for critical packages)..."
 tl-update-containers -location $tlcrit -all \
-  00texlive-installation.config 00texlive.config bin-texlive texlive.infra
+  00texlive.installation 00texlive.config texlive.infra
 
 # update Unix disaster recovery.
 echo "$0: running tl-makeself-from-tlnet..."
Index: tlpkg/bin/tl-update-containers
===================================================================
--- tlpkg/bin/tl-update-containers	(revision 12171)
+++ tlpkg/bin/tl-update-containers	(working copy)
@@ -24,7 +24,7 @@
 use File::Path;
 
 # packages matching these re's will not be updated without --all.
-my @critical_pkg_list = qw/bin-texlive texlive\.infra/;
+my @critical_pkg_list = qw/texlive\.infra/;
 
 our ($mydir, $vc_id);
 my $opt_all = 0;
@@ -176,12 +176,12 @@
     }
   }
   
-  # The two packages 00texlive.config and 00texlive-installation.config
+  # The two packages 00texlive.config and 00texlive.installation
   # are essential and have to be included in each and every case.
   # So add them ...
   my $tlpconfig = $tlpdb->get_package("00texlive.config");
   $nettlpdb->add_tlpobj($tlpconfig);
-  my $tlpinstconfig = $tlpdb->get_package("00texlive-installation.config");
+  my $tlpinstconfig = $tlpdb->get_package("00texlive.installation");
   $nettlpdb->add_tlpobj($tlpinstconfig);
 
   # set up the programs.
@@ -392,7 +392,7 @@
 =item B<-all|-a>
 
 Include packages deemed critical in the update, currently
-C<texlive.infra> and C<bin-texlive>.  (That is, C<tlmgr> itself needs
+C<texlive.infra>.  (That is, C<tlmgr> itself needs
 testing before updating, so we don't do it by default.)
 
 =item B<-no-setup>
Index: tlpkg/bin/tl-makeself-from-tlnet
===================================================================
--- tlpkg/bin/tl-makeself-from-tlnet	(revision 12171)
+++ tlpkg/bin/tl-makeself-from-tlnet	(working copy)
@@ -4,7 +4,7 @@
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
-# Creates a .run file for updating the texlive.infra and bin-texlive
+# Creates a .run file for updating the texlive.infra 
 # packages on Unix, similar to the .exe we create for Windows.  Both are
 # created in the nightly cron from tl-update-tlcritical.
 
@@ -28,9 +28,8 @@
 mkdir master
 cd master
 
-# unpack texlive.infra and bin-texlive archives for all platforms,
-# except w32.
-for pkg in texlive.infra bin-texlive; do
+# unpack texlive.infra archives for all platforms, except w32.
+for pkg in texlive.infra; do
   for i in $ARCHIVE/$pkg*.tar.lzma ; do
     case "$i" in 
       *win32*) ;;
@@ -69,13 +68,12 @@
   mkdir -p $t_instdir/wget
 
   # start the list of tlpobjs we will install
-  tlpobjs="$t_objdir/bin-texlive.tlpobj $t_objdir/texlive.infra.tlpobj"
+  tlpobjs="$t_objdir/texlive.infra.tlpobj"
   for a in $ROOT/bin/*; do
     test -d "$a" || continue  # skip any cruft files
     b=`basename $a`           # just the architecture name
     
     # add the tlpobjs for this platform t the list.
-    tlpobjs="$tlpobjs $t_objdir/bin-texlive.$b.tlpobj"
     tlpobjs="$tlpobjs $t_objdir/texlive.infra.$b.tlpobj"
 
     # install the bin dir for this platform.
Index: tlpkg/bin/tl-update-nsis
===================================================================
--- tlpkg/bin/tl-update-nsis	(revision 12171)
+++ tlpkg/bin/tl-update-nsis	(working copy)
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2008 Norbert Preining
+# Copyright 2008, 2009 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -40,13 +40,9 @@
   chomp (my $Master = `cd $mydir/../.. && pwd`);
   my $tlpdb = TeXLive::TLPDB->new ("root" => $Master);
   die("Cannot find tlpdb in $Master\n") unless defined($tlpdb);
-  my $bintexlive = $tlpdb->get_package("bin-texlive");
-  my $bintexlivew32 = $tlpdb->get_package("bin-texlive.win32");
   my $texliveinfra = $tlpdb->get_package("texlive.infra");
   my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32");
   my @allfiles = ();
-  push @allfiles, $bintexlive->all_files;
-  push @allfiles, $bintexlivew32->all_files if defined $bintexlivew32;
   push @allfiles, $texliveinfra->all_files;
   push @allfiles, $texliveinfraw32->all_files if defined $texliveinfraw32;
   
@@ -58,7 +54,7 @@
     $removetlpobjdir = 1;
   }
   my $rev = 0; # we want the highest rev all these packages.
-  for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
+  for my $p ($texliveinfra, $texliveinfraw32) {
     if (defined $p) {
       if ($p->revision > $rev) {
         $rev = $p->revision;
@@ -95,7 +91,7 @@
 
 Name "TeX Live Manager Update ${REV}"
 OutFile "update-tlmgr-${REV}.exe"
-InstallDir "$PROGRAMFILES\texlive\2008"
+InstallDir "$PROGRAMFILES\texlive\$TeXLive::TLConfig::ReleaseYear"
 
 RequestExecutionLevel "user"
 
@@ -135,7 +131,7 @@
     }
   }
   print "  ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
-  for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
+  for my $p ($texliveinfra, $texliveinfraw32) {
     if (defined $p) {
       print " \"\$INSTDIR\\tlpkg\\tlpobj\\", $p->name, ".tlpobj\"";
     }
Index: tlpkg/etc/2009.combined.patch
===================================================================
--- tlpkg/etc/2009.combined.patch	(revision 12171)
+++ tlpkg/etc/2009.combined.patch	(working copy)
@@ -1,143 +1,68 @@
-Index: texmf/scripts/texlive/tlmgr.pl
+Index: tlpkg/TeXLive/TLPDB.pm
 ===================================================================
---- texmf/scripts/texlive/tlmgr.pl	(revision 12142)
-+++ texmf/scripts/texlive/tlmgr.pl	(working copy)
-@@ -557,6 +557,9 @@
-       info("running post remove action for $pkg\n");
-       &{$PostRemove{$pkg}}($localtlpdb->root);
-     }
-+    #
-+    # Run the post installation code in the postaction tlpsrc entries
-+    &TeXLive::TLUtils::do_postaction_code("remove", $tlp);
-   }
-   return \%ret;
- }
-Index: texmf/scripts/texlive/uninstall-win32.pl
-===================================================================
---- texmf/scripts/texlive/uninstall-win32.pl	(revision 12142)
-+++ texmf/scripts/texlive/uninstall-win32.pl	(working copy)
-@@ -17,6 +17,11 @@
- }
+--- tlpkg/TeXLive/TLPDB.pm	(revision 12171)
++++ tlpkg/TeXLive/TLPDB.pm	(working copy)
+@@ -788,7 +788,7 @@
+ read-only function; you cannot change the root of the TLPDB using this
+ function.
  
- use TeXLive::TLWinGoo;
-+use TeXLive::TLPDB;
-+use TeXLive::TLPOBJ;
-+use TeXLive::TLPostActions;
-+use TeXLive::TLConfig;
-+use TeXLive::TLUtils;
- use Tk;
- use Tk::Dialog;
+-See C<00texlive-installation.config.tlpsrc> for a description of the
++See C<00texlive.installation.tlpsrc> for a description of the
+ special value C<__MASTER>.
  
-@@ -39,6 +44,23 @@
- $cancel->pack(-side => 'left' , -padx => "3m");
+ =cut
+@@ -1111,11 +1111,11 @@
  
- sub doit {
-+  # first we remove the whole bunch of shortcuts and menu entries
-+  # by calling all the post action codes for the installed packages
-+  my $localtlpdb = TeXLive::TLPDB->new ("root" => $Master);
-+  if (!defined($localtlpdb)) {
-+    tlwarn("Cannot load the TLPDB from $Master, are you sure there is an installation?\n");
-+  } else {
-+    for my $pkg ($localtlpdb->list_packages) {
-+      if (defined($PostRemove{$pkg})) {
-+        info("running post remove action for $pkg\n");
-+        &{$PostRemove{$pkg}}($Master);
-+      }
-+    }
-+    &TeXLive::TLUtils::do_postaction_code("remove", $pkg);
-+  }
-+  my $menupath = &TeXLive::TLWinGoo::menu_path();
-+  $menupath =~ s!/!\\!g;
-+  `rmdir /s /q "$menupath\\$TeXLive::TLConfig::WindowsMainMenuName" 2>nul`;
-   remove_texbindirs_from_path();
-   unsetenv_reg("TEXBINDIR");
-   # from_dvd case:
-Index: install-tl
-===================================================================
---- install-tl	(revision 12142)
-+++ install-tl	(working copy)
-@@ -82,7 +82,6 @@
-     &add_menu_shortcut
-     &remove_desktop_shortcut
-     &remove_menu_shortcut
--    &init_unshortbat
-     &create_uninstaller
-   ));
+ sub _set_option_value {
+   my ($self,$key,$value) = @_;
+-  my $pkg = $self->{'tlps'}{'00texlive-installation.config'};
++  my $pkg = $self->{'tlps'}{'00texlive.installation'};
+   my @newdeps;
+   if (!defined($pkg)) {
+     $pkg = new TeXLive::TLPOBJ;
+-    $pkg->name("00texlive-installation.config");
++    $pkg->name("00texlive.installation");
+     $pkg->category("TLCore");
+     push @newdeps, "$key:$value";
+   } else {
+@@ -1133,20 +1133,20 @@
+     }
+   }
+   $pkg->depends(@newdeps);
+-  $self->{'tlps'}{'00texlive-installation.config'} = $pkg;
++  $self->{'tlps'}{'00texlive.installation'} = $pkg;
  }
-@@ -1052,6 +1051,11 @@
-   # post install actions
-   #
  
-+  # in case we are running from DVD we use the tlpdb from the DVD, otherwise
-+  # the one we have locally created, for all the further actions
-+  my $usedtlpdb = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
-+
-+
-   if (win32()) {
-     debug "Actual environment:\n".`set`."\n\n";
-     debug 'Effective TEXMFCNF: '.`kpsewhich -expand-path=\$TEXMFCNF`."\n";
-@@ -1060,15 +1064,24 @@
-   # (re-)initialize batchfile for uninstalling shortcuts
-   if (win32() and !$opt_portable) {
-     mkdirhier("$TEXDIRW/tlpkg/installer") if $vars{'from_dvd'};
--    init_unshortbat($TEXDIRW);
-   }
- 
-+  # Run the post installation code in TLPostAction.pm
-   foreach my $package (sort keys %install) {
-     if ($install{$package} && defined($PostInstall{$package})) {
-       info("running post install action for $package\n");
-       &{$PostInstall{$package}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL);
+ sub _option_value {
+   my ($self,$key) = @_;
+-  if (defined($self->{'tlps'}{'00texlive-installation.config'})) {
+-    foreach my $d ($self->{'tlps'}{'00texlive-installation.config'}->depends) {
++  if (defined($self->{'tlps'}{'00texlive.installation'})) {
++    foreach my $d ($self->{'tlps'}{'00texlive.installation'}->depends) {
+       if ($d =~ m!^$key:(.*)$!) {
+         return "$1";
+       }
      }
+     return;
    }
-+  # Run the post installation code in the postaction tlpsrc entries
-+  foreach my $package (sort keys %install) {
-+    if ($install{$package}) {
-+      &TeXLive::TLUtils::do_postaction_code("install", 
-+                                            $usedtlpdb->get_package($package));
-+    }
-+  }
-+  info ("finished with package specific postactions\n");
-+
-   # $opt_portable: no %install but we still want xetex postinstall
-   &{$PostInstall{'xetex'}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL)
-     if $opt_portable;
-@@ -1085,25 +1098,25 @@
-   # texconfig generate * but Win32 does not have texconfig. But we have
-   # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
-   # the code from the various generate-*.pl scripts
-+
-   info("writing fmtutil.cnf data to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
--  my $tlp = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
--  TeXLive::TLUtils::create_fmtutil($tlp, #$localtlpdb,
-+  TeXLive::TLUtils::create_fmtutil($usedtlpdb,
-     "$TEXMFSYSVAR/web2c/fmtutil.cnf",
-     "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+-  tlwarn("00texlive-installation.config not found, cannot read option $key.\n");
++  tlwarn("00texlive.installation not found, cannot read option $key.\n");
+   return;
+ }
  
-   mkdirhier "$vars{'TEXMFSYSCONFIG'}/web2c";
-   info("writing updmap.cfg to $TEXMFSYSCONFIG/web2c/updmap.cfg\n");
--  TeXLive::TLUtils::create_updmap ($tlp, #$localtlpdb,
-+  TeXLive::TLUtils::create_updmap ($usedtlpdb,
-     "$TEXMFSYSCONFIG/web2c/updmap.cfg",
-     "$TEXMFLOCAL/web2c/updmap-local.cfg");
- 
-   info("writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
--  TeXLive::TLUtils::create_language_dat($tlp, #$localtlpdb,
-+  TeXLive::TLUtils::create_language_dat($usedtlpdb,
-     "$TEXMFSYSVAR/tex/generic/config/language.dat",
-     "$TEXMFLOCAL/tex/generic/config/language-local.dat");
- 
-   info("writing language.def data to $TEXMFSYSVAR/tex/generic/config/language.def\n");
--  TeXLive::TLUtils::create_language_def($tlp, #$localtlpdb,
-+  TeXLive::TLUtils::create_language_def($usedtlpdb,
-     "$TEXMFSYSVAR/tex/generic/config/language.def",
-     "$TEXMFLOCAL/tex/generic/config/language-local.def");
- 
-Index: tlpkg/TeXLive/TLPDB.pm
-===================================================================
---- tlpkg/TeXLive/TLPDB.pm	(revision 12142)
-+++ tlpkg/TeXLive/TLPDB.pm	(working copy)
-@@ -1239,26 +1239,64 @@
+@@ -1179,6 +1179,11 @@
+   if (@_) { $self->_set_option_value("opt_create_symlinks", shift); }
+   return $self->_option_value("opt_create_symlinks"); 
+ }
++sub option_system_integration { 
++  my $self = shift; 
++  if (@_) { $self->_set_option_value("opt_system_integration", shift); }
++  return $self->_option_value("opt_system_integration"); 
++}
+ sub option_install_docfiles { 
+   my $self = shift;
+   if (@_) { $self->_set_option_value("opt_install_docfiles", shift); }
+@@ -1239,26 +1244,64 @@
  =cut
  sub fmtutil_cnf_lines {
    my $self = shift;
@@ -221,9 +146,17 @@
  =item C<< $tlpdb->updmap_cfg_lines >>
 Index: tlpkg/TeXLive/TLConfig.pm
 ===================================================================
---- tlpkg/TeXLive/TLConfig.pm	(revision 12142)
+--- tlpkg/TeXLive/TLConfig.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLConfig.pm	(working copy)
-@@ -28,6 +28,7 @@
+@@ -11,6 +11,7 @@
+   use vars qw( @ISA @EXPORT_OK @EXPORT );
+   @ISA = qw(Exporter);
+   @EXPORT_OK = qw(
++    $ReleaseYear
+     @MetaCategories
+     @NormalCategories
+     @Categories
+@@ -28,10 +29,15 @@
      $WinSpecialUpdatePackagesRegexp
      @CriticalPackagesList
      @AllowedConfigOptions
@@ -231,18 +164,52 @@
    );
    @EXPORT = @EXPORT_OK;
  }
-@@ -82,6 +83,8 @@
+ 
++# the year of our release, will be used in the location of the
++# network packges, and in menu names, and probably many other places
++$ReleaseYear = 2009;
++
+ # Meta Categories do not ship files, but call only for other packages
+ our @MetaCategories = qw/Collection Scheme/;
+ our $MetaCategoriesRegexp = '(Collection|Scheme)';
+@@ -57,14 +63,14 @@
+ 
+ our $Archive = "archive";
+ our $TeXLiveServerURL = "http://mirror.ctan.org";
+-our $TeXLiveServerPath = "systems/texlive/tlnet/2008";
++our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear";
+ our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath";
+ 
+ our $WinSpecialUpdatePackagesRegexp = 
+   '^(texlive\.infra|luatex|bin-tlperl\.win32$|bin-texlive|bin-kpathsea)';
+ 
+ 
+-our @CriticalPackagesList = qw/texlive.infra bin-texlive/;
++our @CriticalPackagesList = qw/texlive.infra/;
+ 
+ our @AllowedConfigOptions = qw/
+   available_architectures
+@@ -82,6 +88,8 @@
    autobackup
    /;
  
-+our $WindowsMainMenuName = "TeX Live 2008";
++our $WindowsMainMenuName = "TeX Live $ReleaseYear";
 +
  1;
  
  
+@@ -163,7 +171,7 @@
+ 
+ =item C<@TeXLive::TLConfig::AllowedConfigOptions>
+ 
+-A list of a config options that can be set in 00texlive-installation.config.
++A list of a config options that can be set in 00texlive.installation.
+ 
+ =back
+ 
 Index: tlpkg/TeXLive/TLPostActions.pm
 ===================================================================
---- tlpkg/TeXLive/TLPostActions.pm	(revision 12142)
+--- tlpkg/TeXLive/TLPostActions.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLPostActions.pm	(working copy)
 @@ -20,48 +20,13 @@
  use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info
@@ -295,6 +262,15 @@
  # xetex
  #
  sub do_install_xetex {
+@@ -125,7 +90,7 @@
+           }
+         }
+         foreach (@lines) {
+-          $_ =~ s!c:/Program Files/texlive/2008!$texdir!;
++          $_ =~ s!c:/Program Files/texlive/$TeXLive::TLConfig::ReleaseYear!$texdir!;
+           $_ =~ s!c:/windows/fonts!$winfontdir! if win32();
+           # hack around fc-cache problem in from_dvd case:
+           #if (win32() and (uc($texdir) ne uc($texdirw)) and
 @@ -149,136 +114,13 @@
  }
  $PostInstall{"xetex"} = \&do_install_xetex;
@@ -883,7 +859,7 @@
  
 Index: tlpkg/TeXLive/TLPSRC.pm
 ===================================================================
---- tlpkg/TeXLive/TLPSRC.pm	(revision 12142)
+--- tlpkg/TeXLive/TLPSRC.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLPSRC.pm	(working copy)
 @@ -30,6 +30,7 @@
      srcpatterns => $params{'srcpatterns'},
@@ -960,6 +936,15 @@
  
  Continuation lines are supported via a trailing backslash.  That is, if
  the C<.tlpsrc> file contains two physical lines like this:
+@@ -638,7 +655,7 @@
+ is only "lzma", which generates .tar.lzma files. zip can be supported.
+ release/NNNN specifies the release number as used in the installer.
+ 
+-=item B<00texlive-installation.config>
++=item B<00texlive.installation>
+ 
+ This package serves a double purpose:
+ 
 @@ -737,12 +754,49 @@
  C<lefthyphenmin>, C<righthyphenmin> (both integers), and C<synonyms> (a
  comma-separated list of alias names for that hyphenation).
@@ -1014,7 +999,7 @@
  adds a pattern (next section) to the respective list of patterns.
 Index: tlpkg/TeXLive/TLPOBJ.pm
 ===================================================================
---- tlpkg/TeXLive/TLPOBJ.pm	(revision 12142)
+--- tlpkg/TeXLive/TLPOBJ.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLPOBJ.pm	(working copy)
 @@ -29,6 +29,7 @@
      docfiles    => defined($params{'docfiles'}) ? $params{'docfiles'} : [],
@@ -1090,7 +1075,7 @@
    if (@_) { $_containerdir = $_[0] }
 Index: tlpkg/TeXLive/TLMedia.pm
 ===================================================================
---- tlpkg/TeXLive/TLMedia.pm	(revision 12142)
+--- tlpkg/TeXLive/TLMedia.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLMedia.pm	(working copy)
 @@ -208,6 +208,9 @@
          info("running post install action for $pkg\n");
@@ -1104,7 +1089,7 @@
    }
 Index: tlpkg/TeXLive/TLUtils.pm
 ===================================================================
---- tlpkg/TeXLive/TLUtils.pm	(revision 12142)
+--- tlpkg/TeXLive/TLUtils.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLUtils.pm	(working copy)
 @@ -56,6 +56,7 @@
    TeXLive::TLUtils::create_language_def($tlpdb,$dest,$localconf);
@@ -1228,7 +1213,7 @@
  Unpacked C<$tarfile> in C<$targetdir> (changing directories to
 Index: tlpkg/TeXLive/TLWinGoo.pm
 ===================================================================
---- tlpkg/TeXLive/TLWinGoo.pm	(revision 12142)
+--- tlpkg/TeXLive/TLWinGoo.pm	(revision 12171)
 +++ tlpkg/TeXLive/TLWinGoo.pm	(working copy)
 @@ -58,7 +58,6 @@
      $prog, $args, $batgui);
@@ -1338,9 +1323,227 @@
  copy \"$tdw\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\"
  rem pause
  \"\%TEMP\%\\uninst2.bat\"
+Index: tlpkg/installer/install-menu-perltk.pl
+===================================================================
+--- tlpkg/installer/install-menu-perltk.pl	(revision 12171)
++++ tlpkg/installer/install-menu-perltk.pl	(working copy)
+@@ -62,7 +62,6 @@
+ my $texmfhometext;
+ my $texdirtext;
+ my $langcoltext;
+-my $symlinktext;
+ my $optletterstate;
+ my $optfmtstate;
+ my $optsrcstate;
+@@ -70,6 +69,7 @@
+ my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
+ my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
+ my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
++my $sysintyesno = ( $vars{'option_sysint'} ? $text{'yes'} : $text{'no'} );
+ my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
+ 
+ $::run_menu = \&run_menu_perltk;
+@@ -258,15 +258,13 @@
+     $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+   }
+ 
++  $row++;
++  $fr->Label(-text => $labels{'sysint'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
++  $fr->Label(-anchor => 'w', -textvariable => \$sysintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
+   if (unix()) {
+-    $row++;
+-    # Symlinks
+-    $fr->Label(-text => "------- $text{'sysint'} -------")->grid(-row => $row, -column => 1,-columnspan => 3);
+-
+-    $row++;
+-    $fr->Label(-text => $labels{'symlink'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+-    $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m");
+     $fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
++  } else {
++    $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+   }
+ 
+   # install/cancel buttons
+@@ -596,7 +594,7 @@
+ 
+ sub menu_select_symlink {
+   our ($lbin,$lman,$linfo);
+-  our $osym = $vars{'option_symlinks'};
++  our $osym = $vars{'option_sysint'};
+   our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
+   sub set_unset_buttons {
+     $lbin = ($osym ? $vars{'sys_bin'} : '');
+@@ -630,8 +628,8 @@
+       $vars{'sys_info'} = $linfo;
+       $vars{'sys_man'} = $lman;
+     }
+-    $vars{'option_symlinks'} = $osym;
+-    menu_update_texts();
++    $vars{'option_sysint'} = $osym;
++    toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno);
+   }
+   my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'});
+   $sw->transient($mainwindow);
+@@ -695,10 +693,6 @@
+   $w->configure(-text => $t, @_);
+ }
+ 
+-sub menu_set_symlink_text {
+-  menu_set_text($symlinktext, (($vars{'option_symlinks'})?$text{'yes'}:$text{'no'}));
+-}
+-
+ sub menu_set_schemebutton_text {
+   menu_set_text($schemebutton, "$vars{'selected_scheme'}");
+ }
+@@ -762,7 +756,6 @@
+   $optfmtstate = ($vars{'option_fmt'} ? $text{'yes'} : $text{'no'});
+   $optsrcstate = ($vars{'option_src'} ? $text{'yes'} : $text{'no'});
+   $optdocstate = ($vars{'option_doc'} ? $text{'yes'} : $text{'no'});
+-  if (unix()) { menu_set_symlink_text; };
+ }
+ 
+ sub callback_select_scheme {
+Index: tlpkg/installer/install-translations.pl
+===================================================================
+--- tlpkg/installer/install-translations.pl	(revision 12171)
++++ tlpkg/installer/install-translations.pl	(working copy)
+@@ -52,7 +52,7 @@
+ }
+ 
+ 
+-our %text = (title      => 'TeX Live 2008 Installation',
++our %text = (title      => 'TeX Live 2009 Installation',
+              basicinfo  => 'Basic Information',
+              custom     => 'Further Customization',
+              dirsetup   => "Directory setup",
+@@ -93,7 +93,7 @@
+              welcome => 'Welcome to TeX Live!',
+              next       => 'Next >',
+              prev       => '< Back',
+-             wizhello   => "Welcome to the installation of TeX Live 2008\n"
++             wizhello   => "Welcome to the installation of TeX Live 2009\n"
+                . "http://tug.org/texlive\n\n"
+                . "This wizard will guide you through the installation.\n\n"
+                . "For an advanced, customizable installation, please consult\n"
+@@ -101,7 +101,7 @@
+              destfolder => 'Destination folder:',
+              advcustom  => 'Advanced customization',
+              pathinfo   => "The destination folder will contain the installation.\nIt is strongly recommended to keep the year as the last component.",
+-             readyinst  => "We are ready to install TeX Live 2008.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
++             readyinst  => "We are ready to install TeX Live 2009.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.",
+              instshort  => 'Install',
+              wizard     => 'Go to Wizard',
+     );
+@@ -121,6 +121,7 @@
+                optdoc   =>  'Install font/macro doc tree',
+                optsrc   =>  'Install font/macro source tree',
+                symlink  =>  'Create symlinks in system directories',
++               sysint   =>  'System integration',
+     );
+ 
+ if (($::lang ne "en") && ($::lang ne "C")) {
+Index: tlpkg/installer/install-menu-text.pl
+===================================================================
+--- tlpkg/installer/install-menu-text.pl	(revision 12171)
++++ tlpkg/installer/install-menu-text.pl	(working copy)
+@@ -675,7 +675,7 @@
+ 
+ 
+ sub options_menu {
+-  my $b_symlinks=button($vars{'option_symlinks'});
++  my $b_sysint=button($vars{'option_sysint'});
+   my $b_doc=button($vars{'option_doc'});
+   my $b_src=button($vars{'option_src'});
+   my $b_fmt=button($vars{'option_fmt'});
+@@ -685,9 +685,9 @@
+   my $sys_man=$vars{'sys_man'};
+   my $sys_info=$vars{'sys_info'};
+ 
+-  my $t_sys_bin=($vars{'option_symlinks'})? $vars{'sys_bin'}:'';
+-  my $t_sys_man=($vars{'option_symlinks'})? $vars{'sys_man'}:'';
+-  my $t_sys_info=($vars{'option_symlinks'})? $vars{'sys_info'}:'';
++  my $t_sys_bin=($vars{'option_sysint'})? $vars{'sys_bin'}:'';
++  my $t_sys_man=($vars{'option_sysint'})? $vars{'sys_man'}:'';
++  my $t_sys_info=($vars{'option_sysint'})? $vars{'sys_info'}:'';
+ 
+   my %command=(
+     'self' => \&options_menu,
+@@ -709,14 +709,21 @@
+   if ($vars{'src_splitting_supported'} and !$vars{'from_dvd'}) {
+     print " <S> install font/macro source tree:           $b_src\n";
+   }
+-  if (unix() && !$vars{'from_dvd'}) {
+-    print <<"EOF";
+- <L> create symlinks in standard directories:  $b_symlinks
++  if (!$vars{'from_dvd'}) {
++    if (unix()) {
++      print <<"EOF";
++ <L> create symlinks in standard directories:  $b_sysint
+             binaries to: $t_sys_bin
+             manpages to: $t_sys_man
+                 info to: $t_sys_info
+ EOF
+ ;
++    } else {
++      print <<"EOF";
++ <L> do system integration:                    $b_sysint
++EOF
++;
++    }
+   }
+   other_options qw(R Q diskspace);
+   my $answer = prompt 'Enter command';
+@@ -726,8 +733,8 @@
+       my $home = getenv('HOME');
+       $home = getenv('USERPROFILE') if (win32());
+       $home ||= '~';
+-      toggle 'option_symlinks';
+-      if ($vars{'option_symlinks'}) {
++      toggle 'option_sysint';
++      if ($vars{'option_sysint'}) {
+         print "New value for binary directory [$sys_bin]: ";
+         chomp($answer=<STDIN>);
+         $vars{'sys_bin'} =  "$answer" if (length $answer);
+@@ -751,8 +758,15 @@
+       }
+       return $command{'self'};
+     }
++  } else {
++    if (("\u$answer" eq 'L') and !$vars{'from_dvd'}) {
++      my $home = getenv('HOME');
++      $home = getenv('USERPROFILE') if (win32());
++      $home ||= '~';
++      toggle 'option_sysint';
++      return $command{'self'};
++    }
+   }
+-
+   if ("\u$answer" eq 'P') {
+     toggle 'option_letter';
+     return $command{'self'};
+@@ -802,7 +816,7 @@
+ sub main_menu {
+   my $this_platform=platform_desc($vars{'this_platform'});
+ 
+-  my $b_symlinks=button($vars{'option_symlinks'});
++  my $b_sysint=button($vars{'option_sysint'});
+   my $b_doc=button($vars{'option_doc'});
+   my $b_src=button($vars{'option_src'});
+   my $b_fmt=button($vars{'option_fmt'});
+@@ -913,9 +927,7 @@
+     if ($vars{'src_splitting_supported'}) {
+       print "   $b_src install macro/font source tree\n";
+     }
+-    if (unix()) {
+-      print "   $b_symlinks create symlinks in standard directories\n";
+-    }
++    print "   $b_sysint system integration\n";
+   }
+ 
+   if ($vars{'from_dvd'}) {
 Index: tlpkg/tlpsrc/bin-tex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-tex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-tex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-tex.tlpsrc	(working copy)
 @@ -1,7 +1,6 @@
  name bin-tex
@@ -1353,7 +1556,7 @@
  binpattern f bin/${ARCH}/tex
 Index: tlpkg/tlpsrc/bin-mex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-mex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-mex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-mex.tlpsrc	(working copy)
 @@ -2,10 +2,9 @@
  category TLCore
@@ -1371,16 +1574,29 @@
  binpattern f bin/${ARCH}/utf8mex
 Index: tlpkg/tlpsrc/texlive-de.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-de.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-de.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-de.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-de
  category Documentation
 +postaction shortcut type=menu name="TeX Live Manual (de) (PDF)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.pdf
 +postaction shortcut type=menu name="TeX Live Manual (de) (HTML)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.html
+Index: tlpkg/tlpsrc/00texlive.installer.tlpsrc
+===================================================================
+--- tlpkg/tlpsrc/00texlive.installer.tlpsrc	(revision 12171)
++++ tlpkg/tlpsrc/00texlive.installer.tlpsrc	(working copy)
+@@ -7,7 +7,7 @@
+ longdesc used *except* to build the installer archives, so it's ok.
+ longdesc
+ longdesc For information on the 00texlive prefix see
+-longdesc   00texlive-installation.config(.tlpsrc)
++longdesc   00texlive.installation(.tlpsrc)
+ category TLCore
+ runpattern f install-tl
+ runpattern f tlpkg/installer/install-tl.html
 Index: tlpkg/tlpsrc/pdftex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/pdftex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/pdftex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/pdftex.tlpsrc	(working copy)
 @@ -1,8 +1,9 @@
  name pdftex
@@ -1396,7 +1612,7 @@
  runpattern f texmf/tex/generic/pdftex/*
 Index: tlpkg/tlpsrc/bin-csplain.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-csplain.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-csplain.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-csplain.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-csplain
@@ -1410,7 +1626,7 @@
  binpattern f bin/${ARCH}/pdfcsplain
 Index: tlpkg/tlpsrc/bin-metapost.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-metapost.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-metapost.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-metapost.tlpsrc	(working copy)
 @@ -1,8 +1,8 @@
  name bin-metapost
@@ -1423,9 +1639,24 @@
  docpattern f texmf/doc/man/man1/dmp.*
  docpattern f texmf/doc/man/man1/dvitomp.*
  docpattern f texmf/doc/man/man1/makempx.*
+Index: tlpkg/tlpsrc/00texlive.config.tlpsrc
+===================================================================
+--- tlpkg/tlpsrc/00texlive.config.tlpsrc	(revision 12171)
++++ tlpkg/tlpsrc/00texlive.config.tlpsrc	(working copy)
+@@ -9,8 +9,8 @@
+ longdesc is only "lzma", which generates .tar.lzma files. zip can be supported.
+ longdesc release/NNNN specifies the release number as used in the installer.
+ longdesc For information on the 00texlive prefix see
+-longdesc   00texlive-installation.config(.tlpsrc)
++longdesc   00texlive.installation(.tlpsrc)
+ depend container_split_src_files
+ depend container_split_doc_files
+ depend container_format/lzma
+-depend release/2008
++depend release/2009
 Index: tlpkg/tlpsrc/texlive-fr.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-fr.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-fr.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-fr.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-fr
@@ -1434,7 +1665,7 @@
 +postaction shortcut type=menu name="TeX Live Manual (fr) (HTML)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.html
 Index: tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-zh-cn.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-zh-cn.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-zh-cn.tlpsrc	(working copy)
 @@ -1,2 +1,3 @@
  name texlive-zh-cn
@@ -1442,7 +1673,7 @@
 +postaction shortcut type=menu name="TeX Live Manual (zh-cn) (PDF)" cmd=TEXDIR/texmf-doc/doc/chinese/texlive-zh-cn/texlive-zh-cn.pdf
 Index: tlpkg/tlpsrc/bin-dviout.win32.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-dviout.win32.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-dviout.win32.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-dviout.win32.tlpsrc	(working copy)
 @@ -2,3 +2,4 @@
  category TLCore
@@ -1451,7 +1682,7 @@
 +postaction shortcut type=menu name="DVIOUT Dvi Viewer" cmd=wscript args=TEXDIR/bin/win32/dviout.vbs hide=1
 Index: tlpkg/tlpsrc/bin-context.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-context.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-context.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-context.tlpsrc	(working copy)
 @@ -1,9 +1,15 @@
  name bin-context
@@ -1473,7 +1704,7 @@
  docpattern f texmf/doc/man/man1/mptopdf.*
 Index: tlpkg/tlpsrc/bin-mltex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-mltex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-mltex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-mltex.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-mltex
@@ -1487,7 +1718,7 @@
  binpattern f bin/${ARCH}/mltex
 Index: tlpkg/tlpsrc/luatex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/luatex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/luatex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/luatex.tlpsrc	(working copy)
 @@ -1,8 +1,8 @@
  name luatex
@@ -1502,7 +1733,7 @@
  binpattern f/!hppa-hpux bin/${ARCH}/texlua
 Index: tlpkg/tlpsrc/bin-cslatex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-cslatex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-cslatex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-cslatex.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-cslatex
@@ -1516,7 +1747,7 @@
  binpattern f bin/${ARCH}/pdfcslatex
 Index: tlpkg/tlpsrc/bin-texdoc.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-texdoc.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-texdoc.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-texdoc.tlpsrc	(working copy)
 @@ -12,3 +12,4 @@
  binpattern f bin/${ARCH}/texdoctk
@@ -1525,7 +1756,7 @@
 +postaction shortcut type=menu name="TeXdoc GUI" cmd="TEXDIR/bin/win32/texdoctk.bat" hide=1
 Index: tlpkg/tlpsrc/bin-latex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-latex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-latex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-latex.tlpsrc	(working copy)
 @@ -4,12 +4,14 @@
  depend pdftex
@@ -1546,7 +1777,7 @@
  runpattern d texmf/tex/latex/config
 Index: tlpkg/tlpsrc/bin-omega.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-omega.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-omega.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-omega.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-omega
@@ -1560,7 +1791,7 @@
  binpattern f bin/${ARCH}/lambda
 Index: tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc	(working copy)
 @@ -5,3 +5,5 @@
  runpattern f bin/win32/psv.bat
@@ -1570,7 +1801,7 @@
 +postaction shortcut type=desktop name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1
 Index: tlpkg/tlpsrc/bin-xmltex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-xmltex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-xmltex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-xmltex.tlpsrc	(working copy)
 @@ -2,7 +2,7 @@
  category TLCore
@@ -1584,7 +1815,7 @@
  binpattern f bin/${ARCH}/xmltex
 Index: tlpkg/tlpsrc/texlive-ru.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-ru.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-ru.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-ru.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-ru
@@ -1593,17 +1824,40 @@
 +postaction shortcut type=menu name="TeX Live Manual (ru) (HTML)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.html
 Index: tlpkg/tlpsrc/bin-texlive.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-texlive.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-texlive.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-texlive.tlpsrc	(working copy)
-@@ -25,3 +25,5 @@
- binpattern f bin/win32/tl-w32-wrapper.texlua
+@@ -1,27 +1,11 @@
+ name bin-texlive
+ category TLCore
+ shortdesc executables and files maintained as part of TeX Live
+-longdesc This packages contains the binaries of the TeX Live tools (notably
+-longdesc tlmgr). Together with texlive.infra, it provides all the basic TeX
+-longdesc Live infrastructure.
++longdesc This packages contains the binaries of the TeX Live tools. 
+ depend texlive.infra
+-runpattern f texmf/fmtutil/fmtutil-hdr.cnf
+ runpattern d texmf/scripts/texlive/lua
+-runpattern d texmf/scripts/texlive/tlmgrgui
+-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui1.pl
+-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-config1.pl
+-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-arch1.pl
+-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
+ runpattern f texmf/scripts/texlive/rungs.tlu
+ runpattern f texmf/scripts/texlive/test-tlpdb.tlu
+ runpattern f texmf/scripts/texlive/texconf.tlu
+-runpattern f texmf/scripts/texlive/tlmgr.pl
+-runpattern !f texmf/scripts/texlive/tlmgr1.pl
+-runpattern f texmf/scripts/texlive/uninstall-win32.pl
+-runpattern f texmf/web2c/updmap-hdr.cfg
+-docpattern f texmf/doc/man/man1/tlmgr.*
+-binpattern f bin/${ARCH}/tlmgr
+ binpattern f bin/${ARCH}/rungs
+-binpattern f bin/win32/tl-w32-wrapper.texlua
  binpattern f bin/win32/symlinks4cygwin.sh
- binpattern f/win32 texmf/scripts/texlive/w32_updater.bat
-+postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr.bat args=gui hide=1
-+postaction shortcut type=menu name="Release notes" cmd="http://tug.org/texlive/windows.html"
+-binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
 Index: tlpkg/tlpsrc/t2.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/t2.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/t2.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/t2.tlpsrc	(working copy)
 @@ -1,5 +1,5 @@
  name t2
@@ -1616,7 +1870,7 @@
 +execute AddFormat name=cyrtexinfo mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtxinf.ini"
 Index: tlpkg/tlpsrc/bin-texsis.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-texsis.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-texsis.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-texsis.tlpsrc	(working copy)
 @@ -1,6 +1,5 @@
  name bin-texsis
@@ -1628,7 +1882,7 @@
  binpattern f bin/${ARCH}/texsis
 Index: tlpkg/tlpsrc/texlive-en.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-en.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-en.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-en.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-en
@@ -1637,7 +1891,7 @@
 +postaction shortcut type=menu name="TeX Live Manual (en) (HTML)" cmd=TEXDIR/texmf-doc/doc/english/texlive-en/texlive-en.html
 Index: tlpkg/tlpsrc/bin-physe.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-physe.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-physe.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-physe.tlpsrc	(working copy)
 @@ -1,6 +1,5 @@
  name bin-physe
@@ -1649,7 +1903,7 @@
  binpattern f bin/${ARCH}/physe
 Index: tlpkg/tlpsrc/bin-phyzzx.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-phyzzx.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-phyzzx.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-phyzzx.tlpsrc	(working copy)
 @@ -1,6 +1,5 @@
  name bin-phyzzx
@@ -1661,7 +1915,7 @@
  binpattern f bin/${ARCH}/phyzzx
 Index: tlpkg/tlpsrc/bin-eplain.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-eplain.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-eplain.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-eplain.tlpsrc	(working copy)
 @@ -1,8 +1,7 @@
  name bin-eplain
@@ -1675,7 +1929,7 @@
  binpattern f bin/${ARCH}/eplain
 Index: tlpkg/tlpsrc/texlive-cz.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-cz.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-cz.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-cz.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-cz
@@ -1684,7 +1938,7 @@
 +postaction shortcut type=menu name="TeX Live Manual (cz) (HTML)" cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.html
 Index: tlpkg/tlpsrc/bin-jadetex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-jadetex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-jadetex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-jadetex.tlpsrc	(working copy)
 @@ -2,7 +2,7 @@
  category TLCore
@@ -1696,9 +1950,44 @@
 +execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="&pdflatex pdfjadetex.ini"
  binpattern f bin/${ARCH}/jadetex
  binpattern f bin/${ARCH}/pdfjadetex
+Index: tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
+===================================================================
+--- tlpkg/tlpsrc/00texlive-installation.config.tlpsrc	(revision 12171)
++++ tlpkg/tlpsrc/00texlive-installation.config.tlpsrc	(working copy)
+@@ -1,30 +0,0 @@
+-name 00texlive-installation.config
+-category TLCore
+-longdesc This package serves two purposes:
+-longdesc
+-longdesc 1. at installation time the present values are taken as default for
+-longdesc    the installer
+-longdesc
+-longdesc 2. on an installed system it serves as a configuration file.
+-longdesc    We have to remember these settings for additional package
+-longdesc    installation, removal, etc.
+-longdesc
+-longdesc The value of __MASTER__ for the location field tells the
+-longdesc installer to use the present directory itself.  For example,
+-longdesc the DVD can be mounted anywhere and we want the installer to work.
+-longdesc
+-longdesc Concerning the 00* names:
+-longdesc All packages starting with 00texlive are considered virtual packages
+-longdesc in the sense that no containers are generated and these packages
+-longdesc are never split into .src and .doc sub-packages in the tlpdb.
+-
+-depend platform:
+-depend location:__MASTER__
+-depend opt_paper:a4
+-depend opt_create_formats:1
+-depend opt_create_symlinks:0
+-depend opt_sys_bin:/usr/local/bin
+-depend opt_sys_info:/usr/local/info
+-depend opt_sys_man:/usr/local/man
+-depend opt_install_docfiles:1
+-depend opt_install_srcfiles:1
 Index: tlpkg/tlpsrc/texlive-pl.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive-pl.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive-pl.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive-pl.tlpsrc	(working copy)
 @@ -1,2 +1,4 @@
  name texlive-pl
@@ -1707,7 +1996,7 @@
 +postaction shortcut type=menu name="TeX Live Manual (pl) (HTML)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.html
 Index: tlpkg/tlpsrc/bin-amstex.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-amstex.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-amstex.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-amstex.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-amstex
@@ -1721,7 +2010,7 @@
  binpattern f bin/${ARCH}/amstex
 Index: tlpkg/tlpsrc/bin-aleph.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-aleph.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-aleph.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-aleph.tlpsrc	(working copy)
 @@ -1,7 +1,7 @@
  name bin-aleph
@@ -1733,9 +2022,46 @@
 +execute AddFormat name=lamed engine=aleph patterns=language.dat options=*lambda.ini
  binpattern f bin/${ARCH}/aleph
  binpattern f bin/${ARCH}/lamed
+Index: tlpkg/tlpsrc/00texlive.installation.tlpsrc
+===================================================================
+--- tlpkg/tlpsrc/00texlive.installation.tlpsrc	(revision 12171)
++++ tlpkg/tlpsrc/00texlive.installation.tlpsrc	(working copy)
+@@ -1,4 +1,4 @@
+-name 00texlive-installation.config
++name 00texlive.installation
+ category TLCore
+ longdesc This package serves two purposes:
+ longdesc
+@@ -22,7 +22,7 @@
+ depend location:__MASTER__
+ depend opt_paper:a4
+ depend opt_create_formats:1
+-depend opt_create_symlinks:0
++depend opt_system_integration:0
+ depend opt_sys_bin:/usr/local/bin
+ depend opt_sys_info:/usr/local/info
+ depend opt_sys_man:/usr/local/man
+
+Property changes on: tlpkg/tlpsrc/00texlive.installation.tlpsrc
+___________________________________________________________________
+Added: svn:mergeinfo
+
+Index: tlpkg/tlpsrc/00texlive.core.tlpsrc
+===================================================================
+--- tlpkg/tlpsrc/00texlive.core.tlpsrc	(revision 12171)
++++ tlpkg/tlpsrc/00texlive.core.tlpsrc	(working copy)
+@@ -6,7 +6,7 @@
+ longdesc and containers are not built; they exist only in the
+ longdesc full DVD image.
+ longdesc For information on the 00texlive prefix see
+-longdesc   00texlive-installation.config(.tlpsrc)
++longdesc   00texlive.installation(.tlpsrc)
+ runpattern d tlpkg/archive
+ runpattern d tlpkg/doc
+ runpattern d tlpkg/libexec
 Index: tlpkg/tlpsrc/bin-metafont.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/bin-metafont.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/bin-metafont.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/bin-metafont.tlpsrc	(working copy)
 @@ -1,8 +1,7 @@
  name bin-metafont
@@ -1749,11 +2075,166 @@
  binpattern f bin/${ARCH}/mf
 Index: tlpkg/tlpsrc/texlive.infra.tlpsrc
 ===================================================================
---- tlpkg/tlpsrc/texlive.infra.tlpsrc	(revision 12142)
+--- tlpkg/tlpsrc/texlive.infra.tlpsrc	(revision 12171)
 +++ tlpkg/tlpsrc/texlive.infra.tlpsrc	(working copy)
-@@ -36,3 +36,5 @@
+@@ -36,3 +36,17 @@
  binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
  powerpc-linux,i386-freebsd,x86_64-linux \
    tlpkg/installer/wget/wget.${ARCH}
++# former tlmgr stuff
++runpattern f texmf/fmtutil/fmtutil-hdr.cnf
++runpattern d texmf/scripts/texlive/tlmgrgui
++runpattern f texmf/scripts/texlive/tlmgr.pl
++runpattern f texmf/scripts/texlive/uninstall-win32.pl
++runpattern f texmf/web2c/updmap-hdr.cfg
++docpattern f texmf/doc/man/man1/tlmgr.*
++binpattern f bin/${ARCH}/tlmgr
++binpattern f bin/win32/tl-w32-wrapper.texlua
++binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
 +# post actions
 +postaction shortcut type=menu name="TeX Live Toplevel Readme Index" cmd=TEXDIR/index.html
++postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr.bat args=gui hide=1
++postaction shortcut type=menu name="Release notes" cmd="http://tug.org/texlive/windows.html"
+Index: tlpkg/bin/tl-update-tlcritical
+===================================================================
+--- tlpkg/bin/tl-update-tlcritical	(revision 12171)
++++ tlpkg/bin/tl-update-tlcritical	(working copy)
+@@ -34,7 +34,7 @@
+ # update normal containers.
+ echo "$0: running tl-update-containers (for critical packages)..."
+ tl-update-containers -location $tlcrit -all \
+-  00texlive-installation.config 00texlive.config bin-texlive texlive.infra
++  00texlive.installation 00texlive.config texlive.infra
+ 
+ # update Unix disaster recovery.
+ echo "$0: running tl-makeself-from-tlnet..."
+Index: tlpkg/bin/tl-update-containers
+===================================================================
+--- tlpkg/bin/tl-update-containers	(revision 12171)
++++ tlpkg/bin/tl-update-containers	(working copy)
+@@ -24,7 +24,7 @@
+ use File::Path;
+ 
+ # packages matching these re's will not be updated without --all.
+-my @critical_pkg_list = qw/bin-texlive texlive\.infra/;
++my @critical_pkg_list = qw/texlive\.infra/;
+ 
+ our ($mydir, $vc_id);
+ my $opt_all = 0;
+@@ -176,12 +176,12 @@
+     }
+   }
+   
+-  # The two packages 00texlive.config and 00texlive-installation.config
++  # The two packages 00texlive.config and 00texlive.installation
+   # are essential and have to be included in each and every case.
+   # So add them ...
+   my $tlpconfig = $tlpdb->get_package("00texlive.config");
+   $nettlpdb->add_tlpobj($tlpconfig);
+-  my $tlpinstconfig = $tlpdb->get_package("00texlive-installation.config");
++  my $tlpinstconfig = $tlpdb->get_package("00texlive.installation");
+   $nettlpdb->add_tlpobj($tlpinstconfig);
+ 
+   # set up the programs.
+@@ -392,7 +392,7 @@
+ =item B<-all|-a>
+ 
+ Include packages deemed critical in the update, currently
+-C<texlive.infra> and C<bin-texlive>.  (That is, C<tlmgr> itself needs
++C<texlive.infra>.  (That is, C<tlmgr> itself needs
+ testing before updating, so we don't do it by default.)
+ 
+ =item B<-no-setup>
+Index: tlpkg/bin/tl-makeself-from-tlnet
+===================================================================
+--- tlpkg/bin/tl-makeself-from-tlnet	(revision 12171)
++++ tlpkg/bin/tl-makeself-from-tlnet	(working copy)
+@@ -4,7 +4,7 @@
+ # This file is licensed under the GNU General Public License version 2
+ # or any later version.
+ # 
+-# Creates a .run file for updating the texlive.infra and bin-texlive
++# Creates a .run file for updating the texlive.infra 
+ # packages on Unix, similar to the .exe we create for Windows.  Both are
+ # created in the nightly cron from tl-update-tlcritical.
+ 
+@@ -28,9 +28,8 @@
+ mkdir master
+ cd master
+ 
+-# unpack texlive.infra and bin-texlive archives for all platforms,
+-# except w32.
+-for pkg in texlive.infra bin-texlive; do
++# unpack texlive.infra archives for all platforms, except w32.
++for pkg in texlive.infra; do
+   for i in $ARCHIVE/$pkg*.tar.lzma ; do
+     case "$i" in 
+       *win32*) ;;
+@@ -69,13 +68,12 @@
+   mkdir -p $t_instdir/wget
+ 
+   # start the list of tlpobjs we will install
+-  tlpobjs="$t_objdir/bin-texlive.tlpobj $t_objdir/texlive.infra.tlpobj"
++  tlpobjs="$t_objdir/texlive.infra.tlpobj"
+   for a in $ROOT/bin/*; do
+     test -d "$a" || continue  # skip any cruft files
+     b=`basename $a`           # just the architecture name
+     
+     # add the tlpobjs for this platform t the list.
+-    tlpobjs="$tlpobjs $t_objdir/bin-texlive.$b.tlpobj"
+     tlpobjs="$tlpobjs $t_objdir/texlive.infra.$b.tlpobj"
+ 
+     # install the bin dir for this platform.
+Index: tlpkg/bin/tl-update-nsis
+===================================================================
+--- tlpkg/bin/tl-update-nsis	(revision 12171)
++++ tlpkg/bin/tl-update-nsis	(working copy)
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env perl
+ # $Id$
+-# Copyright 2008 Norbert Preining
++# Copyright 2008, 2009 Norbert Preining
+ # This file is licensed under the GNU General Public License version 2
+ # or any later version.
+ # 
+@@ -40,13 +40,9 @@
+   chomp (my $Master = `cd $mydir/../.. && pwd`);
+   my $tlpdb = TeXLive::TLPDB->new ("root" => $Master);
+   die("Cannot find tlpdb in $Master\n") unless defined($tlpdb);
+-  my $bintexlive = $tlpdb->get_package("bin-texlive");
+-  my $bintexlivew32 = $tlpdb->get_package("bin-texlive.win32");
+   my $texliveinfra = $tlpdb->get_package("texlive.infra");
+   my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32");
+   my @allfiles = ();
+-  push @allfiles, $bintexlive->all_files;
+-  push @allfiles, $bintexlivew32->all_files if defined $bintexlivew32;
+   push @allfiles, $texliveinfra->all_files;
+   push @allfiles, $texliveinfraw32->all_files if defined $texliveinfraw32;
+   
+@@ -58,7 +54,7 @@
+     $removetlpobjdir = 1;
+   }
+   my $rev = 0; # we want the highest rev all these packages.
+-  for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
++  for my $p ($texliveinfra, $texliveinfraw32) {
+     if (defined $p) {
+       if ($p->revision > $rev) {
+         $rev = $p->revision;
+@@ -95,7 +91,7 @@
+ 
+ Name "TeX Live Manager Update ${REV}"
+ OutFile "update-tlmgr-${REV}.exe"
+-InstallDir "$PROGRAMFILES\texlive\2008"
++InstallDir "$PROGRAMFILES\texlive\$TeXLive::TLConfig::ReleaseYear"
+ 
+ RequestExecutionLevel "user"
+ 
+@@ -135,7 +131,7 @@
+     }
+   }
+   print "  ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
+-  for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
++  for my $p ($texliveinfra, $texliveinfraw32) {
+     if (defined $p) {
+       print " \"\$INSTDIR\\tlpkg\\tlpobj\\", $p->name, ".tlpobj\"";
+     }
Index: install-tl
===================================================================
--- install-tl	(revision 12171)
+++ install-tl	(working copy)
@@ -82,7 +82,6 @@
     &add_menu_shortcut
     &remove_desktop_shortcut
     &remove_menu_shortcut
-    &init_unshortbat
     &create_uninstaller
   ));
 }
@@ -121,7 +120,7 @@
 #
 # The following values are taken from the remote tlpdb using the
 #   $tlpdb->option_XXXXX
-# settings (i.e., taken from tlpkg/tlpsrc/00texlive-installation.tlpsrc
+# settings (i.e., taken from tlpkg/tlpsrc/00texlive.installation.tlpsrc
 #
 #        'option_symlinks' => 0,
 #        'sys_bin' => '/usr/local/bin',
@@ -380,6 +379,14 @@
   $vars{'doc_splitting_supported'} = $tlpdb->config_doc_container;
 }
 $texlive_release = $tlpdb->config_release;
+# if the release from the remote TLPDB does not agree with the
+# TLConfig::ReleaseYear in the first 4 places break out here.
+# Why only the first four places: some optional network distributions
+# might use
+#   release/2009-foobar
+if ($texlive_release !~ m/^$TeXLive::TLConfig::ReleaseYear/) {
+  die "The release version of the installation source and\nthe installation media do not agree:\nsource: $texlive_release\nmedia: $TeXLive::TLConfig::ReleaseYear\nPlease report to tex-live\@tug.org";
+}
 set_platforms_supported();
 set_texlive_default_dirs();
 initialize_collections();
@@ -491,7 +498,229 @@
     save_options_into_tlpdb();
     do_install_packages();
   }
+  # now we save every scheme that is fully covered by the stuff we have
+  # installed to the $localtlpdb
+  foreach my $s ($tlpdb->schemes) {
+    my $stlp = $tlpdb->get_package($s);
+    die ("That cannot happen, $s not defined in tlpdb") unless defined($stlp);
+    my $incit = 1;
+    foreach my $d ($stlp->depends) {
+      if (!defined($localtlpdb->get_package($d))) {
+        $incit = 0;
+        last;
+      }
+    }
+    if ($incit) {
+      $localtlpdb->add_tlpobj($stlp);
+    }
+  }
+  $localtlpdb->save unless $vars{'from_dvd'};
+  do_postinst_stuff();
+}
+
+# do_postinst_stuff has to fix up the texmf tree and install some missing
+# files. The things to do are taken from the install-live.sh installer
+# of former times, and should be critically checked.
+sub do_postinst_stuff {
+  my $TEXDIR="$vars{'TEXDIR'}";
+  my $TEXDIRW="$vars{'TEXDIRW'}";
+  my $TEXMFSYSVAR="$vars{'TEXMFSYSVAR'}";
+  my $TEXMFSYSCONFIG="$vars{'TEXMFSYSCONFIG'}";
+  my $TEXMFLOCAL="$vars{'TEXMFLOCAL'}";
+  my $tmv;
+
+  do_texmf_cnf() unless ($opt_portable);
+
+
+  # final program execution
+  # we have to do several things:
+  # - clean the environment from spurious TEXMF related variables
+  # - add the bin dir to the PATH
+  # - select perl interpreter and set the correct perllib
+  # - run the programs
+
+  # Step 1: Clean the environment
+  my @TMFVARS0=qw(VARTEXFONTS
+    TEXMF SYSTEXMF VARTEXFONTS
+    TEXMFDBS WEB2C TEXINPUTS TEXFORMATS MFBASES MPMEMS TEXPOOL MFPOOL MPPOOL
+    PSHEADERS TEXFONTMAPS TEXPSHEADERS TEXCONFIG TEXMFCNF);
+  my @TMFVARS1=qw(TEXMFMAIN TEXMFDIST TEXMFLOCAL TEXMFSYSVAR TEXMFSYSCONFIG
+    TEXMFHOME TEXMFVAR TEXMFCONFIG);
+
+  if (defined($ENV{'TEXMFCNF'}) and !$vars{'from_dvd'} and !$opt_portable) {
+    print "WARNING: environment variable TEXMFCNF is set.
+You should know what you are doing.
+We will remove that for the post install actions, but all further
+operations might be disturbed.\n\n";
+  }
+  foreach $tmv (@TMFVARS0) {
+    delete $ENV{$tmv} if (defined($ENV{$tmv}));
+  }
+  if (!$opt_portable) {
+    foreach $tmv (@TMFVARS1) {
+      delete $ENV{$tmv} if (defined($ENV{$tmv}));
+    }
+  }
+  $ENV{'TEXMFSYSVAR'} = $vars{'TEXMFSYSVAR'} if $vars{'from_dvd'};
+
+  # Step 2: Setup the PATH, switch to the new Perl
+
+  my $pathsep=(win32)? ';' : ':';
+  my $plat_bindir="$TEXDIR/bin/$vars{'this_platform'}";
+  my $perl_bindir="$TEXDIR/tlpkg/tlperl/bin";
+  my $perl_libdir="$TEXDIR/tlpkg/tlperl/lib";
+
+## This won't do any good;
+## have to remove other tex directories in calling batchfile
+#  if (win32) {
+#    debug("Removing other TeXs from path\n");
+#    my @newpt = ();
+#    foreach my $d (split (';', $ENV{'PATH'})) {
+#      push @newpt, $d unless TeXLive::TLWinGoo::is_a_texdir($d);
+#    }
+#    $ENV{'PATH'} = join($pathsep, @newpt);
+#    debug("Path after removals(s):\n  $ENV{'PATH'}\n");
+#  }
+
+  debug("Prepending $plat_bindir to PATH\n");
+
+  $ENV{'PATH'}="$plat_bindir" . "$pathsep" . "$ENV{'PATH'}";
+
+  if (win32) {
+    debug("Prepending $perl_bindir to PATH\n");
+    $ENV{'PATH'}="$perl_bindir" . "$pathsep" . "$ENV{'PATH'}";
+    $ENV{'PATH'} =~ s!/!\\!g;
+  }
+
+  debug("\nNew PATH is now:\n");
+  foreach my $dir (split $pathsep, $ENV{'PATH'}) {
+    debug("  $dir\n");
+  }
+  debug("\n");
+
+  if (win32) {
+    $ENV{'PERL5LIB'}="$perl_libdir";
+  }
+
+  #
+  # post install actions
+  #
+
+  # in case we are running from DVD we use the tlpdb from the DVD, otherwise
+  # the one we have locally created, for all the further actions
+  my $usedtlpdb = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
+
+
   if (win32()) {
+    debug "Actual environment:\n".`set`."\n\n";
+    debug 'Effective TEXMFCNF: '.`kpsewhich -expand-path=\$TEXMFCNF`."\n";
+  }
+
+  # TODO: can the following two clauses be merged?
+  if (win32()) {
+    create_uninstaller($vars{'TEXDIR'}, $vars{'TEXDIRW'},
+      $vars{'TEXMFSYSVAR'}, $vars{'TEXMFSYSCONFIG'});
+  }
+  # (re-)initialize batchfile for uninstalling shortcuts
+  if (win32() and !$opt_portable) {
+    mkdirhier("$TEXDIRW/tlpkg/installer") if $vars{'from_dvd'};
+  }
+
+  # Step 4: run the programs
+
+  if (!$opt_portable and !$vars{'from_dvd'}) {
+    info("running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf\n");
+    system('mktexlsr', "$TEXDIR/texmf-dist", "$TEXDIR/texmf");
+  }
+
+  # we have to generate the various config file. That could be done with
+  # texconfig generate * but Win32 does not have texconfig. But we have
+  # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
+  # the code from the various generate-*.pl scripts
+
+  info("writing fmtutil.cnf data to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
+  TeXLive::TLUtils::create_fmtutil($usedtlpdb,
+    "$TEXMFSYSVAR/web2c/fmtutil.cnf",
+    "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+
+  mkdirhier "$vars{'TEXMFSYSCONFIG'}/web2c";
+  info("writing updmap.cfg to $TEXMFSYSCONFIG/web2c/updmap.cfg\n");
+  TeXLive::TLUtils::create_updmap ($usedtlpdb,
+    "$TEXMFSYSCONFIG/web2c/updmap.cfg",
+    "$TEXMFLOCAL/web2c/updmap-local.cfg");
+
+  info("writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
+  TeXLive::TLUtils::create_language_dat($usedtlpdb,
+    "$TEXMFSYSVAR/tex/generic/config/language.dat",
+    "$TEXMFLOCAL/tex/generic/config/language-local.dat");
+
+  info("writing language.def data to $TEXMFSYSVAR/tex/generic/config/language.def\n");
+  TeXLive::TLUtils::create_language_def($usedtlpdb,
+    "$TEXMFSYSVAR/tex/generic/config/language.def",
+    "$TEXMFLOCAL/tex/generic/config/language-local.def");
+
+  info("running mktexlsr $TEXMFSYSVAR\n");
+  system('mktexlsr', "$TEXMFSYSVAR");
+
+  info("running updmap-sys... ");
+  # system('updmap-sys', '--nohash');
+  log(`updmap-sys --nohash 2>&1`);
+  info("done\n");
+
+  info("re-running mktexlsr $TEXMFSYSVAR\n");
+  system('mktexlsr', "$TEXMFSYSVAR");
+
+  # now work through the options if specified at all
+
+  # letter instead of a4
+  if ($vars{'option_letter'}) {
+    info("Setting default paper size to letter\n");
+    system("tlmgr", "paper", "letter");
+  }
+
+  # all formats option
+  if ($vars{'option_fmt'}) {
+    info("pre-generating all format files (fmtutil-sys --all), be patient...");
+    log(`fmtutil-sys --all 2>&1`);
+    info("done\n");
+  }
+
+  # TODO: Should/can this be moved into the do_system_integration part?
+  # it looks like it does not do anything outside the texlive tree, so it
+  # would be fine if we do it anyway ...
+  # $opt_portable: no %install but we still want xetex postinstall
+  &{$PostInstall{'xetex'}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL)
+    if $opt_portable;
+
+  # no do the system integration:
+  # on unix this means setting up symlinks
+  # on w32 this means adding to path, settting registry values
+  # on both, we run the TLPostActions and the postaction directives of the tlp
+  do_system_integration() if $vars{'option_sysint'};
+}
+
+sub do_system_integration {
+  # Run the post installation code in TLPostAction.pm
+  foreach my $package (sort keys %install) {
+    if ($install{$package} && defined($PostInstall{$package})) {
+      info("running post install action for $package\n");
+      &{$PostInstall{$package}}($vars{'TEXDIR'}, $vars{'TEXDIRW'}, 
+                                $vars{'TEXMFSYSVAR'}, $vars{'TEXMFLOCAL'});
+    }
+  }
+  # Run the post installation code in the postaction tlpsrc entries
+  my $usedtlpdb = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
+  foreach my $package (sort keys %install) {
+    if ($install{$package}) {
+      &TeXLive::TLUtils::do_postaction_code("install", 
+                                            $usedtlpdb->get_package($package));
+    }
+  }
+  info ("finished with package specific postactions\n");
+
+  if (win32()) {
+    update_assocs();
+
     my $path = TeXLive::TLWinGoo::get_system_env() -> {'/Path'};
     $path =~ s/[\s\x00]+$//;
     log("Old system path: $path\n");
@@ -516,29 +745,97 @@
     # setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
     setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c') if $vars{'from_dvd'};
     broadcast_env();
-    create_uninstaller($vars{'TEXDIR'}, $vars{'TEXDIRW'},
-      $vars{'TEXMFSYSVAR'}, $vars{'TEXMFSYSCONFIG'});
+  } else {
+    $localtlpdb->add_symlinks() 
   }
-  do_postinst_stuff();
-  # now we save every scheme that is fully covered by the stuff we have
-  # installed to the $localtlpdb
-  foreach my $s ($tlpdb->schemes) {
-    my $stlp = $tlpdb->get_package($s);
-    die ("That cannot happen, $s not defined in tlpdb") unless defined($stlp);
-    my $incit = 1;
-    foreach my $d ($stlp->depends) {
-      if (!defined($localtlpdb->get_package($d))) {
-        $incit = 0;
-        last;
+}
+
+
+# we have to adjust the texmf.cnf file to the paths set in the configuration!
+sub do_texmf_cnf {
+  open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
+      or die "$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!";
+  my @texmfcnflines = <TMF>;
+  close(TMF);
+  my @newtmf;
+  my @changedtmf;
+  # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME
+  foreach my $line (@texmfcnflines) {
+    if ($line =~ m/^TEXMFLOCAL/) {
+      # by default TEXMFLOCAL = TEXDIR/../texmf-local, if this is the case
+      # we don't have to change anything from the default
+      my $deftmlocal = dirname($vars{'TEXDIR'});
+      $deftmlocal .= "/texmf-local";
+      if ("$vars{'TEXMFLOCAL'}" eq "$deftmlocal") {
+        push @newtmf, $line;
+      } else {
+        push @newtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
+        push @changedtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
       }
+    } elsif ($line =~ m/^TEXMFSYSVAR/) {
+      # by default TEXMFSYSVAR = TEXDIR/texmf-var, if this is the case
+      # we don't have to change anything from the default
+      if ("$vars{'TEXMFSYSVAR'}" eq "$vars{'TEXDIR'}/texmf-var") {
+        push @newtmf, $line;
+      } else {
+        push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
+        push @changedtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
+      }
+    } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
+      # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
+      # we don't have to change anything from the default
+      if ("$vars{'TEXMFSYSCONFIG'}" eq "$vars{'TEXDIR'}/texmf-config") {
+        push @newtmf, $line;
+      } else {
+        push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
+        push @changedtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
+      }
+    } elsif ($line =~ m/^TEXMFHOME/) {
+      # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
+      # unix differently
+      push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
+      if ("$vars{'TEXMFHOME'}" ne "~/texmf") {
+        push @changedtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
+      }
+    } elsif ($line =~ m/^OSFONTDIR/) {
+      if (win32()) {
+        push @newtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
+        push @changedtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
+      } else {
+        push @newtmf, $line;
+      }
+    } else {
+      push @newtmf, $line;
     }
-    if ($incit) {
-      $localtlpdb->add_tlpobj($stlp);
-    }
   }
-  $localtlpdb->save unless $vars{'from_dvd'};
+  my $TMF;
+  if (!$vars{'from_dvd'}) {
+    $TMF = ">$vars{'TEXDIR'}/texmf.cnf";
+    open(TMF, $TMF) || die "open($TMF) failed: $!";
+    print TMF <<EOF;
+% This texmf.cnf file should contain only your personal changes from the
+% main texmf.cnf.
+%
+% Do NOT change values in the main file (which is in
+% .../texlive/YYYY/texmf/web2c/texmf.cnf), as YOUR CHANGES WILL BE LOST
+% by later updates.
+%
+% If you need to make changes to texmf.cnf, put your custom settings in
+% this file instead, which is YYYY/texmf.cnf.  And insert *only* your
+% changed values.
+%
+EOF
+;
+    foreach (@changedtmf) { print TMF; }
+  } else {
+    $TMF = ">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf";
+    open (TMF, $TMF) || die "open($TMF) failed: $!\n";
+    foreach (@newtmf) { print TMF; }
+  }
+  close(TMF) || warn "close($TMF) failed: $!";
 }
 
+
 sub dump_vars {
   my $filename=shift;
   my $fh;
@@ -744,7 +1041,10 @@
   $vars{'option_fmt'} = $tlpdb->option_create_formats;
   $vars{'option_letter'} = defined($tlpdb->option_paper)
                            && ($tlpdb->option_paper eq "letter" ? 1 : 0);
-  $vars{'option_symlinks'} = $tlpdb->option_create_symlinks;
+  $vars{'option_sysint'} = $tlpdb->option_system_integration;
+  if (win32()) {
+    $vars{'option_sysint'} = 1;
+  }
   $vars{'sys_bin'} = $tlpdb->option_sys_bin;
   $vars{'sys_man'} = $tlpdb->option_sys_man;
   $vars{'sys_info'} = $tlpdb->option_sys_info;
@@ -850,8 +1150,8 @@
     print $fh "$key $vars{$key}\n" if $key=~/^option_doc/;
     print $fh "$key $vars{$key}\n" if $key=~/^option_fmt/;
     print $fh "$key $vars{$key}\n" if $key=~/^option_src/;
-    print $fh "$key $vars{$key}\n" if $key=~/^option_symlinks/;
-    if ($vars{'option_symlinks'}) {
+    print $fh "$key $vars{$key}\n" if $key=~/^option_sysint/;
+    if ($vars{'option_sysint'} && unix()) {
       print $fh "sys_bin ", $vars{'sys_bin'}, "\n" if $key =~ /^sys_bin/;
       print $fh "sys_man ", $vars{'sys_man'}, "\n" if $key =~ /^sys_man/;
       print $fh "sys_info ", $vars{'sys_info'}, "\n" if $key =~ /^sys_info/;
@@ -948,7 +1248,7 @@
   $localtlpdb->option_location($location);
   $localtlpdb->option_paper($vars{'option_letter'} ? "letter" : "a4");
   $localtlpdb->option_create_formats($vars{'option_fmt'} ? "1" : "0");
-  $localtlpdb->option_create_symlinks($vars{'option_symlinks'} ? "1" : "0");
+  $localtlpdb->option_system_integration($vars{'option_sysint'} ? "1" : "0");
   $localtlpdb->option_sys_bin($vars{'sys_bin'});
   $localtlpdb->option_sys_info($vars{'sys_info'});
   $localtlpdb->option_sys_man($vars{'sys_man'});
@@ -964,320 +1264,6 @@
   $localtlpdb->save() unless $vars{'from_dvd'};
 }
 
-# do_postinst_stuff has to fix up the texmf tree and install some missing
-# files. The things to do are taken from the install-live.sh installer
-# of former times, and should be critically checked.
-sub do_postinst_stuff {
-  my $TEXDIR="$vars{'TEXDIR'}";
-  my $TEXDIRW="$vars{'TEXDIRW'}";
-  my $TEXMFSYSVAR="$vars{'TEXMFSYSVAR'}";
-  my $TEXMFSYSCONFIG="$vars{'TEXMFSYSCONFIG'}";
-  my $TEXMFLOCAL="$vars{'TEXMFLOCAL'}";
-  my $tmv;
-
-  do_texmf_cnf() unless ($opt_portable);
-
-
-  # final program execution
-  # we have to do several things:
-  # - clean the environment from spurious TEXMF related variables
-  # - add the bin dir to the PATH
-  # - select perl interpreter and set the correct perllib
-  # - run the programs
-
-  # Step 1: Clean the environment
-  my @TMFVARS0=qw(VARTEXFONTS
-    TEXMF SYSTEXMF VARTEXFONTS
-    TEXMFDBS WEB2C TEXINPUTS TEXFORMATS MFBASES MPMEMS TEXPOOL MFPOOL MPPOOL
-    PSHEADERS TEXFONTMAPS TEXPSHEADERS TEXCONFIG TEXMFCNF);
-  my @TMFVARS1=qw(TEXMFMAIN TEXMFDIST TEXMFLOCAL TEXMFSYSVAR TEXMFSYSCONFIG
-    TEXMFHOME TEXMFVAR TEXMFCONFIG);
-
-  if (defined($ENV{'TEXMFCNF'}) and !$vars{'from_dvd'} and !$opt_portable) {
-    print "WARNING: environment variable TEXMFCNF is set.
-You should know what you are doing.
-We will remove that for the post install actions, but all further
-operations might be disturbed.\n\n";
-  }
-  foreach $tmv (@TMFVARS0) {
-    delete $ENV{$tmv} if (defined($ENV{$tmv}));
-  }
-  if (!$opt_portable) {
-    foreach $tmv (@TMFVARS1) {
-      delete $ENV{$tmv} if (defined($ENV{$tmv}));
-    }
-  }
-  $ENV{'TEXMFSYSVAR'} = $vars{'TEXMFSYSVAR'} if $vars{'from_dvd'};
-
-  # Step 2: Setup the PATH, switch to the new Perl
-
-  my $pathsep=(win32)? ';' : ':';
-  my $plat_bindir="$TEXDIR/bin/$vars{'this_platform'}";
-  my $perl_bindir="$TEXDIR/tlpkg/tlperl/bin";
-  my $perl_libdir="$TEXDIR/tlpkg/tlperl/lib";
-
-## This won't do any good;
-## have to remove other tex directories in calling batchfile
-#  if (win32) {
-#    debug("Removing other TeXs from path\n");
-#    my @newpt = ();
-#    foreach my $d (split (';', $ENV{'PATH'})) {
-#      push @newpt, $d unless TeXLive::TLWinGoo::is_a_texdir($d);
-#    }
-#    $ENV{'PATH'} = join($pathsep, @newpt);
-#    debug("Path after removals(s):\n  $ENV{'PATH'}\n");
-#  }
-
-  debug("Prepending $plat_bindir to PATH\n");
-
-  $ENV{'PATH'}="$plat_bindir" . "$pathsep" . "$ENV{'PATH'}";
-
-  if (win32) {
-    debug("Prepending $perl_bindir to PATH\n");
-    $ENV{'PATH'}="$perl_bindir" . "$pathsep" . "$ENV{'PATH'}";
-    $ENV{'PATH'} =~ s!/!\\!g;
-  }
-
-  debug("\nNew PATH is now:\n");
-  foreach my $dir (split $pathsep, $ENV{'PATH'}) {
-    debug("  $dir\n");
-  }
-  debug("\n");
-
-  if (win32) {
-    $ENV{'PERL5LIB'}="$perl_libdir";
-  }
-
-  #
-  # post install actions
-  #
-
-  if (win32()) {
-    debug "Actual environment:\n".`set`."\n\n";
-    debug 'Effective TEXMFCNF: '.`kpsewhich -expand-path=\$TEXMFCNF`."\n";
-  }
-
-  # (re-)initialize batchfile for uninstalling shortcuts
-  if (win32() and !$opt_portable) {
-    mkdirhier("$TEXDIRW/tlpkg/installer") if $vars{'from_dvd'};
-    init_unshortbat($TEXDIRW);
-  }
-
-  foreach my $package (sort keys %install) {
-    if ($install{$package} && defined($PostInstall{$package})) {
-      info("running post install action for $package\n");
-      &{$PostInstall{$package}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL);
-    }
-  }
-  # $opt_portable: no %install but we still want xetex postinstall
-  &{$PostInstall{'xetex'}}($TEXDIR, $TEXDIRW, $TEXMFSYSVAR, $TEXMFLOCAL)
-    if $opt_portable;
-  update_assocs() if win32();
-
-  # Step 4: run the programs
-
-  if (!$opt_portable and !$vars{'from_dvd'}) {
-    info("running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf\n");
-    system('mktexlsr', "$TEXDIR/texmf-dist", "$TEXDIR/texmf");
-  }
-
-  # we have to generate the various config file. That could be done with
-  # texconfig generate * but Win32 does not have texconfig. But we have
-  # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
-  # the code from the various generate-*.pl scripts
-  info("writing fmtutil.cnf data to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
-  my $tlp = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
-  TeXLive::TLUtils::create_fmtutil($tlp, #$localtlpdb,
-    "$TEXMFSYSVAR/web2c/fmtutil.cnf",
-    "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
-
-  mkdirhier "$vars{'TEXMFSYSCONFIG'}/web2c";
-  info("writing updmap.cfg to $TEXMFSYSCONFIG/web2c/updmap.cfg\n");
-  TeXLive::TLUtils::create_updmap ($tlp, #$localtlpdb,
-    "$TEXMFSYSCONFIG/web2c/updmap.cfg",
-    "$TEXMFLOCAL/web2c/updmap-local.cfg");
-
-  info("writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
-  TeXLive::TLUtils::create_language_dat($tlp, #$localtlpdb,
-    "$TEXMFSYSVAR/tex/generic/config/language.dat",
-    "$TEXMFLOCAL/tex/generic/config/language-local.dat");
-
-  info("writing language.def data to $TEXMFSYSVAR/tex/generic/config/language.def\n");
-  TeXLive::TLUtils::create_language_def($tlp, #$localtlpdb,
-    "$TEXMFSYSVAR/tex/generic/config/language.def",
-    "$TEXMFLOCAL/tex/generic/config/language-local.def");
-
-  info("running mktexlsr $TEXMFSYSVAR\n");
-  system('mktexlsr', "$TEXMFSYSVAR");
-
-  info("running updmap-sys... ");
-  # system('updmap-sys', '--nohash');
-  log(`updmap-sys --nohash 2>&1`);
-  info("done\n");
-
-  info("re-running mktexlsr $TEXMFSYSVAR\n");
-  system('mktexlsr', "$TEXMFSYSVAR");
-
-  # now work through the options if specified at all
-
-  # letter instead of a4
-  if ($vars{'option_letter'}) {
-    info("Setting default paper size to letter\n");
-    if (platform() eq "hppa-hpux") {
-      # we didn't get a texlua binary for hppa-hpux, so try texconfig
-      system("texconfig", "paper", "letter");
-    } else {
-      system("texlua", "$TEXDIR/texmf/scripts/texlive/texconf.tlu", "--sys", "--noformat", "paper", "letter");
-    }
-  }
-
-  # all formats option
-  if ($vars{'option_fmt'}) {
-    info("pre-generating all format files (fmtutil-sys --all), be patient...");
-    #system('fmtutil-sys', '--all');
-    # try to capture that output
-    log(`fmtutil-sys --all 2>&1`);
-    info("done\n");
-  }
-
-  # option_links
-  if ($vars{'option_symlinks'}) {
-    # bin files
-    my @files;
-    mkdirhier $vars{'sys_bin'};
-    if (-w $vars{'sys_bin'}) {
-      info("linking binaries to $vars{'sys_bin'}\n");
-      @files = `ls $plat_bindir`;
-      chomp(@files);
-      `cd "$vars{'sys_bin'}" && rm -f @files`;
-      `ln -s "$plat_bindir/"* "$vars{'sys_bin'}"`;
-    } else {
-      info("destination of bin symlink $vars{'sys_bin'} not writable, "
-           . "no linking of bin files done.\n");
-    }
-    if ($vars{'option_doc'}) {
-      # info files
-      mkdirhier $vars{'sys_info'};
-      if (-w  $vars{'sys_info'}) {
-        info("linking info pages to $vars{'sys_info'}\n");
-        @files = `ls "$TEXDIR/texmf/doc/info"`;
-        chomp(@files);
-        `cd "$vars{'sys_info'}" && rm -f @files`;
-        `ln -s "$TEXDIR/texmf/doc/info/"*info* "$vars{'sys_info'}"`;
-      } else {
-        info("destination of info symlink $vars{'sys_info'} not writable, "
-             . "no linking of info files done.\n");
-      }
-      # man files
-      mkdirhier $vars{'sys_man'};
-      if (-w  $vars{'sys_man'}) {
-        info("linking man pages to $vars{'sys_man'}\n");
-        my $foo = `(cd "$TEXDIR/texmf/doc/man" && echo *)`;
-        my @mans = split ' ', $foo;
-        chomp(@mans);
-        foreach my $m (@mans) {
-          my $mandir = "$TEXDIR/texmf/doc/man/$m";
-          next unless -d $mandir;
-          mkdirhier "$vars{'sys_man'}/$m";
-          next unless -w "$vars{'sys_man'}/$m";
-          @files = `ls "$mandir"`;
-          chomp(@files);
-          `cd "$vars{'sys_man'}/$m" && rm -f @files`;
-          `ln -s "$mandir/"* "$vars{'sys_man'}/$m"`;
-        }
-      } else {
-        info("destination of man symlink $vars{'sys_man'} not writable, "
-             . "no linking of man files done.\n");
-      }
-    }
-  }
-}
-
-
-# we have to adjust the texmf.cnf file to the paths set in the configuration!
-sub do_texmf_cnf {
-  open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
-      or die "$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!";
-  my @texmfcnflines = <TMF>;
-  close(TMF);
-  my @newtmf;
-  my @changedtmf;
-  # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME
-  foreach my $line (@texmfcnflines) {
-    if ($line =~ m/^TEXMFLOCAL/) {
-      # by default TEXMFLOCAL = TEXDIR/../texmf-local, if this is the case
-      # we don't have to change anything from the default
-      my $deftmlocal = dirname($vars{'TEXDIR'});
-      $deftmlocal .= "/texmf-local";
-      if ("$vars{'TEXMFLOCAL'}" eq "$deftmlocal") {
-        push @newtmf, $line;
-      } else {
-        push @newtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
-        push @changedtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
-      }
-    } elsif ($line =~ m/^TEXMFSYSVAR/) {
-      # by default TEXMFSYSVAR = TEXDIR/texmf-var, if this is the case
-      # we don't have to change anything from the default
-      if ("$vars{'TEXMFSYSVAR'}" eq "$vars{'TEXDIR'}/texmf-var") {
-        push @newtmf, $line;
-      } else {
-        push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
-        push @changedtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
-      }
-    } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
-      # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
-      # we don't have to change anything from the default
-      if ("$vars{'TEXMFSYSCONFIG'}" eq "$vars{'TEXDIR'}/texmf-config") {
-        push @newtmf, $line;
-      } else {
-        push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
-        push @changedtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
-      }
-    } elsif ($line =~ m/^TEXMFHOME/) {
-      # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
-      # unix differently
-      push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
-      if ("$vars{'TEXMFHOME'}" ne "~/texmf") {
-        push @changedtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
-      }
-    } elsif ($line =~ m/^OSFONTDIR/) {
-      if (win32()) {
-        push @newtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
-        push @changedtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
-      } else {
-        push @newtmf, $line;
-      }
-    } else {
-      push @newtmf, $line;
-    }
-  }
-  my $TMF;
-  if (!$vars{'from_dvd'}) {
-    $TMF = ">$vars{'TEXDIR'}/texmf.cnf";
-    open(TMF, $TMF) || die "open($TMF) failed: $!";
-    print TMF <<EOF;
-% This texmf.cnf file should contain only your personal changes from the
-% main texmf.cnf.
-%
-% Do NOT change values in the main file (which is in
-% .../texlive/YYYY/texmf/web2c/texmf.cnf), as YOUR CHANGES WILL BE LOST
-% by later updates.
-%
-% If you need to make changes to texmf.cnf, put your custom settings in
-% this file instead, which is YYYY/texmf.cnf.  And insert *only* your
-% changed values.
-%
-EOF
-;
-    foreach (@changedtmf) { print TMF; }
-  } else {
-    $TMF = ">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf";
-    open (TMF, $TMF) || die "open($TMF) failed: $!\n";
-    foreach (@newtmf) { print TMF; }
-  }
-  close(TMF) || warn "close($TMF) failed: $!";
-}
-
 # do everything to select a scheme
 #
 sub select_scheme {
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
--- texmf/scripts/texlive/tlmgr.pl	(revision 12171)
+++ texmf/scripts/texlive/tlmgr.pl	(working copy)
@@ -557,6 +557,9 @@
       info("running post remove action for $pkg\n");
       &{$PostRemove{$pkg}}($localtlpdb->root);
     }
+    #
+    # Run the post installation code in the postaction tlpsrc entries
+    &TeXLive::TLUtils::do_postaction_code("remove", $tlp);
   }
   return \%ret;
 }
Index: texmf/scripts/texlive/uninstall-win32.pl
===================================================================
--- texmf/scripts/texlive/uninstall-win32.pl	(revision 12171)
+++ texmf/scripts/texlive/uninstall-win32.pl	(working copy)
@@ -17,6 +17,11 @@
 }
 
 use TeXLive::TLWinGoo;
+use TeXLive::TLPDB;
+use TeXLive::TLPOBJ;
+use TeXLive::TLPostActions;
+use TeXLive::TLConfig;
+use TeXLive::TLUtils;
 use Tk;
 use Tk::Dialog;
 
@@ -39,6 +44,23 @@
 $cancel->pack(-side => 'left' , -padx => "3m");
 
 sub doit {
+  # first we remove the whole bunch of shortcuts and menu entries
+  # by calling all the post action codes for the installed packages
+  my $localtlpdb = TeXLive::TLPDB->new ("root" => $Master);
+  if (!defined($localtlpdb)) {
+    tlwarn("Cannot load the TLPDB from $Master, are you sure there is an installation?\n");
+  } else {
+    for my $pkg ($localtlpdb->list_packages) {
+      if (defined($PostRemove{$pkg})) {
+        info("running post remove action for $pkg\n");
+        &{$PostRemove{$pkg}}($Master);
+      }
+    }
+    &TeXLive::TLUtils::do_postaction_code("remove", $pkg);
+  }
+  my $menupath = &TeXLive::TLWinGoo::menu_path();
+  $menupath =~ s!/!\\!g;
+  `rmdir /s /q "$menupath\\$TeXLive::TLConfig::WindowsMainMenuName" 2>nul`;
   remove_texbindirs_from_path();
   unsetenv_reg("TEXBINDIR");
   # from_dvd case: