summaryrefslogtreecommitdiff
path: root/misc/estic/files/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'misc/estic/files/patch-ab')
-rw-r--r--misc/estic/files/patch-ab52
1 files changed, 22 insertions, 30 deletions
diff --git a/misc/estic/files/patch-ab b/misc/estic/files/patch-ab
index 9dbca3d166ab..07436f2a2027 100644
--- a/misc/estic/files/patch-ab
+++ b/misc/estic/files/patch-ab
@@ -1,30 +1,22 @@
-# estic.doc
-# Mir ist mitgeteilt worden, daß die FreeBSD Version das Flag USE_OLD_TTY
-# braucht. Offenbar ist die Behandlung der RS232 Handshakeleitungen
-# geändert worden, die für die neue Platine der Istec (#3) benötigt
-# werden. Nähere Informationen liegen mir nicht vor, ich wäre dankbar,
-# wenn das nochmal jemand verifizieren könnte.
-
-# ovb@swissmail.com does not use -DUSE_OLD_TTY
-# neither does jhs@freebsd.org need it
-
-*** estic/make/freebsd.mak.orig Sat Sep 14 15:40:16 1996
---- estic/make/freebsd.mak Mon Nov 18 03:08:31 1996
-***************
-*** 35,41 ****
- # Both configurations of CFLAGS will probably work since FreeBSD has a
- # smart linker...
- #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++
-! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
-
- # ------------------------------------------------------------------------------
---- 35,42 ----
- # Both configurations of CFLAGS will probably work since FreeBSD has a
- # smart linker...
- #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++
-! #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
-! CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
-
- # ------------------------------------------------------------------------------
+--- estic/make/freebsd.mak.orig Sat Sep 14 15:40:16 1996
++++ estic/make/freebsd.mak Fri Mar 9 23:10:46 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,8 @@
+ # Both configurations of CFLAGS will probably work since FreeBSD has a
+ # smart linker...
+ #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++
+-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
++#CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
+
+
+ # ------------------------------------------------------------------------------