From f5fb66c7239d2df2a6aaf87d83c792a2c0045fb1 Mon Sep 17 00:00:00 2001
From: Alex Kozlov <ak@FreeBSD.org>
Date: Wed, 8 Nov 2017 06:04:45 +0000
Subject: [PATCH] - Remove archivers/zip build dependency - Use PLIST_FILES

---
 vietnamese/unicode-uhoai/Makefile  | 9 +++++----
 vietnamese/unicode-uhoai/pkg-plist | 1 -
 vietnamese/vis2u/Makefile          | 7 ++++---
 vietnamese/vis2u/pkg-plist         | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 vietnamese/unicode-uhoai/pkg-plist
 delete mode 100644 vietnamese/vis2u/pkg-plist

diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 9f9d1fd340a0..582920dc1df3 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -11,15 +11,16 @@ DISTNAME=	uhoaiw21
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unicode TrueType Font with UHoai Vietnamese encoding
 
-USES=		fonts zip:infozip
+USES=		fonts zip
 NO_WRKSUBDIR=	yes
-NO_BUILD=	taken care of in do-install target
+NO_BUILD=	yes
+
+PLIST_FILES=	%%FONTSDIR%%/uhoaiw21.ttf
 
 FONTNAME=	TrueType
-EXTRACT_BEFORE_ARGS=	-qoL
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/UHOAIW21.TTF ${STAGEDIR}${FONTSDIR}/uhoaiw21.ttf
 
 .include <bsd.port.mk>
diff --git a/vietnamese/unicode-uhoai/pkg-plist b/vietnamese/unicode-uhoai/pkg-plist
deleted file mode 100644
index 430fcfdf6c70..000000000000
--- a/vietnamese/unicode-uhoai/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%FONTSDIR%%/uhoaiw21.ttf
diff --git a/vietnamese/vis2u/Makefile b/vietnamese/vis2u/Makefile
index 25e72df0b5ca..d2243a4b2804 100644
--- a/vietnamese/vis2u/Makefile
+++ b/vietnamese/vis2u/Makefile
@@ -10,12 +10,13 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VISCII->Unicode conversion
 
-USES=		zip:infozip
+USES=		zip
 NO_WRKSUBDIR=	yes
-EXTRACT_BEFORE_ARGS=	-qoL
+
+PLIST_FILES=	bin/vis2u
 
 do-build:
-	cd ${WRKSRC} ; make vis2u
+	${CC} -x c ${CFLAGS} ${WRKSRC}/VIS2U.C -o ${WRKSRC}/vis2u
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vis2u ${STAGEDIR}${PREFIX}/bin
diff --git a/vietnamese/vis2u/pkg-plist b/vietnamese/vis2u/pkg-plist
deleted file mode 100644
index 49439246eb72..000000000000
--- a/vietnamese/vis2u/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/vis2u