[Midnightbsd-cvs] mports [19826] trunk/databases/qt4-sql: fix build of qt4 sql module

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Aug 19 22:19:36 EDT 2015


Revision: 19826
          http://svnweb.midnightbsd.org/mports/?rev=19826
Author:   laffer1
Date:     2015-08-19 22:19:35 -0400 (Wed, 19 Aug 2015)
Log Message:
-----------
fix build of qt4 sql module

Modified Paths:
--------------
    trunk/databases/qt4-sql/Makefile
    trunk/databases/qt4-sql/pkg-plist

Modified: trunk/databases/qt4-sql/Makefile
===================================================================
--- trunk/databases/qt4-sql/Makefile	2015-08-20 01:59:50 UTC (rev 19825)
+++ trunk/databases/qt4-sql/Makefile	2015-08-20 02:19:35 UTC (rev 19826)
@@ -3,17 +3,17 @@
 
 PORTNAME=	sql
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	databases
+CATEGORIES=	databases
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Qt SQL library
+COMMENT=	Qt SQL database integration module
+
 LICENSE=	gpl3
 
 USE_QT4=	qmake_build moc_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
@@ -38,8 +38,6 @@
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

Modified: trunk/databases/qt4-sql/pkg-plist
===================================================================
--- trunk/databases/qt4-sql/pkg-plist	2015-08-20 01:59:50 UTC (rev 19825)
+++ trunk/databases/qt4-sql/pkg-plist	2015-08-20 02:19:35 UTC (rev 19826)
@@ -1,99 +1,94 @@
-include/qt4/Qt/QtSql
-include/qt4/Qt/qsql.h
-include/qt4/Qt/qsql_db2.h
-include/qt4/Qt/qsql_ibase.h
-include/qt4/Qt/qsql_mysql.h
-include/qt4/Qt/qsql_oci.h
-include/qt4/Qt/qsql_odbc.h
-include/qt4/Qt/qsql_psql.h
-include/qt4/Qt/qsql_sqlite.h
-include/qt4/Qt/qsql_sqlite2.h
-include/qt4/Qt/qsql_symsql.h
-include/qt4/Qt/qsql_tds.h
-include/qt4/Qt/qsqldatabase.h
-include/qt4/Qt/qsqldriver.h
-include/qt4/Qt/qsqldriverplugin.h
-include/qt4/Qt/qsqlerror.h
-include/qt4/Qt/qsqlfield.h
-include/qt4/Qt/qsqlindex.h
-include/qt4/Qt/qsqlquery.h
-include/qt4/Qt/qsqlquerymodel.h
-include/qt4/Qt/qsqlrecord.h
-include/qt4/Qt/qsqlrelationaldelegate.h
-include/qt4/Qt/qsqlrelationaltablemodel.h
-include/qt4/Qt/qsqlresult.h
-include/qt4/Qt/qsqltablemodel.h
-include/qt4/QtSql/QDB2Driver
-include/qt4/QtSql/QDB2Result
-include/qt4/QtSql/QIBaseDriver
-include/qt4/QtSql/QIBaseResult
-include/qt4/QtSql/QMYSQLDriver
-include/qt4/QtSql/QMYSQLResult
-include/qt4/QtSql/QOCIDriver
-include/qt4/QtSql/QOCIResult
-include/qt4/QtSql/QODBCDriver
-include/qt4/QtSql/QODBCResult
-include/qt4/QtSql/QPSQLDriver
-include/qt4/QtSql/QPSQLResult
-include/qt4/QtSql/QSQLite2Driver
-include/qt4/QtSql/QSQLite2Result
-include/qt4/QtSql/QSQLiteDriver
-include/qt4/QtSql/QSQLiteResult
-include/qt4/QtSql/QSqlDatabase
-include/qt4/QtSql/QSqlDriver
-include/qt4/QtSql/QSqlDriverCreator
-include/qt4/QtSql/QSqlDriverCreatorBase
-include/qt4/QtSql/QSqlDriverFactoryInterface
-include/qt4/QtSql/QSqlDriverPlugin
-include/qt4/QtSql/QSqlError
-include/qt4/QtSql/QSqlField
-include/qt4/QtSql/QSqlIndex
-include/qt4/QtSql/QSqlQuery
-include/qt4/QtSql/QSqlQueryModel
-include/qt4/QtSql/QSqlRecord
-include/qt4/QtSql/QSqlRelation
-include/qt4/QtSql/QSqlRelationalDelegate
-include/qt4/QtSql/QSqlRelationalTableModel
-include/qt4/QtSql/QSqlResult
-include/qt4/QtSql/QSqlTableModel
-include/qt4/QtSql/QSymSQLDriver
-include/qt4/QtSql/QSymSQLResult
-include/qt4/QtSql/QTDSDriver
-include/qt4/QtSql/QTDSResult
-include/qt4/QtSql/QtSql
-include/qt4/QtSql/qsql.h
-include/qt4/QtSql/qsql_db2.h
-include/qt4/QtSql/qsql_ibase.h
-include/qt4/QtSql/qsql_mysql.h
-include/qt4/QtSql/qsql_oci.h
-include/qt4/QtSql/qsql_odbc.h
-include/qt4/QtSql/qsql_psql.h
-include/qt4/QtSql/qsql_sqlite.h
-include/qt4/QtSql/qsql_sqlite2.h
-include/qt4/QtSql/qsql_symsql.h
-include/qt4/QtSql/qsql_tds.h
-include/qt4/QtSql/qsqldatabase.h
-include/qt4/QtSql/qsqldriver.h
-include/qt4/QtSql/qsqldriverplugin.h
-include/qt4/QtSql/qsqlerror.h
-include/qt4/QtSql/qsqlfield.h
-include/qt4/QtSql/qsqlindex.h
-include/qt4/QtSql/qsqlquery.h
-include/qt4/QtSql/qsqlquerymodel.h
-include/qt4/QtSql/qsqlrecord.h
-include/qt4/QtSql/qsqlrelationaldelegate.h
-include/qt4/QtSql/qsqlrelationaltablemodel.h
-include/qt4/QtSql/qsqlresult.h
-include/qt4/QtSql/qsqltablemodel.h
-lib/qt4/libQtSql.la
-lib/qt4/libQtSql.prl
-lib/qt4/libQtSql.so
-lib/qt4/libQtSql.so.4
-lib/qt4/libQtSql.so.%%SHLIB_SHVER%%
-lib/qt4/libQtSql.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtSql.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtSql
+%%QT_INCDIR%%/Qt/qsql.h
+%%QT_INCDIR%%/Qt/qsql_db2.h
+%%QT_INCDIR%%/Qt/qsql_ibase.h
+%%QT_INCDIR%%/Qt/qsql_mysql.h
+%%QT_INCDIR%%/Qt/qsql_oci.h
+%%QT_INCDIR%%/Qt/qsql_odbc.h
+%%QT_INCDIR%%/Qt/qsql_psql.h
+%%QT_INCDIR%%/Qt/qsql_sqlite.h
+%%QT_INCDIR%%/Qt/qsql_sqlite2.h
+%%QT_INCDIR%%/Qt/qsql_symsql.h
+%%QT_INCDIR%%/Qt/qsql_tds.h
+%%QT_INCDIR%%/Qt/qsqldatabase.h
+%%QT_INCDIR%%/Qt/qsqldriver.h
+%%QT_INCDIR%%/Qt/qsqldriverplugin.h
+%%QT_INCDIR%%/Qt/qsqlerror.h
+%%QT_INCDIR%%/Qt/qsqlfield.h
+%%QT_INCDIR%%/Qt/qsqlindex.h
+%%QT_INCDIR%%/Qt/qsqlquery.h
+%%QT_INCDIR%%/Qt/qsqlquerymodel.h
+%%QT_INCDIR%%/Qt/qsqlrecord.h
+%%QT_INCDIR%%/Qt/qsqlrelationaldelegate.h
+%%QT_INCDIR%%/Qt/qsqlrelationaltablemodel.h
+%%QT_INCDIR%%/Qt/qsqlresult.h
+%%QT_INCDIR%%/Qt/qsqltablemodel.h
+%%QT_INCDIR%%/QtSql/QDB2Driver
+%%QT_INCDIR%%/QtSql/QDB2Result
+%%QT_INCDIR%%/QtSql/QIBaseDriver
+%%QT_INCDIR%%/QtSql/QIBaseResult
+%%QT_INCDIR%%/QtSql/QMYSQLDriver
+%%QT_INCDIR%%/QtSql/QMYSQLResult
+%%QT_INCDIR%%/QtSql/QOCIDriver
+%%QT_INCDIR%%/QtSql/QOCIResult
+%%QT_INCDIR%%/QtSql/QODBCDriver
+%%QT_INCDIR%%/QtSql/QODBCResult
+%%QT_INCDIR%%/QtSql/QPSQLDriver
+%%QT_INCDIR%%/QtSql/QPSQLResult
+%%QT_INCDIR%%/QtSql/QSQLite2Driver
+%%QT_INCDIR%%/QtSql/QSQLite2Result
+%%QT_INCDIR%%/QtSql/QSQLiteDriver
+%%QT_INCDIR%%/QtSql/QSQLiteResult
+%%QT_INCDIR%%/QtSql/QSqlDatabase
+%%QT_INCDIR%%/QtSql/QSqlDriver
+%%QT_INCDIR%%/QtSql/QSqlDriverCreator
+%%QT_INCDIR%%/QtSql/QSqlDriverCreatorBase
+%%QT_INCDIR%%/QtSql/QSqlDriverFactoryInterface
+%%QT_INCDIR%%/QtSql/QSqlDriverPlugin
+%%QT_INCDIR%%/QtSql/QSqlError
+%%QT_INCDIR%%/QtSql/QSqlField
+%%QT_INCDIR%%/QtSql/QSqlIndex
+%%QT_INCDIR%%/QtSql/QSqlQuery
+%%QT_INCDIR%%/QtSql/QSqlQueryModel
+%%QT_INCDIR%%/QtSql/QSqlRecord
+%%QT_INCDIR%%/QtSql/QSqlRelation
+%%QT_INCDIR%%/QtSql/QSqlRelationalDelegate
+%%QT_INCDIR%%/QtSql/QSqlRelationalTableModel
+%%QT_INCDIR%%/QtSql/QSqlResult
+%%QT_INCDIR%%/QtSql/QSqlTableModel
+%%QT_INCDIR%%/QtSql/QSymSQLDriver
+%%QT_INCDIR%%/QtSql/QSymSQLResult
+%%QT_INCDIR%%/QtSql/QTDSDriver
+%%QT_INCDIR%%/QtSql/QTDSResult
+%%QT_INCDIR%%/QtSql/QtSql
+%%QT_INCDIR%%/QtSql/qsql.h
+%%QT_INCDIR%%/QtSql/qsql_db2.h
+%%QT_INCDIR%%/QtSql/qsql_ibase.h
+%%QT_INCDIR%%/QtSql/qsql_mysql.h
+%%QT_INCDIR%%/QtSql/qsql_oci.h
+%%QT_INCDIR%%/QtSql/qsql_odbc.h
+%%QT_INCDIR%%/QtSql/qsql_psql.h
+%%QT_INCDIR%%/QtSql/qsql_sqlite.h
+%%QT_INCDIR%%/QtSql/qsql_sqlite2.h
+%%QT_INCDIR%%/QtSql/qsql_symsql.h
+%%QT_INCDIR%%/QtSql/qsql_tds.h
+%%QT_INCDIR%%/QtSql/qsqldatabase.h
+%%QT_INCDIR%%/QtSql/qsqldriver.h
+%%QT_INCDIR%%/QtSql/qsqldriverplugin.h
+%%QT_INCDIR%%/QtSql/qsqlerror.h
+%%QT_INCDIR%%/QtSql/qsqlfield.h
+%%QT_INCDIR%%/QtSql/qsqlindex.h
+%%QT_INCDIR%%/QtSql/qsqlquery.h
+%%QT_INCDIR%%/QtSql/qsqlquerymodel.h
+%%QT_INCDIR%%/QtSql/qsqlrecord.h
+%%QT_INCDIR%%/QtSql/qsqlrelationaldelegate.h
+%%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h
+%%QT_INCDIR%%/QtSql/qsqlresult.h
+%%QT_INCDIR%%/QtSql/qsqltablemodel.h
+%%QT_LIBDIR%%/libQtSql.prl
+%%QT_LIBDIR%%/libQtSql.so
+%%QT_LIBDIR%%/libQtSql.so.4
+%%QT_LIBDIR%%/libQtSql.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtSql.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtSql.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtSql.pc
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtSql
- at dirrmtry include/qt4/Qt
- at dirrmtry include/qt4



More information about the Midnightbsd-cvs mailing list