From 059a88c435c9f9cd6922bd49310ceb0980c4904b Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sun, 27 Feb 2000 15:04:16 +0000
Subject: Consolidate diffs to a single file into one patch and add a boatload
 of patches to fix the build on -current.

---
 misc/estic/files/patch-aa | 59 ++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

(limited to 'misc/estic/files/patch-aa')

diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-aa
index 292f70284948..2e3ce5734f67 100644
--- a/misc/estic/files/patch-aa
+++ b/misc/estic/files/patch-aa
@@ -1,39 +1,20 @@
-*** estic/make/freebsd-x.mak.orig	Sat Sep 21 17:37:54 1996
---- estic/make/freebsd-x.mak	Sat Sep 21 17:49:09 1996
-***************
-*** 75,81 ****
-  all:	xestic
-  
-  xestic: $(LIB) $(OBJS)
-! 	$(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
-  
-  
-  # ------------------------------------------------------------------------------
---- 76,82 ----
-  all:	xestic
-  
-  xestic: $(LIB) $(OBJS)
-! 	$(CC) -L /usr/X11R6/lib -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
-  
-  
-  # ------------------------------------------------------------------------------
-*** spunk/make/freebsd-x.mak.orig	Fri Jun 21 12:57:24 1996
---- spunk/make/freebsd-x.mak	Thu Nov 21 23:01:13 1996
-***************
-*** 31,37 ****
-  
-  # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
-  #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
-! CFLAGS	= -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-  
-  LIB	= spunk.a
-  ZIPFILE = spunk.zip
---- 31,38 ----
-  
-  # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
-  #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
-! #CFLAGS	= -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-! CFLAGS	= -DFREEBSD -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-  
-  LIB	= spunk.a
-  ZIPFILE = spunk.zip
+--- estic/make/freebsd-x.mak.orig	Sat Feb 26 18:42:30 2000
++++ estic/make/freebsd-x.mak	Sat Feb 26 18:43:26 2000
+@@ -35,7 +35,7 @@
+ # Both configurations of CFLAGS will probably work since FreeBSD has a
+ # smart linker...
+ #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib
+-CFLAGS	= -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS	= -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
+ 
+ 
+ # ------------------------------------------------------------------------------
+@@ -79,7 +79,7 @@
+ all:	xestic
+ 
+ xestic: $(LIB) $(OBJS)
+-	$(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
++	$(CC) -L /usr/X11R6/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11
+ 
+ 
+ # ------------------------------------------------------------------------------
-- 
cgit v1.2.3