summaryrefslogtreecommitdiff
path: root/misc/estic/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'misc/estic/files/patch-aa')
-rw-r--r--misc/estic/files/patch-aa20
1 files changed, 15 insertions, 5 deletions
diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-aa
index 2e3ce5734f67..5da664d178bf 100644
--- a/misc/estic/files/patch-aa
+++ b/misc/estic/files/patch-aa
@@ -1,15 +1,25 @@
---- 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 @@
+--- estic/make/freebsd-x.mak.orig Sat Sep 14 15:40:16 1996
++++ estic/make/freebsd-x.mak Fri Mar 9 23:10:30 2001
+@@ -27,7 +27,8 @@
+ AR = ar
+ LD = ld
+ ZIP = zip
+-CC = g++
++CXX ?= g++
++CC = ${CXX}
+
+ LIB = ../spunk/spunk.a
+ INCDIR = ../spunk
+@@ -35,7 +36,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
++CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
# ------------------------------------------------------------------------------
-@@ -79,7 +79,7 @@
+@@ -79,7 +80,7 @@
all: xestic
xestic: $(LIB) $(OBJS)