6 files changed, 40 insertions, 88 deletions

diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index b485a2c88094..34a8fb7daf37 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qpxtool
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,24 +17,21 @@ COMMENT=	A GUI for testing CD/DVD quality and transfer rate
 USE_BZIP2=	yes
 USE_QT_VER=	3
 
-MAKE_ENV+=	QTDIR="${QT_PREFIX}"
-MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
+USE_SCONS=	yes
+SCONS_BUILDENV=	QTDIR="${QT_PREFIX}" TMPDIR="${TMPDIR}" ${SCONS_ENV}
 
-PLIST_FILES=	bin/qpxtool bin/pxcontrol
-PORTDOCS=	README ChangeLog
+USE_LDCONFIG=	yes
 
-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}
+PORTDOCS=	README ChangeLog
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qpxtool/qpxtool ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/pxcontrol/pxcontrol ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/lib/lib/* ${PREFIX}/lib/
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/qpxtool/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/sysutils/qpxtool/distinfo b/sysutils/qpxtool/distinfo
index 2ce01f3e943d..784954b9d11c 100644
--- a/sysutils/qpxtool/distinfo
+++ b/sysutils/qpxtool/distinfo
@@ -1,3 +1,3 @@
-MD5 (qpxtool-0.5.4.tar.bz2) = 0409be7f0b1f5c5c97f6157994e0419c
-SHA256 (qpxtool-0.5.4.tar.bz2) = 21afefc1642c726f29ed8933fd0f9c9834f92cb5d9afe2bfa54de0c7179a6def
-SIZE (qpxtool-0.5.4.tar.bz2) = 116066
+MD5 (qpxtool-0.6.tar.bz2) = 90e846ef5eecd448b8d4ab51eb1b9bf1
+SHA256 (qpxtool-0.6.tar.bz2) = 7752bd99456c22d1060e58bf7bae3f569258e37da6ba32342e6b75093eb1c9e0
+SIZE (qpxtool-0.6.tar.bz2) = 149677
diff --git a/sysutils/qpxtool/files/patch-SConstruct b/sysutils/qpxtool/files/patch-SConstruct
new file mode 100644
index 000000000000..b7a34a84b870
--- /dev/null
+++ b/sysutils/qpxtool/files/patch-SConstruct
@@ -0,0 +1,22 @@
+--- SConstruct.orig	Mon Aug 21 01:37:36 2006
++++ SConstruct	Wed Sep 20 17:30:38 2006
+@@ -16,19 +16,6 @@
+ 		env.Replace( **{key: os.environ[key].split(' ')} )
+ 
+ 
+-env.Alias('install', ['/usr/local/bin', '/usr/local/lib' ])
+-env.Alias('install-lib', '/usr/local/lib')
+-
+-env.Install( '/usr/local/bin',
+-	     [ 'bin/qpxtool',
+-	       'bin/pxcontrol',
+-	       'bin/pioquiet'])
+-env.Install( '/usr/local/lib',
+-             [ 'lib/lib/libqpxtransport.so',
+-	       'lib/lib/libqpxscan.so',
+-	       'lib/lib/libqpxplextor.so',
+-	       'lib/lib/libqpxpioneer.so'])
+-
+ Export('env')
+ 
+ SConscript('lib/qpxtransport/SConscript')
diff --git a/sysutils/qpxtool/files/patch-pxcontrol-Makefile b/sysutils/qpxtool/files/patch-pxcontrol-Makefile
deleted file mode 100644
index 3f9aa243a003..000000000000
--- a/sysutils/qpxtool/files/patch-pxcontrol-Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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
deleted file mode 100644
index ec9c092d5cc5..000000000000
--- a/sysutils/qpxtool/files/patch-qpxtool-Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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
diff --git a/sysutils/qpxtool/pkg-plist b/sysutils/qpxtool/pkg-plist
new file mode 100644
index 000000000000..c1d7673607e4
--- /dev/null
+++ b/sysutils/qpxtool/pkg-plist
@@ -0,0 +1,7 @@
+bin/pioquiet
+bin/pxcontrol
+bin/qpxtool
+lib/libqpxpioneer.so
+lib/libqpxplextor.so
+lib/libqpxscan.so
+lib/libqpxtransport.so