Bug 175257 - [PATCH] japanese/ruby-mecab: Add license information etc.
Summary: [PATCH] japanese/ruby-mecab: Add license information 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: freebsd-ruby (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-13 12:00 UTC by Yasuhiro Kimura
Modified: 2013-03-20 15:11 UTC (History)
0 users

See Also:


Attachments
patch-ja-ruby-mecab (1.56 KB, text/plain)
2013-01-13 12:00 UTC, Yasuhiro Kimura
no flags Details
patch-ja-ruby-mecab (1.62 KB, text/plain; charset=Shift_JIS)
2013-01-14 01:34 UTC, Yasuhiro Kimura
no flags Details
patch-ja-ruby-mecab (2.19 KB, text/plain; charset=Shift_JIS)
2013-01-30 10:07 UTC, Yasuhiro Kimura
no flags Details
patch-ja-ruby-mecab (2.14 KB, text/plain; charset=Shift_JIS)
2013-02-17 05:51 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-13 12:00:00 UTC
	- Add license information.
	- Adpot OptionsNG.
	- Trim makefile header.
	- Update WWW url.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-13 12:00:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ruby

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-01-14 01:34:59 UTC
"Created by:" header is added to Makefile. Please commit attached patch
instead of previous ones.

Regards.
Comment 3 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-01-30 10:07:56 UTC
New version 0.995 is release. And there is an issue that options setting
dialog is displayed even if there is already options save file. So
please commit attached patch instead of previous ones. Also please keep
in mind this patch should be commited after ports/175258 is commited.

Regards.
Comment 4 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-02-17 05:51:27 UTC
Unnecessary lines are removed and some cosmetic changes are made at
suggestion of TAKATSU Tomonari <tota@FreeBSD.org>. So please commit
attached patch instead of previous ones. Also please keep in mind this
patch should be commited after ports/175258 is commited.

Regards.
Comment 5 TAKATSU Tomonari freebsd_committer freebsd_triage 2013-02-17 11:20:56 UTC
Hi,

I have tried your patch on RedPorts and caught following error.

MeCab_wrap.cpp:1859:26: error: ruby/version.h: No such file or directory
*** [MeCab_wrap.o] Error code 1

Please see https://redports.org/buildarchive/20130217101900-40541/
and build logs in "Links" in more details.

Could you tell me your environment?

Thanks,

-- 
TAKATSU Tomonari
Comment 6 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-02-17 14:59:09 UTC
From: TAKATSU Tomonari <tota@FreeBSD.org>
Subject: Re: ports/175257: [PATCH] japanese/ruby-mecab: Add license information etc.
Date: Sun, 17 Feb 2013 20:20:56 +0900

> I have tried your patch on RedPorts and caught following error.
> MeCab_wrap.cpp:1859:26: error: ruby/version.h: No such file or directory
> *** [MeCab_wrap.o] Error code 1
> Please see https://redports.org/buildarchive/20130217101900-40541/
> and build logs in "Links" in more details.
> Could you tell me your environment?

The issue seems to specific to ruby 1.8. My environment is ruby 1.9
and there is no problem. I'll investigate it but have to create test
environment at first. So please wait for a while. I'll reply to you
when there is a progress.

Regards.

---
Yasuhiro KIMURA
Comment 7 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-02-18 12:46:14 UTC
TAKATSU-san,

I investigated the issue and reported it to MeCab ML.

http://sourceforge.jp/projects/mecab/lists/archive/users/2013-February/000466.html

Just for your information.

Regards.

---
Yasuhiro KIMURA
Comment 8 TAKATSU Tomonari freebsd_committer freebsd_triage 2013-03-20 07:07:29 UTC
2013/2/18 Yasuhiro KIMURA <yasu@utahime.org>:
> TAKATSU-san,
>
> I investigated the issue and reported it to MeCab ML.
>
> http://sourceforge.jp/projects/mecab/lists/archive/users/2013-February/000466.html
>
> Just for your information.
>
> Regards.

I found a patch to fix build error with Ruby 1.8 .
http://code.google.com/p/mecab/issues/detail?id=3&can=1

So, I tested it on RedPorts.org and got following result.
https://redports.org/buildarchive/20130320061401-56810/

Can you confirm it both on Ruby 1.8 and on Ruby 1.9 environment?
If it is ok, I will commit them for version 0.995.

Thanks,

-- 
TAKATSU Tomonari
Comment 9 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-03-20 10:53:33 UTC
From: TAKATSU Tomonari <tota@FreeBSD.org>
Subject: Re: ports/175257: [PATCH] japanese/ruby-mecab: Add license information etc.
Date: Wed, 20 Mar 2013 16:07:29 +0900

> I found a patch to fix build error with Ruby 1.8 .
> http://code.google.com/p/mecab/issues/detail?id=3&can=1
> So, I tested it on RedPorts.org and got following result.
> https://redports.org/buildarchive/20130320061401-56810/
> Can you confirm it both on Ruby 1.8 and on Ruby 1.9 environment?
> If it is ok, I will commit them for version 0.995.

I checked out https://svn.redports.org/tota/japanese/ruby-mecab and
tried with 1.8 and 1.9. Both were sucessfully installed. So please
commit it.

Best Regards.

---
Yasuhiro KIMURA
Comment 10 dfilter service freebsd_committer freebsd_triage 2013-03-20 12:41:01 UTC
Author: tota
Date: Wed Mar 20 12:40:53 2013
New Revision: 314726
URL: http://svnweb.freebsd.org/changeset/ports/314726

Log:
  - Update to 0.995
  - Add a patch to fix build error with Ruby 1.8 [1]
  - Add LICENSE section
  - Adopt OptionsNG
  - Trim Makefile header
  - Remove Author: line from pkg-descr
  - Replace tab with space WWW: line in pkg-descr
  - Update WWW: line in pkg-descr
  
  PR:		ports/175257
  Submitted by:	Yasuhiro KIMURA <yasu_AT_utahime_DOT_org>
  Obtained from:	http://code.google.com/p/mecab/issues/detail?id=3 [1]

Added:
  head/japanese/ruby-mecab/files/patch-MeCab__wrap.cpp   (contents, props changed)
Modified:
  head/japanese/ruby-mecab/Makefile
  head/japanese/ruby-mecab/distinfo
  head/japanese/ruby-mecab/pkg-descr

Modified: head/japanese/ruby-mecab/Makefile
==============================================================================
--- head/japanese/ruby-mecab/Makefile	Wed Mar 20 12:38:23 2013	(r314725)
+++ head/japanese/ruby-mecab/Makefile	Wed Mar 20 12:40:53 2013	(r314726)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	ruby-mecab
-# Date created:		23 April 2003
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mecab
-PORTVERSION=	0.994
+PORTVERSION=	0.995
 CATEGORIES=	japanese textproc ruby
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
@@ -14,6 +10,12 @@ DISTNAME=	${PORTNAME}-ruby-${PORTVERSION
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	MeCab library module for Ruby
 
+LICENSE=	BSD GPLv2 LGPL21
+LICENSE_COMB=	dual
+LICENSE_FILE_BSD=	${WRKSRC}/BSD
+LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
+LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL
+
 LIB_DEPENDS=	mecab:${PORTSDIR}/japanese/mecab
 
 USE_RUBY=	yes
@@ -21,16 +23,19 @@ USE_RUBY_EXTCONF=	yes
 
 INSTALL_TARGET=	site-install
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONSFILE=	${PORT_DBDIR}/ja-ruby-${PORTNAME}/options
+
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${RUBY_MODDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/bindings.html ${RUBY_MODDOCDIR}/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/
 .endif

Modified: head/japanese/ruby-mecab/distinfo
==============================================================================
--- head/japanese/ruby-mecab/distinfo	Wed Mar 20 12:38:23 2013	(r314725)
+++ head/japanese/ruby-mecab/distinfo	Wed Mar 20 12:40:53 2013	(r314726)
@@ -1,2 +1,2 @@
-SHA256 (mecab-ruby-0.994.tar.gz) = 16f9c6de6a90fb11d07f191ea646217e9006a6aec3f90f386b476ce51e611269
-SIZE (mecab-ruby-0.994.tar.gz) = 44483
+SHA256 (mecab-ruby-0.995.tar.gz) = d55241f11ad676fe02421c67ad57f5805c1ef893d6b6b91d0209ac9cf0dfa7f0
+SIZE (mecab-ruby-0.995.tar.gz) = 48688

Added: head/japanese/ruby-mecab/files/patch-MeCab__wrap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/ruby-mecab/files/patch-MeCab__wrap.cpp	Wed Mar 20 12:40:53 2013	(r314726)
@@ -0,0 +1,12 @@
+--- MeCab_wrap.cpp.orig	2013-01-25 14:07:27.000000000 +0900
++++ MeCab_wrap.cpp	2013-03-20 15:01:31.000000000 +0900
+@@ -1856,8 +1856,7 @@
+ 
+ /* Workaround for ruby1.9.x */
+ #if defined SWIGRUBY
+-#include "ruby/version.h"
+-#if RUBY_API_VERSION_CODE >= 10900
++#if HAVE_RUBY_ENCODING_H
+ #include "ruby/encoding.h"
+ #define rb_str_new rb_external_str_new
+ #endif

Modified: head/japanese/ruby-mecab/pkg-descr
==============================================================================
--- head/japanese/ruby-mecab/pkg-descr	Wed Mar 20 12:38:23 2013	(r314725)
+++ head/japanese/ruby-mecab/pkg-descr	Wed Mar 20 12:40:53 2013	(r314726)
@@ -1,4 +1,3 @@
 This is the MeCab library module for Ruby.
 
-Author:	Taku Kudo <taku@chasen.org>
-WWW:	http://mecab.sourceforge.net/
+WWW: https://code.google.com/p/mecab/
_______________________________________________
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 11 TAKATSU Tomonari freebsd_committer freebsd_triage 2013-03-20 15:11:04 UTC
State Changed
From-To: open->closed

Committed. Thanks!