diff --git a/graphics/hiptext/Makefile b/graphics/hiptext/Makefile
index 0281a4b25317..9528cfaa240b 100644
--- a/graphics/hiptext/Makefile
+++ b/graphics/hiptext/Makefile
@@ -1,43 +1,47 @@
 PORTNAME=	hiptext
 PORTVERSION=	0.0.s20160621
 PORTREVISION=	16
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool for rendering images and videos inside terminals
 WWW=		https://github.com/jart/hiptext
 
-LICENSE=	NONE
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	ragel:devel/ragel
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libpng.so:graphics/png \
-		libswscale.so:multimedia/ffmpeg \
+		libswscale.so:multimedia/ffmpeg4 \
 		libfreetype.so:print/freetype2
 TEST_DEPENDS=	googletest>=1.7.0:devel/googletest
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jart
 GH_TAGNAME=	f89b44f
 
-USES=		compiler:c++11-lib gmake jpeg localbase
+USES=		compiler:c++14-lang gmake jpeg localbase
 CPPFLAGS+=	-I${LOCALBASE}/include/freetype2
+CPPFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
+LDFLAGS+=	-L${LOCALBASE}/lib -lfreetype
+LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib
 MAKE_ENV=	GTEST_DIR="${LOCALBASE}" \
 		TARGET_ARCH=""
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/hiptext
 
 post-extract:
 	@${RM} -r ${WRKSRC}/gtest
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"DejaVuSansMono.ttf"|"${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf"|' \
 		${WRKSRC}/font.cc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hiptext ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/graphics/hiptext/files/patch-Makefile b/graphics/hiptext/files/patch-Makefile
index 3c5e6b016a7e..986e21681d00 100644
--- a/graphics/hiptext/files/patch-Makefile
+++ b/graphics/hiptext/files/patch-Makefile
@@ -1,28 +1,37 @@
 --- Makefile.orig	2016-06-21 21:09:17 UTC
 +++ Makefile
+@@ -17,7 +17,7 @@ CXXFLAGS    ?= -g -O3
+ PREFIX      ?= /usr/local
+ TARGET_ARCH ?= -march=native
+ CXXFLAGS    ?= -g -O3
+-CXXFLAGS    += -std=c++11 -Wall -Wextra
++CXXFLAGS    += -std=c++14 -Wall -Wextra
+ CXXFLAGS    += -fno-exceptions -fno-rtti
+ LDLIBS      += -lm -lglog -lgflags -lpng -ljpeg
+ LDLIBS      += -lavcodec -lavformat -lavutil -lswscale
 @@ -48,7 +48,7 @@ check: test
  	./test --alsologtostderr --gtest_color=yes
  
  clean:
 -	$(RM) test hiptext $(wildcard *.o *.d *.S $(GTEST_DIR)/*.o) cpplint.py
 +	$(RM) test hiptext $(wildcard *.o *.d *.S) cpplint.py
  
  install: hiptext
  	install --mode=0755 hiptext $(PREFIX)/bin
 @@ -78,12 +78,11 @@ pixel_parse.o: CXXFLAGS := $(filter-out 
  font.%:        CXXFLAGS += $(shell freetype-config --cflags)
  
  # google-test integration magic.
 -GTEST_DIR ?= gtest
 -TESTS = $(GTEST_DIR)/src/gtest-all.o $(GTEST_DIR)/src/gtest_main.o \
 -        $(patsubst %.cc,%.o,$(wildcard *_test.cc))
 -$(TESTS): CXXFLAGS += -I$(GTEST_DIR)/include -I$(GTEST_DIR) -pthread
 +GTEST_DIR ?= $(PREFIX)
 +TESTS = $(patsubst %.cc,%.o,$(wildcard *_test.cc))
 +$(TESTS): CXXFLAGS += -I$(GTEST_DIR)/include -pthread
  $(filter gtest%,$(TESTS)): CXXFLAGS := $(filter-out -MD -Wall,$(CXXFLAGS))
 -test: $(TESTS) $(SOURCES) ; $(LINK.cc) $^ $(LDLIBS) -lpthread -o $@
 +test: $(TESTS) $(SOURCES) ; $(LINK.cc) $^ $(LDLIBS) -lpthread -L$(GTEST_DIR)/lib -lgtest -lgtest_main -o $@
  
  # Recompile sources when headers change.
  CXXFLAGS += -MD
diff --git a/graphics/hiptext/files/patch-artiste.cc b/graphics/hiptext/files/patch-artiste.cc
index 7d4da546d785..304fa46c2d03 100644
--- a/graphics/hiptext/files/patch-artiste.cc
+++ b/graphics/hiptext/files/patch-artiste.cc
@@ -1,11 +1,19 @@
 --- artiste.cc.orig	2016-06-21 21:09:17 UTC
 +++ artiste.cc
-@@ -166,7 +166,7 @@ void Artiste::PrintMovie(Movie movie) {
+@@ -9,6 +9,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/termios.h>
+ #include <sys/select.h>
++#include <unistd.h>
+ #include <gflags/gflags.h>
+ #include <glog/logging.h>
+ 
+@@ -166,7 +167,7 @@ void Artiste::PrintMovie(Movie movie) {
    ComputeDimensions(RatioOf(movie.width(), movie.height()));
    movie.PrepareRGB(width_, height_);
    HideCursor();
 -  sighandler_t old_handler = signal(SIGINT, OnCtrlC);
 +  sig_t old_handler = signal(SIGINT, OnCtrlC);
    for (auto graphic : movie) {
      if (g_done) {
        break;