- Fix build with python

PR:		114338
Submitted by:	Max Brazhnikov <makc@issp.ac.ru> (maintainer)
This commit is contained in:
Martin Wilke
2007-07-09 16:02:57 +00:00
parent 16201d29c6
commit 8553f7d689
2 changed files with 6 additions and 15 deletions

View File

@@ -37,7 +37,6 @@ OPTIONS= DOCS "Install the QtiPlot Handbook" on \
.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 @@ RUN_DEPENDS+= qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc
.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,18 +88,10 @@ post-configure:
@${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:
${MKDIR} ${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot

View File

@@ -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 {