Updated the foundries. Especially for print/gsfont (See also PR #54647)

Submitted by:	"Pedro F. Giffuni" <giffunip@yahoo.com> (former maintainer)

1 files changed, 107 insertions, 0 deletions

diff --git a/x11-fonts/p5-type1inst/files/patch-type1inst b/x11-fonts/p5-type1inst/files/patch-type1inst
new file mode 100644
index 000000000000..253ab2ddc880
--- /dev/null
+++ b/x11-fonts/p5-type1inst/files/patch-type1inst
@@ -0,0 +1,107 @@
+--- type1inst.orig	Thu Jul 24 13:53:19 2003
++++ type1inst	Sat Jul 26 14:51:56 2003
+@@ -83,10 +83,12 @@
+ 	      "Bigelow & Holmes:b&h",
+ 	      "Bitstream:bitstream",
+ 	      "Corel Corporation:corel",
++	      "Swfte International:expert",
+ 	      "International Typeface Corporation:itc",
+ 	      "IBM:ibm",
+ 	      "LETRASET:letraset",
+ 	      "Monotype Corporation:monotype",
++	      "Star Division GmbH:star",
+ 	      "SoftMaker:softmaker",
+ 	      "URW:urw",
+ 	      "Jonathan Brecher:brecher",
+@@ -103,6 +105,7 @@
+ 	      "Reasonable Solutions:reasonable",
+ 	      "Southern Software:southern",
+ 	      "Title Wave:titlewave",
++	      "Wolfram Research:wri",
+ 	      "ZSoft:zsoft",
+ 	      "Digiteyes Multimedia:digiteyes",
+ 	      "MWSoft:mwsoft",
+@@ -110,7 +113,8 @@
+ 	      "Three Islands Press:3ip",
+ 	      "Hank Gillette:gillette",
+ 	      "Doug Miles:miles",
+-	      "Richard Mitchell:mitchell");
++	      "Richard Mitchell:mitchell",
++	      "Porchez Typofonderie:ptf");
+ 
+ # Note: Hershey is the public Hershey fonts which come with Ghostscript.
+ # These cause no end of problems since they look inside like funny PS
+@@ -337,7 +341,7 @@
+       # I think that we should accept the manufacturers classification.
+       # Try to extract this from FontName only if it's missing.
+       # (It shouldn't. There are other reasons why this won't work, though.)
+-      if (/\/FamilyName\s*\((.+)\)\s+readonly\s+def\s*/) {
++      if (/\/FamilyName\s*\((.+)\)\s*readonly\s+def\s*/) {
+ 	  $familyname = $1;
+ 
+ 	  # Convert to lower case (because case is insignificant).
+@@ -348,7 +352,7 @@
+       # a little cluttered, though. Perhaps it would be better to map it
+       # to standard strings like you do. It's named $weight_add because
+       # you already used $weight...
+-      if (/\/Weight\s*\((.+)\)\s+readonly\s+def\s*/) {
++      if (/\/Weight\s*\((.+)\)\s*readonly\s+def\s*/) {
+ 	  $weight_add = $1;
+ 
+ 	  # Convert to lower case. Spaces are acceptable according to XLFD?
+@@ -374,7 +378,7 @@
+       }
+       # FullName might contain useful information in determining
+       # the properties of a font.
+-      if (/\/FullName\s*\((.+)\)\s+readonly\s+def\s*/) {
++      if (/\/FullName\s*\((.+)\)\s*readonly\s+def\s*/) {
+ 	  $fullname = $1;
+ 
+ 	  # Convert to lower case
+@@ -385,7 +389,7 @@
+       }
+       # Note : some fonts have a suspect /FontName declaration where there
+       # is no space between /FontName and the name of the font itself....
+-      if (/\/FontName\s*[\/\(]([^\)]+)\)?\s+def\s*/) {
++      if (/\/FontName\s*[\/\(]([^\)]+)\)?\s*def\s*/) {
+ 	  $fontname = $1;
+ 
+ 	  # Remove any embedded spaces
+@@ -515,8 +519,8 @@
+       if (/\/BlendAxisTypes\s+\[([^\]]+)\]\s*def/) {
+ 	  $axis = $1;
+ 	  # Remove axises we don't need
+-	  $axis =~ s/\/Weight\s+//;
+-	  $axis =~ s/\/Width\s+//;
++	  $axis =~ s/\/Weight\s*//;
++	  $axis =~ s/\/Width\s*//;
+ 	  # Are there still some axises left?
+ 	  if ($axis =~ /\//) {
+ 	      # Remove trailing spaces
+@@ -784,7 +788,7 @@
+     log_only_msg("Reading Fontmap ....\n");
+ 
+     while (<FONTMAP>) {
+-	if (/\/+(\S+)\s+\((.*)\)\s+;\s+/) {
++	if (/\/+(\S+)\s*\((.*)\)\s*;\s*/) {
+ 	    chop;
+ 	    $fontname = $1;
+ 	    $filename = $2;
+@@ -1183,10 +1187,17 @@
+     }
+ }
+ 
++sub have_pfbtops_or_die
++{
++	system "type pfbtops >/dev/null" or return;
++	die "Can't find pfbtops. Try installing groff.\n";
++}
++
+ # Process binary PS fonts
+ foreach $filename (do_glob("pfa.gz")) {
+     if (($dox && (! $fs{$filename})) ||
+ 	(($dogs || $samples) && (! $fm{$filename}))) {
++	have_pfbtops_or_die();
+ 	system("gunzip -c $filename > foo");
+ 	($x, $gs) = &process_font("foo");
+ 	system("rm foo");