From c1fa73878885ea1228c46d4e24a512991b2fe3fd Mon Sep 17 00:00:00 2001 From: erwin Date: Sun, 16 Jul 2006 21:18:34 +0000 Subject: Update to 0.5.4 PR: 100401 Submitted by: Dmitry Marakasov (maintainer) --- sysutils/qpxtool/files/patch-Makefile | 37 ------------------------- sysutils/qpxtool/files/patch-pxcontrol-Makefile | 37 +++++++++++++++++++++++++ sysutils/qpxtool/files/patch-qpxtool-Makefile | 37 +++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 37 deletions(-) delete mode 100644 sysutils/qpxtool/files/patch-Makefile create mode 100644 sysutils/qpxtool/files/patch-pxcontrol-Makefile create mode 100644 sysutils/qpxtool/files/patch-qpxtool-Makefile (limited to 'sysutils/qpxtool/files') diff --git a/sysutils/qpxtool/files/patch-Makefile b/sysutils/qpxtool/files/patch-Makefile deleted file mode 100644 index 71487272c2cc..000000000000 --- a/sysutils/qpxtool/files/patch-Makefile +++ /dev/null @@ -1,37 +0,0 @@ ---- Makefile.orig Sun Mar 19 16:50:26 2006 -+++ Makefile Thu Mar 23 05:26:07 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. -I$(QTDIR)/include --LINK = g++ -+INCPATH = -I. -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 -@@ -181,7 +181,7 @@ - $(MOC): - ( cd $(QTDIR)/src/moc && $(MAKE) ) - --Makefile: qpxtool.pro /usr/lib/qt/mkspecs/default/qmake.conf /usr/lib/qt/lib/libqt-mt.prl -+Makefile: qpxtool.pro - $(QMAKE) -o Makefile qpxtool.pro - qmake: - @$(QMAKE) -o Makefile qpxtool.pro 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-qpxtool-Makefile b/sysutils/qpxtool/files/patch-qpxtool-Makefile new file mode 100644 index 000000000000..ec9c092d5cc5 --- /dev/null +++ b/sysutils/qpxtool/files/patch-qpxtool-Makefile @@ -0,0 +1,37 @@ +--- 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 + +-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 +@@ -190,7 +190,7 @@ + $(MOC): + ( cd $(QTDIR)/src/moc && $(MAKE) ) + +-Makefile: qpxtool.pro /usr/lib/qt/mkspecs/default/qmake.conf /usr/lib/qt/lib/libqt-mt.prl ++Makefile: qpxtool.pro + $(QMAKE) -o Makefile qpxtool.pro + qmake: + @$(QMAKE) -o Makefile qpxtool.pro -- cgit