Date: Wed, 19 Feb 2020 22:04:16 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526531 - in head/japanese: libtomoe-gtk tomoe Message-ID: <202002192204.01JM4GgK066569@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Feb 19 22:04:16 2020 New Revision: 526531 URL: https://svnweb.freebsd.org/changeset/ports/526531 Log: Remove optional dependency on pygtk2 With hat: portmgr Modified: head/japanese/libtomoe-gtk/Makefile head/japanese/libtomoe-gtk/pkg-plist head/japanese/tomoe/Makefile head/japanese/tomoe/pkg-plist Modified: head/japanese/libtomoe-gtk/Makefile ============================================================================== --- head/japanese/libtomoe-gtk/Makefile Wed Feb 19 21:38:14 2020 (r526530) +++ head/japanese/libtomoe-gtk/Makefile Wed Feb 19 22:04:16 2020 (r526531) @@ -3,7 +3,7 @@ PORTNAME= libtomoe-gtk PORTVERSION= 0.6.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese MASTER_SITES= SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION} DISTNAME= tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -14,7 +14,8 @@ COMMENT= TOMOE GTK+ library LIB_DEPENDS= libtomoe.so:japanese/tomoe GNU_CONFIGURE= yes -USES= gmake gnome libtool pathfix pkgconfig python:2.7,build +CONFIGURE_ARGS= --with-python=no +USES= gmake gnome libtool pathfix pkgconfig USE_GNOME= gtk20 USE_LDCONFIG= yes @@ -29,14 +30,5 @@ PLIST_SUB+= GUCHARMAP="@comment " #LIB_DEPENDS+= libgucharmap.so:deskutils/gucharmap #PLIST_SUB+= GUCHARMAP="" #.endif - -.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc) -CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \ - pyexecdir=${PYTHON_SITELIBDIR} -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+=--with-python=no -PLIST_SUB+= PYTHON="@comment " -.endif .include <bsd.port.mk> Modified: head/japanese/libtomoe-gtk/pkg-plist ============================================================================== --- head/japanese/libtomoe-gtk/pkg-plist Wed Feb 19 21:38:14 2020 (r526530) +++ head/japanese/libtomoe-gtk/pkg-plist Wed Feb 19 22:04:16 2020 (r526531) @@ -16,8 +16,6 @@ lib/libtomoe-gtk.a lib/libtomoe-gtk.so lib/libtomoe-gtk.so.0 lib/libtomoe-gtk.so.0.1.0 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/gtk-2.0/tomoegtk.a -%%PYTHON%%%%PYTHON_SITELIBDIR%%/gtk-2.0/tomoegtk.so libdata/pkgconfig/tomoe-gtk.pc share/tomoe-gtk/tomoe-data-view.png share/tomoe-gtk/tomoe-dictionary.png Modified: head/japanese/tomoe/Makefile ============================================================================== --- head/japanese/tomoe/Makefile Wed Feb 19 21:38:14 2020 (r526530) +++ head/japanese/tomoe/Makefile Wed Feb 19 22:04:16 2020 (r526531) @@ -3,7 +3,7 @@ PORTNAME= tomoe PORTVERSION= 0.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -15,17 +15,16 @@ COMMENT= Tegaki Online MOji-ninshiki Engine BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser GNU_CONFIGURE= yes -USES= gettext gmake libtool pathfix perl5 pkgconfig +USES= gettext gmake gnome libtool pathfix perl5 pkgconfig +USE_GNOME= glib20 USE_LDCONFIG= yes USE_PERL5= build -CONFIGURE_ENV= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \ - pyexecdir=${PYTHON_SITELIBDIR} \ - GMSGFMT="${LOCALBASE}/bin/msgfmt" +CONFIGURE_ARGS= --with-python=no +CONFIGURE_ENV= GMSGFMT="${LOCALBASE}/bin/msgfmt" CFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= DICT_RUBY EST MYSQL PYTHON RUBY UNIHAN -OPTIONS_DEFAULT= PYTHON +OPTIONS_DEFINE= DICT_RUBY EST MYSQL RUBY UNIHAN OPTIONS_SUB= yes DICT_RUBY_DESC= Enable Ruby based dictionary module DICT_RUBY_CONFIGURE_ENABLE= dict-ruby @@ -34,10 +33,6 @@ EST_CONFIGURE_WITH= est MYSQL_DESC= Enable MySQL dictionary module MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql -PYTHON_DESC= Enable Python module -PYTHON_USES= gnome python:2.7 -PYTHON_USE= GNOME=pygtk2 -PYTHON_CONFIGURE_OFF= --with-python=no RUBY_DESC= Enable Ruby module RUBY_BROKEN= Does not build RUBY_USE= RUBY=yes Modified: head/japanese/tomoe/pkg-plist ============================================================================== --- head/japanese/tomoe/pkg-plist Wed Feb 19 21:38:14 2020 (r526530) +++ head/japanese/tomoe/pkg-plist Wed Feb 19 22:04:16 2020 (r526531) @@ -1,5 +1,4 @@ etc/tomoe/config -%%PYTHON%%include/tomoe/pytomoe-utils.h include/tomoe/tomoe-candidate.h include/tomoe/tomoe-char.h include/tomoe/tomoe-config.h @@ -18,8 +17,6 @@ lib/libtomoe.a lib/libtomoe.so lib/libtomoe.so.0 lib/libtomoe.so.0.1.0 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/tomoe.a -%%PYTHON%%%%PYTHON_SITELIBDIR%%/tomoe.so %%EST%%lib/tomoe/module/dict/est.a %%EST%%lib/tomoe/module/dict/est.so %%MYSQL%%lib/tomoe/module/dict/mysql.a @@ -32,7 +29,6 @@ lib/tomoe/module/dict/xml.a lib/tomoe/module/dict/xml.so lib/tomoe/module/recognizer/simple.a lib/tomoe/module/recognizer/simple.so -%%PYTHON%%libdata/pkgconfig/pytomoe.pc libdata/pkgconfig/tomoe.pc share/gtk-doc/html/tomoe/TomoeCandidate.html share/gtk-doc/html/tomoe/TomoeChar.html @@ -58,7 +54,6 @@ share/gtk-doc/html/tomoe/tomoe.html share/gtk-doc/html/tomoe/up.png share/locale/ja/LC_MESSAGES/tomoe.mo share/tomoe/dict.dtd -%%PYTHON%%share/tomoe/python/tomoe.defs share/tomoe/recognizer/handwriting-ja.xml share/tomoe/recognizer/handwriting-zh_CN.xml share/tomoe/xml2est.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002192204.01JM4GgK066569>