7 files changed, 14 insertions, 7 deletions
diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile
index eeef76b427f..d181ccba18c 100644
--- a/fonts/xorg-fonts100dpi/Makefile
+++ b/fonts/xorg-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fonts100dpi-${XORG_VER}
@@ -14,6 +14,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/bdf/100dpi
 XINSTALL_DIRS=	fonts/bdf/100dpi
+XEXTRACTS=	${XBUILD_DIRS} fonts/bdf/75dpi/Imakefile.inc
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile
index 3db718ccf8b..39456eec140 100644
--- a/fonts/xorg-fonts75dpi/Makefile
+++ b/fonts/xorg-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fonts75dpi-${XORG_VER}
@@ -14,6 +14,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/bdf/75dpi
 XINSTALL_DIRS=	fonts/bdf/75dpi
+XEXTRACTS=	${XBUILD_DIRS}
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile
index 49b320a0af1..1e016f1a253 100644
--- a/fonts/xorg-fontsCyrillic/Makefile
+++ b/fonts/xorg-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsCyrillic-${XORG_VER}
@@ -14,6 +14,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/bdf/cyrillic
 XINSTALL_DIRS=	fonts/bdf/cyrillic
+XEXTRACTS=	${XBUILD_DIRS}
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile
index 4ec40685c19..7d4bacdfe19 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/09/21 17:38:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsEncodings-${XORG_VER}
@@ -12,6 +12,7 @@ COMMENT=	X.org Encoding fonts
 BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
 
 XBUILD_DIRS=	fonts/encodings
+XEXTRACTS=	${XBUILD_DIRS}
 
 .include "../../meta-pkgs/xorg/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile
index def8b823712..12f5347e01d 100644
--- a/fonts/xorg-fontsMisc/Makefile
+++ b/fonts/xorg-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsMisc-${XORG_VER}
@@ -14,6 +14,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/bdf/misc
 XINSTALL_DIRS=	fonts/bdf/misc
+XEXTRACTS=	${XBUILD_DIRS} extras/fonts
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile
index b20f3ff8504..5e96034c6f0 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/12 11:11:52 hira Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/30 20:40:31 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsTruetype-${XORG_VER}
@@ -15,6 +15,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/scaled/TTF
 XINSTALL_DIRS=	fonts/scaled/TTF
+XEXTRACTS=	${XBUILD_DIRS} extras/fonts
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile
index fbcc58506b9..af0e7902a2a 100644
--- a/fonts/xorg-fontsType1/Makefile
+++ b/fonts/xorg-fontsType1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/12 11:13:55 hira Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/30 20:40:32 hira Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsType1-${XORG_VER}
@@ -14,6 +14,7 @@ DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 XBUILD_DIRS=	fonts/encodings fonts/scaled/Type1
 XINSTALL_DIRS=	fonts/scaled/Type1
+XEXTRACTS=	${XBUILD_DIRS}
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files