diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-03-19 18:22:49 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-03-19 18:22:49 +0000 |
| commit | 4b15967b617058860abddc58a287bc98961f599e (patch) | |
| tree | 690cb8e3488268061035b072f57261cdbbefc30e /x11-servers/XFree86-4-Server | |
| parent | a800140659d9ffdd47f4e35fa8c543efed1239af (diff) | |
| download | ports-4b15967b617058860abddc58a287bc98961f599e.tar.gz ports-4b15967b617058860abddc58a287bc98961f599e.zip | |
Fix alpha package -- some files are not installed when MACHINE_ARCH=alpha.
No PORTREVISION bump -- package for alpha didn't build last time and for
all other arches nothing changes. Tested on i386 only. This also fixes
the logic error which added MATROX files to pkg-plist if BuildXF86DRI was
set to NO.
Submitted by: gallatin
Notes
Notes:
svn path=/head/; revision=56348
Diffstat (limited to 'x11-servers/XFree86-4-Server')
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 12 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/pkg-plist | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 2b1a0e60db34..7b8ec43ddec4 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -44,7 +44,6 @@ MAN1= XFree86.1 \ Xserver.1 \ kbd_mode.1 \ pcitweak.1 \ - scanpci.1 \ xf86cfg.1 \ xf86config.1 MAN3= XF86VidMode.3 \ @@ -70,7 +69,6 @@ MAN4= mga.4 \ nv.4 \ siliconmotion.4 \ vga.4 \ - vmware.4 \ keyboard.4 \ mouse.4 MAN5= XF86Config.5 @@ -108,6 +106,15 @@ PLIST_SUB+= DRI="@comment " PLIST_SUB+= DRI_KMOD="@comment " .endif # have /sys +# Some things are not applicable if this machine is an alpha +.if ${ARCH} == alpha +PLIST_SUB+= ALPHA_NA="@comment " +.else +PLIST_SUB+= ALPHA_NA="" +MAN1+= scanpci.1 +MAN4+= vmware.4 +.endif + .if ${ARCH} == i386 PLIST_SUB+= I386:="" MAN4+= apm.4 \ @@ -184,6 +191,7 @@ post-install:: .endif # !WITH_MATROX_GXX_DRIVER .else HaveMatroxHal= NO +PLIST_SUB+= MATROX="@comment " .endif do-configure: diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index 963613ed2a5b..39161e7b8d7a 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -3,7 +3,7 @@ bin/XFree86 %%XIE:%%bin/joycal bin/kbd_mode bin/pcitweak -bin/scanpci +%%ALPHA_NA%%bin/scanpci bin/xf86cfg bin/xf86config lib/X11/app-defaults/XF86Cfg @@ -153,7 +153,7 @@ lib/modules/input/mouse_drv.o %%XIE:%%lib/modules/input/summa_drv.o %%XIE:%%lib/modules/input/void_drv.o %%XIE:%%lib/modules/input/wacom_drv.o -lib/modules/libafb.a +%%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a lib/modules/libcfb24.a |