diff options
| author | hrs <hrs@FreeBSD.org> | 2004-07-25 23:10:24 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2004-07-25 23:10:24 +0800 |
| commit | fac70de59f81e181c5fce24a60d5fbb45f4ef1ad (patch) | |
| tree | 2a24c94b45442d00f8f312be8fde99876c95869e /x11-fonts | |
| parent | b7bf84588f683073c3b4a44ba01f888994da12ef (diff) | |
| download | freebsd-ports-gnome-fac70de59f81e181c5fce24a60d5fbb45f4ef1ad.tar.gz freebsd-ports-gnome-fac70de59f81e181c5fce24a60d5fbb45f4ef1ad.tar.zst freebsd-ports-gnome-fac70de59f81e181c5fce24a60d5fbb45f4ef1ad.zip | |
- Add a patch to support some Ghostscript fonts.
- Use DOCSDIR.
- Take maintainership.
Approved by: linimon (mentor)
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/p5-type1inst/Makefile | 7 | ||||
| -rw-r--r-- | x11-fonts/p5-type1inst/files/patch-type1inst | 34 | ||||
| -rw-r--r-- | x11-fonts/p5-type1inst/pkg-plist | 3 |
3 files changed, 33 insertions, 11 deletions
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile index 01596f3ba96f..5bcfef59421c 100644 --- a/x11-fonts/p5-type1inst/Makefile +++ b/x11-fonts/p5-type1inst/Makefile @@ -7,13 +7,13 @@ PORTNAME= type1inst PORTVERSION= 0.6.1 -PORTREVISON= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts perl5 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR=X11/xutils PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= A script that helps install Postscript fonts in X Window System RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} @@ -29,7 +29,8 @@ do-install: @${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1 .if !defined(NOPORTDOCS) - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.type1inst + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README.type1inst .endif .include <bsd.port.mk> diff --git a/x11-fonts/p5-type1inst/files/patch-type1inst b/x11-fonts/p5-type1inst/files/patch-type1inst index b93dba5e8965..7691d1a08389 100644 --- a/x11-fonts/p5-type1inst/files/patch-type1inst +++ b/x11-fonts/p5-type1inst/files/patch-type1inst @@ -1,5 +1,5 @@ ---- type1inst.orig Thu Jul 24 13:53:19 2003 -+++ type1inst Sat Jul 26 20:57:53 2003 +--- type1inst.orig Wed Feb 11 20:00:13 1998 ++++ type1inst Mon Jun 14 16:44:27 2004 @@ -78,15 +78,18 @@ @foundries = ( "Adobe:adobe", @@ -64,16 +64,17 @@ $fullname = $1; # Convert to lower case -@@ -385,7 +390,7 @@ +@@ -385,7 +390,8 @@ } # 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*/) { ++ if (/\/FontName\s*[\/\(]([^\)]+)\)?\s*def\s*/ ++ or ($gsfont and /^\/([^ ]+)\s+\d+\s+\[107\s+0/)) { $fontname = $1; # Remove any embedded spaces -@@ -515,8 +520,8 @@ +@@ -515,8 +521,8 @@ if (/\/BlendAxisTypes\s+\[([^\]]+)\]\s*def/) { $axis = $1; # Remove axises we don't need @@ -84,7 +85,26 @@ # Are there still some axises left? if ($axis =~ /\//) { # Remove trailing spaces -@@ -784,7 +789,7 @@ +@@ -532,12 +538,12 @@ + &try_another_way(); + # This is for .pfa and .pfb fonts + last; +- } elsif (($gsfont) && (/currentdict\s+end/)) { +- &try_another_way(); +- # This is for ghostscript .gsf fonts. Why don't all these have a +- # currentfile eexec ? +- last; +- } ++ } #elsif (($gsfont) && (/currentdict\s+end/)) { ++ # &try_another_way(); ++ # # This is for ghostscript .gsf fonts. Why don't all these have a ++ # # currentfile eexec ? ++ # last; ++ #} + } + close(IN); + +@@ -784,7 +790,7 @@ log_only_msg("Reading Fontmap ....\n"); while (<FONTMAP>) { @@ -93,7 +113,7 @@ chop; $fontname = $1; $filename = $2; -@@ -1183,10 +1188,17 @@ +@@ -1183,10 +1189,17 @@ } } diff --git a/x11-fonts/p5-type1inst/pkg-plist b/x11-fonts/p5-type1inst/pkg-plist index 59d7300541d2..745eb414a7a0 100644 --- a/x11-fonts/p5-type1inst/pkg-plist +++ b/x11-fonts/p5-type1inst/pkg-plist @@ -1,3 +1,4 @@ bin/t1embed bin/type1inst -%%PORTDOCS%%share/doc/README.type1inst +%%PORTDOCS%%%%DOCSDIR%%/README.type1inst +%%PORTDOCS%%@dirrm %%DOCSDIR%% |