ports/114338: math/qtiplot - fix build with python

[Max Brazhnikov]

>Number:         114338
>Category:       ports
>Synopsis:       math/qtiplot - fix build with python
>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:   Thu Jul 05 20:00:21 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Jun 30 15:49:44 MSD 2007     root at luna.dio.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
Fix build if WITH_PYTHON is defined
Clean up Makefile
>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	Fri Jun 29 09:46:42 2007
+++ /home/makc/porting/ports/math/qtiplot/Makefile	Thu Jul  5 21:11:53 2007
@@ -37,7 +37,6 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PYTHON)
-BROKEN=	py-qt4-\* ports should be fixed first
 USE_PYTHON=	yes
 # manually include this, because USE_PYTHON is defined
 # after including bsd.port.pre.mk
@@ -58,7 +57,6 @@
 .if !defined(WITHOUT_NLS)
 #QT_COMPONENTS+=	linguist
 BUILD_DEPENDS+=	${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist
-QTI_LANG=	de es fr ja ru sv
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
@@ -90,16 +88,8 @@
 	@${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; \
 		 s|^CXX .*|CXX=${CXX}|; \
-		 s|^LINK .*|LINK=${CXX}|; \
-		 s|-pipe||; \
-		 s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
-		 s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
+		 s|^LINK .*|LINK=${CXX}|' \
 		${WRKSRC}/${d}/Makefile
-.endfor
-
-do-build:
-.for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
 .endfor
 
 do-install:
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	Fri Jun 15 13:46:44 2007
+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro	Fri Jun  8 00:58:41 2007
@@ -1,5 +1,5 @@
---- ./qtiplot/qtiplot.pro.orig	Sat Jun  2 15:33:23 2007
-+++ ./qtiplot/qtiplot.pro	Sat Jun  2 15:35:21 2007
+--- ./qtiplot/qtiplot.pro.orig	Fri Jun  8 00:55:33 2007
++++ ./qtiplot/qtiplot.pro	Fri Jun  8 00:58:19 2007
 @@ -17,24 +17,17 @@
  
  # what to install and where
@@ -128,7 +128,7 @@
  
  }
  
-@@ -396,12 +391,11 @@
+@@ -396,12 +391,12 @@
    SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
  
    unix {
@@ -141,7 +141,8 @@
 +	INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
 +	LIBS +=	-lm -l$$(PYTHON_VERSION)
 +	system(mkdir -p $${SIP_DIR})
-+	system($$(PYTHON_VERSION) -c $${SIP_DIR} src/qti.sip)
++	SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
++	system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
 +	}
  
    win32 {


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