diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/py-qt4-sql/Makefile | 3 | ||||
| -rw-r--r-- | databases/py-qt5-sql/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqliteman/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake | 12 | ||||
| -rw-r--r-- | databases/tora/Makefile | 4 | ||||
| -rw-r--r-- | databases/tora/files/patch-config_m4_qtkde.m4 | 21 |
6 files changed, 41 insertions, 7 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index 62f12f40d634..32fba328cfe1 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= sql +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python @@ -24,7 +25,7 @@ OPTIONS_SUB= yes 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:devel/qscintilla2 +API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace .include <bsd.port.mk> diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile index d39a6a28458d..02020ca21628 100644 --- a/databases/py-qt5-sql/Makefile +++ b/databases/py-qt5-sql/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sql -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases devel python MAINTAINER= kde@FreeBSD.org @@ -23,7 +23,7 @@ OPTIONS_SUB= yes 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-qt5.so:devel/qscintilla2-qt5 +API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace .include <bsd.port.mk> diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 09a8112958d8..4201bd085b2f 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -3,14 +3,14 @@ PORTNAME= sqliteman PORTVERSION= 1.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases MASTER_SITES= SF MAINTAINER= wen@FreeBSD.org COMMENT= Admin's GUI tool for Sqlite3 -LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 +LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 USES= cmake sqlite USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql diff --git a/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake new file mode 100644 index 000000000000..8e0adee9f6e9 --- /dev/null +++ b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake @@ -0,0 +1,12 @@ +The library is called libqscintilla_qt4.so since 2.10.2. +--- cmake/modules/FindQScintilla.cmake.orig 2018-02-16 21:57:36 UTC ++++ cmake/modules/FindQScintilla.cmake +@@ -21,7 +21,7 @@ IF(QT4_FOUND) + "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci + ) + +- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) ++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2_qt4 qscintilla2 libqscintilla2) + FIND_LIBRARY(QSCINTILLA_LIBRARY + NAMES ${QSCINTILLA_NAMES} + PATHS ${QT_LIBRARY_DIR} diff --git a/databases/tora/Makefile b/databases/tora/Makefile index e626ff2ce366..a2b152204144 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -3,7 +3,7 @@ PORTNAME= tora PORTVERSION= 2.1.3 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SF @@ -14,7 +14,7 @@ COMMENT= Toolkit for Oracle LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit -LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \ +LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \ libpcre.so:devel/pcre OPTIONS_DEFINE= PGSQL MYSQL DOCS diff --git a/databases/tora/files/patch-config_m4_qtkde.m4 b/databases/tora/files/patch-config_m4_qtkde.m4 new file mode 100644 index 000000000000..ef2770c79d6e --- /dev/null +++ b/databases/tora/files/patch-config_m4_qtkde.m4 @@ -0,0 +1,21 @@ +The library is called libqscintilla2_qt4.so since 2.10.2. +--- config/m4/qtkde.m4.orig 2018-02-16 21:51:49 UTC ++++ config/m4/qtkde.m4 +@@ -112,7 +112,7 @@ AC_DEFUN([TORA_CHECK_QSCINTILLA], + @LIB_DCOP@ \ + @LIB_KHTML@ \ + $scin_ldflags" +- LIBS="-lqscintilla2" ++ LIBS="-lqscintilla2_qt4" + + AC_LANG_PUSH(C++) + +@@ -148,7 +148,7 @@ Or alternatively see if your OS offers a QScintilla 2 + + AC_DEFINE_UNQUOTED(QSCINTILLA_DLL, 1, [True if on Windows.]) + AC_SUBST(QSCINTILLA_CXXFLAGS, $scin_cflags) +- AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2") ++ AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2_qt4") + AC_MSG_RESULT(yes) + ]) + |