diff options
Diffstat (limited to 'sysutils/qpxtool')
-rw-r--r-- | sysutils/qpxtool/Makefile | 13 | ||||
-rw-r--r-- | sysutils/qpxtool/distinfo | 6 | ||||
-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 |
4 files changed, 54 insertions, 12 deletions
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile index 4901de27939d..b485a2c88094 100644 --- a/sysutils/qpxtool/Makefile +++ b/sysutils/qpxtool/Makefile @@ -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 @@ USE_QT_VER= 3 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 --git a/sysutils/qpxtool/distinfo b/sysutils/qpxtool/distinfo index 7006f0b7f703..2ce01f3e943d 100644 --- a/sysutils/qpxtool/distinfo +++ b/sysutils/qpxtool/distinfo @@ -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 --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) ) |