- Add PLIST_SUBST for the scanpci.

 - Build the scanpci on the NetBSD/macppc.

4 files changed, 20 insertions, 11 deletions

diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 9d34e867841..090cc4c8cb9 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2005/04/14 21:35:51 xtraeme Exp $
+$NetBSD: distinfo,v 1.18 2005/04/15 21:33:27 hira Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -29,7 +29,7 @@ SHA1 (patch-ar) = ba96209b55579f16c53f8a1c26337a3278d1808a
 SHA1 (patch-as) = 80112c0604470d7a113bd70595401481e454b8c9
 SHA1 (patch-at) = bc375171b6f0a8141621009767b5457962967112
 SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
-SHA1 (patch-av) = 99e9764ca1afdfb5882d62e453ccaea7dfa7f182
+SHA1 (patch-av) = 6713ed0ba746940cec658591583dc90c92d5b563
 SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
 SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
 SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b
diff --git a/x11/xorg-libs/patches/patch-av b/x11/xorg-libs/patches/patch-av
index 497309c156b..91cb220dc1d 100644
--- a/x11/xorg-libs/patches/patch-av
+++ b/x11/xorg-libs/patches/patch-av
@@ -1,12 +1,13 @@
-$NetBSD: patch-av,v 1.1 2004/11/15 11:15:49 hira Exp $
+$NetBSD: patch-av,v 1.2 2005/04/15 21:33:27 hira Exp $
 
---- config/cf/xorg.cf.orig	2004-11-14 02:17:40.000000000 +0900
-+++ config/cf/xorg.cf	2004-11-14 02:17:44.000000000 +0900
-@@ -1287,6 +1287,7 @@
+--- config/cf/xorg.cf.orig	2005-01-24 12:11:42.000000000 +0900
++++ config/cf/xorg.cf	2005-04-15 23:01:03.000000000 +0900
+@@ -1294,6 +1294,8 @@
  #ifndef BuildScanpci
  # if SystemV || SystemV4 || \
      (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \
-+    (defined(NetBSDArchitecture) && defined(AMD64Architecture)) || \
++    (defined(NetBSDArchitecture) && \
++    (defined(AMD64Architecture) || defined(PpcArchitecture))) || \
      defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
      defined(OS2Architecture) || defined(GNUMachArchitecture)
  #   define BuildScanpci		YES
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 190bcc4db39..bf5fc76ee6b 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/14 21:40:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/15 21:33:27 hira Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
@@ -57,6 +57,14 @@ BUILDLINK_PASSTHRU_DIRS+=	/System
 .include "options.mk"
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || \
+    (${OPSYS} == "NetBSD" && \
+    (${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "powerpc"))
+PLIST_SUBST+=	SCANPCI=
+.else
+PLIST_SUBST+=	SCANPCI='@comment '
+.endif
+
 post-install:
 	@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if ${OPSYS} == "Darwin"
diff --git a/x11/xorg-server/PLIST b/x11/xorg-server/PLIST
index e17b7121c8e..1f7b24fd05c 100644
--- a/x11/xorg-server/PLIST
+++ b/x11/xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2005/03/30 20:29:20 hira Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/04/15 21:33:27 hira Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -990,7 +990,7 @@ ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/getconfig.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/gtf.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/pcitweak.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/scanpci.${MAN_SUFFIX}
+${SCANPCI}${X11ROOT_PREFIX}/${MAN_DIR}/scanpci.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/xorgcfg.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/xorgconfig.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/bin/XFree86
@@ -1008,7 +1008,7 @@ ${X11ROOT_PREFIX}/bin/outb
 ${X11ROOT_PREFIX}/bin/outl
 ${X11ROOT_PREFIX}/bin/outw
 ${X11ROOT_PREFIX}/bin/pcitweak
-${X11ROOT_PREFIX}/bin/scanpci
+${SCANPCI}${X11ROOT_PREFIX}/bin/scanpci
 ${X11ROOT_PREFIX}/bin/xorgcfg
 ${X11ROOT_PREFIX}/bin/xorgconfig
 ${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm