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

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

2 files changed, 100 insertions, 100 deletions

diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile
index f4f6b9e255f..37c28cbb4ed 100644
--- a/misc/XFree86-docs/Makefile
+++ b/misc/XFree86-docs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/29 06:22:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/02 14:20:28 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-docs-${XF_VER}
-WRKSRC=			${WRKDIR}/xc/doc/specs
+PKGREVISION=		1
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES+=		X430src-1.tgz X430src-6.tgz
@@ -15,22 +15,22 @@ BUILD_DEPENDS=		imake>=4.3.0:../../x11/imake
 
 USE_BUILDLINK2=		yes
 NO_XFREE86_TARGETS=	# defined
+WRKSRC=			${WRKDIR}/xc/doc/specs
 
 pre-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
 
 do-configure:
 	( cd ${WRKSRC}; \
-	${IMAKE} -DUseInstalled -I. -I${PREFIX}/lib/X11/config \
+	${IMAKE} -DUseInstalled -I. -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/misc/XFree86-docs/PLIST b/misc/XFree86-docs/PLIST
index 76804b4ff49..14ec37216fd 100644
--- a/misc/XFree86-docs/PLIST
+++ b/misc/XFree86-docs/PLIST
@@ -1,95 +1,95 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/24 09:06:00 xtraeme Exp $
-lib/X11/doc/DPMS.TXT
-lib/X11/doc/DPMSLib.TXT
-lib/X11/doc/ICElib.TXT
-lib/X11/doc/LocaleDB.TXT
-lib/X11/doc/PM_spec.TXT
-lib/X11/doc/PostScript/DPMS.PS
-lib/X11/doc/PostScript/DPMSLib.PS
-lib/X11/doc/PostScript/ICElib.PS
-lib/X11/doc/PostScript/LocaleDB.PS
-lib/X11/doc/PostScript/SMlib.PS
-lib/X11/doc/PostScript/XIMTransport.PS
-lib/X11/doc/PostScript/XiLib.PS
-lib/X11/doc/PostScript/XiPorting.PS
-lib/X11/doc/PostScript/XiProtocol.PS
-lib/X11/doc/PostScript/Xtrans.PS
-lib/X11/doc/PostScript/appgroup.PS
-lib/X11/doc/PostScript/bdf.PS
-lib/X11/doc/PostScript/bigreq.PS
-lib/X11/doc/PostScript/buffer.PS
-lib/X11/doc/PostScript/ctext.PS
-lib/X11/doc/PostScript/ctlseqs.PS
-lib/X11/doc/PostScript/ddx.PS
-lib/X11/doc/PostScript/evi.PS
-lib/X11/doc/PostScript/fontlib.PS
-lib/X11/doc/PostScript/fsproto.PS
-lib/X11/doc/PostScript/i18nFramework.PS
-lib/X11/doc/PostScript/icccm.PS
-lib/X11/doc/PostScript/ice.PS
-lib/X11/doc/PostScript/intrinsics.PS
-lib/X11/doc/PostScript/mit-shm.PS
-lib/X11/doc/PostScript/proto.PS
-lib/X11/doc/PostScript/record.PS
-lib/X11/doc/PostScript/recordlib.PS
-lib/X11/doc/PostScript/rstart.PS
-lib/X11/doc/PostScript/shape.PS
-lib/X11/doc/PostScript/shapelib.PS
-lib/X11/doc/PostScript/tog-cup.PS
-lib/X11/doc/PostScript/widgets.PS
-lib/X11/doc/PostScript/xc-misc.PS
-lib/X11/doc/PostScript/xdmcp.PS
-lib/X11/doc/PostScript/xfs-design.PS
-lib/X11/doc/PostScript/xim.PS
-lib/X11/doc/PostScript/xlfd.PS
-lib/X11/doc/PostScript/xlib.PS
-lib/X11/doc/PostScript/xmu.PS
-lib/X11/doc/PostScript/xsmp.PS
-lib/X11/doc/PostScript/xtest.PS
-lib/X11/doc/PostScript/xtestlib.PS
-lib/X11/doc/SMlib.TXT
-lib/X11/doc/XIMTransport.TXT
-lib/X11/doc/XiLib.TXT
-lib/X11/doc/XiPorting.TXT
-lib/X11/doc/XiProtocol.TXT
-lib/X11/doc/Xtrans.TXT
-lib/X11/doc/XvMC_API.TXT
-lib/X11/doc/appgroup.TXT
-lib/X11/doc/bdf.TXT
-lib/X11/doc/bigreq.TXT
-lib/X11/doc/buffer.TXT
-lib/X11/doc/ctext.TXT
-lib/X11/doc/ctlseqs.TXT
-lib/X11/doc/ddx.TXT
-lib/X11/doc/evi.TXT
-lib/X11/doc/fontlib.TXT
-lib/X11/doc/fsproto.TXT
-lib/X11/doc/i18nFramework.TXT
-lib/X11/doc/icccm.TXT
-lib/X11/doc/ice.TXT
-lib/X11/doc/intrinsics.TXT
-lib/X11/doc/libGL.TXT
-lib/X11/doc/mit-shm.TXT
-lib/X11/doc/proto.TXT
-lib/X11/doc/record.TXT
-lib/X11/doc/recordlib.TXT
-lib/X11/doc/render-protocol.TXT
-lib/X11/doc/rstart.TXT
-lib/X11/doc/rstartd.TXT
-lib/X11/doc/shape.TXT
-lib/X11/doc/shapelib.TXT
-lib/X11/doc/tog-cup.TXT
-lib/X11/doc/widgets.TXT
-lib/X11/doc/xc-misc.TXT
-lib/X11/doc/xdmcp.TXT
-lib/X11/doc/xfs-design.TXT
-lib/X11/doc/xim.TXT
-lib/X11/doc/xlfd.TXT
-lib/X11/doc/xlib.TXT
-lib/X11/doc/xmu.TXT
-lib/X11/doc/xsmp.TXT
-lib/X11/doc/xtest.TXT
-lib/X11/doc/xtestlib.TXT
-lib/X11/doc/xv-protocol-v2.TXT
-@dirrm lib/X11/doc/PostScript
-@unexec ${RM} %D/lib/X11/doc 2>/dev/null || true
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:20:28 xtraeme Exp $
+X11R6/lib/X11/doc/DPMS.TXT
+X11R6/lib/X11/doc/DPMSLib.TXT
+X11R6/lib/X11/doc/ICElib.TXT
+X11R6/lib/X11/doc/LocaleDB.TXT
+X11R6/lib/X11/doc/PM_spec.TXT
+X11R6/lib/X11/doc/PostScript/DPMS.PS
+X11R6/lib/X11/doc/PostScript/DPMSLib.PS
+X11R6/lib/X11/doc/PostScript/ICElib.PS
+X11R6/lib/X11/doc/PostScript/LocaleDB.PS
+X11R6/lib/X11/doc/PostScript/SMlib.PS
+X11R6/lib/X11/doc/PostScript/XIMTransport.PS
+X11R6/lib/X11/doc/PostScript/XiLib.PS
+X11R6/lib/X11/doc/PostScript/XiPorting.PS
+X11R6/lib/X11/doc/PostScript/XiProtocol.PS
+X11R6/lib/X11/doc/PostScript/Xtrans.PS
+X11R6/lib/X11/doc/PostScript/appgroup.PS
+X11R6/lib/X11/doc/PostScript/bdf.PS
+X11R6/lib/X11/doc/PostScript/bigreq.PS
+X11R6/lib/X11/doc/PostScript/buffer.PS
+X11R6/lib/X11/doc/PostScript/ctext.PS
+X11R6/lib/X11/doc/PostScript/ctlseqs.PS
+X11R6/lib/X11/doc/PostScript/ddx.PS
+X11R6/lib/X11/doc/PostScript/evi.PS
+X11R6/lib/X11/doc/PostScript/fontlib.PS
+X11R6/lib/X11/doc/PostScript/fsproto.PS
+X11R6/lib/X11/doc/PostScript/i18nFramework.PS
+X11R6/lib/X11/doc/PostScript/icccm.PS
+X11R6/lib/X11/doc/PostScript/ice.PS
+X11R6/lib/X11/doc/PostScript/intrinsics.PS
+X11R6/lib/X11/doc/PostScript/mit-shm.PS
+X11R6/lib/X11/doc/PostScript/proto.PS
+X11R6/lib/X11/doc/PostScript/record.PS
+X11R6/lib/X11/doc/PostScript/recordlib.PS
+X11R6/lib/X11/doc/PostScript/rstart.PS
+X11R6/lib/X11/doc/PostScript/shape.PS
+X11R6/lib/X11/doc/PostScript/shapelib.PS
+X11R6/lib/X11/doc/PostScript/tog-cup.PS
+X11R6/lib/X11/doc/PostScript/widgets.PS
+X11R6/lib/X11/doc/PostScript/xc-misc.PS
+X11R6/lib/X11/doc/PostScript/xdmcp.PS
+X11R6/lib/X11/doc/PostScript/xfs-design.PS
+X11R6/lib/X11/doc/PostScript/xim.PS
+X11R6/lib/X11/doc/PostScript/xlfd.PS
+X11R6/lib/X11/doc/PostScript/xlib.PS
+X11R6/lib/X11/doc/PostScript/xmu.PS
+X11R6/lib/X11/doc/PostScript/xsmp.PS
+X11R6/lib/X11/doc/PostScript/xtest.PS
+X11R6/lib/X11/doc/PostScript/xtestlib.PS
+X11R6/lib/X11/doc/SMlib.TXT
+X11R6/lib/X11/doc/XIMTransport.TXT
+X11R6/lib/X11/doc/XiLib.TXT
+X11R6/lib/X11/doc/XiPorting.TXT
+X11R6/lib/X11/doc/XiProtocol.TXT
+X11R6/lib/X11/doc/Xtrans.TXT
+X11R6/lib/X11/doc/XvMC_API.TXT
+X11R6/lib/X11/doc/appgroup.TXT
+X11R6/lib/X11/doc/bdf.TXT
+X11R6/lib/X11/doc/bigreq.TXT
+X11R6/lib/X11/doc/buffer.TXT
+X11R6/lib/X11/doc/ctext.TXT
+X11R6/lib/X11/doc/ctlseqs.TXT
+X11R6/lib/X11/doc/ddx.TXT
+X11R6/lib/X11/doc/evi.TXT
+X11R6/lib/X11/doc/fontlib.TXT
+X11R6/lib/X11/doc/fsproto.TXT
+X11R6/lib/X11/doc/i18nFramework.TXT
+X11R6/lib/X11/doc/icccm.TXT
+X11R6/lib/X11/doc/ice.TXT
+X11R6/lib/X11/doc/intrinsics.TXT
+X11R6/lib/X11/doc/libGL.TXT
+X11R6/lib/X11/doc/mit-shm.TXT
+X11R6/lib/X11/doc/proto.TXT
+X11R6/lib/X11/doc/record.TXT
+X11R6/lib/X11/doc/recordlib.TXT
+X11R6/lib/X11/doc/render-protocol.TXT
+X11R6/lib/X11/doc/rstart.TXT
+X11R6/lib/X11/doc/rstartd.TXT
+X11R6/lib/X11/doc/shape.TXT
+X11R6/lib/X11/doc/shapelib.TXT
+X11R6/lib/X11/doc/tog-cup.TXT
+X11R6/lib/X11/doc/widgets.TXT
+X11R6/lib/X11/doc/xc-misc.TXT
+X11R6/lib/X11/doc/xdmcp.TXT
+X11R6/lib/X11/doc/xfs-design.TXT
+X11R6/lib/X11/doc/xim.TXT
+X11R6/lib/X11/doc/xlfd.TXT
+X11R6/lib/X11/doc/xlib.TXT
+X11R6/lib/X11/doc/xmu.TXT
+X11R6/lib/X11/doc/xsmp.TXT
+X11R6/lib/X11/doc/xtest.TXT
+X11R6/lib/X11/doc/xtestlib.TXT
+X11R6/lib/X11/doc/xv-protocol-v2.TXT
+@dirrm X11R6/lib/X11/doc/PostScript
+@unexec ${RM} %D/X11R6/lib/X11/doc 2>/dev/null || true