diff options
Diffstat (limited to 'misc/estic/files/patch-spunk-freebsd-x.mak')
| -rw-r--r-- | misc/estic/files/patch-spunk-freebsd-x.mak | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/misc/estic/files/patch-spunk-freebsd-x.mak b/misc/estic/files/patch-spunk-freebsd-x.mak index aa2a0569ab32..7cf9d00c6e2c 100644 --- a/misc/estic/files/patch-spunk-freebsd-x.mak +++ b/misc/estic/files/patch-spunk-freebsd-x.mak @@ -1,26 +1,40 @@ ---- spunk/make/freebsd-x.mak.orig Fri Jun 21 12:57:24 1996 -+++ spunk/make/freebsd-x.mak Fri Mar 9 23:13:10 2001 -@@ -27,11 +27,12 @@ +--- spunk/make/freebsd-x.mak.orig Sun Nov 24 22:33:26 1996 ++++ spunk/make/freebsd-x.mak Tue Sep 6 09:54:21 2005 +@@ -27,10 +27,10 @@ AR = ar LD = ld ZIP = zip -CC = g++ -+CXX ?= g++ -+CC = ${CXX} ++CC = $(CXX) - # 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 ${X11BASE}/include -fno-implicit-templates -DEXPLICIT_TEMPLATES + # Flags for the gnu compiler +-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip -@@ -206,7 +207,7 @@ +@@ -135,8 +135,8 @@ + # ------------------------------------------------------------------------------ # Dummy targets - xresed: $(LIB) $(RESEDITOBJS) $(HDRS) +-xresed: $(LIB) $(RESEDITOBJS) - $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11 -+ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L/usr/X11R6/lib -lX11 ++resed: $(LIB) $(RESEDITOBJS) ++ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(X11BASE)/lib -lX11 lib: $(LIB) +@@ -192,10 +192,12 @@ + + clean: + -rm -f *~ linuxsrc/*~ bsdsrc/*~ unixsrc/*~ ++ -rm -f *.o ++ -rm -f xresed $(LIB) $(ZIPFILE) + + zap: clean +- -rm -f *.o + -rm -f .depend ++ + + + |