diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2007-11-19 17:17:39 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2007-11-19 17:17:39 +0000 |
| commit | c2fdd1f5057bb3cdf72c86dd37b7cfad748f9699 (patch) | |
| tree | 7a1c392db11fedf913fd582a36e1d9af0175ed1f /x11-servers | |
| parent | 670ecd9e7fdc61b0cd49a2cc9b7ea12a9c251141 (diff) | |
| download | ports-c2fdd1f5057bb3cdf72c86dd37b7cfad748f9699.tar.gz ports-c2fdd1f5057bb3cdf72c86dd37b7cfad748f9699.zip | |
Fix plist for sparc64. Should be a no-op on other archs, but bump
portrevision for sparc64. While here, pet portlint.
Tested on: pointyhat
Submitted by: flz
Approved by: portmgr (self)
Notes
Notes:
svn path=/head/; revision=202761
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 10 | ||||
| -rw-r--r-- | x11-servers/xorg-server/pkg-plist | 17 |
2 files changed, 14 insertions, 13 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 2c2dade60736..73ceca9e6031 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --enable-aiglx=yes .else CONFIGURE_ARGS+= --disable-aiglx=yes .endif - + .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO CONFIGURE_ARGS+=--enable-install-setuid .else @@ -94,11 +94,11 @@ PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -PLIST_SUB+= AMD64_I386="" +.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64 +PLIST_SUB+= AMD64_I386_SPARC64="" MAN1+= scanpci.1 .else -PLIST_SUB+= AMD64_I386="@comment " +PLIST_SUB+= AMD64_I386_SPARC64="@comment " .endif .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 4d42df873573..1dc5f28c943b 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -2,15 +2,15 @@ bin/X bin/Xorg bin/cvt bin/gtf -%%SPARC64_NA%%%%PPC_NA%%bin/inb -%%SPARC64_NA%%%%PPC_NA%%bin/inl -%%SPARC64_NA%%%%PPC_NA%%bin/inw -%%SPARC64_NA%%%%PPC_NA%%bin/ioport -%%SPARC64_NA%%%%PPC_NA%%bin/outb -%%SPARC64_NA%%%%PPC_NA%%bin/outl -%%SPARC64_NA%%%%PPC_NA%%bin/outw +%%PPC_NA%%bin/inb +%%PPC_NA%%bin/inl +%%PPC_NA%%bin/inw +%%PPC_NA%%bin/ioport +%%PPC_NA%%bin/outb +%%PPC_NA%%bin/outl +%%PPC_NA%%bin/outw bin/pcitweak -%%AMD64_I386%%bin/scanpci +%%AMD64_I386_SPARC64%%bin/scanpci bin/xorgconfig include/xorg/BT.h include/xorg/IBM.h @@ -152,6 +152,7 @@ include/xorg/xf86RandR12.h include/xorg/xf86RamDac.h include/xorg/xf86Rename.h include/xorg/xf86Resources.h +%%SPARC64%%include/xorg/xf86Sbus.h include/xorg/xf86Version.h include/xorg/xf86Xinput.h include/xorg/xf86_OSlib.h |