ports/137960: [Maintainer Update]x11-toolkits/py-pyqwt:update to 5.2.0

Wed Aug 19 12:10:01 UTC 2009

>Number:         137960
>Category:       ports
>Synopsis:       [Maintainer Update]x11-toolkits/py-pyqwt:update to 5.2.0
>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:   Wed Aug 19 12:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Wen Heping
>Release:        FreeBSD 8.0-Current
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Fri Apr 10 16:36:28 HKT 2009     root at fb8.wenjing.com:/usr/obj/usr/src/sys/wen1  i386
>Description:
1 UNBROKEN it
2 update to 5.2.0 from 5.1.0
3 fix the build error with CUSTOM PREFIX
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN py-pyqwt/Makefile py-pyqwt.new/Makefile

--- py-pyqwt/Makefile	2009-08-03 22:34:15.000000000 +0800
+++ py-pyqwt.new/Makefile	2009-08-20 03:40:19.000000000 +0800
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	pyqwt
-PORTVERSION=	5.1.0
-PORTREVISION=	1
+PORTVERSION=	5.2.0
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	SF
+MASTER_SITES=	SFP
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyQwt-${PORTVERSION}
 
 MAINTAINER=	wenheping at gmail.com
 COMMENT=	Python Bindings for the Qwt Class Library
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.3.3:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.3.3:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.3.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \
+BUILD_DEPENDS=	${LOCALBASE}/bin/qmake-qt4:${PORTSDIR}/devel/qmake4 \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.5.4:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.4:${PORTSDIR}/graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.4.1:${PORTSDIR}/devel/py-qt4-qscintilla2 \
 		${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
@@ -29,6 +30,8 @@
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 
-BROKEN=		does not compile
+post-patch:
+		${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
+			${WRKSRC}/GNUmakefile
 
 .include <bsd.port.mk>
diff -urN py-pyqwt/distinfo py-pyqwt.new/distinfo
--- py-pyqwt/distinfo	2009-01-20 18:50:17.000000000 +0800
+++ py-pyqwt.new/distinfo	2009-08-19 00:22:35.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (PyQwt-5.1.0.tar.gz) = c9d662a0d4fc95cec75d3c526e4e748a
-SHA256 (PyQwt-5.1.0.tar.gz) = 13d90d25b3c21c5dadd5cfac1e45cd41680f3c9b7731776c5a46bb1eece12716
-SIZE (PyQwt-5.1.0.tar.gz) = 4700809
+MD5 (PyQwt-5.2.0.tar.gz) = fcd6c6029090d473dcc9df497516eae7
+SHA256 (PyQwt-5.2.0.tar.gz) = 98a8c7e0c76d07701c11dffb77793b05f071b664a8b520d6e97054a98179e70b
+SIZE (PyQwt-5.2.0.tar.gz) = 2670893
diff -urN py-pyqwt/files/patch-GNUmakefile py-pyqwt.new/files/patch-GNUmakefile
--- py-pyqwt/files/patch-GNUmakefile	2009-02-01 18:35:49.000000000 +0800
+++ py-pyqwt.new/files/patch-GNUmakefile	2009-08-17 17:36:55.000000000 +0800
@@ -14,7 +14,7 @@
  4:
  	cd configure \
 -	&& python configure.py -4 -Q $(QWT) -j $(JOBS) \
-+	&& python configure.py -4 -I/usr/local/include/qwt -L/usr/local/lib -lqwt -j $(JOBS) \
++	&& python configure.py -4 -I%%LOCALBASE%%/include/qwt -L%%LOCALBASE%%/lib -lqwt -j $(JOBS) \
  	&& $(MAKE) -j $(JOBS)
  
  
diff -urN py-pyqwt/files/patch-configure-configure.py py-pyqwt.new/files/patch-configure-configure.py
--- py-pyqwt/files/patch-configure-configure.py	1970-01-01 08:00:00.000000000 +0800
+++ py-pyqwt.new/files/patch-configure-configure.py	2009-08-17 05:26:01.000000000 +0800
@@ -0,0 +1,11 @@
+--- configure/configure.py.orig	2009-08-17 05:24:49.000000000 +0800
++++ configure/configure.py	2009-08-17 05:25:10.000000000 +0800
+@@ -183,7 +183,7 @@
+ ''' % ' '.join(extra_include_dirs))
+     f.close()
+ 
+-    qmake = os.path.join(configuration.qt_dir, 'bin', 'qmake')
++    qmake = os.path.join(configuration.qt_dir, 'bin', 'qmake-qt4')
+     os.system('%s -spec %s -o %s %s' % (
+         qmake, configuration.platform, make_file, pro_file))
+ 
diff -urN py-pyqwt/pkg-plist py-pyqwt.new/pkg-plist
--- py-pyqwt/pkg-plist	2009-02-17 04:11:30.000000000 +0800
+++ py-pyqwt.new/pkg-plist	2009-08-17 19:11:37.000000000 +0800
@@ -1,4 +1,3 @@
-%%PYTHON_SITELIBDIR%%/PyQt4/Qwt5
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/_iqt.so
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/Qwt.so
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/qplt.py
@@ -13,10 +12,12 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/iqt.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/pythonrc.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/qplt.pyc
-share/py-sip/Qwt5
+%%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/ipy_user_conf.py
+%%PYTHON_SITELIBDIR%%/PyQt4/Qwt5/ipy_user_conf.pyc
 share/py-sip/Qwt5/qwt_arrow_button.sip
 share/py-sip/Qwt5/qwt_knob.sip
 share/py-sip/Qwt5/qwt_plot_picker.sip
+share/py-sip/Qwt5/qwt_plot_rescaler.sip
 share/py-sip/Qwt5/qwt_plot_svgitem.sip
 share/py-sip/Qwt5/qwt_legend_itemmanager.sip
 share/py-sip/Qwt5/qwt_text.sip
@@ -25,7 +26,6 @@
 share/py-sip/Qwt5/qwt_abstract_scale_draw.sip
 share/py-sip/Qwt5/qwt_plot_printfilter.sip
 share/py-sip/Qwt5/qwt_scale_map.sip
-share/py-sip/Qwt5/qwt_scale_widget.sip
 share/py-sip/Qwt5/QwtArrayInt.sip
 share/py-sip/Qwt5/qwt_dial_needle.sip
 share/py-sip/Qwt5/qwt_plot_curve.sip
@@ -89,4 +89,4 @@
 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/Qwt5
 @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
 @dirrm share/py-sip/Qwt5
- at dirrm share/py-sip
+ at dirrmtry share/py-sip


>Release-Note:
>Audit-Trail:
>Unformatted:

