diff options
| author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-08-02 01:49:05 +0000 |
|---|---|---|
| committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-08-02 01:49:05 +0000 |
| commit | a707ab698e7c42aef7665cc1323e37976badba93 (patch) | |
| tree | d80bc0d77b8712f432e71017b732e8955966c16f /games/xlines | |
| parent | Remove non-existent file (diff) | |
Fix patch so it applies cleanly
Found by: bento
Notes
Notes:
svn path=/head/; revision=31235
Diffstat (limited to 'games/xlines')
| -rw-r--r-- | games/xlines/files/patch-aa | 74 |
1 files changed, 48 insertions, 26 deletions
diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa index 7f4c05076817..ca54baadd9bd 100644 --- a/games/xlines/files/patch-aa +++ b/games/xlines/files/patch-aa @@ -1,31 +1,53 @@ ---- Makefile.orig Mon Apr 27 16:47:35 1998 -+++ Makefile Sun Jul 16 19:47:51 2000 -@@ -1,8 +1,8 @@ --INCDIR=/usr/local/qt/include --CFLAGS=-O2 -I/usr/X11/include -DSHOW_NEXT_COLORS --LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11 --CC=gcc --MOC=/usr/local/qt/bin/moc +--- Makefile.orig Sat Jan 17 05:11:10 1998 ++++ Makefile Tue Aug 1 21:47:09 2000 +@@ -1,25 +1,25 @@ +-INCDIR=/usr/local/qt/include
+-CFLAGS=-O2 -I/usr/X11/include
+-LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11
+-CC=gcc
+-MOC=/usr/local/qt/bin/moc
+-
+-SRC=lines.cpp lines.moc
+-OBJECTS=lines.o
+-MOCFILES=lines.moc
+-
+-
+-TARGET=xlines
+-
+-.SUFFIXES: .cpp
+-
+-.cpp.o:
+- $(CC) -c $(CFLAGS) -I$(INCDIR) $<
+-
+-all: $(TARGET)
+-
+-$(TARGET): $(MOCFILES) $(OBJECTS) lines.h
+- $(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR)
+-
+-lines.moc: lines.h
+- $(MOC) lines.h -o lines.moc
+INCDIR=${X11BASE}/include/X11/qt -+CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS ++CXXFLAGS+=-I${X11BASE}/include +LFLAGS=-L${X11BASE}/lib -lqt -lX11 -+CC?=gcc ++CXX?=g++ +MOC=${X11BASE}/bin/moc - - SRC=lines.cpp lines.moc - OBJECTS=lines.o -@@ -14,12 +14,12 @@ - .SUFFIXES: .cpp - - .cpp.o: -- $(CC) -c $(CFLAGS) -I$(INCDIR) $< ++ ++SRC=lines.cpp lines.moc ++OBJECTS=lines.o ++MOCFILES=lines.moc ++ ++ ++TARGET=xlines ++ ++.SUFFIXES: .cpp ++ ++.cpp.o: + $(CXX) -c $(CXXFLAGS) -I$(INCDIR) $< - - all: $(TARGET) - - $(TARGET): $(MOCFILES) $(OBJECTS) lines.h -- $(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR) ++ ++all: $(TARGET) ++ ++$(TARGET): $(MOCFILES) $(OBJECTS) lines.h + $(CXX) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR) - - lines.moc: lines.h - $(MOC) lines.h -o lines.moc ++ ++lines.moc: lines.h ++ $(MOC) lines.h -o lines.moc |