pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/xpkgwedge Let xpkgwedge to create a symlink $...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68f62dfb031e
branches:  trunk
changeset: 476568:68f62dfb031e
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 15 02:27:10 2004 +0000

description:
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:

 pkgtools/xpkgwedge/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 2a2eee033759 -r 68f62dfb031e pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Tue Jun 15 00:26:07 2004 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Tue Jun 15 02:27:10 2004 +0000
@@ -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 @@
 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 @@
 # 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}



Home | Main Index | Thread Index | Old Index