diff options
| author | hira <hira@pkgsrc.org> | 2005-04-15 21:33:27 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2005-04-15 21:33:27 +0000 |
| commit | 27cf9999b69ab1317a68d9ec54d4f34e744b6e4f (patch) | |
| tree | 1724b014b49f177fa73bfb132b02ca698a41656f /x11/xorg-server | |
| parent | ff3618f97c7303fc3a20d33c3eb18a9e07ec6b59 (diff) | |
| download | pkgsrc-27cf9999b69ab1317a68d9ec54d4f34e744b6e4f.tar.gz | |
- Add PLIST_SUBST for the scanpci.
- Build the scanpci on the NetBSD/macppc.
Diffstat (limited to 'x11/xorg-server')
| -rw-r--r-- | x11/xorg-server/Makefile | 10 | ||||
| -rw-r--r-- | x11/xorg-server/PLIST | 6 |
2 files changed, 12 insertions, 4 deletions
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 |