Bug 175294 - [PATCH] japanese/nkf: add license information and etc.
Summary: [PATCH] japanese/nkf: add license information and etc.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Eitan Adler
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-14 17:00 UTC by Yasuhiro Kimura
Modified: 2013-02-04 05:40 UTC (History)
0 users

See Also:


Attachments
patch-ja-nkf (1.24 KB, text/plain)
2013-01-14 17:00 UTC, Yasuhiro Kimura
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2013-01-14 17:00:00 UTC
	- Add license information.
	- Trim makefile header.
Comment 1 Eitan Adler freebsd_committer freebsd_triage 2013-02-04 02:21:53 UTC
Responsible Changed
From-To: freebsd-ports-bugs->eadler

I'll take it.
Comment 2 Eitan Adler freebsd_committer freebsd_triage 2013-02-04 02:29:47 UTC
State Changed
From-To: open->feedback

patch fails to apply
Comment 3 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-02-04 02:42:46 UTC
Thank you for feedback.

Would you mind showing me output of patch command?

Best Regards.

---
Yasuhiro KIMURA
Comment 4 Eitan Adler freebsd_committer freebsd_triage 2013-02-04 04:49:04 UTC
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
Comment 5 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-02-04 05:14:19 UTC
Would you please try

% cd /usr/ports
% svn patch /path/to/patchfile

instead of 'patch' command?

Best regards.

---
Yasuhiro KIMURA
Comment 6 Eitan Adler freebsd_committer freebsd_triage 2013-02-04 05:24:57 UTC
State Changed
From-To: feedback->open

Submitter provided requested information
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-02-04 05:29:56 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"
Comment 8 Eitan Adler freebsd_committer freebsd_triage 2013-02-04 05:30:03 UTC
State Changed
From-To: open->closed

Committed. Thanks!