From owner-svn-ports-head@FreeBSD.ORG  Tue Apr 30 07:23:28 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EF7B4583;
 Tue, 30 Apr 2013 07:23:28 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C84E01014;
 Tue, 30 Apr 2013 07:23:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3U7NSoV011687;
 Tue, 30 Apr 2013 07:23:28 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3U7NSPU011682;
 Tue, 30 Apr 2013 07:23:28 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201304300723.r3U7NSPU011682@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 30 Apr 2013 07:23:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316888 - head/japanese/font-kochi
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Apr 2013 07:23:29 -0000

Author: hrs
Date: Tue Apr 30 07:23:28 2013
New Revision: 316888
URL: http://svnweb.freebsd.org/changeset/ports/316888

Log:
  - Trim old-style header.
  - Fix MASTER_SITES.
  - Use OPTIONS_DEFINE for DOCS.

Modified:
  head/japanese/font-kochi/Makefile
  head/japanese/font-kochi/pkg-descr

Modified: head/japanese/font-kochi/Makefile
==============================================================================
--- head/japanese/font-kochi/Makefile	Tue Apr 30 07:21:58 2013	(r316887)
+++ head/japanese/font-kochi/Makefile	Tue Apr 30 07:23:28 2013	(r316888)
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	Kochi TrueType fonts
-# Date created:		6 January 2001
-# Whom:			KANOU Hiroki <kanou@mil.allnet.ne.jp>
-#
+# Created by: KANOU Hiroki <kanou@mil.allnet.ne.jp>
 # $FreeBSD$
-#
 
-PORTNAME=	font-kochi
+PORTNAME=	kochi
 PORTVERSION=	20030809
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://downloads.sourceforge.jp/efont/5411/ \
-		${MASTER_SITE_PORTS_JP}
-DISTNAME=	kochi-substitute-${PORTVERSION}
+MASTER_SITES=	SFJP/efont/5411/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	${PORTNAME}-substitute-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Kochi Japanese TrueType font
@@ -26,13 +22,17 @@ SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTS
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
 		DATADIR=share/${PORTNAME}
-WRKSRC=		${WRKDIR}/kochi-substitute-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
 PORTDOCS=	README.ja COPYING docs
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
@@ -49,7 +49,7 @@ do-install:
 		${PREFIX}/etc/fonts/conf.d/20-unhint-kochi.conf
 	${LN} -s -f ../conf.avail/62-fonts-kochi.conf \
 		${PREFIX}/etc/fonts/conf.d/62-fonts-kochi.conf
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif

Modified: head/japanese/font-kochi/pkg-descr
==============================================================================
--- head/japanese/font-kochi/pkg-descr	Tue Apr 30 07:21:58 2013	(r316887)
+++ head/japanese/font-kochi/pkg-descr	Tue Apr 30 07:23:28 2013	(r316888)
@@ -1,3 +1,3 @@
 Free Japanese TrueType fonts named 'Kochi Mincho' and 'Kochi Gothic'. 
 
-WWW:	http://wiki.fdiary.net/font/?kochi-alternative
+WWW: http://wiki.fdiary.net/font/?kochi-alternative