From owner-svn-ports-all@FreeBSD.ORG  Mon Feb  4 05:29:47 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 74DA6833;
 Mon,  4 Feb 2013 05:29:47 +0000 (UTC)
 (envelope-from eadler@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 4F03FDF8;
 Mon,  4 Feb 2013 05:29:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r145TkoI097794;
 Mon, 4 Feb 2013 05:29:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r145TktH097791;
 Mon, 4 Feb 2013 05:29:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302040529.r145TktH097791@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 4 Feb 2013 05:29:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311574 - in head/japanese: nkf p5-nkf
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: Mon, 04 Feb 2013 05:29:47 -0000

Author: eadler
Date: Mon Feb  4 05:29:46 2013
New Revision: 311574
URL: http://svnweb.freebsd.org/changeset/ports/311574

Log:
  Add license
  Fix header
  
  PR:		ports/175294
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

Modified:
  head/japanese/nkf/Makefile
  head/japanese/p5-nkf/Makefile

Modified: head/japanese/nkf/Makefile
==============================================================================
--- head/japanese/nkf/Makefile	Mon Feb  4 04:24:54 2013	(r311573)
+++ head/japanese/nkf/Makefile	Mon Feb  4 05:29:46 2013	(r311574)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nkf
-# Date created:		5 February 1995
-# Whom:			asami
-#
+# Created by: asami
 # $FreeBSD$
-#
 
 PORTNAME=	nkf
 PORTVERSION=	2.1.2
@@ -16,6 +12,9 @@ PKGNAMEPREFIX?=	ja-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Network Kanji code conversion Filter
 
+LICENSE?=	ZLIB
+LICENSE_FILE?=	${WRKSRC}/nkf.c
+
 .if ${PKGNAMEPREFIX} != "ja-p5-"
 MAN1=		nkf.1
 MANLANG=	"" ja

Modified: head/japanese/p5-nkf/Makefile
==============================================================================
--- head/japanese/p5-nkf/Makefile	Mon Feb  4 04:24:54 2013	(r311573)
+++ head/japanese/p5-nkf/Makefile	Mon Feb  4 05:29:46 2013	(r311574)
@@ -1,18 +1,20 @@
-# New ports collection makefile for:	p5-nkf
-# Date created:		23 Feb 2000
-# Whom:			max
-#
+# Created by: max
 # $FreeBSD$
-#
 
 CATEGORIES=	japanese perl5
 PKGNAMEPREFIX=	ja-p5-
 
 COMMENT=	A perl extension module to use NKF
 
+LICENSE=	ZLIB NKF
+LICENSE_COMB=	multi
+LICENSE_NAME_NKF=	NKF License
+LICENSE_FILE_ZLIB=	${WRKSRC}/NKF.pm
+LICENSE_FILE_NKF=	${WRKSRC}/NKF.xs
+LICENSE_PERMS_NKF=	${_LICENSE_PERMS_DEFAULT}
+
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/NKF.mod
 PATCHDIR=	${.CURDIR}/files