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

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

3 files changed, 148 insertions, 141 deletions

diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index b3bc0e1d6fb..fedc3c936c5 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/31 14:38:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/02 14:14:45 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 DISTFILES=	X430src-1.tgz X430src-3.tgz
@@ -18,7 +19,7 @@ NO_XFREE86_TARGETS=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_SUBST+=	IMAKE_MAN_DIR=${IMAKE_MAN_DIR}
-PLIST_SUBST+=	IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}
+PLIST_SUBST+=	IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
 PLIST_SUBST+=	AVAILABLE=
diff --git a/x11/imake/PLIST b/x11/imake/PLIST
index 468bbb02b8d..49dab425300 100644
--- a/x11/imake/PLIST
+++ b/x11/imake/PLIST
@@ -1,137 +1,143 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/31 14:38:15 xtraeme Exp $
-bin/ccmakedep
-bin/cleanlinks
-bin/gccmakedep
-bin/imake
-bin/lndir
-bin/makedepend
-bin/makeg
-bin/makestrs
-bin/mergelib
-bin/mkdirhier
-bin/mkhtmlindex
-bin/pswrap
-bin/revpath
-bin/rman
-bin/xmkmf
-lib/X11/config/Amoeba.cf
-lib/X11/config/DGUX.cf
-lib/X11/config/FreeBSD.cf
-lib/X11/config/Imake.cf
-lib/X11/config/Imake.rules
-lib/X11/config/Imake.tmpl
-lib/X11/config/Library.tmpl
-lib/X11/config/Mips.cf
-lib/X11/config/Motif.rules
-lib/X11/config/Motif.tmpl
-lib/X11/config/NetBSD.cf
-lib/X11/config/Oki.cf
-lib/X11/config/OpenBSD.cf
-lib/X11/config/QNX4.cf
-lib/X11/config/QNX4.rules
-lib/X11/config/Server.tmpl
-lib/X11/config/ServerLib.tmpl
-lib/X11/config/Threads.tmpl
-lib/X11/config/Win32.cf
-lib/X11/config/Win32.rules
-lib/X11/config/WinLib.tmpl
-lib/X11/config/X11.rules
-lib/X11/config/X11.tmpl
-lib/X11/config/apollo.cf
-lib/X11/config/bsd.cf
-lib/X11/config/bsdLib.rules
-lib/X11/config/bsdLib.tmpl
-lib/X11/config/bsdi.cf
-lib/X11/config/cde.rules
-lib/X11/config/cde.tmpl
-lib/X11/config/convex.cf
-lib/X11/config/cray.cf
-lib/X11/config/cygwin.cf
-lib/X11/config/cygwin.rules
-lib/X11/config/cygwin.tmpl
-lib/X11/config/darwin.cf
-lib/X11/config/darwinLib.rules
-lib/X11/config/darwinLib.tmpl
-lib/X11/config/date.def
-lib/X11/config/fujitsu.cf
-lib/X11/config/generic.cf
-lib/X11/config/gnu.cf
-lib/X11/config/gnuLib.rules
-lib/X11/config/gnuLib.tmpl
-lib/X11/config/host.def
-lib/X11/config/hp.cf
-lib/X11/config/hpLib.rules
-lib/X11/config/hpLib.tmpl
-lib/X11/config/ibm.cf
-lib/X11/config/ibmLib.rules
-lib/X11/config/ibmLib.tmpl
-lib/X11/config/isc.cf
-lib/X11/config/linux.cf
-lib/X11/config/lnxLib.rules
-lib/X11/config/lnxLib.tmpl
-lib/X11/config/lnxdoc.rules
-lib/X11/config/lnxdoc.tmpl
-lib/X11/config/luna.cf
-lib/X11/config/lynx.cf
-lib/X11/config/macII.cf
-lib/X11/config/mach.cf
-lib/X11/config/minix.cf
-lib/X11/config/moto.cf
-lib/X11/config/ncr.cf
-lib/X11/config/nec.cf
-lib/X11/config/necLib.rules
-lib/X11/config/necLib.tmpl
-lib/X11/config/noop.rules
-lib/X11/config/nto.cf
-lib/X11/config/nto.rules
-lib/X11/config/oldlib.rules
-lib/X11/config/os2.cf
-lib/X11/config/os2.rules
-lib/X11/config/os2Lib.rules
-lib/X11/config/os2Lib.tmpl
-lib/X11/config/osf1.cf
-lib/X11/config/osfLib.rules
-lib/X11/config/osfLib.tmpl
-lib/X11/config/pegasus.cf
-lib/X11/config/sco.cf
-lib/X11/config/sco5.cf
-lib/X11/config/scoLib.rules
-lib/X11/config/sequent.cf
-lib/X11/config/sgi.cf
-lib/X11/config/sgiLib.rules
-lib/X11/config/sgiLib.tmpl
-lib/X11/config/site.def
-lib/X11/config/sony.cf
-lib/X11/config/sun.cf
-lib/X11/config/sunLib.rules
-lib/X11/config/sunLib.tmpl
-lib/X11/config/sv3Lib.rules
-lib/X11/config/sv3Lib.tmpl
-lib/X11/config/sv4Lib.rules
-lib/X11/config/sv4Lib.tmpl
-lib/X11/config/svr3.cf
-lib/X11/config/svr4.cf
-lib/X11/config/ultrix.cf
-lib/X11/config/usl.cf
-lib/X11/config/version.def
-lib/X11/config/x386.cf
-lib/X11/config/xf86.rules
-lib/X11/config/xf86.tmpl
-lib/X11/config/xf86site.def
-lib/X11/config/xfree86.cf
-${AVAILABLE}${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/imake.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/lndir.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makedepend.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makeg.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makestrs.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mergelib.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/pswrap.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/revpath.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/rman.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MAN_SUFFIX}
-@dirrm lib/X11/config
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:14:45 xtraeme Exp $
+X11R6/bin/ccmakedep
+X11R6/bin/cleanlinks
+X11R6/bin/gccmakedep
+X11R6/bin/imake
+X11R6/bin/lndir
+X11R6/bin/makedepend
+X11R6/bin/makeg
+X11R6/bin/makestrs
+X11R6/bin/mergelib
+X11R6/bin/mkdirhier
+X11R6/bin/mkhtmlindex
+X11R6/bin/pswrap
+X11R6/bin/revpath
+X11R6/bin/rman
+X11R6/bin/xmkmf
+X11R6/lib/X11/config/Amoeba.cf
+X11R6/lib/X11/config/DGUX.cf
+X11R6/lib/X11/config/FreeBSD.cf
+X11R6/lib/X11/config/Imake.cf
+X11R6/lib/X11/config/Imake.rules
+X11R6/lib/X11/config/Imake.tmpl
+X11R6/lib/X11/config/Library.tmpl
+X11R6/lib/X11/config/Mips.cf
+X11R6/lib/X11/config/Motif.rules
+X11R6/lib/X11/config/Motif.tmpl
+X11R6/lib/X11/config/${OPSYS}.cf
+X11R6/lib/X11/config/Oki.cf
+X11R6/lib/X11/config/OpenBSD.cf
+X11R6/lib/X11/config/QNX4.cf
+X11R6/lib/X11/config/QNX4.rules
+X11R6/lib/X11/config/Server.tmpl
+X11R6/lib/X11/config/ServerLib.tmpl
+X11R6/lib/X11/config/Threads.tmpl
+X11R6/lib/X11/config/Win32.cf
+X11R6/lib/X11/config/Win32.rules
+X11R6/lib/X11/config/WinLib.tmpl
+X11R6/lib/X11/config/X11.rules
+X11R6/lib/X11/config/X11.tmpl
+X11R6/lib/X11/config/apollo.cf
+X11R6/lib/X11/config/bsd.cf
+X11R6/lib/X11/config/bsdLib.rules
+X11R6/lib/X11/config/bsdLib.tmpl
+X11R6/lib/X11/config/bsdi.cf
+X11R6/lib/X11/config/cde.rules
+X11R6/lib/X11/config/cde.tmpl
+X11R6/lib/X11/config/convex.cf
+X11R6/lib/X11/config/cray.cf
+X11R6/lib/X11/config/cygwin.cf
+X11R6/lib/X11/config/cygwin.rules
+X11R6/lib/X11/config/cygwin.tmpl
+X11R6/lib/X11/config/darwin.cf
+X11R6/lib/X11/config/darwinLib.rules
+X11R6/lib/X11/config/darwinLib.tmpl
+X11R6/lib/X11/config/date.def
+X11R6/lib/X11/config/fujitsu.cf
+X11R6/lib/X11/config/generic.cf
+X11R6/lib/X11/config/gnu.cf
+X11R6/lib/X11/config/gnuLib.rules
+X11R6/lib/X11/config/gnuLib.tmpl
+X11R6/lib/X11/config/host.def
+X11R6/lib/X11/config/hp.cf
+X11R6/lib/X11/config/hpLib.rules
+X11R6/lib/X11/config/hpLib.tmpl
+X11R6/lib/X11/config/ibm.cf
+X11R6/lib/X11/config/ibmLib.rules
+X11R6/lib/X11/config/ibmLib.tmpl
+X11R6/lib/X11/config/isc.cf
+X11R6/lib/X11/config/linux.cf
+X11R6/lib/X11/config/lnxLib.rules
+X11R6/lib/X11/config/lnxLib.tmpl
+X11R6/lib/X11/config/lnxdoc.rules
+X11R6/lib/X11/config/lnxdoc.tmpl
+X11R6/lib/X11/config/luna.cf
+X11R6/lib/X11/config/lynx.cf
+X11R6/lib/X11/config/macII.cf
+X11R6/lib/X11/config/mach.cf
+X11R6/lib/X11/config/minix.cf
+X11R6/lib/X11/config/moto.cf
+X11R6/lib/X11/config/ncr.cf
+X11R6/lib/X11/config/nec.cf
+X11R6/lib/X11/config/necLib.rules
+X11R6/lib/X11/config/necLib.tmpl
+X11R6/lib/X11/config/noop.rules
+X11R6/lib/X11/config/nto.cf
+X11R6/lib/X11/config/nto.rules
+X11R6/lib/X11/config/oldlib.rules
+X11R6/lib/X11/config/os2.cf
+X11R6/lib/X11/config/os2.rules
+X11R6/lib/X11/config/os2Lib.rules
+X11R6/lib/X11/config/os2Lib.tmpl
+X11R6/lib/X11/config/osf1.cf
+X11R6/lib/X11/config/osfLib.rules
+X11R6/lib/X11/config/osfLib.tmpl
+X11R6/lib/X11/config/pegasus.cf
+X11R6/lib/X11/config/sco.cf
+X11R6/lib/X11/config/sco5.cf
+X11R6/lib/X11/config/scoLib.rules
+X11R6/lib/X11/config/sequent.cf
+X11R6/lib/X11/config/sgi.cf
+X11R6/lib/X11/config/sgiLib.rules
+X11R6/lib/X11/config/sgiLib.tmpl
+X11R6/lib/X11/config/site.def
+X11R6/lib/X11/config/sony.cf
+X11R6/lib/X11/config/sun.cf
+X11R6/lib/X11/config/sunLib.rules
+X11R6/lib/X11/config/sunLib.tmpl
+X11R6/lib/X11/config/sv3Lib.rules
+X11R6/lib/X11/config/sv3Lib.tmpl
+X11R6/lib/X11/config/sv4Lib.rules
+X11R6/lib/X11/config/sv4Lib.tmpl
+X11R6/lib/X11/config/svr3.cf
+X11R6/lib/X11/config/svr4.cf
+X11R6/lib/X11/config/ultrix.cf
+X11R6/lib/X11/config/usl.cf
+X11R6/lib/X11/config/version.def
+X11R6/lib/X11/config/x386.cf
+X11R6/lib/X11/config/xf86.rules
+X11R6/lib/X11/config/xf86.tmpl
+X11R6/lib/X11/config/xf86site.def
+X11R6/lib/X11/config/xfree86.cf
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/imake.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/lndir.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makedepend.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makeg.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makestrs.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mergelib.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/pswrap.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/revpath.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/rman.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MANNEWSUFFIX}
+@dirrm X11R6/bin
+@dirrm X11R6/${IMAKE_MAN_DIR}
+@dirrm X11R6/man
+@dirrm X11R6/lib/X11/config
+@dirrm X11R6/lib/X11
+@dirrm X11R6/lib
+@dirrm X11R6
diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def
index 19a9d8d25d2..7039cb0c511 100644
--- a/x11/imake/files/host.def
+++ b/x11/imake/files/host.def
@@ -1,10 +1,10 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/02/02 14:14:45 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  *
  */ 
 
-#define ProjectRoot @PREFIX@
+#define ProjectRoot @PREFIX@/X11R6
 #define BuildHtmlManPages NO
 #define MakeCmd @MAKE@