aboutsummaryrefslogtreecommitdiff
path: root/databases/py-qt4-sql
diff options
context:
space:
mode:
Diffstat (limited to 'databases/py-qt4-sql')
-rw-r--r--databases/py-qt4-sql/Makefile26
-rw-r--r--databases/py-qt4-sql/distinfo6
-rw-r--r--databases/py-qt4-sql/pkg-plist36
3 files changed, 31 insertions, 37 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 2941e7d117f2..d2a2f63a9f53 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -6,15 +6,13 @@
PORTNAME= sql
PORTVERSION= ${PYQT4_VERSION}
-PORTREVISION= 2
PORTEPOCH= 1
-
CATEGORIES= databases devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
DISTNAME= ${PYQT4_DISTNAME}
-MAINTAINER= ${PYQT_MAINTAINER}
+MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtSql module
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -23,7 +21,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
USE_QT_VER= 4
-QT_COMPONENTS= sql qmake
+QT_COMPONENTS= sql qmake_build
OPTIONS= API "Install QtSql API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
@@ -33,11 +31,13 @@ OPTIONS= API "Install QtSql API for QScintilla2" on \
PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files
OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options
SIPDIR= ${PREFIX}/share/py-sip
+QSCIDIR= ${PREFIX}/share/qt4/qsci
CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}"
ARGS= -b ${PREFIX}/bin\
- -d ${PYTHON_SITELIBDIR}\
- -q ${QT_PREFIX}/bin/qmake-qt4\
- --confirm-license
+ -d ${PYTHONPREFIX_SITELIBDIR}\
+ -p ${PREFIX}/${QT_PLUGINDIR_REL}\
+ -q ${QMAKE}\
+ --confirm-license\
.include "../../devel/py-sip/files/bsd.pyqt.mk"
.include <bsd.port.pre.mk>
@@ -48,21 +48,17 @@ ARGS+= --debug
.if defined(WITHOUT_API)
ARGS+= --no-qsci-api
PLIST_SUB+= API="@comment "
-PLIST_SUB+= APIFILE="@comment "
.else
-LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+= --qsci-api
+LIB_DEPENDS+= qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR}
PLIST_SUB+= API=""
-PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtSql.api"
.endif
.if defined(WITHOUT_SIPFILES)
ARGS+= --no-sip-files
-PLIST_SUB+= SIPFILES="@comment "
-PLIST_SUB+= SIPDIR="@comment "
+PLIST_SUB+= SIP="@comment "
.else
ARGS+= --sipdir ${SIPDIR}
-PLIST_SUB+= SIPFILES=""
-PLIST_SUB+= SIPDIR="share/py-sip"
+PLIST_SUB+= SIP=""
.endif
.if defined(WITH_TRACING)
ARGS+= --trace
diff --git a/databases/py-qt4-sql/distinfo b/databases/py-qt4-sql/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
+SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
+SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
diff --git a/databases/py-qt4-sql/pkg-plist b/databases/py-qt4-sql/pkg-plist
index e32d1e579adb..fded39d417a3 100644
--- a/databases/py-qt4-sql/pkg-plist
+++ b/databases/py-qt4-sql/pkg-plist
@@ -1,20 +1,18 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtSql.so
-%%SIPFILES%%%%SIPDIR%%/QtSql/QtSqlmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsql.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqldatabase.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqldriver.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlerror.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlfield.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlindex.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlquery.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlquerymodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrecord.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrelationaldelegate.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlresult.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqltablemodel.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtSql
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtSql/QtSqlmod.sip
+%%SIP%%share/py-sip/QtSql/qsql.sip
+%%SIP%%share/py-sip/QtSql/qsqldatabase.sip
+%%SIP%%share/py-sip/QtSql/qsqldriver.sip
+%%SIP%%share/py-sip/QtSql/qsqlerror.sip
+%%SIP%%share/py-sip/QtSql/qsqlfield.sip
+%%SIP%%share/py-sip/QtSql/qsqlindex.sip
+%%SIP%%share/py-sip/QtSql/qsqlquery.sip
+%%SIP%%share/py-sip/QtSql/qsqlquerymodel.sip
+%%SIP%%share/py-sip/QtSql/qsqlrecord.sip
+%%SIP%%share/py-sip/QtSql/qsqlrelationaldelegate.sip
+%%SIP%%share/py-sip/QtSql/qsqlrelationaltablemodel.sip
+%%SIP%%share/py-sip/QtSql/qsqlresult.sip
+%%SIP%%share/py-sip/QtSql/qsqltablemodel.sip
+%%API%%share/qt4/qsci/api/python/QtSql.api
+%%SIP%%@dirrmtry share/py-sip/QtSql
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4