ports/102829: [MAINTAINER] sysutils/qpxtool: update to 0.6
Dmitry Marakasov
amdmi3 at mail.ru
Sun Sep 3 19:10:25 UTC 2006
>Number: 102829
>Category: ports
>Synopsis: [MAINTAINER] sysutils/qpxtool: update to 0.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 03 19:10:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Fri Aug 11 00:27:45 MSD 2006 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Update to 0.6
* Project moved to SCons build system
* Major functionality moved to shared libs
>How-To-Repeat:
>Fix:
--- qpxtool-0.6.patch begins here ---
diff -ruN qpxtool.orig/Makefile qpxtool/Makefile
--- qpxtool.orig/Makefile Sun Sep 3 21:04:42 2006
+++ qpxtool/Makefile Sun Sep 3 21:47:53 2006
@@ -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 @@
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}" ${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 -ruN qpxtool.orig/distinfo qpxtool/distinfo
--- qpxtool.orig/distinfo Sun Sep 3 21:04:42 2006
+++ qpxtool/distinfo Sun Sep 3 21:26:18 2006
@@ -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 -ruN qpxtool.orig/files/patch-SConstruct qpxtool/files/patch-SConstruct
--- qpxtool.orig/files/patch-SConstruct Thu Jan 1 03:00:00 1970
+++ qpxtool/files/patch-SConstruct Sun Sep 3 21:33:56 2006
@@ -0,0 +1,22 @@
+--- SConstruct.orig Mon Aug 21 02:37:36 2006
++++ SConstruct Sun Sep 3 21:32:39 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 -ruN qpxtool.orig/files/patch-pxcontrol-Makefile qpxtool/files/patch-pxcontrol-Makefile
--- qpxtool.orig/files/patch-pxcontrol-Makefile Sun Sep 3 21:04:42 2006
+++ qpxtool/files/patch-pxcontrol-Makefile Thu Jan 1 03:00:00 1970
@@ -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 -ruN qpxtool.orig/files/patch-qpxtool-Makefile qpxtool/files/patch-qpxtool-Makefile
--- qpxtool.orig/files/patch-qpxtool-Makefile Sun Sep 3 21:04:42 2006
+++ qpxtool/files/patch-qpxtool-Makefile Thu Jan 1 03:00:00 1970
@@ -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 -ruN qpxtool.orig/pkg-plist qpxtool/pkg-plist
--- qpxtool.orig/pkg-plist Thu Jan 1 03:00:00 1970
+++ qpxtool/pkg-plist Sun Sep 3 21:45:59 2006
@@ -0,0 +1,7 @@
+bin/pioquiet
+bin/pxcontrol
+bin/qpxtool
+lib/libqpxpioneer.so
+lib/libqpxplextor.so
+lib/libqpxscan.so
+lib/libqpxtransport.so
--- qpxtool-0.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list