diff options
| author | minskim <minskim@pkgsrc.org> | 2004-06-15 02:27:10 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-06-15 02:27:10 +0000 |
| commit | ccf85a76cd57d1840eb038b70ae9c89ad88e7690 (patch) | |
| tree | a30f32c7a4819e28aec2521dc373e1437b9f0e01 /pkgtools | |
| parent | cafa116f35eaf9d868a38141e6dbb78f76c9aee2 (diff) | |
| download | pkgsrc-ccf85a76cd57d1840eb038b70ae9c89ad88e7690.tar.gz | |
Let xpkgwedge to create a symlink ${PREFIX}/bin/mkfontscale, which is
required to install fonts/jmk-fonts and fonts/sgi-fonts with recent X.
Suggested by Kibum Han.
Also add mkfontscale to CONFLICTS because mkfontscale installs
bin/mkfontscale.
Bump PKGVERSION to 1.11.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index ff692189592..4d5f1cb93ca 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2004/04/30 19:44:21 tv Exp $ +# $NetBSD: Makefile,v 1.51 2004/06/15 02:27:10 minskim Exp $ -DISTNAME= xpkgwedge-1.10 +DISTNAME= xpkgwedge-1.11 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty @@ -23,6 +23,10 @@ NO_CHECKSUM= # defined PKG_SKIP_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE" .endif +.if exists(${X11BASE}/bin/mkfontscale) +CONFLICTS+= mkfontscale-[0-9]* +.endif + USE_X11= YES USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL @@ -32,7 +36,7 @@ INSTALLATION_DIRS= bin lib/X11/config # FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow # ${PREFIX}/bin/${prog} to always work. # -FONT_PROGS= bdftopcf fstobdf mkfontdir +FONT_PROGS= bdftopcf fstobdf mkfontdir mkfontscale FILES_SUBST+= VIEWBASE=${VIEWBASE} FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} |