From owner-svn-ports-head@freebsd.org  Mon Feb 27 09:01:48 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E7FFCEFC94;
 Mon, 27 Feb 2017 09:01:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 25C9510E;
 Mon, 27 Feb 2017 09:01:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1R91lVe082006;
 Mon, 27 Feb 2017 09:01:47 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1R91lwR082004;
 Mon, 27 Feb 2017 09:01:47 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201702270901.v1R91lwR082004@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 27 Feb 2017 09:01:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r434918 - head/chinese/fandol
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Feb 2017 09:01:48 -0000

Author: amdmi3
Date: Mon Feb 27 09:01:46 2017
New Revision: 434918
URL: https://svnweb.freebsd.org/changeset/ports/434918

Log:
  - Add LICENSE_FILE
  - Remove unneeded libX11 dependency
  - Don't install COPYING along with documentation
  - Simplify installation
  - Add NO_ARCH
  - Switch to options helpers

Modified:
  head/chinese/fandol/Makefile
  head/chinese/fandol/pkg-plist

Modified: head/chinese/fandol/Makefile
==============================================================================
--- head/chinese/fandol/Makefile	Mon Feb 27 08:50:23 2017	(r434917)
+++ head/chinese/fandol/Makefile	Mon Feb 27 09:01:46 2017	(r434918)
@@ -11,42 +11,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CTAN Fandol: Four GNU GPLv3-licensed Chinese OpenType fonts
 
 LICENSE=	GPLv3
+LICENSE_FILES=	${WRKSRC}/fandol/COPYING
 
-USE_XORG=	x11
-USES=		zip fonts
+USES=		fonts zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 FONTNAME=	fandol
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	README COPYING
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fandol/*.otf ${STAGEDIR}${FONTSDIR}
 
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolSong-Bold.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolSong-Regular.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolHei-Regular.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolHei-Bold.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolFang-Regular.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolKai-Regular.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolBraille-Display.otf \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fandol/FandolBraille-Regular.otf \
-		${STAGEDIR}${FONTSDIR}
-
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/fandol/README \
-		${WRKSRC}/fandol/COPYING \
-			${STAGEDIR}${DOCSDIR}
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fandol/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/chinese/fandol/pkg-plist
==============================================================================
--- head/chinese/fandol/pkg-plist	Mon Feb 27 08:50:23 2017	(r434917)
+++ head/chinese/fandol/pkg-plist	Mon Feb 27 09:01:46 2017	(r434918)
@@ -6,4 +6,3 @@
 %%FONTSDIR%%/FandolKai-Regular.otf
 %%FONTSDIR%%/FandolSong-Bold.otf
 %%FONTSDIR%%/FandolSong-Regular.otf
-