diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2004-03-06 22:57:48 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2004-03-06 22:57:48 +0000 |
commit | d3c24d35b28931a1a81edb37b2ecb04497bb5402 (patch) | |
tree | 1c57506bdf87ab09eb437aa066de64bc51f30549 /math/xgfe/files/patch-aa | |
parent | The hostsentry port is unusable as shipped and requires additional (diff) |
Update to xgfe 2.1, switch to QT 3, respect NOPORTDOCS, fix build
with gcc 3.
Submitted by: Marius Strobl <marius@alchemy.franken.de>
PR: ports/59024
Diffstat (limited to 'math/xgfe/files/patch-aa')
-rw-r--r-- | math/xgfe/files/patch-aa | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa index f2a7b25e13de..dd2b7a94a91e 100644 --- a/math/xgfe/files/patch-aa +++ b/math/xgfe/files/patch-aa @@ -5,40 +5,40 @@ ####### Compiler, tools and options -CC = gcc --CFLAGS = -Wall -W -O2 -fno-strength-reduce +-CFLAGS = -Wall -W -INCPATH = -I$(QTDIR)/include -LINK = gcc +#CC = gcc -+#CFLAGS = -Wall -W -O2 -fno-strength-reduce ++CXXFLAGS += ${PTHREAD_CFLAGS} +QTDIR = $(X11BASE) -+INCPATH = -I$(X11BASE)/include/X11/qt1 ++INCPATH = -I$(X11BASE)/include +LINK = $(CXX) LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc -+LIBS = -L$(QTDIR)/lib -lqt1 -L$(X11BASE)/lib -lX11 -+MOC = ${X11BASE}/bin/moc1 ++LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS} ++MOC = ${X11BASE}/bin/moc ####### Files -@@ -224,16 +225,16 @@ +@@ -254,16 +255,16 @@ .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< ++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< ++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< ++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< ++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |