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

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

2 files changed, 48 insertions, 48 deletions

diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile
index 4641c5593a3..59bdf45284c 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/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=	X430src-4
 PKGNAME=	XFree86-fontsEncodings-${XF_VER}
-WRKSRC=		${WRKDIR}/xc/fonts/encodings
+PKGREVISION=	1
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 EXTRACT_SUFX=	.tgz
@@ -15,22 +15,22 @@ DEPENDS=	XFree86-clients>=4.3.0:../../x11/XFree86-clients
 
 USE_BUILDLINK2=		yes
 NO_XFREE86_TARGETS=	# defined
+WRKSRC=			${WRKDIR}/xc/fonts/encodings
 
 post-extract:
 	@${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
 
 do-configure:
 	(cd ${WRKSRC} && \
-	${IMAKE} -DUseInstalled -I${PREFIX}/lib/X11/config \
+	${IMAKE} -DUseInstalled -I${X11ROOT}/lib/X11/config \
 		-DTOPDIR=../../.. -DCURDIR=.; \
 	${MAKE} Makefiles ; \
 	${MAKE} includes ; \
 	${MAKE} depend)
 
 .include "../../meta-pkgs/XFree86/Makefile.common"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fontsEncodings/PLIST b/fonts/XFree86-fontsEncodings/PLIST
index 669d1b4b442..f6a1629761b 100644
--- a/fonts/XFree86-fontsEncodings/PLIST
+++ b/fonts/XFree86-fontsEncodings/PLIST
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/24 08:57:34 xtraeme Exp $
-lib/X11/fonts/encodings/adobe-dingbats.enc.gz
-lib/X11/fonts/encodings/adobe-standard.enc.gz
-lib/X11/fonts/encodings/adobe-symbol.enc.gz
-lib/X11/fonts/encodings/armscii-8.enc
-lib/X11/fonts/encodings/dec-special.enc
-lib/X11/fonts/encodings/encodings.dir
-lib/X11/fonts/encodings/ibm-cp437.enc
-lib/X11/fonts/encodings/ibm-cp850.enc
-lib/X11/fonts/encodings/ibm-cp852.enc
-lib/X11/fonts/encodings/ibm-cp866.enc
-lib/X11/fonts/encodings/iso8859-11.enc
-lib/X11/fonts/encodings/iso8859-13.enc
-lib/X11/fonts/encodings/iso8859-16.enc
-lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
-lib/X11/fonts/encodings/large/encodings.dir
-lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
-lib/X11/fonts/encodings/large/gbk-0.enc.gz
-lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
-lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
-lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
-lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
-lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
-lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
-lib/X11/fonts/encodings/microsoft-cp1250.enc
-lib/X11/fonts/encodings/microsoft-cp1251.enc
-lib/X11/fonts/encodings/microsoft-cp1252.enc
-lib/X11/fonts/encodings/microsoft-cp1253.enc
-lib/X11/fonts/encodings/microsoft-cp1254.enc
-lib/X11/fonts/encodings/microsoft-cp1255.enc
-lib/X11/fonts/encodings/microsoft-cp1256.enc
-lib/X11/fonts/encodings/microsoft-cp1257.enc
-lib/X11/fonts/encodings/microsoft-cp1258.enc
-lib/X11/fonts/encodings/microsoft-win3.1.enc
-lib/X11/fonts/encodings/mulearabic-0.enc
-lib/X11/fonts/encodings/mulearabic-1.enc
-lib/X11/fonts/encodings/mulearabic-2.enc
-lib/X11/fonts/encodings/mulelao-1.enc
-lib/X11/fonts/encodings/tcvn-0.enc
-lib/X11/fonts/encodings/tis620-2.enc
-lib/X11/fonts/encodings/viscii1.1-1.enc.gz
-@dirrm lib/X11/fonts/encodings/large
-@dirrm lib/X11/fonts/encodings
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:19:02 xtraeme Exp $
+X11R6/lib/X11/fonts/encodings/adobe-dingbats.enc.gz
+X11R6/lib/X11/fonts/encodings/adobe-standard.enc.gz
+X11R6/lib/X11/fonts/encodings/adobe-symbol.enc.gz
+X11R6/lib/X11/fonts/encodings/armscii-8.enc
+X11R6/lib/X11/fonts/encodings/dec-special.enc
+X11R6/lib/X11/fonts/encodings/encodings.dir
+X11R6/lib/X11/fonts/encodings/ibm-cp437.enc
+X11R6/lib/X11/fonts/encodings/ibm-cp850.enc
+X11R6/lib/X11/fonts/encodings/ibm-cp852.enc
+X11R6/lib/X11/fonts/encodings/ibm-cp866.enc
+X11R6/lib/X11/fonts/encodings/iso8859-11.enc
+X11R6/lib/X11/fonts/encodings/iso8859-13.enc
+X11R6/lib/X11/fonts/encodings/iso8859-16.enc
+X11R6/lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/encodings.dir
+X11R6/lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
+X11R6/lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
+X11R6/lib/X11/fonts/encodings/microsoft-cp1250.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1251.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1252.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1253.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1254.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1255.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1256.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1257.enc
+X11R6/lib/X11/fonts/encodings/microsoft-cp1258.enc
+X11R6/lib/X11/fonts/encodings/microsoft-win3.1.enc
+X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
+X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
+X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
+X11R6/lib/X11/fonts/encodings/mulelao-1.enc
+X11R6/lib/X11/fonts/encodings/tcvn-0.enc
+X11R6/lib/X11/fonts/encodings/tis620-2.enc
+X11R6/lib/X11/fonts/encodings/viscii1.1-1.enc.gz
+@dirrm X11R6/lib/X11/fonts/encodings/large
+@dirrm X11R6/lib/X11/fonts/encodings