Index: head/chinese/ibus-libpinyin/Makefile =================================================================== --- head/chinese/ibus-libpinyin/Makefile (revision 509066) +++ head/chinese/ibus-libpinyin/Makefile (revision 509067) @@ -1,50 +1,49 @@ # Created by: Henry Hu # $FreeBSD$ PORTNAME= ibus-libpinyin -PORTVERSION= 1.10.0 -PORTREVISION= 3 +PORTVERSION= 1.11.1 CATEGORIES= chinese MASTER_SITES= SF/libpinyin/${PORTNAME} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Intelligent Pinyin engine based on libpinyin for IBus LICENSE= GPLv2 LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libibus-1.0.so:textproc/ibus \ libpinyin.so:chinese/libpinyin -USES= compiler:c++11-lib gmake python pkgconfig gettext -USE_GNOME= glib20 +USES= compiler:c++11-lib gmake gnome python pkgconfig gettext USE_PYTHON= py3kplist +USE_GNOME= glib20 +GLIB_SCHEMAS= com.github.libpinyin.ibus-libpinyin.gschema.xml WRKSRC= ${WRKDIR}/${DISTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking --disable-boost \ --disable-lua-extension OPTIONS_DEFINE= ENGLISH STROKE OPENCC NLS -OPTIONS_DEFAULT= ENGLISH STROKE +OPTIONS_DEFAULT= ENGLISH STROKE OPENCC OPTIONS_SUB= yes ENGLISH_DESC= Enable English input mode STROKE_DESC= Enable stroke input mode OPENCC_DESC= Use opencc for simplified and traditional Chinese conversion ENGLISH_CONFIGURE_ENABLE= english-input-mode STROKE_CONFIGURE_ENABLE= stroke-input-mode -OPENCC_BROKEN= Requires newer OpenCC OPENCC_CONFIGURE_ENABLE= opencc OPENCC_LIB_DEPENDS= libopencc.so:chinese/opencc NLS_USES= gettext NLS_USE= GNOME=intltool NLS_CONFIGURE_ENABLE= nls post-configure: @${REINPLACE_CMD} -e 's|DATADIRNAME = lib|DATADIRNAME = share|' ${WRKSRC}/po/Makefile .include Index: head/chinese/ibus-libpinyin/distinfo =================================================================== --- head/chinese/ibus-libpinyin/distinfo (revision 509066) +++ head/chinese/ibus-libpinyin/distinfo (revision 509067) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539584534 -SHA256 (ibus-libpinyin-1.10.0.tar.gz) = 6cc4f80d2348f93ed408d52fb33b45736f51ae33335a869e8a3bb6460957087b -SIZE (ibus-libpinyin-1.10.0.tar.gz) = 1081199 +TIMESTAMP = 1565071977 +SHA256 (ibus-libpinyin-1.11.1.tar.gz) = 80f530ccb88d44c51cfbb20d1191d50b0d4240c2a087de4e3aae89c6e26381ae +SIZE (ibus-libpinyin-1.11.1.tar.gz) = 1177679 Property changes on: head/chinese/ibus-libpinyin/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/chinese/ibus-libpinyin/files/patch-data_Makefile.am =================================================================== --- head/chinese/ibus-libpinyin/files/patch-data_Makefile.am (nonexistent) +++ head/chinese/ibus-libpinyin/files/patch-data_Makefile.am (revision 509067) @@ -0,0 +1,11 @@ +--- data/Makefile.am.orig 2019-05-09 06:57:21 UTC ++++ data/Makefile.am +@@ -67,7 +67,7 @@ desktop_files = $(desktop_in_files:.desktop.in=.deskto + + $(desktop_files): $(desktop_in_files) Makefile + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +- sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \ ++ sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@ + + desktopdir=$(datadir)/applications Property changes on: head/chinese/ibus-libpinyin/files/patch-data_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/ibus-libpinyin/files/patch-data_Makefile.in =================================================================== --- head/chinese/ibus-libpinyin/files/patch-data_Makefile.in (nonexistent) +++ head/chinese/ibus-libpinyin/files/patch-data_Makefile.in (revision 509067) @@ -0,0 +1,11 @@ +--- data/Makefile.in.orig 2019-05-09 06:57:27 UTC ++++ data/Makefile.in +@@ -863,7 +863,7 @@ $(STROKES_DB): $(STROKES) $(STROKES_AWK) + + $(desktop_files): $(desktop_in_files) Makefile + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +- sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \ ++ sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. Property changes on: head/chinese/ibus-libpinyin/files/patch-data_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/ibus-libpinyin/pkg-plist =================================================================== --- head/chinese/ibus-libpinyin/pkg-plist (revision 509066) +++ head/chinese/ibus-libpinyin/pkg-plist (revision 509067) @@ -1,41 +1,40 @@ %%NLS%%share/locale/ca/LC_MESSAGES/ibus-libpinyin.mo %%NLS%%share/locale/fr/LC_MESSAGES/ibus-libpinyin.mo %%NLS%%share/locale/ru/LC_MESSAGES/ibus-libpinyin.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-libpinyin.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus-libpinyin.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus-libpinyin.mo libexec/ibus-engine-libpinyin libexec/ibus-setup-libpinyin share/appdata/libpinyin.appdata.xml share/applications/ibus-setup-libbopomofo.desktop share/applications/ibus-setup-libpinyin.desktop -share/glib-2.0/schemas/com.github.libpinyin.ibus-libpinyin.gschema.xml %%ENGLISH%%%%DATADIR%%/db/english.db %%STROKE%%%%DATADIR%%/db/strokes.db %%DATADIR%%/icons/chinese.svg %%DATADIR%%/icons/english.svg %%DATADIR%%/icons/full-punct.svg %%DATADIR%%/icons/full.svg %%DATADIR%%/icons/half-punct.svg %%DATADIR%%/icons/half.svg %%DATADIR%%/icons/ibus-bopomofo.svg %%DATADIR%%/icons/ibus-pinyin.svg %%DATADIR%%/icons/simp-chinese.svg %%DATADIR%%/icons/trad-chinese.svg %%DATADIR%%/setup/config.py %%DATADIR%%/setup/config.pyc %%DATADIR%%/setup/config.pyo %%DATADIR%%/setup/dicttreeview.py %%DATADIR%%/setup/dicttreeview.pyc %%DATADIR%%/setup/dicttreeview.pyo %%DATADIR%%/setup/ibus-libpinyin-preferences.ui %%DATADIR%%/setup/keyboardshortcut.py %%DATADIR%%/setup/keyboardshortcut.pyc %%DATADIR%%/setup/keyboardshortcut.pyo %%DATADIR%%/setup/main2.py %%DATADIR%%/setup/main2.pyc %%DATADIR%%/setup/main2.pyo %%DATADIR%%/setup/shortcuteditor.py %%DATADIR%%/setup/shortcuteditor.pyc %%DATADIR%%/setup/shortcuteditor.pyo share/ibus/component/libpinyin.xml Property changes on: head/chinese/ibus-libpinyin/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/chinese/libpinyin/Makefile =================================================================== --- head/chinese/libpinyin/Makefile (revision 509066) +++ head/chinese/libpinyin/Makefile (revision 509067) @@ -1,30 +1,34 @@ # Created by: Zhihao Yuan # $FreeBSD$ PORTNAME= libpinyin -PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTVERSION= 2.3.0 CATEGORIES= chinese textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= lichray@gmail.com COMMENT= Library to deal with pinyin LICENSE= GPLv2 -USES= bdb compiler:c++11-lang gettext gmake libtool pathfix pkgconfig +USES= bdb compiler:c++11-lang gmake gnome libtool pathfix pkgconfig USE_GNOME= glib20 + GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \ -I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \ LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}" INSTALL_TARGET=install-strip + +OPTIONS_DEFINE= NLS + +NLS_USES= gettext PLIST_SUB+= VER=${PORTVERSION} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpinyin.so.13.0.0 .include Index: head/chinese/libpinyin/distinfo =================================================================== --- head/chinese/libpinyin/distinfo (revision 509066) +++ head/chinese/libpinyin/distinfo (revision 509067) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539587914 -SHA256 (libpinyin-2.2.0.tar.gz) = f22144418031f48784ea4b417927e935424bb6767a63ceea107377b9d9ee9cb0 -SIZE (libpinyin-2.2.0.tar.gz) = 19602224 +TIMESTAMP = 1564885156 +SHA256 (libpinyin-2.3.0.tar.gz) = b3dc9c6a1af55e9427f9d462ff176fbab6a3793368080a2f8e2a58c4cd4e2691 +SIZE (libpinyin-2.3.0.tar.gz) = 20465096 Index: head/chinese/libpinyin/files/patch-data_Makefile.in =================================================================== --- head/chinese/libpinyin/files/patch-data_Makefile.in (revision 509066) +++ head/chinese/libpinyin/files/patch-data_Makefile.in (revision 509067) @@ -1,11 +1,11 @@ ---- data/Makefile.in.orig 2014-06-05 14:21:55.000000000 +0800 -+++ data/Makefile.in 2014-06-05 14:22:17.000000000 +0800 -@@ -288,7 +288,7 @@ +--- data/Makefile.in.orig 2019-08-07 02:01:59 UTC ++++ data/Makefile.in +@@ -307,7 +307,7 @@ EXTRA_DIST = $(textual_model_data) \ libpinyin_db_DATA = $(binary_model_data) \ table.conf -libpinyin_dbdir = $(libdir)/libpinyin/data +libpinyin_dbdir = $(datadir)/libpinyin/data CLEANFILES = $(binary_model_data) all: all-am Property changes on: head/chinese/libpinyin/files/patch-data_Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/libpinyin/files/patch-libpinyin.pc.in =================================================================== --- head/chinese/libpinyin/files/patch-libpinyin.pc.in (revision 509066) +++ head/chinese/libpinyin/files/patch-libpinyin.pc.in (revision 509067) @@ -1,11 +1,11 @@ ---- libpinyin.pc.in.orig 2014-06-05 14:28:26.000000000 +0800 -+++ libpinyin.pc.in 2014-06-05 14:28:35.000000000 +0800 -@@ -2,7 +2,7 @@ +--- libpinyin.pc.in.orig 2018-05-28 08:15:28 UTC ++++ libpinyin.pc.in +@@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -pkgdatadir=@libdir@/libpinyin +pkgdatadir=@datadir@/libpinyin libpinyinincludedir=${includedir}/libpinyin-@VERSION@ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@ Property changes on: head/chinese/libpinyin/files/patch-libpinyin.pc.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/ibus/Makefile =================================================================== --- head/textproc/ibus/Makefile (revision 509066) +++ head/textproc/ibus/Makefile (revision 509067) @@ -1,122 +1,126 @@ # Created by: Henry Hu # $FreeBSD$ PORTNAME= ibus -PORTVERSION= 1.5.18 -PORTREVISION= 4 +PORTVERSION= 1.5.20 CATEGORIES= textproc -MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Intelligent Input Bus for Linux / Unix OS LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \ - ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes + ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ + gtkdocize:textproc/gtk-doc RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \ ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \ setxkbmap:x11/setxkbmap -USES= compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:2.7 +USES= autoreconf compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:2.7 shebangfix USE_GNOME= glib20 intltool librsvg2 pygobject3 USE_LDCONFIG= yes +SHEBANG_GLOB= *.sh + +USE_GITHUB= yes + GNU_CONFIGURE= yes INSTALLS_ICONS= yes OPTIONS_SUB= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-ucd-dir=${LOCALBASE}/share/unicode/ucd OPTIONS_DEFINE= NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE EMOJI OPTIONS_RADIO= CONFIG OPTIONS_RADIO_CONFIG= GCONF DCONF OPTIONS_DEFAULT= GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE EMOJI GTK2_DESC= Install GTK2 client GTK3_DESC= Install GTK3 client and panel VALA_DESC= Install vala binding GINTRO_DESC= Install GObject Introspection data PYTHON_LIB_DESC= Install ibus Python libraries GCONF_DESC= Use GConf for configuration DCONF_DESC= Use dconf for configuration XIM_DESC= Install XIM server ENGINE_DESC= Install ibus simple engine EMOJI_DESC= Install emoji dictionary CPE_VENDOR= ibus_project NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls GTK2_USE= GNOME=cairo,gtk20 GTK2_CONFIGURE_ENABLE= gtk2 GTK2_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK3_USE= GNOME=cairo,gtk30 XORG=x11,xi GTK3_CONFIGURE_ENABLE= gtk3 libnotify GTK3_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libnotify.so:devel/libnotify GTK3_LIBS= -lX11 VALA_BUILD_DEPENDS= vala>=0.20:lang/vala VALA_CONFIGURE_ENABLE= vala VALA_IMPLIES= GINTRO GINTRO_BUILD_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection GINTRO_RUN_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection GINTRO_CONFIGURE_ENABLE= introspection PYTHON_LIB_USE= GNOME=pygtk2 PYTHON_LIB_CONFIGURE_ENABLE= python-library GCONF_USE= GNOME=gconf2 GCONF_CONFIGURE_ENABLE= gconf GCONF_VARS= GCONF_SCHEMAS=ibus.schemas DCONF_USE= GNOME=dconf,gconf2 DCONF_CONFIGURE_ENABLE= dconf DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml DOCS_CONFIGURE_ENABLE= gtk-doc-html XIM_CONFIGURE_ENABLE= xim ENGINE_CONFIGURE_ENABLE= engine EMOJIONE_TAG= ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7 EMOJI_CONFIGURE_ON= --with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \ --with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations EMOJI_CONFIGURE_ENABLE= emoji-dict EMOJI_BUILD_DEPENDS= json-glib>=0:devel/json-glib \ unicode-emoji>0:misc/unicode-emoji \ cldr-emoji-annotation>0:misc/cldr-emoji-annotation .include .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif .if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF} PLIST_SUB+= COMPDIR="" .else PLIST_SUB+= COMPDIR="@comment " .endif + +pre-configure: + cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart ${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart do-test: ${MAKE} -C ${WRKSRC}/src/tests check .include Index: head/textproc/ibus/distinfo =================================================================== --- head/textproc/ibus/distinfo (revision 509066) +++ head/textproc/ibus/distinfo (revision 509067) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529005317 -SHA256 (ibus-1.5.18.tar.gz) = 8551f7d027fb65d48225642fc8f3b232412ea75a4eb375244dd72a4d73c2639e -SIZE (ibus-1.5.18.tar.gz) = 2760121 +TIMESTAMP = 1565144028 +SHA256 (ibus-ibus-1.5.20_GH0.tar.gz) = 3a417af0d652ad4cef899f96acde74b67e07382cc45c16bd9feb2d347da7cb62 +SIZE (ibus-ibus-1.5.20_GH0.tar.gz) = 1228060 Index: head/textproc/ibus/files/patch-configure =================================================================== --- head/textproc/ibus/files/patch-configure (revision 509066) +++ head/textproc/ibus/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2018-03-02 08:24:44 UTC -+++ configure -@@ -20218,7 +20218,7 @@ fi - - # Check whether --with-ucd-dir was given. - if test "${with_ucd_dir+set}" = set; then : -- withval=$with_ucd_dir; UCD_DIR=$with_emoji_annotation_dir -+ withval=$with_ucd_dir; UCD_DIR=$with_ucd_dir - else - UCD_DIR="/usr/share/unicode/ucd" - Property changes on: head/textproc/ibus/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh =================================================================== --- head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh (nonexistent) +++ head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh (revision 509067) @@ -0,0 +1,11 @@ +--- data/dconf/make-dconf-override-db.sh.orig 2019-08-07 03:33:23 UTC ++++ data/dconf/make-dconf-override-db.sh +@@ -6,7 +6,7 @@ set -e + # breaks dbus-launch. There's dbus-run-session which is + # better, but not everyone has it yet. + export DBUS_FATAL_WARNINGS=0 +-export TMPDIR=$(mktemp -d --tmpdir="$PWD") ++export TMPDIR=$(TMPDIR="${PWD}" mktemp -d) + export XDG_CONFIG_HOME="$TMPDIR/config" + export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" Property changes on: head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/ibus/pkg-message =================================================================== --- head/textproc/ibus/pkg-message (revision 509066) +++ head/textproc/ibus/pkg-message (revision 509067) @@ -1,55 +1,55 @@ [ { type: install message: <