From 626b870bba9996e7a1cd8b470e643db993452afc Mon Sep 17 00:00:00 2001
From: hira <hira>
Date: Fri, 15 Apr 2005 21:53:38 +0000
Subject: Add PLIST_SUBST for the ioport.

---
 x11/xorg-server/Makefile |  9 ++++++++-
 x11/xorg-server/PLIST    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'x11/xorg-server')

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index bf5fc76ee6b..d02a800087f 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/15 21:33:27 hira Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/15 21:53:38 hira Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
@@ -65,6 +65,13 @@ PLIST_SUBST+=	SCANPCI=
 PLIST_SUBST+=	SCANPCI='@comment '
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || \
+    ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "x86_64"
+PLIST_SUBST+=	IOPORT=
+.else
+PLIST_SUBST+=	IOPORT='@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 1f7b24fd05c..7b41e10016d 100644
--- a/x11/xorg-server/PLIST
+++ b/x11/xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/15 21:33:27 hira Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/04/15 21:53:38 hira Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -998,15 +998,15 @@ ${X11ROOT_PREFIX}/bin/Xorg
 ${X11ROOT_PREFIX}/bin/getconfig
 ${X11ROOT_PREFIX}/bin/getconfig.pl
 ${X11ROOT_PREFIX}/bin/gtf
-${X11ROOT_PREFIX}/bin/inb
-${X11ROOT_PREFIX}/bin/inl
-${X11ROOT_PREFIX}/bin/inw
-${X11ROOT_PREFIX}/bin/ioport
+${IOPORT}${X11ROOT_PREFIX}/bin/inb
+${IOPORT}${X11ROOT_PREFIX}/bin/inl
+${IOPORT}${X11ROOT_PREFIX}/bin/inw
+${IOPORT}${X11ROOT_PREFIX}/bin/ioport
 ${X11ROOT_PREFIX}/bin/mmapr
 ${X11ROOT_PREFIX}/bin/mmapw
-${X11ROOT_PREFIX}/bin/outb
-${X11ROOT_PREFIX}/bin/outl
-${X11ROOT_PREFIX}/bin/outw
+${IOPORT}${X11ROOT_PREFIX}/bin/outb
+${IOPORT}${X11ROOT_PREFIX}/bin/outl
+${IOPORT}${X11ROOT_PREFIX}/bin/outw
 ${X11ROOT_PREFIX}/bin/pcitweak
 ${SCANPCI}${X11ROOT_PREFIX}/bin/scanpci
 ${X11ROOT_PREFIX}/bin/xorgcfg
-- 
cgit v1.2.3