Fix build for Alpha.

4 files changed, 88 insertions, 17 deletions

diff --git a/games/libshhcards/files/patch-aa b/games/libshhcards/files/patch-aa
index 1c57127c01c8..898cd23991b5 100644
--- a/games/libshhcards/files/patch-aa
+++ b/games/libshhcards/files/patch-aa
@@ -1,7 +1,7 @@
---- Makefile.orig	Sun Mar 23 03:02:53 1997
-+++ Makefile	Wed Sep 30 23:28:35 1998
+--- Makefile.orig	Sun Jul  5 11:52:26 1998
++++ Makefile	Sun May 30 21:07:36 1999
 @@ -1,14 +1,17 @@
- # $Id: patch-aa,v 1.4 1999/01/10 17:21:34 simokawa Exp $
+ # $Id: Makefile,v 1.4 1998/07/05 16:52:26 sverrehu Exp $
  DIST		= shhcards
  VERMAJ		= 1
 -VERMIN		= 0
@@ -33,6 +33,21 @@
  
  ###########################################################################
  
+@@ -68,10 +71,10 @@
+ endif
+ 
+ # Alpha at USIT
+-ifeq ($(HOSTTYPE),alpha)
+-INCDIR		= -I. -I/usr/include/X11 -I/usr/local/X11R5/include
+-LIBDIR		= -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
+-endif
++#ifeq ($(HOSTTYPE),alpha)
++#INCDIR		= -I. -I/usr/include/X11 -I/usr/local/X11R5/include
++#LIBDIR		= -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
++#endif
+ 
+ ###########################################################################
+ 
 @@ -87,7 +90,11 @@
  
  $(LIBTARGET): $(LIBOBJS)
diff --git a/games/sol/files/patch-aa b/games/sol/files/patch-aa
index 72e8fe34b763..1b870204ad4c 100644
--- a/games/sol/files/patch-aa
+++ b/games/sol/files/patch-aa
@@ -1,6 +1,20 @@
---- Makefile	Wed Aug 13 20:37:02 1997
-+++ /home/andy/tmp/wrk/Makefile	Sun Apr 12 19:14:29 1998
-@@ -62,7 +62,7 @@
+--- Makefile.orig	Sun Jul  5 03:30:26 1998
++++ Makefile	Sun May 30 21:12:31 1999
+@@ -53,16 +53,16 @@
+ endif
+ 
+ # DEC Alpha at USIT
+-ifeq ($(HOSTTYPE),alpha)
+-INCDIR		= -I$$HOME/include -I/usr/include/X11 \
+-		  -I/usr/local/X11R5/include
+-LIBDIR		= -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib
+-endif
++#ifeq ($(HOSTTYPE),alpha)
++#INCDIR		= -I$$HOME/include -I/usr/include/X11 \
++#		  -I/usr/local/X11R5/include
++#LIBDIR		= -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib
++#endif
+ 
  ###########################################################################
  
  # Where do you want to install the program and the highscore file?
diff --git a/x11-wm/tvtwm/files/patch-ac b/x11-wm/tvtwm/files/patch-ac
index 3122091620e4..a8601c670ae0 100644
--- a/x11-wm/tvtwm/files/patch-ac
+++ b/x11-wm/tvtwm/files/patch-ac
@@ -1,7 +1,41 @@
-*** Imakefile.orig	Mon Dec  5 14:47:52 1994
---- Imakefile	Mon Dec  5 14:49:04 1994
+*** Imakefile.orig	Thu Feb  2 18:25:44 1995
+--- Imakefile	Sun May 30 11:42:08 1999
 ***************
-*** 106,115 ****
+*** 25,31 ****
+  XCOMM will define yylineno.  If you get an "Undefined symbol: _yylineno"
+  XCOMM when linking, adjust this to work on your system.
+  
+! #if defined(i386BsdArchitecture) || defined(LinuxArchitecture)
+  # ifdef LexCmd
+  LEX = LexCmd -l
+  # else
+--- 25,31 ----
+  XCOMM will define yylineno.  If you get an "Undefined symbol: _yylineno"
+  XCOMM when linking, adjust this to work on your system.
+  
+! #if defined(FreeBSDArchitecture) || defined(LinuxArchitecture)
+  # ifdef LexCmd
+  LEX = LexCmd -l
+  # else
+***************
+*** 100,106 ****
+  SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
+  SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
+  
+! #if defined(UltrixArchitecture) || defined(AlphaArchitecture)
+  SpecialObjectRule(menus.o,NullParameter,-Olimit 700)
+  #endif
+  
+--- 100,106 ----
+  SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
+  SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
+  
+! #if !defined(FreeBSDArchitecture) && (defined(UltrixArchitecture) || defined(AlphaArchitecture))
+  SpecialObjectRule(menus.o,NullParameter,-Olimit 700)
+  #endif
+  
+***************
+*** 120,129 ****
   XCOMM	ln $(BINDIR)/tvtwm $(BINDIR)/twm
   
   #if (ProjectX < 5)
@@ -12,7 +46,7 @@
   /* InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) */
   #endif
   
---- 106,115 ----
+--- 120,129 ----
   XCOMM	ln $(BINDIR)/tvtwm $(BINDIR)/twm
   
   #if (ProjectX < 5)
diff --git a/x11/libhelp/files/patch-ad b/x11/libhelp/files/patch-ad
index 1e3f3048b2a8..11cf27ec09cd 100644
--- a/x11/libhelp/files/patch-ad
+++ b/x11/libhelp/files/patch-ad
@@ -1,16 +1,20 @@
 diff -cb ../../../libhelp-1.8.1/libhtmlw/HTML-PSformat.c libhtmlw/HTML-PSformat.c
 *** ../../../libhelp-1.8.1/libhtmlw/HTML-PSformat.c	Mon Dec 26 12:15:57 1994
---- libhtmlw/HTML-PSformat.c	Mon Oct 20 19:00:12 1997
+--- libhtmlw/HTML-PSformat.c	Sun May 30 18:26:14 1999
 ***************
-*** 47,53 ****
+*** 47,57 ****
   #include <stdio.h>
   #include <ctype.h>
   #include <math.h>
 ! #include <malloc.h>
   #include "HTMLP.h"
-
+  
   /* Fix thanks to robm. */
---- 47,57 ----
+! #ifdef __alpha
+  #include <Xm/VaSimple.h>
+  #endif
+  
+--- 47,61 ----
   #include <stdio.h>
   #include <ctype.h>
   #include <math.h>
@@ -20,12 +24,16 @@ diff -cb ../../../libhelp-1.8.1/libhtmlw/HTML-PSformat.c libhtmlw/HTML-PSformat.
 ! # include <malloc.h>
 ! #endif
   #include "HTMLP.h"
-
+  
   /* Fix thanks to robm. */
+! #if defined(__alpha) && !defined(__FreeBSD__)
+  #include <Xm/VaSimple.h>
+  #endif
+  
 ***************
 *** 1507,1510 ****
-
+  
   	return( PS_string);
   }
--
+- 
 --- 1511,1513 ----