--Signature=_Sat__12_Jun_2004_20_01_41_-0500_G9Ee/sMtYl2f=JBv
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

* Krister Walfridsson, Sat, 12 Jun 2004 01:20:47 +0200 (MEST):
> pkgsrc bulk build results
> NetBSD 2.0_BETA/i386
>
> fonts/jmk-fonts                    jwise@NetBSD.org
> fonts/sgi-fonts                    tech-pkg@NetBSD.org

These packages fail because they require mkfontscale.  It occurs only
on platforms with recent X, where imake is aware of mkfontscale.  The
following patch makes xpkgwedge create a symlink to mkfontscale in
${PREFIX}/bin (suggested by Kibum Han) and conflict with
fonts/mkfontscale.

If we apply this patch, packages depending on mkfontscale should be
modified so that they can co-exist with xpkgwedge.  Currently,
fonts/kochi-ttf is the only such package, but it doesn't seem to use
mkfontscale any more.  So I think we can just remove the dependency.
(Masao?)

Is it okay to commit?

-- 
Min Sik Kim


Index: pkgtools/xpkgwedge/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/xpkgwedge/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- pkgtools/xpkgwedge/Makefile	30 Apr 2004 19:44:21 -0000	1.50
+++ pkgtools/xpkgwedge/Makefile	12 Jun 2004 18:25:32 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.50 2004/04/30 19:44:21 tv 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}
Index: fonts/mkfontscale/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/mkfontscale/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- fonts/mkfontscale/Makefile	11 Apr 2004 17:18:30 -0000	1.13
+++ fonts/mkfontscale/Makefile	12 Jun 2004 18:25:32 -0000
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	mkfontscale-20020524
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.pps.jussieu.fr/~jch/software/files/
 
@@ -20,4 +20,8 @@
 PKG_FAIL_REASON= "Needs the fontenc.h header file, which comes with newer XFree versions."
 .endif
 
+.if exists(${X11BASE}/bin/mkfontscale)
+CONFLICTS+=	xpkgwedge>=1.11
+.endif
+
 .include "../../mk/bsd.pkg.mk"

--Signature=_Sat__12_Jun_2004_20_01_41_-0500_G9Ee/sMtYl2f=JBv
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (NetBSD)

iQEVAwUBQMundfQsKR/Zi7L+AQKpLAf+PpgE/8QAmL0aB6H1/TtvGoxAFC1oLcz5
IvUM3aFH953+pUJLjBOnk/NhnniVy3iCthEdVQjzUgByfPjjdptD4xXm4WIZqzjX
Tlt9Ji4bah4L8vsHOrsv0FEig8dBIvOt1HRFKr3/xRcZPMT5Zy+w3cxfMIwCVMda
JGJ2aJ83/1wDDW3LpqL1twe8wBQJBbSschJoEmMgkBo/EPE43GGPCycGAF4ZCeEy
tO7XcgcnrhbmwX0RgJYKBWyM5860GZ5p+6bdyQvDQpd3jCkyS3OSYCpZEIA3lcBA
CdRl+5OPdKy5JnZwYpDvYpahzhHCNhbzIKtdfijkYl/fpf0XAOBz6Q==
=qnej
-----END PGP SIGNATURE-----

--Signature=_Sat__12_Jun_2004_20_01_41_-0500_G9Ee/sMtYl2f=JBv--