From owner-svn-ports-head@FreeBSD.ORG Sun Mar 30 17:38:22 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1809E06; Sun, 30 Mar 2014 17:38:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B19FB6D8; Sun, 30 Mar 2014 17:38:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2UHcMVp090916; Sun, 30 Mar 2014 17:38:22 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2UHcMQI090913; Sun, 30 Mar 2014 17:38:22 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201403301738.s2UHcMQI090913@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sun, 30 Mar 2014 17:38:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349650 - head/japanese/tomoe X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Mar 2014 17:38:23 -0000 Author: ume Date: Sun Mar 30 17:38:21 2014 New Revision: 349650 URL: http://svnweb.freebsd.org/changeset/ports/349650 QAT: https://qat.redports.org/buildarchive/r349650/ Log: - Make Ruby binding optional and off by default. - Mark Ruby binding BROKEN as it doesn't detect rbobject.h correctly after gem version of ruby-glib2 was enforced. Spotted by: pkg-fallout Modified: head/japanese/tomoe/Makefile head/japanese/tomoe/pkg-plist Modified: head/japanese/tomoe/Makefile ============================================================================== --- head/japanese/tomoe/Makefile Sun Mar 30 17:28:57 2014 (r349649) +++ head/japanese/tomoe/Makefile Sun Mar 30 17:38:21 2014 (r349650) @@ -19,9 +19,7 @@ USE_LDCONFIG= yes USE_RUBY= yes USE_PERL5= build -BUILD_DEPENDS+= rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2 \ - p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -RUN_DEPENDS+= rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2 +BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser # We cannot use ${ARCH} nor ${UNAME} which are defined in bsd.port.mk, here. UNAME?= /usr/bin/uname @@ -38,7 +36,7 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif -OPTIONS_DEFINE= DICT_RUBY EST MYSQL PYTHON UNIHAN +OPTIONS_DEFINE= DICT_RUBY EST MYSQL PYTHON RUBY UNIHAN OPTIONS_DEFAULT= PYTHON .if ${ARCH} != "sparc64" && ${OSVERSION} < 700042 OPTIONS_DEFAULT+= UNIHAN @@ -54,11 +52,22 @@ MYSQL_CONFIGURE_WITH= mysql PYTHON_DESC= Enable Python module PYTHON_USE= PYTHON=yes GNOME=pygtk2 PYTHON_CONFIGURE_OFF= --with-python=no +RUBY_DESC= Enable Ruby module +RUBY_USE= RUBY=yes +RUBY_CONFIGURE_OFF= --with-ruby=no +RUBY_BUILD_DEPENDS= rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2 +RUBY_RUN_DEPENDS= rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2 +RUBY_CFLAGS= -I${LOCALBASE}/include/ruby-${RUBY_VER} \ + -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} UNIHAN_DESC= Enable Unihan database dictionary module UNIHAN_CONFIGURE_ENABLE= unihan .include +.if ${PORT_OPTIONS:MRUBY} +BROKEN= Broken with gem version of glib2 +.endif + .if ${PORT_OPTIONS:MUNIHAN} .if ${OSVERSION} >= 700042 BROKEN= Broken with Unihan with gcc 4.2 @@ -77,9 +86,7 @@ BUILD_DEPENDS+= \ CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \ pyexecdir=${PYTHON_SITELIBDIR} \ GMSGFMT="${LOCALBASE}/bin/msgfmt" -CFLAGS+= -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/ruby-${RUBY_VER} \ - -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} +CFLAGS+= -I${LOCALBASE}/include .if ${PORT_OPTIONS:MUNIHAN} post-extract: Modified: head/japanese/tomoe/pkg-plist ============================================================================== --- head/japanese/tomoe/pkg-plist Sun Mar 30 17:28:57 2014 (r349649) +++ head/japanese/tomoe/pkg-plist Sun Mar 30 17:38:21 2014 (r349650) @@ -82,8 +82,8 @@ share/tomoe/recognizer/handwriting-zh_CN @dirrm share/tomoe/recognizer share/tomoe/xml2est.rb @dirrm share/tomoe -%%RUBY_SITEARCHLIBDIR%%/rbtomoe.h -%%RUBY_SITEARCHLIBDIR%%/tomoe.a -%%RUBY_SITEARCHLIBDIR%%/tomoe.la -%%RUBY_SITEARCHLIBDIR%%/tomoe.so -%%RUBY_SITELIBDIR%%/tomoe.rb +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/rbtomoe.h +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/tomoe.a +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/tomoe.la +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/tomoe.so +%%RUBY%%%%RUBY_SITELIBDIR%%/tomoe.rb