aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/py-qt4-sql/Makefile51
-rw-r--r--databases/sqliteman/Makefile2
-rw-r--r--databases/tora/Makefile2
3 files changed, 11 insertions, 44 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index ebd4d2b529af..fe3fe76c1240 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -2,13 +2,8 @@
# $FreeBSD$
PORTNAME= sql
-PORTVERSION= ${PYQT4_VERSION}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases devel python
-MASTER_SITES= ${MASTER_SITES_PYQT4}
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME= ${PYQT4_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtSql module
@@ -16,47 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtSql module
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
-HAS_CONFIGURE= yes
-USE_PYTHON= yes
+CONFIGURE_ARGS= --enable QtSql
+PYQT4_DIST= yes
USE_QT4= moc_build gui sql qmake_build
-OPTIONS_DEFINE= API
+OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
-API_DESC= Install QtSql API for QScintilla2
+OPTIONS_SUB= yes
-PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files
-OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options
-SIPDIR= ${PREFIX}/share/py-sip
-QSCIDIR= ${PREFIX}/share/qt4/qsci
-ARGS= -b ${PREFIX}/bin \
- -d ${PYTHONPREFIX_SITELIBDIR} \
- -p ${PREFIX}/${QT_PLUGINDIR_REL} \
- -q ${QMAKE} \
- --confirm-license \
- --sipdir ${SIPDIR} \
- --enable QtSql \
- CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+API_DESC= Install QtSql API for QScintilla2
+API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
+API_CONFIGURE_OFF= --no-qsci-api
+API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+DEBUG_CONFIGURE_ON= --debug --trace
.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MAPI)
-ARGS+= --no-qsci-api
-PLIST_SUB+= API="@comment "
-.else
-LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
-ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR}
-PLIST_SUB+= API=""
-.endif
-
-.if defined(WITH_DEBUG)
-ARGS+= --debug --trace
-.endif
-
-do-configure:
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
- ${PYTHON_CMD} configure.py ${ARGS}
-
.include <bsd.port.mk>
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 6113dd38fe3c..8e62d5ee2354 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sqliteman
PORTVERSION= 1.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= SF
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 1af3a52fee36..8bf7b2848af3 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tora
PORTVERSION= 2.1.3
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SF