diff options
| author | steve <steve@FreeBSD.org> | 1999-07-27 22:27:34 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1999-07-27 22:27:34 +0800 |
| commit | fa7ae63af105273b65501348378fbeb0d3761321 (patch) | |
| tree | e46ce85e7d6c31370d6da749ef82e07435d6d2cc /x11/XFree86-4-libraries | |
| parent | 50356faeb4f354209a1e53ece978e7b29adf4e61 (diff) | |
| download | freebsd-ports-gnome-fa7ae63af105273b65501348378fbeb0d3761321.tar.gz freebsd-ports-gnome-fa7ae63af105273b65501348378fbeb0d3761321.tar.zst freebsd-ports-gnome-fa7ae63af105273b65501348378fbeb0d3761321.zip | |
Add Doug Rabson's patches for XFree86 on the FreeBSD/Alpha with minor
tweaks to the PLIST to accomodate the recent upgrade to 3.3.4.
Submitted by: dfr
Reviewed by: jmz (maintainer)
Diffstat (limited to 'x11/XFree86-4-libraries')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 6 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-5 | 11 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 25 |
3 files changed, 40 insertions, 2 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 794220f3be48..cccdc7d236e8 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $ +# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $ # DISTNAME= xc @@ -33,6 +33,10 @@ MTREE_FILE= /etc/mtree/BSD.x11.dist SCRIPTS_ENV+= MACHINE=pc98 PLIST= ${PKGDIR}/PLIST.pc98 .endif +.if (${MACHINE} == "alpha") +SCRIPTS_ENV+= MACHINE=alpha +PLIST= ${PKGDIR}/PLIST.alpha +.endif .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO) pre-fetch: diff --git a/x11/XFree86-4-libraries/files/patch-5 b/x11/XFree86-4-libraries/files/patch-5 new file mode 100644 index 000000000000..a5f67a13c03f --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-5 @@ -0,0 +1,11 @@ +--- programs/Xserver/os/access.c.orig Thu Dec 24 13:43:25 1998 ++++ programs/Xserver/os/access.c Wed Dec 23 15:32:23 1998 +@@ -634,7 +634,7 @@ + #endif + ifc.ifc_len = sizeof (buf); + ifc.ifc_buf = buf; +- if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0) ++ if (ifioctl (fd, SIOCGIFCONF, (pointer) &ifc) < 0) + Error ("Getting interface configuration (4)"); + + #ifdef ISC diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 7b0dd6664444..e19c0c5e5310 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -101,6 +101,18 @@ if [ X"${MACHINE}" = X"pc98" ]; then echo "#undef XF86${i}Server" >>$F echo "#define XF86${i}Server NO" >>$F done +elif [ X"${MACHINE}" = X"alpha" ]; then +# force the compilation of the SVGA server. + echo "#undef XF86SVGAServer" >>$F + echo "#define XF86SVGAServer YES" >>$F + servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA" + selected=SVGA + for i in $servers; do + yesno "Do you want to build the $i server?" + if [ $answ = YES ]; then selected="$selected $i"; fi + echo "#undef XF86${i}Server" >>$F + echo "#define XF86${i}Server $answ" >>$F + done else # force the compilation of the SVGA server. echo "#undef XF86SVGAServer" >>$F @@ -139,6 +151,13 @@ yesno "Do you want to build Xvfb?" echo "#define XVirtualFramebufferServer $answ" >>$F if [ X"${MACHINE}" != X"pc98" ]; then +if [ X"${MACHINE}" = X"alpha" ]; then +cat >> $F <<END +#define XF86SvgaDrivers nv mga s3v generic + +#define XF86MonoDrivers hgc1280 sigma apollo hercules +END +else cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 compaq mga oak al2101 ali \ @@ -158,6 +177,8 @@ cat >> $F <<END END fi +fi + cat <<END @@ -199,7 +220,9 @@ if [ $answ = NO ]; then echo "#undef BuildXInputExt" >> $F echo "#define BuildXInputExt NO" >> $F else - echo "#define JoystickSupport YES" >> $F + if [ X${MACHINE} != X"alpha" ]; then + echo "#define JoystickSupport YES" >> $F + fi fi yesno "Build PEX?" |