From owner-svn-ports-all@FreeBSD.ORG  Tue Apr 30 20:53:25 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D0BFEA2C;
 Tue, 30 Apr 2013 20:53:25 +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 A813017CD;
 Tue, 30 Apr 2013 20:53:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3UKrPdG099928;
 Tue, 30 Apr 2013 20:53:25 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3UKrP3n099927;
 Tue, 30 Apr 2013 20:53:25 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201304302053.r3UKrP3n099927@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 30 Apr 2013 20:53:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316964 - head/japanese/font-sazanami
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Apr 2013 20:53:25 -0000

Author: hrs
Date: Tue Apr 30 20:53:25 2013
New Revision: 316964
URL: http://svnweb.freebsd.org/changeset/ports/316964

Log:
  - Trim old-style header.
  - Use OPTIONS_DEFINE.

Modified:
  head/japanese/font-sazanami/Makefile

Modified: head/japanese/font-sazanami/Makefile
==============================================================================
--- head/japanese/font-sazanami/Makefile	Tue Apr 30 20:49:37 2013	(r316963)
+++ head/japanese/font-sazanami/Makefile	Tue Apr 30 20:53:25 2013	(r316964)
@@ -1,16 +1,10 @@
-# New ports collection makefile for:	Sazanami TrueType fonts
-# Date created:		19 June 2004
-# Whom:			hrs
-#
 # $FreeBSD$
-#
 
-PORTNAME=	font-sazanami
+PORTNAME=	sazanami
 PORTVERSION=	20040629
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	efont/10087
-DISTNAME=	${PORTNAME:C/font-//}-${PORTVERSION}
+MASTER_SITES=	SFJP/efont/10087
+PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Sazanami Japanese TrueType fonts
@@ -26,11 +20,14 @@ SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTS
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
 PORTDOCS=	README doc
-WRKSRC=		${WRKDIR}/sazanami-${PORTVERSION}
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
@@ -40,14 +37,14 @@ do-install:
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f \
 		${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami.conf \
-		${FILESDIR}/62-fonts-sazanami.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
+		${FILESDIR}/62-fonts-${PORTNAME}.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-sazanami.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami.conf
-	${LN} -s -f ../conf.avail/62-fonts-sazanami.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami.conf
-.if !defined(NOPORTDOCS)
+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif