ports/122229: maintainer update: math/qtiplot

[Max Brazhnikov]

>Number:         122229
>Category:       ports
>Synopsis:       maintainer update: math/qtiplot
>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:   Sat Mar 29 10:00:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon Mar 10 22:27:40 MSK 2008     root at luna.dio.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
Update qtiplot to 0.9.4
Please note this PR requires ports/119904

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile
--- /usr/ports/math/qtiplot/Makefile	2007-12-15 14:30:38.000000000 +0300
+++ /home/makc/porting/ports/math/qtiplot/Makefile	2008-03-29 12:27:13.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.2
+DISTVERSION=	0.9.4
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
@@ -16,7 +16,7 @@
 LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
 		muparser.0:${PORTSDIR}/math/muparser \
 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
-		qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel
+		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -62,10 +62,6 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-QPRO_DIRS=	fitPlugins/fitRational0 \
-		fitPlugins/fitRational1 \
-		qtiplot
-
 post-patch:
 .if defined(WITH_PYTHON)
 	@${REINPLACE_CMD} -e \
@@ -83,8 +79,7 @@
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
 	@${REINPLACE_CMD} -e \
-		's|/usr/share/doc/qtiplot/manual-%1|${DATADIR}/manual|; \
-		 s|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
+		's|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
 		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
 .if defined(WITH_DEBUG)
 	@${REINPLACE_CMD} -e \
@@ -99,13 +94,8 @@
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -recursive)
 
 post-configure:
-.for d in ${QPRO_DIRS}
-	@${REINPLACE_CMD} -e \
-		's|^CC .*|CC=${CC}|; \
-		 s|^CXX .*|CXX=${CXX}|; \
-		 s|^LINK .*|LINK=${CXX}|' \
-		${WRKSRC}/${d}/Makefile
-.endfor
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
 	@${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile
 
 do-install:
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo
--- /usr/ports/math/qtiplot/distinfo	2007-12-15 14:30:38.000000000 +0300
+++ /home/makc/porting/ports/math/qtiplot/distinfo	2008-03-29 10:29:24.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.2.tar.bz2) = 943c50f7fb28e1b11ed0188ec918cf4c
-SHA256 (qtiplot-0.9.2.tar.bz2) = 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd
-SIZE (qtiplot-0.9.2.tar.bz2) = 897629
+MD5 (qtiplot-0.9.4.tar.bz2) = 25d32035c69095a2951967797c010c38
+SHA256 (qtiplot-0.9.4.tar.bz2) = 7b4f9b734e8b258459a2a8d85beeda0c964340891d64822aa944a1fb93c60da1
+SIZE (qtiplot-0.9.4.tar.bz2) = 7025345
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot.pro
--- /usr/ports/math/qtiplot/files/patch-qtiplot.pro	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot.pro	2008-03-29 10:46:13.000000000 +0300
@@ -0,0 +1,9 @@
+--- ./qtiplot.pro.orig	2008-03-29 10:43:50.000000000 +0300
++++ ./qtiplot.pro	2008-03-29 10:43:50.000000000 +0300
+@@ -2,6 +2,4 @@
+ 
+ SUBDIRS = fitPlugins/fitRational0\
+           fitPlugins/fitRational1\
+-          3rdparty/qwt\
+-		  manual\
+           qtiplot
diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro
--- /usr/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	2007-12-15 14:30:38.000000000 +0300
+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	2008-03-29 10:46:13.000000000 +0300
@@ -1,6 +1,6 @@
---- ./qtiplot/qtiplot.pro.orig	2007-11-14 20:19:55.000000000 +0300
-+++ ./qtiplot/qtiplot.pro	2007-11-14 20:19:55.000000000 +0300
-@@ -34,12 +34,8 @@
+--- ./qtiplot/qtiplot.pro.orig	2008-03-29 10:43:50.000000000 +0300
++++ ./qtiplot/qtiplot.pro	2008-03-29 10:46:00.000000000 +0300
+@@ -45,12 +45,8 @@
  #!!! Warning: You must modify these paths according to your computer settings
  #############################################################################
  
@@ -15,7 +15,7 @@
  
  ##################### 3rd PARTY LIBRARIES SECTION ###########################
  #!!! Warning: You must modify these paths according to your computer settings
-@@ -48,17 +44,13 @@
+@@ -59,17 +55,13 @@
  ##################### Linux (Mac OS X) ######################################
  
  # statically link against libraries in 3rdparty
@@ -36,7 +36,18 @@
  
  ##################### Windows ###############################################
  
-@@ -400,6 +392,7 @@
+@@ -124,8 +116,8 @@
+                   translations/qtiplot_ja.ts \
+                   translations/qtiplot_sv.ts
+ 
+-system(lupdate -verbose qtiplot.pro)
+-system(lrelease -verbose qtiplot.pro)
++#system(lupdate -verbose qtiplot.pro)
++#system(lrelease -verbose qtiplot.pro)
+ 
+ translations.files += translations/qtiplot_de.qm \
+                   translations/qtiplot_es.qm \
+@@ -435,6 +427,7 @@
  ##################### Default: muParser v1.28 #################
  
  contains(SCRIPTING_LANGS, muParser) {
@@ -44,15 +55,15 @@
    DEFINES += SCRIPTING_MUPARSER
  
    HEADERS += src/muParserScript.h \
-@@ -417,11 +410,11 @@
+@@ -461,11 +454,12 @@
    SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
  
    unix {
 -    INCLUDEPATH += $$system(python python-includepath.py)
 -    LIBS        += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
--    LIBS        += -lm
 +    INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
-+    LIBS +=	-lm -l$$(PYTHON_VERSION)
++    LIBS        += -l$$(PYTHON_VERSION)
+     LIBS        += -lm
      system(mkdir -p $${SIP_DIR})
 -    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
 +    SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py


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