diff options
| author | hrs <hrs@FreeBSD.org> | 2007-09-02 21:52:03 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2007-09-02 21:52:03 +0800 |
| commit | 27172227d110db6395c8c2cf7da2c47767bec262 (patch) | |
| tree | f3b63d584df2453c477e8c1c36e64d9a7b51f1f2 | |
| parent | a5abef9d7aa2738997a092052f099474020cc1ab (diff) | |
| download | freebsd-ports-gnome-27172227d110db6395c8c2cf7da2c47767bec262.tar.gz freebsd-ports-gnome-27172227d110db6395c8c2cf7da2c47767bec262.tar.zst freebsd-ports-gnome-27172227d110db6395c8c2cf7da2c47767bec262.zip | |
- Reduce dependencies[1].
- Add WITHOUT_X11 knob support; necessary for fixing WITHOUT_X11
support of textproc/docproj [2].
- Some style fixes.
PR: ports/115509 [1]
Reported by: brian[2]
| -rw-r--r-- | x11-fonts/p5-type1inst/Makefile | 15 | ||||
| -rw-r--r-- | x11-fonts/p5-type1inst/files/patch-type1inst | 11 | ||||
| -rw-r--r-- | x11-fonts/p5-type1inst/pkg-plist | 4 |
3 files changed, 19 insertions, 11 deletions
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile index 1f3cc9b0167b..8277ab8114a6 100644 --- a/x11-fonts/p5-type1inst/Makefile +++ b/x11-fonts/p5-type1inst/Makefile @@ -7,7 +7,7 @@ PORTNAME= type1inst PORTVERSION= 0.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts perl5 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR=X11/xutils @@ -16,21 +16,24 @@ PKGNAMEPREFIX= p5- MAINTAINER= hrs@FreeBSD.org COMMENT= A script that helps install Postscript fonts in X Window System -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +.if !defined(WITHOUT_X11) +RUN_DEPENDS= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +.endif USE_PERL5= yes -USE_XLIB= yes NO_BUILD= yes +PORTDOCS= README +PLIST_FILES= bin/t1embed bin/type1inst MAN1= type1inst.1 do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin + @cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1 .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README.type1inst + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-fonts/p5-type1inst/files/patch-type1inst b/x11-fonts/p5-type1inst/files/patch-type1inst index 7691d1a08389..a1e977454788 100644 --- a/x11-fonts/p5-type1inst/files/patch-type1inst +++ b/x11-fonts/p5-type1inst/files/patch-type1inst @@ -1,5 +1,5 @@ --- type1inst.orig Wed Feb 11 20:00:13 1998 -+++ type1inst Mon Jun 14 16:44:27 2004 ++++ type1inst Tue Jun 26 00:53:33 2007 @@ -78,15 +78,18 @@ @foundries = ( "Adobe:adobe", @@ -131,3 +131,12 @@ system("gunzip -c $filename > foo"); ($x, $gs) = &process_font("foo"); system("rm foo"); +@@ -1248,7 +1261,7 @@ + + if ($dox) { + &write_fonts_scale(%fs); +- system("mkfontdir"); # Generate fonts.dir ++ (system("mkfontdir") == 0) or system("echo 0 > fonts.dir"); + system("chmod 0755 fonts.dir") && log_msg("Couldn't chmod \"fonts.dir\" ... continuing on anyway\n"); + } + if ($dogs) { diff --git a/x11-fonts/p5-type1inst/pkg-plist b/x11-fonts/p5-type1inst/pkg-plist deleted file mode 100644 index 745eb414a7a0..000000000000 --- a/x11-fonts/p5-type1inst/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/t1embed -bin/type1inst -%%PORTDOCS%%%%DOCSDIR%%/README.type1inst -%%PORTDOCS%%@dirrm %%DOCSDIR%% |