Index: head/japanese/uim-anthy/Makefile =================================================================== --- head/japanese/uim-anthy/Makefile (revision 357973) +++ head/japanese/uim-anthy/Makefile (revision 357974) @@ -1,53 +1,48 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ CATEGORIES= japanese .if defined(WITHOUT_X11) PKGNAMESUFFIX= -anthy-nox11 .else PKGNAMESUFFIX= -anthy .endif COMMENT= Uim plugin using Anthy input method .if !defined(WITHOUT_X11) USE_GNOME= gtk20 .endif -LIB_DEPENDS= anthy:${PORTSDIR}/japanese/anthy \ - uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libanthy.so:${PORTSDIR}/japanese/anthy \ + libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-anthy --with-anthy-utf8 .if !defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-gtk2 --enable-dict .endif UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la) (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy-utf8.la) .if !defined(WITHOUT_X11) (cd ${WRKSRC}/gtk2/dict && ${GMAKE} uim-dict-gtk) .endif do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/gtk2/dict && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) + (cd ${WRKSRC}/gtk2/dict && ${GMAKE} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) .endif - -post-install: - ${LOCALBASE}/bin/uim-module-manager --register anthy - ${LOCALBASE}/bin/uim-module-manager --register anthy-utf8 .include "${MASTERDIR}/Makefile" Index: head/textproc/uim/Makefile =================================================================== --- head/textproc/uim/Makefile (revision 357973) +++ head/textproc/uim/Makefile (revision 357974) @@ -1,117 +1,113 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= uim -PORTVERSION= 1.8.5 +PORTVERSION= 1.8.6 CATEGORIES?= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library USE_BZIP2= yes USE_LDCONFIG= yes WANT_GNOME= yes USE_GNOME+= glib20 intltool USE_AUTOTOOLS= libtool USES= gettext gmake iconv pkgconfig perl5 USE_PERL5= build GNU_CONFIGURE= yes .if !defined(WITHOUT_X11) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS+= libXft.so:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif .if !defined(UIM_SLAVE) .if !defined(WITHOUT_X11) USE_GNOME+= gtk20 CONFIGURE_ARGS+= --with-gtk2 .endif CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime .endif CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .if !defined(UIM_SLAVE) -.if !defined(WITHOUT_X11) -MAN1= uim-xim.1 -.endif DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim DOCSDIR_SIGSCHEME= ${PREFIX}/share/doc/uim/sigscheme PLIST_SUB= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \ DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}" .endif .if defined(WITHOUT_X11) PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" .endif -NO_STAGE= yes .include .if ${ARCH} == "ia64" IGNORE= not yet ported to ia64 .endif .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64" CONFIGURE_ARGS+= --enable-storage=fatty .endif .for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif .endfor .for _x in gnome-applet kde-applet emacs pref .if ${CONFIGURE_ARGS:M--enable-${_x}} == "" CONFIGURE_ARGS+=--disable-${_x} .endif .endfor post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm do-build: .if !defined(UIM_SLAVE) .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${GMAKE} .endfor .if !defined(WITHOUT_X11) cd ${WRKSRC}/gtk2/candwin && ${GMAKE} .endif .endif do-install: .if !defined(UIM_SLAVE) - cd ${WRKSRC} && ${GMAKE} install-data-am + cd ${WRKSRC} && ${GMAKE} DESTDIR=${STAGEDIR} install-data-am .for d in sigscheme uim scm xim po fep emacs pixmaps tables - cd ${WRKSRC}/${d} && ${GMAKE} install + cd ${WRKSRC}/${d} && ${GMAKE} DESTDIR=${STAGEDIR} install .endfor .if !defined(WITHOUT_X11) - cd ${WRKSRC}/gtk2/candwin && ${GMAKE} install + cd ${WRKSRC}/gtk2/candwin && ${GMAKE} DESTDIR=${STAGEDIR} install .endif .endif .if !defined(UIM_SLAVE) post-install: - ${MKDIR} ${DATADIR}/helperdata + ${MKDIR} ${STAGEDIR}${DATADIR}/helperdata .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${MKDIR} ${DOCSDIR_JA} - ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY - ${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.fep - ${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.key - ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep - ${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} + ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY + ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep + ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key + ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep + ${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim .endif .endif .include Index: head/textproc/uim/distinfo =================================================================== --- head/textproc/uim/distinfo (revision 357973) +++ head/textproc/uim/distinfo (revision 357974) @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.5.tar.bz2) = f74550b42d22a1e2bbc581039585541f7784eb6652a06ec17aa88bcf5f0f3d58 -SIZE (uim-1.8.5.tar.bz2) = 6497675 +SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f +SIZE (uim-1.8.6.tar.bz2) = 6500739 Index: head/textproc/uim/pkg-plist =================================================================== --- head/textproc/uim/pkg-plist (revision 357973) +++ head/textproc/uim/pkg-plist (revision 357974) @@ -1,412 +1,413 @@ bin/uim-el-agent bin/uim-el-helper-agent bin/uim-fep bin/uim-fep-tick bin/uim-help bin/uim-module-manager bin/uim-sh %%X11%%bin/uim-xim include/gcroots.h include/uim/dynlib.h include/uim/uim-custom.h include/uim/uim-helper.h include/uim/uim-im-switcher.h include/uim/uim-notify.h include/uim/uim-posix.h include/uim/uim-scm.h include/uim/uim-scm-abbrev.h include/uim/uim-util.h include/uim/uim.h include/uim/version.h lib/libgcroots.a lib/libgcroots.la lib/libgcroots.so lib/libgcroots.so.1 lib/libuim-custom.a lib/libuim-custom.la lib/libuim-custom.so lib/libuim-custom.so.3 lib/libuim-scm.a lib/libuim-scm.la lib/libuim-scm.so lib/libuim-scm.so.1 lib/libuim.a lib/libuim.la lib/libuim.so lib/libuim.so.8 lib/uim/plugin/libuim-custom-enabler.a lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-custom-enabler.so lib/uim/plugin/libuim-editline.a lib/uim/plugin/libuim-editline.la lib/uim/plugin/libuim-editline.so lib/uim/plugin/libuim-fileio.a lib/uim/plugin/libuim-fileio.la lib/uim/plugin/libuim-fileio.so lib/uim/plugin/libuim-lolevel.a lib/uim/plugin/libuim-lolevel.la lib/uim/plugin/libuim-lolevel.so lib/uim/plugin/libuim-look.a lib/uim/plugin/libuim-look.la lib/uim/plugin/libuim-look.so lib/uim/plugin/libuim-process.a lib/uim/plugin/libuim-process.la lib/uim/plugin/libuim-process.so lib/uim/plugin/libuim-skk.a lib/uim/plugin/libuim-skk.la lib/uim/plugin/libuim-skk.so lib/uim/plugin/libuim-socket.a lib/uim/plugin/libuim-socket.la lib/uim/plugin/libuim-socket.so libdata/pkgconfig/gcroots.pc libdata/pkgconfig/uim.pc %%X11%%libexec/uim-candwin-gtk %%X11%%libexec/uim-candwin-horizontal-gtk %%X11%%libexec/uim-candwin-tbl-gtk libexec/uim-helper-server +%%X11%%man/man1/uim-xim.1.gz share/applications/uim.desktop share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo share/locale/ko/LC_MESSAGES/uim.mo %%PORTDOCS%%%%DOCSDIR_JA%%/README.fep %%PORTDOCS%%%%DOCSDIR%%/KEY %%PORTDOCS%%%%DOCSDIR%%/README.fep %%PORTDOCS%%%%DOCSDIR%%/README.key %%PORTDOCS%%%%DOCSDIR%%/README.xim %%DATADIR%%/action.scm %%DATADIR%%/ajax-ime-custom.scm %%DATADIR%%/ajax-ime-key-custom.scm %%DATADIR%%/ajax-ime.scm %%DATADIR%%/annotation-custom.scm %%DATADIR%%/annotation-dict.scm %%DATADIR%%/annotation-eb.scm %%DATADIR%%/annotation-filter.scm %%DATADIR%%/annotation-osx-dcs.scm %%DATADIR%%/annotation.scm %%DATADIR%%/anthy-custom.scm %%DATADIR%%/anthy-key-custom.scm %%DATADIR%%/anthy-utf8-custom.scm %%DATADIR%%/anthy-utf8.scm %%DATADIR%%/anthy.scm %%DATADIR%%/baidu-olime-jp-custom.scm %%DATADIR%%/baidu-olime-jp-key-custom.scm %%DATADIR%%/baidu-olime-jp.scm %%DATADIR%%/byeoru-custom.scm %%DATADIR%%/byeoru-key-custom.scm %%DATADIR%%/byeoru-symbols.scm %%DATADIR%%/byeoru.scm %%DATADIR%%/canna-custom.scm %%DATADIR%%/canna-key-custom.scm %%DATADIR%%/canna.scm %%DATADIR%%/cannav3-socket.scm %%DATADIR%%/composer.scm %%DATADIR%%/ct.scm %%DATADIR%%/custom-rt.scm %%DATADIR%%/custom.scm %%DATADIR%%/default.scm %%DATADIR%%/deprecated-util.scm %%DATADIR%%/dict-socket.scm %%DATADIR%%/direct.scm %%DATADIR%%/dynlib.scm %%DATADIR%%/editline.scm %%DATADIR%%/elatin-custom.scm %%DATADIR%%/elatin-rules.scm %%DATADIR%%/elatin.scm %%DATADIR%%/event.scm %%DATADIR%%/fileio.scm %%DATADIR%%/generic-custom.scm %%DATADIR%%/generic-key-custom.scm %%DATADIR%%/generic-predict.scm %%DATADIR%%/generic.scm %%DATADIR%%/google-cgiapi-jp-custom.scm %%DATADIR%%/google-cgiapi-jp-key-custom.scm %%DATADIR%%/google-cgiapi-jp.scm %%DATADIR%%/hangul.scm %%DATADIR%%/hangul2.scm %%DATADIR%%/hangul3.scm %%DATADIR%%/http-client.scm %%DATADIR%%/http-server.scm %%DATADIR%%/i18n.scm %%DATADIR%%/ichar.scm %%DATADIR%%/im-custom.scm %%DATADIR%%/im-switcher.scm %%DATADIR%%/im.scm %%DATADIR%%/init.scm %%DATADIR%%/input-parse.scm %%DATADIR%%/installed-modules.scm %%DATADIR%%/ipa-x-sampa.scm %%DATADIR%%/iso-639-1.scm %%DATADIR%%/japanese-act.scm %%DATADIR%%/japanese-azik.scm %%DATADIR%%/japanese-custom.scm %%DATADIR%%/japanese-kana.scm %%DATADIR%%/japanese-kzik.scm %%DATADIR%%/japanese.scm %%DATADIR%%/json-parser-expanded.scm %%DATADIR%%/json.scm %%DATADIR%%/key.scm %%DATADIR%%/latin.scm %%DATADIR%%/lazy-load.scm %%DATADIR%%/lib/sigscheme-init.scm %%DATADIR%%/lib/srfi-0.scm %%DATADIR%%/lib/srfi-1.scm %%DATADIR%%/lib/srfi-43.scm %%DATADIR%%/lib/srfi-55.scm %%DATADIR%%/lib/srfi-69.scm %%DATADIR%%/lib/srfi-9.scm %%DATADIR%%/lib/srfi-95.scm %%DATADIR%%/lib/unittest.scm %%DATADIR%%/light-record.scm %%DATADIR%%/load-action.scm %%DATADIR%%/loader.scm %%DATADIR%%/lolevel.scm %%DATADIR%%/look-custom.scm %%DATADIR%%/look.scm %%DATADIR%%/m17nlib.scm %%DATADIR%%/m17nlib-custom.scm %%DATADIR%%/mana-custom.scm %%DATADIR%%/mana-key-custom.scm %%DATADIR%%/mana.scm %%DATADIR%%/match.scm %%DATADIR%%/ng-action.scm %%DATADIR%%/ng-key.scm %%DATADIR%%/openssl.scm %%DATADIR%%/packrat.scm %%DATADIR%%/pinyin-big5.scm %%DATADIR%%/pixmaps/ajax-ime.png %%DATADIR%%/pixmaps/ajax-ime.svg %%DATADIR%%/pixmaps/anthy.png %%DATADIR%%/pixmaps/baidu-olime-jp.png %%DATADIR%%/pixmaps/baidu-olime-jp.svg %%DATADIR%%/pixmaps/byeoru.png %%DATADIR%%/pixmaps/byeoru.svg %%DATADIR%%/pixmaps/canna.png %%DATADIR%%/pixmaps/direct.png %%DATADIR%%/pixmaps/direct.svg %%DATADIR%%/pixmaps/direct_dark_background.png %%DATADIR%%/pixmaps/direct_dark_background.svg %%DATADIR%%/pixmaps/direct_input.png %%DATADIR%%/pixmaps/direct_input.svg %%DATADIR%%/pixmaps/direct_input_dark_background.png %%DATADIR%%/pixmaps/direct_input_dark_background.svg %%DATADIR%%/pixmaps/elatin.png %%DATADIR%%/pixmaps/elatin.svg %%DATADIR%%/pixmaps/google-cgiapi-jp.png %%DATADIR%%/pixmaps/google-cgiapi-jp.svg %%DATADIR%%/pixmaps/hangul2.png %%DATADIR%%/pixmaps/hangul2.svg %%DATADIR%%/pixmaps/hangul3.png %%DATADIR%%/pixmaps/hangul3.svg %%DATADIR%%/pixmaps/im_subst.svg %%DATADIR%%/pixmaps/im_switcher.png %%DATADIR%%/pixmaps/im_switcher.svg %%DATADIR%%/pixmaps/ipa-x-sampa.png %%DATADIR%%/pixmaps/ipa-x-sampa.svg %%DATADIR%%/pixmaps/ja_act.png %%DATADIR%%/pixmaps/ja_act.svg %%DATADIR%%/pixmaps/ja_act_dark_background.png %%DATADIR%%/pixmaps/ja_act_dark_background.svg %%DATADIR%%/pixmaps/ja_azik.png %%DATADIR%%/pixmaps/ja_azik.svg %%DATADIR%%/pixmaps/ja_azik_dark_background.png %%DATADIR%%/pixmaps/ja_azik_dark_background.svg %%DATADIR%%/pixmaps/ja_direct.png %%DATADIR%%/pixmaps/ja_direct.svg %%DATADIR%%/pixmaps/ja_direct_dark_background.png %%DATADIR%%/pixmaps/ja_direct_dark_background.svg %%DATADIR%%/pixmaps/ja_fullwidth_alnum.png %%DATADIR%%/pixmaps/ja_fullwidth_alnum.svg %%DATADIR%%/pixmaps/ja_fullwidth_alnum_dark_background.png %%DATADIR%%/pixmaps/ja_fullwidth_alnum_dark_background.svg %%DATADIR%%/pixmaps/ja_halfkana.png %%DATADIR%%/pixmaps/ja_halfkana.svg %%DATADIR%%/pixmaps/ja_halfkana_dark_background.png %%DATADIR%%/pixmaps/ja_halfkana_dark_background.svg %%DATADIR%%/pixmaps/ja_halfwidth_alnum.png %%DATADIR%%/pixmaps/ja_halfwidth_alnum.svg %%DATADIR%%/pixmaps/ja_halfwidth_alnum_dark_background.png %%DATADIR%%/pixmaps/ja_halfwidth_alnum_dark_background.svg %%DATADIR%%/pixmaps/ja_hiragana.png %%DATADIR%%/pixmaps/ja_hiragana.svg %%DATADIR%%/pixmaps/ja_hiragana_dark_background.png %%DATADIR%%/pixmaps/ja_hiragana_dark_background.svg %%DATADIR%%/pixmaps/ja_kana.png %%DATADIR%%/pixmaps/ja_kana.svg %%DATADIR%%/pixmaps/ja_kana_dark_background.png %%DATADIR%%/pixmaps/ja_kana_dark_background.svg %%DATADIR%%/pixmaps/ja_katakana.png %%DATADIR%%/pixmaps/ja_katakana.svg %%DATADIR%%/pixmaps/ja_katakana_dark_background.png %%DATADIR%%/pixmaps/ja_katakana_dark_background.svg %%DATADIR%%/pixmaps/ja_kzik.png %%DATADIR%%/pixmaps/ja_kzik.svg %%DATADIR%%/pixmaps/ja_kzik_dark_background.png %%DATADIR%%/pixmaps/ja_kzik_dark_background.svg %%DATADIR%%/pixmaps/ja_nicola.png %%DATADIR%%/pixmaps/ja_nicola.svg %%DATADIR%%/pixmaps/ja_pocketbell.png %%DATADIR%%/pixmaps/ja_pocketbell.svg %%DATADIR%%/pixmaps/ja_romaji.png %%DATADIR%%/pixmaps/ja_romaji.svg %%DATADIR%%/pixmaps/ja_romaji_dark_background.png %%DATADIR%%/pixmaps/ja_romaji_dark_background.svg %%DATADIR%%/pixmaps/ko_direct.png %%DATADIR%%/pixmaps/ko_direct.svg %%DATADIR%%/pixmaps/ko_direct_dark_background.png %%DATADIR%%/pixmaps/ko_direct_dark_background.svg %%DATADIR%%/pixmaps/ko_hangulchar.png %%DATADIR%%/pixmaps/ko_hangulchar.svg %%DATADIR%%/pixmaps/ko_hangulchar_dark_background.png %%DATADIR%%/pixmaps/ko_hangulchar_dark_background.svg %%DATADIR%%/pixmaps/ko_hangulword.png %%DATADIR%%/pixmaps/ko_hangulword.svg %%DATADIR%%/pixmaps/ko_hangulword_dark_background.png %%DATADIR%%/pixmaps/ko_hangulword_dark_background.svg %%DATADIR%%/pixmaps/latin.png %%DATADIR%%/pixmaps/latin.svg %%DATADIR%%/pixmaps/look.png %%DATADIR%%/pixmaps/look.svg %%DATADIR%%/pixmaps/mana.png %%DATADIR%%/pixmaps/mana.svg %%DATADIR%%/pixmaps/null.png %%DATADIR%%/pixmaps/off.png %%DATADIR%%/pixmaps/off.svg %%DATADIR%%/pixmaps/off_dark_background.png %%DATADIR%%/pixmaps/off_dark_background.svg %%DATADIR%%/pixmaps/on.png %%DATADIR%%/pixmaps/on.svg %%DATADIR%%/pixmaps/on_dark_background.png %%DATADIR%%/pixmaps/on_dark_background.svg %%DATADIR%%/pixmaps/pinyin-big5.png %%DATADIR%%/pixmaps/pinyin-big5.svg %%DATADIR%%/pixmaps/prime.png %%DATADIR%%/pixmaps/prime_mode_application.png %%DATADIR%%/pixmaps/prime_mode_application.svg %%DATADIR%%/pixmaps/prime_mode_application_dark_background.png %%DATADIR%%/pixmaps/prime_mode_application_dark_background.svg %%DATADIR%%/pixmaps/py.png %%DATADIR%%/pixmaps/py.svg %%DATADIR%%/pixmaps/pyunihan.png %%DATADIR%%/pixmaps/pyunihan.svg %%DATADIR%%/pixmaps/romaja.png %%DATADIR%%/pixmaps/romaja.svg %%DATADIR%%/pixmaps/scim.png %%DATADIR%%/pixmaps/scim.svg %%DATADIR%%/pixmaps/sj3.png %%DATADIR%%/pixmaps/sj3.svg %%DATADIR%%/pixmaps/skk.png %%DATADIR%%/pixmaps/skk.svg %%DATADIR%%/pixmaps/skk_dark_background.png %%DATADIR%%/pixmaps/skk_dark_background.svg %%DATADIR%%/pixmaps/social-ime.png %%DATADIR%%/pixmaps/social-ime.svg %%DATADIR%%/pixmaps/tcode.png %%DATADIR%%/pixmaps/tcode.svg %%DATADIR%%/pixmaps/tcode_dark_background.png %%DATADIR%%/pixmaps/tcode_dark_background.svg %%DATADIR%%/pixmaps/trycode.png %%DATADIR%%/pixmaps/trycode.svg %%DATADIR%%/pixmaps/trycode_dark_background.png %%DATADIR%%/pixmaps/trycode_dark_background.svg %%DATADIR%%/pixmaps/tutcode.png %%DATADIR%%/pixmaps/tutcode.svg %%DATADIR%%/pixmaps/tutcode_dark_background.png %%DATADIR%%/pixmaps/tutcode_dark_background.svg %%DATADIR%%/pixmaps/uim-dict.png %%DATADIR%%/pixmaps/uim-dict.svg %%DATADIR%%/pixmaps/uim-gray.png %%DATADIR%%/pixmaps/uim-icon.png %%DATADIR%%/pixmaps/uim-icon48.png %%DATADIR%%/pixmaps/uim-icon64.png %%DATADIR%%/pixmaps/unknown.png %%DATADIR%%/pixmaps/unknown.svg %%DATADIR%%/pixmaps/unknown_dark_background.png %%DATADIR%%/pixmaps/unknown_dark_background.svg %%DATADIR%%/pixmaps/viqr.png %%DATADIR%%/pixmaps/viqr.svg %%DATADIR%%/pixmaps/wb86.png %%DATADIR%%/pixmaps/wb86.svg %%DATADIR%%/pixmaps/wb86_dark_background.png %%DATADIR%%/pixmaps/wb86_dark_background.svg %%DATADIR%%/pixmaps/wnn.png %%DATADIR%%/pixmaps/wnn.svg %%DATADIR%%/pixmaps/yahoo-jp.png %%DATADIR%%/pixmaps/yahoo-jp.svg %%DATADIR%%/pixmaps/zm.png %%DATADIR%%/pixmaps/zm.svg %%DATADIR%%/pixmaps/zm_dark_background.png %%DATADIR%%/pixmaps/zm_dark_background.svg %%DATADIR%%/tables/wb86.table %%DATADIR%%/tables/zm.table %%DATADIR%%/plugin.scm %%DATADIR%%/predict-custom.scm %%DATADIR%%/predict-google-suggest.scm %%DATADIR%%/predict-look-skk.scm %%DATADIR%%/predict-look.scm %%DATADIR%%/predict-sqlite3.scm %%DATADIR%%/pregexp.scm %%DATADIR%%/prime-custom.scm %%DATADIR%%/prime-key-custom.scm %%DATADIR%%/prime.scm %%DATADIR%%/process.scm %%DATADIR%%/py.scm %%DATADIR%%/pyload.scm %%DATADIR%%/pyunihan.scm %%DATADIR%%/rk.scm %%DATADIR%%/romaja.scm %%DATADIR%%/scim.scm %%DATADIR%%/sj3-custom.scm %%DATADIR%%/sj3-key-custom.scm %%DATADIR%%/sj3.scm %%DATADIR%%/sj3v2-socket.scm %%DATADIR%%/skk-custom.scm %%DATADIR%%/skk-dialog.scm %%DATADIR%%/skk-editor.scm %%DATADIR%%/skk-key-custom.scm %%DATADIR%%/skk.scm %%DATADIR%%/social-ime-custom.scm %%DATADIR%%/social-ime-key-custom.scm %%DATADIR%%/social-ime.scm %%DATADIR%%/socket.scm %%DATADIR%%/sqlite3.scm %%DATADIR%%/sxml-tools.scm %%DATADIR%%/sxpathlib.scm %%DATADIR%%/tcode.scm %%DATADIR%%/trec.scm %%DATADIR%%/trycode.scm %%DATADIR%%/tutcode-bushu.scm %%DATADIR%%/tutcode-bushudic.scm %%DATADIR%%/tutcode-custom.scm %%DATADIR%%/tutcode-dialog.scm %%DATADIR%%/tutcode-editor.scm %%DATADIR%%/tutcode-key-custom.scm %%DATADIR%%/tutcode-kigou-rule.scm %%DATADIR%%/tutcode-kigoudic.scm %%DATADIR%%/tutcode-rule.scm %%DATADIR%%/tutcode-rule-custom.scm %%DATADIR%%/tutcode.scm %%DATADIR%%/uim-help.scm %%DATADIR%%/uim-module-manager.scm %%DATADIR%%/uim-sh.scm %%DATADIR%%/ustr.scm %%DATADIR%%/util.scm %%DATADIR%%/viqr.scm %%DATADIR%%/wlos.scm %%DATADIR%%/wnn-custom.scm %%DATADIR%%/wnn-key-custom.scm %%DATADIR%%/wnn.scm %%DATADIR%%/xmload.scm %%DATADIR%%/yahoo-jp-custom.scm %%DATADIR%%/yahoo-jp-key-custom.scm %%DATADIR%%/yahoo-jp.scm %%DATADIR%%/zaurus.scm @dirrm include/uim @dirrm lib/uim/plugin @dirrm lib/uim %%PORTDOCS%%@dirrm %%DOCSDIR_JA%% @dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/helperdata @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/tables @dirrm %%DATADIR%% Index: head/textproc/uim-el/Makefile =================================================================== --- head/textproc/uim-el/Makefile (revision 357973) +++ head/textproc/uim-el/Makefile (revision 357974) @@ -1,48 +1,47 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= uim-el -PORTVERSION= 1.8.5 +PORTVERSION= 1.8.6 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -${EMACS_PORT_NAME} DISTNAME= uim-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Emacs lisp for uim input method library PROJECTHOST= uim CONFLICTS?= uim-el-xemacs21-mule-[0-9]* \ uim-el-emacs22-[0-9]* \ uim-el-emacs21-[0-9]* RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim USE_BZIP2= yes USE_PERL5= build USE_GNOME= intltool USES= iconv gmake perl5 USE_EMACS= yes GNU_CONFIGURE= yes -NO_STAGE= yes BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} CONFIGURE_ENV= EMACS="${EMACS_CMD}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim-el PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" .if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${DOCSDIR} - ${MKDIR} ${DOCSDIR_JA} - ${INSTALL_DATA} ${WRKSRC}/emacs/README ${DOCSDIR}/README - ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${DOCSDIR_JA}/README.ja + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} + ${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja .endif .include Index: head/textproc/uim-el/distinfo =================================================================== --- head/textproc/uim-el/distinfo (revision 357973) +++ head/textproc/uim-el/distinfo (revision 357974) @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.5.tar.bz2) = f74550b42d22a1e2bbc581039585541f7784eb6652a06ec17aa88bcf5f0f3d58 -SIZE (uim-1.8.5.tar.bz2) = 6497675 +SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f +SIZE (uim-1.8.6.tar.bz2) = 6500739 Index: head/textproc/uim-el-emacs21/Makefile =================================================================== --- head/textproc/uim-el-emacs21/Makefile (revision 357973) +++ head/textproc/uim-el-emacs21/Makefile (revision 357974) @@ -1,20 +1,19 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Emacs lisp for uim input method library CONFLICTS= uim-el-xemacs21-mule-[0-9]* \ uim-el-emacs23-[0-9]* \ uim-el-emacs22-[0-9]* EMACS_PORT_NAME=emacs21 PLIST= ${MASTERDIR}/pkg-plist DESCR= ${MASTERDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../uim-el -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-el-emacs22/Makefile =================================================================== --- head/textproc/uim-el-emacs22/Makefile (revision 357973) +++ head/textproc/uim-el-emacs22/Makefile (revision 357974) @@ -1,20 +1,19 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Emacs lisp for uim input method library CONFLICTS= uim-el-xemacs21-mule-[0-9]* \ uim-el-emacs23-[0-9]* \ uim-el-emacs21-[0-9]* EMACS_PORT_NAME= emacs22 PLIST= ${MASTERDIR}/pkg-plist DESCR= ${MASTERDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../uim-el -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-gtk/Makefile =================================================================== --- head/textproc/uim-gtk/Makefile (revision 357973) +++ head/textproc/uim-gtk/Makefile (revision 357974) @@ -1,43 +1,42 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PKGNAMESUFFIX= -gtk COMMENT= GTK+ modules of uim input method USE_GNOME= gtk20 -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-gtk2 --enable-pref UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk2_immodule_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_pad_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_pref_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_switcher_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in .if defined(WITHOUT_X11) IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk2/immodule && ${GMAKE}) (cd ${WRKSRC}/gtk2/pad && ${GMAKE}) (cd ${WRKSRC}/gtk2/pref && ${GMAKE}) (cd ${WRKSRC}/gtk2/switcher && ${GMAKE}) (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE}) do-install: - (cd ${WRKSRC}/gtk2/immodule && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/pad && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/pref && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/switcher && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} install) + (cd ${WRKSRC}/gtk2/immodule && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pad && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pref && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/switcher && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-gtk3/Makefile =================================================================== --- head/textproc/uim-gtk3/Makefile (revision 357973) +++ head/textproc/uim-gtk3/Makefile (revision 357974) @@ -1,37 +1,36 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PKGNAMESUFFIX= -gtk3 COMMENT= GTK+ 3.x modules of uim input method USE_GNOME= gtk30 -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-gtk3 --enable-pref --enable-default-toolkit=gtk3 UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk3_candwin_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_dict_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_immodule_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_pad_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_pref_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_switcher_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_toolbar_Makefile.in .if defined(WITHOUT_X11) IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk3 && ${GMAKE}) do-install: - (cd ${WRKSRC}/gtk3 && ${GMAKE} install) + (cd ${WRKSRC}/gtk3 && ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-kde4/Makefile =================================================================== --- head/textproc/uim-kde4/Makefile (revision 357973) +++ head/textproc/uim-kde4/Makefile (revision 357974) @@ -1,40 +1,39 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PKGNAMESUFFIX= -kde4 COMMENT= KDE4 panel applet of uim input method BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4 USE_GCC= any USE_KDE4= kdehier kdeprefix kdelibs automoc4 USE_QT4= qmake_build moc_build qt3support uic rcc USE_AUTOTOOLS= libtool MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-qt4 --enable-pref --enable-default-toolkit=qt4 \ --enable-kde4-applet CONFIGURE_ENV= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt4_toolbar_CMakeLists.txt .if defined(WITHOUT_X11) IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: - (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} install) + (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-m17nlib/Makefile =================================================================== --- head/textproc/uim-m17nlib/Makefile (revision 357973) +++ head/textproc/uim-m17nlib/Makefile (revision 357974) @@ -1,43 +1,41 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ .if defined(WITHOUT_X11) PKGNAMESUFFIX= -m17nlib-nox11 .else PKGNAMESUFFIX= -m17nlib .endif COMMENT= Uim plugin using m17n library input method BUILD_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db -LIB_DEPENDS= m17n:${PORTSDIR}/devel/m17n-lib \ - uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib \ + libuim.so:${PORTSDIR}/textproc/uim RUN_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db .if !defined(WITHOUT_M17NCONTRIB) RUN_DEPENDS+= ${LOCALBASE}/share/m17n/icons/as-phonetic.png:${PORTSDIR}/textproc/m17n-contrib .endif MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-m17nlib UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-m17nlib.la) do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ - ${MKDIR} ${PREFIX}/share/uim/pixmaps && \ - DESTDIR="" ${SH} ../pixmaps/uim-m17nlib-relink-icons) + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ + DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) post-install: - ${LOCALBASE}/bin/uim-module-manager --register m17nlib @${FIND} ${LOCALBASE}/share/m17n/icons/ -name '*.png' -execdir ${ECHO} share/uim/pixmaps/m17n-{} \; >>${TMPPLIST} .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-qt4/Makefile =================================================================== --- head/textproc/uim-qt4/Makefile (revision 357973) +++ head/textproc/uim-qt4/Makefile (revision 357974) @@ -1,37 +1,36 @@ # Created by: Yamashiro Jun # $FreeBSD$ PKGNAMESUFFIX= -qt4 COMMENT= Qt4 modules of uim input method -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim USE_QT4= qmake_build moc_build qt3support uic USE_AUTOTOOLS= libtool USES= iconv MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule CONFIGURE_ENV= DATADIRNAME="share" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include UIM_SLAVE= yes .if defined(WITHOUT_X11) IGNORE= cannot be built without X11. Please, unset WITHOUT_X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${GMAKE}) (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: - (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} install) + (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile"