- merged and updated to 4.0.2

Changed files:
    XFree86-ISO8859-2-pld.patch -> 1.3
    XFree86-fonts-ISO-8859-2.patch -> 1.2
    XFree86-fonts-ISO8859-2.patch -> 1.1

diff --git a/XFree86-ISO8859-2-pld.patch b/XFree86-ISO8859-2-pld.patch
deleted file mode 100644 (file)
index c0b4d9e..0000000
--- a/XFree86-ISO8859-2-pld.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -urN XFree86-ISO8859-2/Makefile XFree86-ISO8859-2.pld/Makefile
---- XFree86-ISO8859-2/Makefile Thu Jan  1 01:00:00 1970
-+++ XFree86-ISO8859-2.pld/Makefile     Thu May  6 22:20:46 1999
-@@ -0,0 +1,49 @@
-+FONTDIR=/usr/share/fonts/ISO8859-2
-+
-+#
-+# Select whether or not you want to compress the fonts and which compression
-+# utility to use for that
-+COMPFONTS=set
-+COMPUTIL=gzip
-+COMPFLAGS=-9f
-+
-+FONTC=bdftopcf
-+FONTCFLAGS=
-+MKFONTDIR=mkfontdir
-+MKFONTDIRFLAGS=
-+
-+FONTS=misc 75dpi 100dpi
-+
-+all: $(addsuffix .done, $(FONTS))
-+
-+%.done: %
-+      cd $< ;\
-+      for i in *.bdf ; do\
-+         $(FONTC) $(FONTCFLAGS) $$i > `basename $$i .bdf`.pcf;\
-+         if [ $(COMPFONTS) ];then\
-+            $(COMPUTIL) $(COMPFLAGS) `basename $$i .bdf`.pcf;\
-+         fi;\
-+      done;\
-+      $(MKFONTDIR) $(MKFONTDIRFLAGS);
-+
-+install: installfonts
-+
-+installfonts:
-+      for i in $(FONTS) ;do\
-+         cd $$i;\
-+         if [ -f fonts.dir ] ; then\
-+            install -d $(FONTDIR)/$$i;\
-+            install *.pcf* $(FONTDIR)/$$i;\
-+            install fonts.dir $(FONTDIR)/$$i;\
-+            install fonts.alias $(FONTDIR)/$$i;\
-+         fi;\
-+         cd ..;\
-+      done;
-+
-+clean:
-+      for i in $(FONTS) ;do\
-+         cd $$i;\
-+         rm -f *.pcf* fonts.dir;\
-+         cd ..;\
-+      done;
-+
-diff -urN XFree86-ISO8859-2/ulT1mo-beta-1.0/Makefile XFree86-ISO8859-2.pld/ulT1mo-beta-1.0/Makefile
---- XFree86-ISO8859-2/ulT1mo-beta-1.0/Makefile Thu Jan  1 01:00:00 1970
-+++ XFree86-ISO8859-2.pld/ulT1mo-beta-1.0/Makefile     Thu May  6 22:22:16 1999
-@@ -0,0 +1,24 @@
-+FONTDIR=/usr/share/fonts
-+
-+all: 
-+      for j in *.pfb ; do \
-+         mv $$j `basename $$j .pfb`-ISO-8859-2.pfb; \
-+      done; \
-+      cd afm; \
-+      for j in *.afm ; do \
-+         mv $$j `basename $$j .afm`-ISO-8859-2.afm; \
-+      done; \
-+      cd ../pfm; \
-+      for j in *.pfm ; do \
-+         mv $$j `basename $$j .pfm`-ISO-8859-2.pfm; \
-+      done;
-+
-+install:
-+      install -d $(FONTDIR)/Type1
-+      install -d $(FONTDIR)/Type1/afm
-+      install -d $(FONTDIR)/Type1/pfm
-+      install *.pfb $(FONTDIR)/Type1
-+      install afm/*.afm $(FONTDIR)/Type1/afm
-+      install pfm/*.pfm $(FONTDIR)/Type1/pfm
-+
-+

diff --git a/XFree86-fonts-ISO-8859-2.patch b/XFree86-fonts-ISO8859-2.patch
similarity index 61%
rename from XFree86-fonts-ISO-8859-2.patch
rename to XFree86-fonts-ISO8859-2.patch
index 25e1c3841d4685febd9691065222d6c13c6d5ea4..4b3f053ea93ec3311ce2de3e1a40d9c92969d39a 100644 (file)
--- a/XFree86-fonts-ISO-8859-2.patch
+++ b/XFree86-fonts-ISO8859-2.patch
@@ -1,6 +1,34 @@
-diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/100dpi/Imakefile XFree86-fonts-4.0/xc/fonts/bdf/latin2/100dpi/Imakefile
---- XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/100dpi/Imakefile        Mon May  3 17:54:33 1999
-+++ XFree86-fonts-4.0/xc/fonts/bdf/latin2/100dpi/Imakefile     Mon May  1 16:51:31 2000
+diff -urN XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile XFree86-fonts-4.0.2.new/ulT1mo-beta-1.0/Makefile
+--- XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile       Thu Jan  1 01:00:00 1970
++++ XFree86-fonts-4.0.2.new/ulT1mo-beta-1.0/Makefile   Sat Dec 23 21:20:54 2000
+@@ -0,0 +1,24 @@
++FONTDIR=/usr/share/fonts
++
++all: 
++      for j in *.pfb ; do \
++         mv $$j `basename $$j .pfb`-ISO-8859-2.pfb; \
++      done; \
++      cd afm; \
++      for j in *.afm ; do \
++         mv $$j `basename $$j .afm`-ISO-8859-2.afm; \
++      done; \
++      cd ../pfm; \
++      for j in *.pfm ; do \
++         mv $$j `basename $$j .pfm`-ISO-8859-2.pfm; \
++      done;
++
++install:
++      install -d $(FONTDIR)/Type1
++      install -d $(FONTDIR)/Type1/afm
++      install -d $(FONTDIR)/Type1/pfm
++      install *.pfb $(FONTDIR)/Type1
++      install afm/*.afm $(FONTDIR)/Type1/afm
++      install pfm/*.pfm $(FONTDIR)/Type1/pfm
++
++
+diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/100dpi/Imakefile
+--- XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile   Mon May  3 15:11:59 1999
++++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/100dpi/Imakefile       Sat Dec 23 21:17:59 2000
 @@ -4,6 +4,9 @@
        FontObj(courB18) FontObj(courB24) FontObj(courBO08) \
        FontObj(courBO10) FontObj(courBO12) FontObj(courBO14) \
@@ -79,9 +107,9 @@ diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/100dpi/Imakefile X
  
  InstallFontObjs($(OBJS1),$(FONTINSTDIR))
  InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/75dpi/Imakefile XFree86-fonts-4.0/xc/fonts/bdf/latin2/75dpi/Imakefile
---- XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/75dpi/Imakefile Mon May  3 17:54:39 1999
-+++ XFree86-fonts-4.0/xc/fonts/bdf/latin2/75dpi/Imakefile      Mon May  1 16:52:02 2000
+diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/75dpi/Imakefile
+--- XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile    Mon May  3 15:12:00 1999
++++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/75dpi/Imakefile        Sat Dec 23 21:17:59 2000
 @@ -4,6 +4,9 @@
        FontObj(courB18) FontObj(courB24) FontObj(courBO08) \
        FontObj(courBO10) FontObj(courBO12) FontObj(courBO14) \
@@ -182,57 +210,108 @@ diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/75dpi/Imakefile XF
  
  InstallFontObjs($(OBJS1),$(FONTINSTDIR))
  InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/Imakefile XFree86-fonts-4.0/xc/fonts/bdf/latin2/Imakefile
---- XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/Imakefile       Thu Apr 17 14:55:44 1997
-+++ XFree86-fonts-4.0/xc/fonts/bdf/latin2/Imakefile    Mon May  1 17:01:34 2000
-@@ -9,7 +9,7 @@
- DPI100DIR = 100dpi
- #endif
+diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/Imakefile
+--- XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile    Sat Dec 23 21:22:21 2000
++++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/Imakefile        Sat Dec 23 21:15:10 2000
+@@ -8,10 +8,10 @@
+       FontObj(cu-pua12) FontObj(cu12)
+ CLEARLYUDIR = $(TOP)/extras/fonts/ClearlyU
  
--        SUBDIRS = $(DPI75DIR) $(DPI100DIR)
-+        SUBDIRS = misc $(DPI75DIR) $(DPI100DIR)
+-OBJS = FontObj(5x7) FontObj(5x7-ISO8859-1) \
++OBJS = FontObj(5x7) FontObj(5x7-ISO8859-1) FontObj(5x7-ISO8859-2) \
+       FontObj(5x8) FontObj(5x8-ISO8859-1) \
+       FontObj(6x9) FontObj(6x9-ISO8859-1) \
+-      FontObj(6x10) FontObj(6x10-ISO8859-1) \
++      FontObj(6x10) FontObj(6x10-ISO8859-1) FontObj(6x10-ISO8859-2) \
+       FontObj(6x12) FontObj(6x12-ISO8859-1) \
+       FontObj(6x13) FontObj(6x13-ISO8859-1) FontObj(6x13-ISO8859-2) \
+       FontObj(6x13-ISO8859-3) FontObj(6x13-ISO8859-4) \
+@@ -43,6 +43,7 @@
+       FontObj(7x13O-ISO8859-13) FontObj(7x13O-ISO8859-15) \
+       FontObj(7x14) \
+       FontObj(7x14-ISO8859-1) FontObj(7x14-JISX0201.1976-0) \
++      FontObj(7x14-ISO8859-2) FontObj(7x14B-ISO8859-2) \
+       FontObj(7x14B) FontObj(7x14B-ISO8859-1) \
+       FontObj(8x13) FontObj(8x13-ISO8859-1) FontObj(8x13-ISO8859-2) \
+       FontObj(8x13-ISO8859-3) FontObj(8x13-ISO8859-4) \
+@@ -58,14 +59,14 @@
+       FontObj(8x13O-ISO8859-5) FontObj(8x13O-ISO8859-7) \
+       FontObj(8x13O-ISO8859-9) FontObj(8x13O-ISO8859-13) \
+       FontObj(8x13O-ISO8859-15) \
+-      FontObj(8x16) FontObj(8x16rk) \
+-      FontObj(9x15) FontObj(9x15-ISO8859-1) \
+-      FontObj(9x15B) FontObj(9x15B-ISO8859-1) \
++      FontObj(8x16) FontObj(8x16-ISO8859-2) FontObj(8x16rk) \
++      FontObj(9x15) FontObj(9x15-ISO8859-1) FontObj(9x15-ISO8859-2) \
++      FontObj(9x15B) FontObj(9x15B-ISO8859-1) FontObj(9x15B-ISO8859-2) \
+       FontObj(9x18) FontObj(9x18-ISO8859-1) \
+       FontObj(9x18B) FontObj(9x18B-ISO8859-1) \
+-      FontObj(10x20) FontObj(10x20-ISO8859-1) \
++      FontObj(10x20) FontObj(10x20-ISO8859-1) FontObj(10x20-ISO8859-2) \
+       FontObj(12x13ja) \
+-      FontObj(12x24) FontObj(12x24rk) \
++      FontObj(12x24) FontObj(12x24-ISO8859-2) FontObj(12x24rk) \
+       FontObj(18x18ja) FontObj(18x18ko) \
+       FontObj(cursor) FontObj(deccurs) FontObj(decsess) FontObj(olcursor) \
+       FontObj(olgl10) FontObj(olgl12) FontObj(olgl14) FontObj(olgl19) \
+@@ -88,12 +89,14 @@
+ 
+ FontTarget(5x7)
+ FontTarget(5x7-ISO8859-1)
++FontTarget(5x7-ISO8859-2)
+ FontTarget(5x8)
+ FontTarget(5x8-ISO8859-1)
+ FontTarget(6x9)
+ FontTarget(6x9-ISO8859-1)
+ FontTarget(6x10)
+ FontTarget(6x10-ISO8859-1)
++FontTarget(6x10-ISO8859-2)
+ FontTarget(6x12)
+ FontTarget(6x12-ISO8859-1)
+ FontTarget(6x13)
+@@ -156,9 +159,11 @@
+ FontTarget(7x13O-ISO8859-15)
+ FontTarget(7x14)
+ FontTarget(7x14-ISO8859-1)
++FontTarget(7x14-ISO8859-2)
+ FontTarget(7x14-JISX0201.1976-0)
+ FontTarget(7x14B)
+ FontTarget(7x14B-ISO8859-1)
++FontTarget(7x14B-ISO8859-2)
+ FontTarget(8x13)
+ FontTarget(8x13-ISO8859-1)
+ FontTarget(8x13-ISO8859-2)
+@@ -189,18 +194,23 @@
+ FontTarget(8x13O-ISO8859-13)
+ FontTarget(8x13O-ISO8859-15)
+ FontTarget(8x16)
++FontTarget(8x16-ISO8859-2)
+ FontTarget(8x16rk)
+ FontTarget(9x15)
+ FontTarget(9x15-ISO8859-1)
++FontTarget(9x15-ISO8859-2)
+ FontTarget(9x15B)
+ FontTarget(9x15B-ISO8859-1)
++FontTarget(9x15B-ISO8859-2)
+ FontTarget(9x18)
+ FontTarget(9x18-ISO8859-1)
+ FontTarget(9x18B)
+ FontTarget(9x18B-ISO8859-1)
+ FontTarget(10x20)
+ FontTarget(10x20-ISO8859-1)
++FontTarget(10x20-ISO8859-2)
+ FontTarget(12x24)
++FontTarget(12x24-ISO8859-2)
+ FontTarget(12x24rk)
+ FontTarget(12x13ja)
+ FontTarget(18x18ja)
+diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/fonts.alias
+--- XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias  Sun Dec 26 18:47:37 1999
++++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/fonts.alias      Sat Dec 23 21:19:40 2000
+@@ -23,6 +23,24 @@
+ 12x24        -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+ nil2         -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
  
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
-diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/Imakefile XFree86-fonts-4.0/xc/fonts/bdf/latin2/misc/Imakefile
---- XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/Imakefile  Thu Jan  1 01:00:00 1970
-+++ XFree86-fonts-4.0/xc/fonts/bdf/latin2/misc/Imakefile       Mon May  1 16:57:43 2000
-@@ -0,0 +1,31 @@
-+XCOMM $TOG: Imakefile /main/36 1998/05/20 15:10:33 kaleb $
-+XCOMM $XFree86: xc/fonts/bdf/misc/Imakefile,v 1.7 1999/12/28 15:03:02 robin Exp $
-+
-+OBJS = FontObj(5x7) FontObj(6x10) FontObj(6x13) FontObj(6x13B) \
-+      FontObj(7x13) FontObj(7x13B) FontObj(7x14) FontObj(7x14B) \
-+      FontObj(8x13) FontObj(8x13B) FontObj(8x16) FontObj(9x15) \
-+      FontObj(9x15B) FontObj(10x20) FontObj(12x24)
-+
-+FONTINSTDIR = $(FONTDIR)/latin2/misc
-+
-+MakeFonts()
-+
-+FontTarget(5x7)
-+FontTarget(6x10)
-+FontTarget(6x13)
-+FontTarget(6x13B)
-+FontTarget(7x13)
-+FontTarget(7x13B)
-+FontTarget(7x14)
-+FontTarget(7x14B)
-+FontTarget(8x13)
-+FontTarget(8x13B)
-+FontTarget(8x16)
-+FontTarget(9x15)
-+FontTarget(9x15B)
-+FontTarget(10x20)
-+FontTarget(12x24)
-+
-+InstallFonts($(FONTINSTDIR))
-+InstallFontAliases($(FONTINSTDIR))
-+InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
-diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/fonts.alias XFree86-fonts-4.0/xc/fonts/bdf/latin2/misc/fonts.alias
---- XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/fonts.alias        Thu Jan  1 01:00:00 1970
-+++ XFree86-fonts-4.0/xc/fonts/bdf/latin2/misc/fonts.alias     Mon May  1 17:00:42 2000
-@@ -0,0 +1,36 @@
 +fixedlatin2    -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +variablelatin2 -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-2
 +5x7latin2      -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
@@ -250,6 +329,14 @@ diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/fonts.alias X
 +9x15boldlatin2 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
 +10x20latin2    -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
 +12x24latin2    -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
++
+ heb6x13      -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+ heb8x13      -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+ 
+@@ -75,6 +93,25 @@
+ -sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+ -jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+ -jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
 +
 +-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-2 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
 +-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-2 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
@@ -269,3 +356,6 @@ diff -urN -x *.bdf XFree86-fonts-4.0.orig/xc/fonts/bdf/latin2/misc/fonts.alias X
 +-sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2 -biznet-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
 +-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-2 -biznet-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
 +-sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2 -biznet-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
+ 
+ ! These fonts are not really ISO8859-1, but these aliases are provided
+ ! for compatibility with X11R5.