Date: Thu, 24 Jul 2014 17:35:10 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362834 - in head: databases/qt4-ibase-plugin databases/qt4-mysql-plugin databases/qt4-odbc-plugin databases/qt4-pgsql-plugin databases/qt4-sqlite-plugin databases/qt4-sqlite3-plugin mi... Message-ID: <201407241735.s6OHZAkd062221@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Jul 24 17:35:09 2014 New Revision: 362834 URL: http://svnweb.freebsd.org/changeset/ports/362834 QAT: https://qat.redports.org/buildarchive/r362834/ Log: Unbreak Qt4 ports that do not extract src/corelib after r362770. The easiest solution is to just make them extract it (it's not a big directory anyway). This can be reverted once 4.8.7 is released. Modified: head/databases/qt4-ibase-plugin/Makefile head/databases/qt4-mysql-plugin/Makefile head/databases/qt4-odbc-plugin/Makefile head/databases/qt4-pgsql-plugin/Makefile head/databases/qt4-sqlite-plugin/Makefile head/databases/qt4-sqlite3-plugin/Makefile head/misc/qt4-l10n/Makefile Modified: head/databases/qt4-ibase-plugin/Makefile ============================================================================== --- head/databases/qt4-ibase-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-ibase-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -18,6 +18,7 @@ DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/databases/qt4-mysql-plugin/Makefile ============================================================================== --- head/databases/qt4-mysql-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-mysql-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -17,6 +17,7 @@ USE_MYSQL= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/databases/qt4-odbc-plugin/Makefile ============================================================================== --- head/databases/qt4-odbc-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-odbc-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -19,6 +19,7 @@ QT_DIST= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/databases/qt4-pgsql-plugin/Makefile ============================================================================== --- head/databases/qt4-pgsql-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-pgsql-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -17,6 +17,7 @@ USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/${PLUGIN} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/databases/qt4-sqlite-plugin/Makefile ============================================================================== --- head/databases/qt4-sqlite-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-sqlite-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -18,6 +18,7 @@ DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/databases/qt4-sqlite3-plugin/Makefile ============================================================================== --- head/databases/qt4-sqlite3-plugin/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/databases/qt4-sqlite3-plugin/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -19,6 +19,7 @@ DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/corelib \ ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ Modified: head/misc/qt4-l10n/Makefile ============================================================================== --- head/misc/qt4-l10n/Makefile Thu Jul 24 17:10:57 2014 (r362833) +++ head/misc/qt4-l10n/Makefile Thu Jul 24 17:35:09 2014 (r362834) @@ -11,7 +11,8 @@ COMMENT= Qt localized messages USE_QT4= linguist_build QT_DIST= yes -EXTRACT_AFTER_ARGS+= --include '${DISTNAME}/translations' +EXTRACT_AFTER_ARGS+= --include '${DISTNAME}/src/corelib' \ + '${DISTNAME}/translations' EXTRA_PATCHES= # empty
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407241735.s6OHZAkd062221>