From 6b1063e483e3f3e155c53c51cff9462a5637494e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 23 May 2017 18:25:38 +0200 Subject: FreeBSD: Fix FTBFS due to a malfunctioning fmake This resolves Bug 2752 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- freebsd/dependencies/tqmake/Makefile | 4 +++- freebsd/dependencies/tqt3-ibase-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3-mysql-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3-odbc-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3-pgsql-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3-sqlite-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3-sqlite3-plugin/Makefile | 4 +++- freebsd/dependencies/tqt3/Makefile | 4 +++- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/freebsd/dependencies/tqmake/Makefile b/freebsd/dependencies/tqmake/Makefile index 6d53229e6..007ccdc20 100644 --- a/freebsd/dependencies/tqmake/Makefile +++ b/freebsd/dependencies/tqmake/Makefile @@ -15,7 +15,9 @@ DIST_SUBDIR= TDE/dependencies PREFIX= ${LOCALBASE} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} WRKSRC= ${WRKDIR}/${DISTNAME}/qmake MAKEFILE= ${FILESDIR}/Makefile.bsd diff --git a/freebsd/dependencies/tqt3-ibase-plugin/Makefile b/freebsd/dependencies/tqt3-ibase-plugin/Makefile index adb3aeeed..752000863 100644 --- a/freebsd/dependencies/tqt3-ibase-plugin/Makefile +++ b/freebsd/dependencies/tqt3-ibase-plugin/Makefile @@ -21,7 +21,9 @@ DB= ibase PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} USE_FIREBIRD= yes EXTRACT_AFTER_ARGS+= \ diff --git a/freebsd/dependencies/tqt3-mysql-plugin/Makefile b/freebsd/dependencies/tqt3-mysql-plugin/Makefile index 91d9a071f..acd44be11 100644 --- a/freebsd/dependencies/tqt3-mysql-plugin/Makefile +++ b/freebsd/dependencies/tqt3-mysql-plugin/Makefile @@ -21,7 +21,9 @@ DB= mysql PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} USE_MYSQL= yes EXTRACT_AFTER_ARGS+= \ diff --git a/freebsd/dependencies/tqt3-odbc-plugin/Makefile b/freebsd/dependencies/tqt3-odbc-plugin/Makefile index ca7ecdd98..10dbc964c 100644 --- a/freebsd/dependencies/tqt3-odbc-plugin/Makefile +++ b/freebsd/dependencies/tqt3-odbc-plugin/Makefile @@ -21,7 +21,9 @@ DB= odbc PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} EXTRACT_AFTER_ARGS+= \ ${EXTRACT_BASE}${PLUGIN} \ diff --git a/freebsd/dependencies/tqt3-pgsql-plugin/Makefile b/freebsd/dependencies/tqt3-pgsql-plugin/Makefile index b6f07b1c6..1a14b91bf 100644 --- a/freebsd/dependencies/tqt3-pgsql-plugin/Makefile +++ b/freebsd/dependencies/tqt3-pgsql-plugin/Makefile @@ -21,7 +21,9 @@ DB= psql PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} USE_PGSQL= yes WANT_PGSQL= server diff --git a/freebsd/dependencies/tqt3-sqlite-plugin/Makefile b/freebsd/dependencies/tqt3-sqlite-plugin/Makefile index 39015bfa3..c10eb41ca 100644 --- a/freebsd/dependencies/tqt3-sqlite-plugin/Makefile +++ b/freebsd/dependencies/tqt3-sqlite-plugin/Makefile @@ -21,7 +21,9 @@ DB= sqlite PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} USE_SQLITE= yes EXTRACT_AFTER_ARGS+= \ diff --git a/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile b/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile index fd6d1d3e4..9269427c3 100644 --- a/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile +++ b/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile @@ -21,7 +21,9 @@ DB= sqlite3 PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} USE_SQLITE= yes EXTRACT_AFTER_ARGS+= \ diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile index b6d89e859..2ac5a6154 100644 --- a/freebsd/dependencies/tqt3/Makefile +++ b/freebsd/dependencies/tqt3/Makefile @@ -17,7 +17,9 @@ DIST_SUBDIR= TDE/dependencies PREFIX= ${LOCALBASE} -USES+= fmake +# For TQt3 is used FreeBSD make +# Remove gmake from USES +USES=${USES/gmake//} BUILD_DEPENDS+= tqmake:${PORTSDIR}/x11/trinity/dependencies/tqmake -- cgit v1.2.1