From yasu@home.utahime.org  Mon Jan 14 16:58:59 2013
Return-Path: <yasu@home.utahime.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 23B21A5D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Jan 2013 16:58:59 +0000 (UTC)
	(envelope-from yasu@home.utahime.org)
Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210])
	by mx1.freebsd.org (Postfix) with ESMTP id E8B3F6D0
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Jan 2013 16:58:58 +0000 (UTC)
Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1])
	by gate.utahime.jp (Postfix) with ESMTP id 872FD61F9D;
	Tue, 15 Jan 2013 01:58:54 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 64F074E630;
	Tue, 15 Jan 2013 01:58:54 +0900 (JST)
Received: by eastasia.home.utahime.org (Postfix, from userid 1000)
	id 4A0224E62E; Tue, 15 Jan 2013 01:58:54 +0900 (JST)
Message-Id: <20130114165854.4A0224E62E@eastasia.home.utahime.org>
Date: Tue, 15 Jan 2013 01:58:54 +0900 (JST)
From: Yasuhiro KIMURA <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] japanese/nkf: add license information and etc.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         175294
>Category:       ports
>Synopsis:       [PATCH] japanese/nkf: add license information and etc.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 14 17:00:00 UTC 2013
>Closed-Date:    Mon Feb 04 05:30:04 UTC 2013
>Last-Modified:  Mon Feb  4 05:40:00 UTC 2013
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD xxxx 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r245243: Fri Jan 11 10:39:45 JST 2013 xxxx amd64


	
>Description:

	- Add license information.
	- Trim makefile header.

	
>How-To-Repeat:
	
>Fix:

	

--- patch-ja-nkf begins here ---
Index: japanese/nkf/Makefile
===================================================================
--- japanese/nkf/Makefile	(revision 310361)
+++ japanese/nkf/Makefile	(working copy)
@@ -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 @@
 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
Index: japanese/p5-nkf/Makefile
===================================================================
--- japanese/p5-nkf/Makefile	(revision 310361)
+++ japanese/p5-nkf/Makefile	(working copy)
@@ -1,15 +1,18 @@
-# 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
 
--- patch-ja-nkf ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Mon Feb 4 02:21:53 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175294 
State-Changed-From-To: open->feedback 
State-Changed-By: eadler 
State-Changed-When: Mon Feb 4 02:29:47 UTC 2013 
State-Changed-Why:  
patch fails to apply 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175294 

From: Yasuhiro KIMURA <yasu@utahime.org>
To: eadler@FreeBSD.org
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/175294: [PATCH] japanese/nkf: add license information
 and etc.
Date: Mon, 04 Feb 2013 11:42:46 +0900 (JST)

 Thank you for feedback.
 
 Would you mind showing me output of patch command?
 
 Best Regards.
 
 ---
 Yasuhiro KIMURA

From: Eitan Adler <eadler@freebsd.org>
To: Yasuhiro KIMURA <yasu@utahime.org>
Cc: bug-followup <bug-followup@freebsd.org>
Subject: Re: ports/175294: [PATCH] japanese/nkf: add license information and etc.
Date: Sun, 3 Feb 2013 23:49:04 -0500

 On 3 February 2013 21:42, Yasuhiro KIMURA <yasu@utahime.org> wrote:
 > Thank you for feedback.
 >
 > Would you mind showing me output of patch command?
 
 [9305 eitan@gravity (100)% ~/svn/fbsd/ports ]%fetch -o a.a 'http://www.freebsd.o
 rg/cgi/query-pr.cgi?pr=175294&getpatch=1'
 fetch: http://www.freebsd.org/cgi/query-pr.cgi?pr=175294&getpatch=1: size of rem
 ote file is not known
 a.a                                                   1273  B 2292 kBps
 [9306 eitan@gravity (100)% ~/svn/fbsd/ports ]%patch < a.a  (svn)-[head:311573]-
 Hmm...  Looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |Index: japanese/nkf/Makefile
 |===================================================================
 |--- japanese/nkf/Makefile      (revision 310361)
 |+++ japanese/nkf/Makefile      (working copy)
 --------------------------
 Patching file japanese/nkf/Makefile using Plan A...
 Hunk #1 failed at 1.
 Hunk #2 succeeded at 18 with fuzz 2 (offset 6 lines).
 1 out of 2 hunks failed--saving rejects to japanese/nkf/Makefile.rej
 Hmm...  The next patch looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |Index: japanese/p5-nkf/Makefile
 |===================================================================
 |--- japanese/p5-nkf/Makefile   (revision 310361)
 |+++ japanese/p5-nkf/Makefile   (working copy)
 --------------------------
 Patching file japanese/p5-nkf/Makefile using Plan A...
 Hunk #1 failed at 1.
 1 out of 1 hunks failed--saving rejects to japanese/p5-nkf/Makefile.rej
 done
 
 
 -- 
 Eitan Adler
 Source, Ports, Doc committer
 Bugmeister, Ports Security teams

From: Yasuhiro KIMURA <yasu@utahime.org>
To: eadler@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/175294: [PATCH] japanese/nkf: add license information
 and etc.
Date: Mon, 04 Feb 2013 14:14:19 +0900 (JST)

 Would you please try
 
 % cd /usr/ports
 % svn patch /path/to/patchfile
 
 instead of 'patch' command?
 
 Best regards.
 
 ---
 Yasuhiro KIMURA
State-Changed-From-To: feedback->open 
State-Changed-By: eadler 
State-Changed-When: Mon Feb 4 05:24:57 UTC 2013 
State-Changed-Why:  
Submitter provided requested information 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175294 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Mon Feb 4 05:30:03 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175294 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175294: commit references a PR
Date: Mon,  4 Feb 2013 05:29:56 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
