From 4015e6cf3ce7a2787b4d9d8aee4c860c28c110fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 18 Feb 2020 19:50:22 +0100 Subject: FreeBSD: Update for final release R14.0.8. Switch from gmake to ninja for CMake builds. Switch several applications to CMake. Add ports for several applications. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- freebsd/trinity.port.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'freebsd/trinity.port.mk') diff --git a/freebsd/trinity.port.mk b/freebsd/trinity.port.mk index 7d976d4ab..0de956dfc 100644 --- a/freebsd/trinity.port.mk +++ b/freebsd/trinity.port.mk @@ -1,6 +1,6 @@ ### General information -TDE_VERSION?= 14.0.7 +TDE_VERSION?= 14.0.8 TDE_PREFIX= /opt/trinity PREFIX= ${TDE_PREFIX} @@ -40,12 +40,13 @@ BUILD_DEPENDS=\ automake:${PORTSDIR}/devel/automake \ libtool:${PORTSDIR}/devel/libtool \ cmake:${PORTSDIR}/devel/cmake \ + ninja:${PORTSDIR}/devel/ninja \ gettext:${PORTSDIR}/devel/gettext \ gfind:${PORTSDIR}/misc/findutils \ gsed:${PORTSDIR}/textproc/gsed \ bash:${PORTSDIR}/shells/bash \ -USES+= gmake +USES+= ninja PATCH_STRIP= -p1 @@ -79,6 +80,7 @@ TDE_CMAKE_CONFIGURE=\ [ -z "${TDE_BUILD_SUBDIR}" ] || mkdir ${WRKSRC}/${TDE_BUILD_SUBDIR} && \ cd ${WRKSRC}/${TDE_BUILD_SUBDIR} && \ cmake ${WRKSRC} \ + -GNinja \ -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \ -DCMAKE_C_FLAGS="${TDE_FLAGS}" \ -DCMAKE_CXX_FLAGS="${TDE_FLAGS}" \ @@ -121,7 +123,7 @@ TDE_AUTOTOOLS_CONFIGURE+=--disable-debug ### Custom build targets tde-pathfix: cd ${WRKSRC}; \ - [ -d admin ] && \ + [ -d admin ] && [ -e admin/am_edit ] && \ gsed -i admin/am_edit \ admin/debianrules \ admin/nmcheck \ -- cgit v1.2.1