Date: Tue, 21 Jun 2016 23:33:22 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417290 - head/databases/sqlitestudio Message-ID: <201606212333.u5LNXMHl009469@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Jun 21 23:33:22 2016 New Revision: 417290 URL: https://svnweb.freebsd.org/changeset/ports/417290 Log: Update to 3.1.0 PR: 210427 Submitted by: yuri@rawbw.com (maintainer) Modified: head/databases/sqlitestudio/Makefile head/databases/sqlitestudio/distinfo head/databases/sqlitestudio/pkg-plist Modified: head/databases/sqlitestudio/Makefile ============================================================================== --- head/databases/sqlitestudio/Makefile Tue Jun 21 21:01:27 2016 (r417289) +++ head/databases/sqlitestudio/Makefile Tue Jun 21 23:33:22 2016 (r417290) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sqlitestudio -PORTVERSION= 3.0.7 +PORTVERSION= 3.1.0 CATEGORIES= databases MASTER_SITES= http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/ @@ -12,52 +12,48 @@ COMMENT= SQLite database GUI manager LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/guiSQLiteStudio/license.txt -OPTIONS_DEFINE= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_HTML_EXPORT -OPTIONS_DEFINE+= PLUGIN_PDF_EXPORT PLUGIN_JSON_EXPORT PLUGIN_XML_EXPORT -OPTIONS_DEFINE+= PLUGIN_SQL_EXPORT PLUGIN_REGEXP_IMPORT -OPTIONS_DEFINE+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_ENTERPRISE_FORMATTER -OPTIONS_DEFINE+= PLUGIN_PRINTING +OPTIONS_DEFINE= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_DB_SQLITE_CIPHER PLUGIN_HTML_EXPORT +OPTIONS_DEFINE+= PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT +OPTIONS_DEFINE+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER +OPTIONS_DEFINE+= PLUGIN_XML_EXPORT PLUGIN_CSV_IMPORT_DESC= Install CsvImport plugin PLUGIN_CSV_EXPORT_DESC= Install CsvExport plugin +PLUGIN_DB_SQLITE_CIPHER_DESC= Install DbSqliteCipher plugin PLUGIN_HTML_EXPORT_DESC= Install HtmlExport plugin -PLUGIN_PDF_EXPORT_DESC= Install PdfExport plugin PLUGIN_JSON_EXPORT_DESC= Install JsonExport plugin -PLUGIN_XML_EXPORT_DESC= Install XmlExport plugin -PLUGIN_SQL_EXPORT_DESC= Install SqlExport plugin +PLUGIN_PDF_EXPORT_DESC= Install PdfExport plugin +PLUGIN_PRINTING_DESC= Install Printing plugin PLUGIN_REGEXP_IMPORT_DESC= Install RegExp plugin PLUGIN_SQL_FORMATTER_SIMPLE_DESC= Install SqlFormatterSimple plugin +PLUGIN_SQL_EXPORT_DESC= Install SqlExport plugin PLUGIN_SQL_ENTERPRISE_FORMATTER_DESC= Install SqlEnterpriseFormatter plugin -PLUGIN_PRINTING_DESC= Install Printing plugin +PLUGIN_XML_EXPORT_DESC= Install XmlExport plugin + OPTIONS_DEFAULT= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_HTML_EXPORT -OPTIONS_DEFAULT+= PLUGIN_PDF_EXPORT PLUGIN_JSON_EXPORT PLUGIN_XML_EXPORT -OPTIONS_DEFAULT+= PLUGIN_SQL_EXPORT PLUGIN_REGEXP_IMPORT -OPTIONS_DEFAULT+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_ENTERPRISE_FORMATTER -OPTIONS_DEFAULT+= PLUGIN_PRINTING +OPTIONS_DEFAULT+= PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT +OPTIONS_DEFAULT+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER +OPTIONS_DEFAULT+= PLUGIN_XML_EXPORT OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/SQLiteStudio3 -USES= compiler:c++11-lib gmake ncurses qmake sqlite +USES= compiler:c++11-lib gmake ncurses qmake readline sqlite +USE_CXXSTD= c++11 USE_QT5= core gui svg sql xml network sql-sqlite3_run widgets script \ concurrent uitools buildtools_build linguisttools_build USE_GL= gl USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${COMPILER_TYPE} == clang && (${COMPILER_VERSION} < 37) -# The reason for clang37 is that previous versions fail to compile with various errors -BUILD_DEPENDS+= clang37:lang/clang37 -CPP= clang-cpp37 -CC= clang37 -CXX= clang++37 -.endif +CXXFLAGS+= -I${WRKSRC}/coreSQLiteStudio post-patch: @${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' \ ${WRKSRC}/dirs.pri @${REINPLACE_CMD} -e 's|pluginDirs += QDir(CFG->getConfigDir()).absoluteFilePath("plugins");|pluginDirs += "${LOCALBASE}/lib/sqlitestudio";|' \ ${WRKSRC}/coreSQLiteStudio/services/impl/pluginmanagerimpl.cpp + # Patch from http://bugs.sqlitestudio.pl/index.rvt?id=3102 + @${REINPLACE_CMD} -e 's|^include(.*|include($$$$PWD/../../SQLiteStudio3/plugins.pri)|' \ + ${WRKDIR}/Plugins/DbSqliteCipher/DbSqliteCipher.pro .include <bsd.port.options.mk> @@ -68,36 +64,43 @@ PLUGIN_DIRS += CsvImport .if ${PORT_OPTIONS:MPLUGIN_CSV_EXPORT} PLUGIN_DIRS += CsvExport .endif +.if ${PORT_OPTIONS:MPLUGIN_DB_SQLITE_CIPHER} +PLUGIN_DIRS += DbSqliteCipher +USE_OPENSSL= yes +.endif .if ${PORT_OPTIONS:MPLUGIN_HTML_EXPORT} PLUGIN_DIRS += HtmlExport .endif -.if ${PORT_OPTIONS:MPLUGIN_PDF_EXPORT} -PLUGIN_DIRS += PdfExport -.endif .if ${PORT_OPTIONS:MPLUGIN_JSON_EXPORT} PLUGIN_DIRS += JsonExport .endif -.if ${PORT_OPTIONS:MPLUGIN_XML_EXPORT} -PLUGIN_DIRS += XmlExport +.if ${PORT_OPTIONS:MPLUGIN_PDF_EXPORT} +PLUGIN_DIRS += PdfExport .endif -.if ${PORT_OPTIONS:MPLUGIN_SQL_EXPORT} -PLUGIN_DIRS += SqlExport +.if ${PORT_OPTIONS:MPLUGIN_PRINTING} +PLUGIN_DIRS += Printing +USE_QT5+= printsupport .endif .if ${PORT_OPTIONS:MPLUGIN_REGEXP_IMPORT} PLUGIN_DIRS += RegExpImport .endif -.if ${PORT_OPTIONS:MPLUGIN_SQL_FORMATTER_SIMPLE} -PLUGIN_DIRS += SqlFormatterSimple -.endif .if ${PORT_OPTIONS:MPLUGIN_SQL_ENTERPRISE_FORMATTER} PLUGIN_DIRS += SqlEnterpriseFormatter .endif -.if ${PORT_OPTIONS:MPLUGIN_PRINTING} -PLUGIN_DIRS += Printing -USE_QT5+= printsupport +.if ${PORT_OPTIONS:MPLUGIN_SQL_EXPORT} +PLUGIN_DIRS += SqlExport +.endif +.if ${PORT_OPTIONS:MPLUGIN_SQL_FORMATTER_SIMPLE} +PLUGIN_DIRS += SqlFormatterSimple +.endif +.if ${PORT_OPTIONS:MPLUGIN_XML_EXPORT} +PLUGIN_DIRS += XmlExport .endif post-configure: + # Fix for a suspected bug in qmake: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210418 + @${REINPLACE_CMD} -E 's|SUBLIBS) -L[^ ]+|SUBLIBS) |' ${WRKSRC}/sqlitestudio/Makefile + @${REINPLACE_CMD} -E 's|LIBS)$$|LIBS) -L${PREFIX}/lib|' ${WRKSRC}/sqlitestudio/Makefile .for plugin in ${PLUGIN_DIRS} @cd ${WRKDIR}/Plugins/${plugin} && \ ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} @@ -113,4 +116,4 @@ post-install: ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/sqlitestudio/distinfo ============================================================================== --- head/databases/sqlitestudio/distinfo Tue Jun 21 21:01:27 2016 (r417289) +++ head/databases/sqlitestudio/distinfo Tue Jun 21 23:33:22 2016 (r417290) @@ -1,2 +1,3 @@ -SHA256 (sqlitestudio-3.0.7.tar.gz) = b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa -SIZE (sqlitestudio-3.0.7.tar.gz) = 2551341 +TIMESTAMP = 1466103045 +SHA256 (sqlitestudio-3.1.0.tar.gz) = e36690e71825a21d4274de730932a05a029b01dad28728b2c45f9fce0cfe9894 +SIZE (sqlitestudio-3.1.0.tar.gz) = 4565170 Modified: head/databases/sqlitestudio/pkg-plist ============================================================================== --- head/databases/sqlitestudio/pkg-plist Tue Jun 21 21:01:27 2016 (r417289) +++ head/databases/sqlitestudio/pkg-plist Tue Jun 21 23:33:22 2016 (r417290) @@ -10,12 +10,13 @@ lib/libguiSQLiteStudio.so.1.0 lib/libguiSQLiteStudio.so.1.0.0 %%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so %%PLUGIN_CSV_EXPORT%%lib/sqlitestudio/libCsvExport.so +%%PLUGIN_DB_SQLITE_CIPHER%%lib/sqlitestudio/libDbSqliteCipher.so %%PLUGIN_HTML_EXPORT%%lib/sqlitestudio/libHtmlExport.so -%%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so %%PLUGIN_JSON_EXPORT%%lib/sqlitestudio/libJsonExport.so -%%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so -%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so +%%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so +%%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so %%PLUGIN_REGEXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so %%PLUGIN_SQL_FORMATTER_SIMPLE%%lib/sqlitestudio/libSqlFormatterSimple.so +%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so %%PLUGIN_SQL_ENTERPRISE_FORMATTER%%lib/sqlitestudio/libSqlEnterpriseFormatter.so -%%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so +%%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606212333.u5LNXMHl009469>