diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2006-07-16 21:18:34 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2006-07-16 21:18:34 +0000 |
| commit | 3a8aefc66fb64255dd91c53a4b8d31797b4fb8da (patch) | |
| tree | 63b7eb305e145d696207315b954458ed21080518 /sysutils/qpxtool/files | |
| parent | dcc76ea52efba246656593ae623514a03242d99a (diff) | |
| download | ports-3a8aefc66fb64255dd91c53a4b8d31797b4fb8da.tar.gz ports-3a8aefc66fb64255dd91c53a4b8d31797b4fb8da.zip | |
Notes
Diffstat (limited to 'sysutils/qpxtool/files')
| -rw-r--r-- | sysutils/qpxtool/files/patch-pxcontrol-Makefile | 37 | ||||
| -rw-r--r-- | sysutils/qpxtool/files/patch-qpxtool-Makefile (renamed from sysutils/qpxtool/files/patch-Makefile) | 10 |
2 files changed, 42 insertions, 5 deletions
diff --git a/sysutils/qpxtool/files/patch-pxcontrol-Makefile b/sysutils/qpxtool/files/patch-pxcontrol-Makefile new file mode 100644 index 000000000000..3f9aa243a003 --- /dev/null +++ b/sysutils/qpxtool/files/patch-pxcontrol-Makefile @@ -0,0 +1,37 @@ +--- pxcontrol/Makefile.orig Fri Jul 14 01:08:28 2006 ++++ pxcontrol/Makefile Sun Jul 16 22:25:31 2006 +@@ -8,18 +8,18 @@ + + ####### Compiler, tools and options + +-CC = gcc +-CXX = g++ ++CC ?= gcc ++CXX ?= g++ + LEX = flex + YACC = yacc +-CFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT +-CXXFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT ++CFLAGS += -Wall -W -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT ++CXXFLAGS += -Wall -W -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT + LEXFLAGS = + YACCFLAGS= -d +-INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I. -Iinclude -I$(QTDIR)/include +-LINK = g++ ++INCPATH = -I. -Iinclude -I$(QTDIR)/include ++LINK = $(CXX) + LFLAGS = -Wl,-rpath,$(QTDIR)/lib +-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm ++LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lcam -pthread + AR = ar cqs + RANLIB = + MOC = $(QTDIR)/bin/moc +@@ -103,7 +103,7 @@ + $(MOC): + ( cd $(QTDIR)/src/moc && $(MAKE) ) + +-Makefile: pxcontrol.pro /usr/lib/qt/mkspecs/default/qmake.conf /usr/lib/qt/lib/libqt-mt.prl ++Makefile: pxcontrol.pro + $(QMAKE) -o Makefile pxcontrol.pro + qmake: + @$(QMAKE) -o Makefile pxcontrol.pro diff --git a/sysutils/qpxtool/files/patch-Makefile b/sysutils/qpxtool/files/patch-qpxtool-Makefile index 71487272c2cc..ec9c092d5cc5 100644 --- a/sysutils/qpxtool/files/patch-Makefile +++ b/sysutils/qpxtool/files/patch-qpxtool-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Mar 19 16:50:26 2006 -+++ Makefile Thu Mar 23 05:26:07 2006 +--- qpxtool/Makefile.orig Fri Jul 14 01:06:57 2006 ++++ qpxtool/Makefile Sun Jul 16 22:23:17 2006 @@ -8,18 +8,18 @@ ####### Compiler, tools and options @@ -16,9 +16,9 @@ +CXXFLAGS += -Wall -W -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT LEXFLAGS = YACCFLAGS= -d --INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I. -I$(QTDIR)/include +-INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I. -Iinclude -I$(QTDIR)/include -LINK = g++ -+INCPATH = -I. -I$(QTDIR)/include ++INCPATH = -I. -Iinclude -I$(QTDIR)/include +LINK = $(CXX) LFLAGS = -Wl,-rpath,$(QTDIR)/lib -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm @@ -26,7 +26,7 @@ AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc -@@ -181,7 +181,7 @@ +@@ -190,7 +190,7 @@ $(MOC): ( cd $(QTDIR)/src/moc && $(MAKE) ) |