Index: head/japanese/libtomoe-gtk/Makefile =================================================================== --- head/japanese/libtomoe-gtk/Makefile (revision 526530) +++ head/japanese/libtomoe-gtk/Makefile (revision 526531) @@ -1,42 +1,34 @@ # Created by: Hajimu UMEMOTO # $FreeBSD$ 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} MAINTAINER= ume@FreeBSD.org 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 #OPTIONS= GUCHARMAP "Compile with gucharmap" on .include #.if defined(WITHOUT_GUCHARMAP) CONFIGURE_ARGS+=--with-gucharmap=no PLIST_SUB+= GUCHARMAP="@comment " #.else #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 Index: head/japanese/libtomoe-gtk/pkg-plist =================================================================== --- head/japanese/libtomoe-gtk/pkg-plist (revision 526530) +++ head/japanese/libtomoe-gtk/pkg-plist (revision 526531) @@ -1,42 +1,40 @@ include/tomoe/gtk/tomoe-canvas.h include/tomoe/gtk/tomoe-char-table.h include/tomoe/gtk/tomoe-details.h include/tomoe/gtk/tomoe-edit-char.h include/tomoe/gtk/tomoe-edit-meta.h include/tomoe/gtk/tomoe-edit-strokes.h include/tomoe/gtk/tomoe-gtk.h include/tomoe/gtk/tomoe-gtk-config.h include/tomoe/gtk/tomoe-gtk-enum-types.h %%GUCHARMAP%%include/tomoe/gtk/tomoe-gucharmap.h include/tomoe/gtk/tomoe-handwriting.h include/tomoe/gtk/tomoe-reading-search.h include/tomoe/gtk/tomoe-scrollable.h include/tomoe/gtk/tomoe-window.h 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 share/tomoe-gtk/tomoe-gucharmap.png share/tomoe-gtk/tomoe-handwriting.png share/tomoe-gtk/tomoe-search.png share/gtk-doc/html/libtomoe-gtk/TomoeCanvas.html share/gtk-doc/html/libtomoe-gtk/TomoeCharTable.html share/gtk-doc/html/libtomoe-gtk/TomoeHandwriting.html share/gtk-doc/html/libtomoe-gtk/TomoeWindow.html share/gtk-doc/html/libtomoe-gtk/home.png share/gtk-doc/html/libtomoe-gtk/index.html share/gtk-doc/html/libtomoe-gtk/index.sgml share/gtk-doc/html/libtomoe-gtk/ix01.html share/gtk-doc/html/libtomoe-gtk/left.png share/gtk-doc/html/libtomoe-gtk/libtomoe-gtk-tomoe-scrollable.html share/gtk-doc/html/libtomoe-gtk/libtomoe-gtk.devhelp share/gtk-doc/html/libtomoe-gtk/libtomoe-gtk.devhelp2 share/gtk-doc/html/libtomoe-gtk/libtomoe-gtk.html share/gtk-doc/html/libtomoe-gtk/right.png share/gtk-doc/html/libtomoe-gtk/style.css share/gtk-doc/html/libtomoe-gtk/up.png Index: head/japanese/tomoe/Makefile =================================================================== --- head/japanese/tomoe/Makefile (revision 526530) +++ head/japanese/tomoe/Makefile (revision 526531) @@ -1,71 +1,66 @@ # Created by: Hajimu UMEMOTO # $FreeBSD$ PORTNAME= tomoe PORTVERSION= 0.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ume@FreeBSD.org 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 EST_DESC= Enable Hyper Estraier dictionary module 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 RUBY_CONFIGURE_OFF= --with-ruby=no RUBY_BUILD_DEPENDS= rubygem-glib2>0:devel/rubygem-glib2 RUBY_RUN_DEPENDS= rubygem-glib2>0: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_BROKEN= Does not build UNIHAN_MASTER_SITES= ftp://ftp.unicode.org/Public/UNIDATA/:unihan UNIHAN_DISTFILES= Unihan.zip:unihan UNIHAN_EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip UNIHAN_BUILD_DEPENDS= \ ${RUBY_SITEARCHLIBDIR}/uconv.so:japanese/ruby-uconv \ ${RUBY_SITELIBDIR}/suikyo/suikyo.rb:japanese/suikyo UNIHAN_USE= RUBY=yes UNIHAN_CONFIGURE_ENABLE=unihan post-extract-UNIHAN-on: cd ${WRKSRC}/module/dict && \ ${UNZIP_CMD} -qo ${DISTDIR}/Unihan.zip -d ${WRKSRC}/module/dict post-patch: @${REINPLACE_CMD} -e 's|glib/ge.*\.h>|glib.h>|g' \ -e 's|glib/ga.*\.h>|glib.h>|g' \ ${WRKSRC}/lib/glib-compat-key-file.h \ ${WRKSRC}/lib/tomoe.c \ ${WRKSRC}/lib/glib-utils.h .include Index: head/japanese/tomoe/pkg-plist =================================================================== --- head/japanese/tomoe/pkg-plist (revision 526530) +++ head/japanese/tomoe/pkg-plist (revision 526531) @@ -1,69 +1,64 @@ etc/tomoe/config -%%PYTHON%%include/tomoe/pytomoe-utils.h include/tomoe/tomoe-candidate.h include/tomoe/tomoe-char.h include/tomoe/tomoe-config.h include/tomoe/tomoe-context.h include/tomoe/tomoe-dict.h include/tomoe/tomoe-enum-types.h include/tomoe/tomoe-module-impl.h include/tomoe/tomoe-module.h include/tomoe/tomoe-query.h include/tomoe/tomoe-reading.h include/tomoe/tomoe-recognizer.h include/tomoe/tomoe-shelf.h include/tomoe/tomoe-writing.h include/tomoe/tomoe.h 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 %%MYSQL%%lib/tomoe/module/dict/mysql.so %%DICT_RUBY%%lib/tomoe/module/dict/ruby.a %%DICT_RUBY%%lib/tomoe/module/dict/ruby.so %%UNIHAN%%lib/tomoe/module/dict/unihan.a %%UNIHAN%%lib/tomoe/module/dict/unihan.so 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 share/gtk-doc/html/tomoe/TomoeConfig.html share/gtk-doc/html/tomoe/TomoeContext.html share/gtk-doc/html/tomoe/TomoeDict.html share/gtk-doc/html/tomoe/TomoeQuery.html share/gtk-doc/html/tomoe/TomoeReading.html share/gtk-doc/html/tomoe/TomoeRecognizer.html share/gtk-doc/html/tomoe/TomoeShelf.html share/gtk-doc/html/tomoe/TomoeWriting.html share/gtk-doc/html/tomoe/home.png share/gtk-doc/html/tomoe/index.html share/gtk-doc/html/tomoe/index.sgml share/gtk-doc/html/tomoe/ix01.html share/gtk-doc/html/tomoe/left.png share/gtk-doc/html/tomoe/right.png share/gtk-doc/html/tomoe/style.css share/gtk-doc/html/tomoe/tomoe-tomoe.html share/gtk-doc/html/tomoe/tomoe.devhelp share/gtk-doc/html/tomoe/tomoe.devhelp2 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 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/rbtomoe.h %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/tomoe.a %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/tomoe.so %%RUBY%%%%RUBY_SITELIBDIR%%/tomoe.rb @dir share/tomoe/dict