From c912ba5ffac13b58573c62e8f19ec38486e74a5c Mon Sep 17 00:00:00 2001
From: jfouquart <jfouquart@hotmail.fr>
Date: Wed, 19 Jun 2019 16:17:37 +0200
Subject: [PATCH] Fix Tilix Build

---
 lang/ldc/Makefile     | 10 +++++-----
 x11-toolkits/Makefile |  1 +
 x11/Makefile          |  1 +
 x11/tilix/Makefile    |  4 +++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lang/ldc/Makefile b/lang/ldc/Makefile
index b348d4477f93e..b4c809f15e555 100644
--- a/lang/ldc/Makefile
+++ b/lang/ldc/Makefile
@@ -10,9 +10,9 @@ COMMENT=	The LLVM-based D compiler
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	llvm70>0:devel/llvm70 \
+BUILD_DEPENDS=	llvm60>0:devel/llvm60 \
 		ninja:devel/ninja
-RUN_DEPENDS=	llvm70>0:devel/llvm70
+RUN_DEPENDS=	llvm60>0:devel/llvm60
 LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 BROKEN_armv6=		fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
@@ -33,11 +33,11 @@ GH_TUPLE=       ldc-developers:ldc:d442f9f:tree/ltsmaster \
 CMAKE_ARGS+=	-DD_COMPILER:STRING="${WRKSRC}/ltsmaster/bin/ldmd2" \
 		-DBUILD_SHARED_LIBS:STRING="BOTH"
 
-CC=		clang70
-CXX=		clang++70
+CC=		clang60
+CXX=		clang++60
 
 BOOTVER=	0.17.6
-LLVM_CONFIG=	llvm-config70
+LLVM_CONFIG=	llvm-config60
 LDCVER=		${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 9e166729fd1f7..23dfbcd8f2c24 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -40,6 +40,7 @@
     SUBDIR += gtk30
     SUBDIR += gtkada
     SUBDIR += gtkada3
+    SUBDIR += gtkd-3
     SUBDIR += gtkdatabox
     SUBDIR += gtkextra
     SUBDIR += gtkglarea2
diff --git a/x11/Makefile b/x11/Makefile
index f7194d2041ac6..eaceba107ad55 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -322,6 +322,7 @@
     SUBDIR += thinglaunch
     SUBDIR += thingylaunch
     SUBDIR += tilda
+    SUBDIR += tilix
     SUBDIR += tint
     SUBDIR += trayer
     SUBDIR += tycoon
diff --git a/x11/tilix/Makefile b/x11/tilix/Makefile
index b2c38d937c06e..70017ab778f84 100644
--- a/x11/tilix/Makefile
+++ b/x11/tilix/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS+=	libunwind.so:devel/libunwind \
 		libgtkd-3.so:x11-toolkits/gtkd-3 \
 		libvted-3.so:x11-toolkits/gtkd-3
 
-USES=	meson gnome shebangfix
+USES=	meson gettext-tools gnome pkgconfig python:3.6+,build shebangfix
 USE_XORG=	x11
 USE_GNOME=	gtk30 vte3
 USE_GITHUB=	yes
@@ -24,6 +24,8 @@ SSP_UNSAFE=	yes # not understood by ldc2
 SHEBANG_FILES=	data/scripts/tilix_int.sh
 GLIB_SCHEMAS=	com.gexperts.Tilix.gschema.xml
 
+BINARY_ALIAS+=	python3=${PYTHON_CMD}
+
 post-patch:
 	${CP} ${FILESDIR}/LINGUAS ${WRKSRC}/po