Attachment 68265 Details for Bug 100401 – qpxtool-0.5.4.patch

[patch] qpxtool-0.5.4.patch

qpxtool-0.5.4.patch (text/plain), 6.15 KB, created by Dmitry Marakasov on 2006-07-16 19:40:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2006-07-16 19:40:13 UTC

Size: 6.15 KB

patch

obsolete

>diff -ruN qpxtool.orig/Makefile qpxtool/Makefile
>--- qpxtool.orig/Makefile	Sun Jul 16 22:04:32 2006
>+++ qpxtool/Makefile	Sun Jul 16 22:33:33 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	qpxtool
>-PORTVERSION=	0.5.3
>+PORTVERSION=	0.5.4
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -20,16 +20,21 @@
> MAKE_ENV+=	QTDIR="${QT_PREFIX}"
> MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
> 
>-PLIST_FILES=	bin/qpxtool
>+PLIST_FILES=	bin/qpxtool bin/pxcontrol
> PORTDOCS=	README ChangeLog
> 
>+do-build:
>+	cd ${WRKSRC}/qpxtool && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
>+	cd ${WRKSRC}/pxcontrol && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
>+
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/qpxtool ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/qpxtool/qpxtool ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/pxcontrol/pxcontrol ${PREFIX}/bin
> 
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
> .for f in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/qpxtool/${f} ${DOCSDIR}
> .endfor
> .endif
> 
>diff -ruN qpxtool.orig/distinfo qpxtool/distinfo
>--- qpxtool.orig/distinfo	Sun Jul 16 22:04:32 2006
>+++ qpxtool/distinfo	Sun Jul 16 22:05:43 2006
>@@ -1,3 +1,3 @@
>-MD5 (qpxtool-0.5.3.tar.bz2) = be0fd0042c19f9916e3e912193fd8cdf
>-SHA256 (qpxtool-0.5.3.tar.bz2) = 895bcb2d7903b31c777f39444e4f8c9f4f6f1f12a5281a098e526a815d013101
>-SIZE (qpxtool-0.5.3.tar.bz2) = 125485
>+MD5 (qpxtool-0.5.4.tar.bz2) = 0409be7f0b1f5c5c97f6157994e0419c
>+SHA256 (qpxtool-0.5.4.tar.bz2) = 21afefc1642c726f29ed8933fd0f9c9834f92cb5d9afe2bfa54de0c7179a6def
>+SIZE (qpxtool-0.5.4.tar.bz2) = 116066
>diff -ruN qpxtool.orig/files/patch-Makefile qpxtool/files/patch-Makefile
>--- qpxtool.orig/files/patch-Makefile	Sun Jul 16 22:04:32 2006
>+++ qpxtool/files/patch-Makefile	Thu Jan  1 03:00:00 1970
>@@ -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 -ruN qpxtool.orig/files/patch-pxcontrol-Makefile qpxtool/files/patch-pxcontrol-Makefile
>--- qpxtool.orig/files/patch-pxcontrol-Makefile	Thu Jan  1 03:00:00 1970
>+++ qpxtool/files/patch-pxcontrol-Makefile	Sun Jul 16 22:26:03 2006
>@@ -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 -ruN qpxtool.orig/files/patch-qpxtool-Makefile qpxtool/files/patch-qpxtool-Makefile
>--- qpxtool.orig/files/patch-qpxtool-Makefile	Thu Jan  1 03:00:00 1970
>+++ qpxtool/files/patch-qpxtool-Makefile	Sun Jul 16 22:24:18 2006
>@@ -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

Actions: View | Diff

Attachments on bug 100401: 68265