XFree86 meta-package can be now installed with or without xpkgwedge,

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

2 files changed, 108 insertions, 108 deletions

diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index 2272e4f01c8..b34aea8ea6c 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/29 06:21:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/02 14:19:02 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsScalable-${XF_VER}
-WRKSRC=		${WRKDIR}/xc/fonts
+PKGREVISION=	1
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 DISTFILES=	X430src-4.tgz X430src-5.tgz
@@ -13,28 +13,30 @@ COMMENT=	XFree86 scalable fonts
 
 DEPENDS+=	XFree86-fontsEncodings>=4.3.0:../../fonts/XFree86-fontsEncodings
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		yes
 NO_XFREE86_TARGETS=	# defined
+WRKSRC=			${WRKDIR}/xc/fonts
 
 FILESDIR=	${.CURDIR}/../../fonts/XFree86-fontsEncodings/files
 
 do-configure:
 	@${SED} \
-		-e "s|@PREFIX@|${X11PREFIX}|g" \
+		-e "s|@PREFIX@|${X11ROOT}|g" \
 		-e "s|@MAKE@|${MAKE_PROGRAM}|g" \
 		-e "s|@IMAKE@|${IMAKE}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/host.def
-	@${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/encodings
-	@${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/encodings/large
+.for f in encodings encodings/large scaled
+	@${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/${f}
+.endfor
 	(cd ${WRKSRC}/encodings && \
-	${IMAKE} -DUseInstalled -I${PREFIX}/lib/X11/config \
+	${IMAKE} -DUseInstalled -I${X11ROOT}/lib/X11/config \
 		-DTOPDIR=../.. -DCURDIR=.; \
 	${MAKE} Makefiles ; \
 	${MAKE} includes ; \
 	${MAKE} depend)
 
 	(cd ${WRKSRC} && \
-	${IMAKE} -DUseInstalled -I${PREFIX}/lib/X11/config \
+	${IMAKE} -DUseInstalled -I${X11ROOT}/lib/X11/config \
 		-DTOPDIR=../.. -DCURDIR=.; \
 	${MAKE} Makefiles ; \
 	${MAKE} includes ; \
@@ -44,16 +46,14 @@ pre-build:
 	@for dir in Type1 TTF ; do \
 		${MV} ${WRKSRC}/scaled/$${dir}/Makefile \
 			${WRKSRC}/scaled/$${dir}/Makefile.orig && \
-		${SED} -e 's|$$(BINDIR)/fc-cache|${LOCALBASE}/bin/fc-cache|' \
+		${SED} -e 's|$$(BINDIR)/fc-cache|${PREFIX}/bin/fc-cache|' \
 			${WRKSRC}/scaled/$${dir}/Makefile.orig \
 			> ${WRKSRC}/scaled/$${dir}/Makefile ; \
 	done
-	cd ${WRKSRC}/encodings && \
-		${MAKE} all
+	cd ${WRKSRC}/encodings && ${MAKE} all
 
 pre-install:
-	${LN} -sf ${WRKDIR}/xc/fonts ${WRKDIR}/fonts
+	@${LN} -sf ${WRKDIR}/xc/fonts ${WRKDIR}/fonts
 
 .include "../../meta-pkgs/XFree86/Makefile.common"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fontsScalable/PLIST b/fonts/XFree86-fontsScalable/PLIST
index c007a4ce598..ea6bf0f1ce7 100644
--- a/fonts/XFree86-fontsScalable/PLIST
+++ b/fonts/XFree86-fontsScalable/PLIST
@@ -1,95 +1,95 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/24 08:59:39 xtraeme Exp $
-lib/X11/fonts/CID/fonts.dir
-lib/X11/fonts/CID/fonts.scale
-lib/X11/fonts/Speedo/encodings.dir
-lib/X11/fonts/Speedo/font0419.spd
-lib/X11/fonts/Speedo/font0582.spd
-lib/X11/fonts/Speedo/font0583.spd
-lib/X11/fonts/Speedo/font0611.spd
-lib/X11/fonts/Speedo/font0648.spd
-lib/X11/fonts/Speedo/font0649.spd
-lib/X11/fonts/Speedo/font0709.spd
-lib/X11/fonts/Speedo/font0710.spd
-lib/X11/fonts/Speedo/fonts.dir
-lib/X11/fonts/Speedo/fonts.scale
-lib/X11/fonts/TTF/encodings.dir
-lib/X11/fonts/TTF/fonts.cache-1
-lib/X11/fonts/TTF/fonts.dir
-lib/X11/fonts/TTF/fonts.scale
-lib/X11/fonts/TTF/luximb.ttf
-lib/X11/fonts/TTF/luximbi.ttf
-lib/X11/fonts/TTF/luximr.ttf
-lib/X11/fonts/TTF/luximri.ttf
-lib/X11/fonts/TTF/luxirb.ttf
-lib/X11/fonts/TTF/luxirbi.ttf
-lib/X11/fonts/TTF/luxirr.ttf
-lib/X11/fonts/TTF/luxirri.ttf
-lib/X11/fonts/TTF/luxisb.ttf
-lib/X11/fonts/TTF/luxisbi.ttf
-lib/X11/fonts/TTF/luxisr.ttf
-lib/X11/fonts/TTF/luxisri.ttf
-lib/X11/fonts/Type1/UTBI____.afm
-lib/X11/fonts/Type1/UTBI____.pfa
-lib/X11/fonts/Type1/UTB_____.afm
-lib/X11/fonts/Type1/UTB_____.pfa
-lib/X11/fonts/Type1/UTI_____.afm
-lib/X11/fonts/Type1/UTI_____.pfa
-lib/X11/fonts/Type1/UTRG____.afm
-lib/X11/fonts/Type1/UTRG____.pfa
-lib/X11/fonts/Type1/c0419bt_.afm
-lib/X11/fonts/Type1/c0419bt_.pfb
-lib/X11/fonts/Type1/c0582bt_.afm
-lib/X11/fonts/Type1/c0582bt_.pfb
-lib/X11/fonts/Type1/c0583bt_.afm
-lib/X11/fonts/Type1/c0583bt_.pfb
-lib/X11/fonts/Type1/c0611bt_.afm
-lib/X11/fonts/Type1/c0611bt_.pfb
-lib/X11/fonts/Type1/c0632bt_.afm
-lib/X11/fonts/Type1/c0632bt_.pfb
-lib/X11/fonts/Type1/c0633bt_.afm
-lib/X11/fonts/Type1/c0633bt_.pfb
-lib/X11/fonts/Type1/c0648bt_.afm
-lib/X11/fonts/Type1/c0648bt_.pfb
-lib/X11/fonts/Type1/c0649bt_.afm
-lib/X11/fonts/Type1/c0649bt_.pfb
-lib/X11/fonts/Type1/cour.afm
-lib/X11/fonts/Type1/cour.pfa
-lib/X11/fonts/Type1/courb.afm
-lib/X11/fonts/Type1/courb.pfa
-lib/X11/fonts/Type1/courbi.afm
-lib/X11/fonts/Type1/courbi.pfa
-lib/X11/fonts/Type1/couri.afm
-lib/X11/fonts/Type1/couri.pfa
-lib/X11/fonts/Type1/cursor.pfa
-lib/X11/fonts/Type1/encodings.dir
-lib/X11/fonts/Type1/fonts.cache-1
-lib/X11/fonts/Type1/fonts.dir
-lib/X11/fonts/Type1/fonts.scale
-lib/X11/fonts/Type1/l047013t.afm
-lib/X11/fonts/Type1/l047013t.pfa
-lib/X11/fonts/Type1/l047016t.afm
-lib/X11/fonts/Type1/l047016t.pfa
-lib/X11/fonts/Type1/l047033t.afm
-lib/X11/fonts/Type1/l047033t.pfa
-lib/X11/fonts/Type1/l047036t.afm
-lib/X11/fonts/Type1/l047036t.pfa
-lib/X11/fonts/Type1/l048013t.afm
-lib/X11/fonts/Type1/l048013t.pfa
-lib/X11/fonts/Type1/l048016t.afm
-lib/X11/fonts/Type1/l048016t.pfa
-lib/X11/fonts/Type1/l048033t.afm
-lib/X11/fonts/Type1/l048033t.pfa
-lib/X11/fonts/Type1/l048036t.afm
-lib/X11/fonts/Type1/l048036t.pfa
-lib/X11/fonts/Type1/l049013t.afm
-lib/X11/fonts/Type1/l049013t.pfa
-lib/X11/fonts/Type1/l049016t.afm
-lib/X11/fonts/Type1/l049016t.pfa
-lib/X11/fonts/Type1/l049033t.afm
-lib/X11/fonts/Type1/l049033t.pfa
-lib/X11/fonts/Type1/l049036t.afm
-lib/X11/fonts/Type1/l049036t.pfa
-@dirrm lib/X11/fonts/Type1
-@dirrm lib/X11/fonts/TTF
-@dirrm lib/X11/fonts/Speedo
-@dirrm lib/X11/fonts/CID
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:19:02 xtraeme Exp $
+X11R6/lib/X11/fonts/CID/fonts.dir
+X11R6/lib/X11/fonts/CID/fonts.scale
+X11R6/lib/X11/fonts/Speedo/encodings.dir
+X11R6/lib/X11/fonts/Speedo/font0419.spd
+X11R6/lib/X11/fonts/Speedo/font0582.spd
+X11R6/lib/X11/fonts/Speedo/font0583.spd
+X11R6/lib/X11/fonts/Speedo/font0611.spd
+X11R6/lib/X11/fonts/Speedo/font0648.spd
+X11R6/lib/X11/fonts/Speedo/font0649.spd
+X11R6/lib/X11/fonts/Speedo/font0709.spd
+X11R6/lib/X11/fonts/Speedo/font0710.spd
+X11R6/lib/X11/fonts/Speedo/fonts.dir
+X11R6/lib/X11/fonts/Speedo/fonts.scale
+X11R6/lib/X11/fonts/TTF/encodings.dir
+X11R6/lib/X11/fonts/TTF/fonts.cache-1
+X11R6/lib/X11/fonts/TTF/fonts.dir
+X11R6/lib/X11/fonts/TTF/fonts.scale
+X11R6/lib/X11/fonts/TTF/luximb.ttf
+X11R6/lib/X11/fonts/TTF/luximbi.ttf
+X11R6/lib/X11/fonts/TTF/luximr.ttf
+X11R6/lib/X11/fonts/TTF/luximri.ttf
+X11R6/lib/X11/fonts/TTF/luxirb.ttf
+X11R6/lib/X11/fonts/TTF/luxirbi.ttf
+X11R6/lib/X11/fonts/TTF/luxirr.ttf
+X11R6/lib/X11/fonts/TTF/luxirri.ttf
+X11R6/lib/X11/fonts/TTF/luxisb.ttf
+X11R6/lib/X11/fonts/TTF/luxisbi.ttf
+X11R6/lib/X11/fonts/TTF/luxisr.ttf
+X11R6/lib/X11/fonts/TTF/luxisri.ttf
+X11R6/lib/X11/fonts/Type1/UTBI____.afm
+X11R6/lib/X11/fonts/Type1/UTBI____.pfa
+X11R6/lib/X11/fonts/Type1/UTB_____.afm
+X11R6/lib/X11/fonts/Type1/UTB_____.pfa
+X11R6/lib/X11/fonts/Type1/UTI_____.afm
+X11R6/lib/X11/fonts/Type1/UTI_____.pfa
+X11R6/lib/X11/fonts/Type1/UTRG____.afm
+X11R6/lib/X11/fonts/Type1/UTRG____.pfa
+X11R6/lib/X11/fonts/Type1/c0419bt_.afm
+X11R6/lib/X11/fonts/Type1/c0419bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0582bt_.afm
+X11R6/lib/X11/fonts/Type1/c0582bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0583bt_.afm
+X11R6/lib/X11/fonts/Type1/c0583bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0611bt_.afm
+X11R6/lib/X11/fonts/Type1/c0611bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0632bt_.afm
+X11R6/lib/X11/fonts/Type1/c0632bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0633bt_.afm
+X11R6/lib/X11/fonts/Type1/c0633bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0648bt_.afm
+X11R6/lib/X11/fonts/Type1/c0648bt_.pfb
+X11R6/lib/X11/fonts/Type1/c0649bt_.afm
+X11R6/lib/X11/fonts/Type1/c0649bt_.pfb
+X11R6/lib/X11/fonts/Type1/cour.afm
+X11R6/lib/X11/fonts/Type1/cour.pfa
+X11R6/lib/X11/fonts/Type1/courb.afm
+X11R6/lib/X11/fonts/Type1/courb.pfa
+X11R6/lib/X11/fonts/Type1/courbi.afm
+X11R6/lib/X11/fonts/Type1/courbi.pfa
+X11R6/lib/X11/fonts/Type1/couri.afm
+X11R6/lib/X11/fonts/Type1/couri.pfa
+X11R6/lib/X11/fonts/Type1/cursor.pfa
+X11R6/lib/X11/fonts/Type1/encodings.dir
+X11R6/lib/X11/fonts/Type1/fonts.cache-1
+X11R6/lib/X11/fonts/Type1/fonts.dir
+X11R6/lib/X11/fonts/Type1/fonts.scale
+X11R6/lib/X11/fonts/Type1/l047013t.afm
+X11R6/lib/X11/fonts/Type1/l047013t.pfa
+X11R6/lib/X11/fonts/Type1/l047016t.afm
+X11R6/lib/X11/fonts/Type1/l047016t.pfa
+X11R6/lib/X11/fonts/Type1/l047033t.afm
+X11R6/lib/X11/fonts/Type1/l047033t.pfa
+X11R6/lib/X11/fonts/Type1/l047036t.afm
+X11R6/lib/X11/fonts/Type1/l047036t.pfa
+X11R6/lib/X11/fonts/Type1/l048013t.afm
+X11R6/lib/X11/fonts/Type1/l048013t.pfa
+X11R6/lib/X11/fonts/Type1/l048016t.afm
+X11R6/lib/X11/fonts/Type1/l048016t.pfa
+X11R6/lib/X11/fonts/Type1/l048033t.afm
+X11R6/lib/X11/fonts/Type1/l048033t.pfa
+X11R6/lib/X11/fonts/Type1/l048036t.afm
+X11R6/lib/X11/fonts/Type1/l048036t.pfa
+X11R6/lib/X11/fonts/Type1/l049013t.afm
+X11R6/lib/X11/fonts/Type1/l049013t.pfa
+X11R6/lib/X11/fonts/Type1/l049016t.afm
+X11R6/lib/X11/fonts/Type1/l049016t.pfa
+X11R6/lib/X11/fonts/Type1/l049033t.afm
+X11R6/lib/X11/fonts/Type1/l049033t.pfa
+X11R6/lib/X11/fonts/Type1/l049036t.afm
+X11R6/lib/X11/fonts/Type1/l049036t.pfa
+@dirrm X11R6/lib/X11/fonts/Type1
+@dirrm X11R6/lib/X11/fonts/TTF
+@dirrm X11R6/lib/X11/fonts/Speedo
+@dirrm X11R6/lib/X11/fonts/CID