svn commit: r338683 - in head: chinese/fcitx chinese/gcin chinese/gcin/files chinese/oxim chinese/wenju japanese/im-ja korean/imhangul textproc/ibus textproc/scim textproc/uim-gtk
Antoine Brodin
antoine at FreeBSD.org
Sat Jan 4 23:28:02 UTC 2014
Author: antoine
Date: Sat Jan 4 23:27:58 2014
New Revision: 338683
URL: http://svnweb.freebsd.org/changeset/ports/338683
Log:
With gtk 2.4.22, immodule cache has moved from gtk.immodules to
immodules.cache. gtk-query-immodules-2.0 has a new option,
--update-cache that does what we want too.
Use this new option.
While here, add stage support to non slave ports
Reviewed by: kwm (immodules part)
Modified:
head/chinese/fcitx/Makefile
head/chinese/fcitx/pkg-plist
head/chinese/gcin/Makefile
head/chinese/gcin/files/patch-Makefile
head/chinese/gcin/pkg-plist
head/chinese/oxim/Makefile
head/chinese/oxim/pkg-plist
head/chinese/wenju/pkg-plist
head/japanese/im-ja/Makefile
head/japanese/im-ja/pkg-plist
head/korean/imhangul/Makefile
head/korean/imhangul/pkg-plist
head/textproc/ibus/Makefile
head/textproc/ibus/pkg-plist
head/textproc/scim/pkg-plist
head/textproc/uim-gtk/pkg-plist
Modified: head/chinese/fcitx/Makefile
==============================================================================
--- head/chinese/fcitx/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/fcitx/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -22,8 +22,6 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/
libicuuc.so:${PORTSDIR}/devel/icu
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-MAN1= createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
- readPYBase.1 readPYMB.1 scel2org.1 txt2mb.1
SUB_FILES= pkg-message
SUB_LIST+= PORTSDIR=${PORTSDIR}
@@ -33,7 +31,7 @@ USE_XZ= yes
USE_GNOME= pango intltool libxml2 introspection
USE_XORG= x11 xext xkbfile
USE_LDCONFIG= yes
-USES= cmake gettext iconv pathfix pkgconfig
+USES= cmake desktop-file-utils gettext iconv pathfix pkgconfig shared-mime-info
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
@@ -46,7 +44,6 @@ QT4_DESC= Enable Qt4 IM module
OPENCC_DESC= Enable OpenCC for Chinese Transform
TPUNC_DESC= Use traditional quotation marks
-NO_STAGE= yes
.include <bsd.port.options.mk>
CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON
@@ -95,10 +92,6 @@ CMAKE_ARGS+= -DENABLE_DEBUG=ON
DOCS_EXTRA_PATCHES= ${FILESDIR}/nodocs-doc_CMakeLists.txt
-.if defined(NOPORTDATA)
-IGNORE= code tables are required, undefine NOPORTDATA
-.endif
-
_DICT_VER= 20120815
post-patch:
@@ -111,15 +104,4 @@ EXTRA_PATCHES+= ${FILESDIR}/getline-src_
${FILESDIR}/getline-src_lib_fcitx-utils_utils.h
.endif
-post-install:
-.if ${PORT_OPTIONS:MGTK2}
- -${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
-.endif
-.if ${PORT_OPTIONS:MGTK3}
- -${LOCALBASE}/bin/gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
-.endif
- @${ECHO_CMD}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_CMD}
-
.include <bsd.port.mk>
Modified: head/chinese/fcitx/pkg-plist
==============================================================================
--- head/chinese/fcitx/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/fcitx/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -84,13 +84,22 @@ lib/libfcitx-utils.so
lib/libfcitx-utils.so.0
lib/libfcitx-utils.so.0.1
lib/girepository-1.0/Fcitx-1.0.typelib
+man/man1/createPYMB.1.gz
+man/man1/fcitx-remote.1.gz
+man/man1/fcitx.1.gz
+man/man1/mb2org.1.gz
+man/man1/mb2txt.1.gz
+man/man1/readPYBase.1.gz
+man/man1/readPYMB.1.gz
+man/man1/scel2org.1.gz
+man/man1/txt2mb.1.gz
share/gir-1.0/Fcitx-1.0.gir
%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
-%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
-%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
-%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
%%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
%%QT4%%@dirrmtry lib/qt4/plugins
Modified: head/chinese/gcin/Makefile
==============================================================================
--- head/chinese/gcin/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/gcin/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -26,12 +26,6 @@ OPTIONS_DEFINE= ANTHY QT_IM_MODULE
ANTHY_DESC= Japanese anthy IM module
QT_IM_MODULE_DESC= QT IM module
-MAN1= gcin.1 gcin-exit.1 gcin2tab.1 gcin-gb-toggle.1 gcin-kbm-toggle.1 \
- gcin-message.1 gcin-tools.1 gtab-merge.1 juyin-learn.1 \
- phoa2d.1 sim2trad.1 tsa2d32.1 tslearn.1 \
- ts-contribute.1 ts-edit.1
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT_IM_MODULE}
@@ -103,17 +97,8 @@ post-build:
post-install:
.if !defined(DEBUG_FLAGS)
.for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts-edit tsa2d32 tsd2a32 tsin2gtab-phrase tslearn
- @${STRIP_CMD} ${PREFIX}/bin/${f}
-.endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
-.for f in Changelog.html README.html
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
.endif
- @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
- @${CAT} ${PKGMESSAGE}
- @${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
.include <bsd.port.post.mk>
Modified: head/chinese/gcin/files/patch-Makefile
==============================================================================
--- head/chinese/gcin/files/patch-Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/gcin/files/patch-Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -1,6 +1,6 @@
---- Makefile.orig 2011-12-19 10:45:09.000000000 +0800
-+++ Makefile 2012-02-03 08:29:40.000000000 +0800
-@@ -90,7 +90,7 @@ PROGS_CV=kbmcv pin-juyin
+--- ./Makefile.orig 2012-12-08 00:32:13.000000000 +0000
++++ ./Makefile 2014-01-04 22:34:02.000000000 +0000
+@@ -94,7 +94,7 @@
all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
$(MAKE) -C data
$(MAKE) -C gtk-im
@@ -9,7 +9,7 @@
if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi
if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
-@@ -204,7 +204,7 @@ install:
+@@ -215,11 +215,11 @@
$(MAKE) -C data install
$(MAKE) -C im-client install
$(MAKE) -C gtk-im install
@@ -18,8 +18,13 @@
if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im install; fi
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
-@@ -221,6 +221,7 @@ install:
- rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+- if [ $(prefix) = /usr/local ]; then \
++ if [ $(prefix) = /nonstaged ]; then \
+ install -m 644 gcin.png /usr/share/icons; \
+ install -d $(DOC_DIR); \
+ install -m 644 README.html Changelog.html $(DOC_DIR); \
+@@ -234,6 +234,7 @@
+ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
fi
$(MAKE) -C scripts install
+ $(MAKE) -C man install
Modified: head/chinese/gcin/pkg-plist
==============================================================================
--- head/chinese/gcin/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/gcin/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -27,6 +27,21 @@ lib/gcin/intcode-module.so
lib/gcin/libgcin-im-client.so
lib/gcin/libgcin-im-client.so.1.2.5
lib/gcin/libgcin-im-client.so.1
+man/man1/gcin-exit.1.gz
+man/man1/gcin-gb-toggle.1.gz
+man/man1/gcin-kbm-toggle.1.gz
+man/man1/gcin-message.1.gz
+man/man1/gcin-tools.1.gz
+man/man1/gcin.1.gz
+man/man1/gcin2tab.1.gz
+man/man1/gtab-merge.1.gz
+man/man1/juyin-learn.1.gz
+man/man1/phoa2d.1.gz
+man/man1/sim2trad.1.gz
+man/man1/ts-contribute.1.gz
+man/man1/ts-edit.1.gz
+man/man1/tsa2d32.1.gz
+man/man1/tslearn.1.gz
%%DATADIR%%/script/gcin-user-setup
%%DATADIR%%/script/gtab.append_prepare
%%DATADIR%%/script/html-browser
@@ -153,5 +168,5 @@ share/icons/gcin.png
@dirrmtry lib/gtk-2.0/immodules
@dirrmtry lib/gtk-2.0
@dirrm lib/gcin
- at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
- at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+ at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+ at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Modified: head/chinese/oxim/Makefile
==============================================================================
--- head/chinese/oxim/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/oxim/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -34,9 +34,6 @@ CONFIGURE_ARGS+=--disable-bimsphone-modu
# oxim requires qinputcontextplugin.h which only exists in Debian package
CONFIGURE_ARGS+=--disable-qt-immodule
-MAN1= oxim.1
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK2}
@@ -83,11 +80,4 @@ post-patch:
${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/src/gtk-immodule/gtkintl.h
-post-install:
-.if ${PORT_OPTIONS:MGTK2}
- @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
-.endif
- @${CAT} ${PKGMESSAGE}
- @${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
-
.include <bsd.port.mk>
Modified: head/chinese/oxim/pkg-plist
==============================================================================
--- head/chinese/oxim/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/oxim/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -23,6 +23,7 @@ lib/oxim/tables/cnscj.tab
lib/oxim/tables/cnsphone.tab
lib/oxim/tables/default.phr
lib/oxim/tables/symbol.list
+man/man1/oxim.1.gz
share/locale/zh_CN/LC_MESSAGES/oxim.mo
share/locale/zh_HK/LC_MESSAGES/oxim.mo
share/locale/zh_TW/LC_MESSAGES/oxim.mo
@@ -35,5 +36,5 @@ share/locale/zh_TW/LC_MESSAGES/oxim.mo
@dirrmtry share/locale/zh_HK
%%GTK2%%@dirrmtry lib/gtk-2.0/immodules
%%GTK2%%@dirrmtry lib/gtk-2.0
-%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Modified: head/chinese/wenju/pkg-plist
==============================================================================
--- head/chinese/wenju/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/chinese/wenju/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -18,5 +18,5 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/i
%%DATADIR%%/wubi.tim
%%DATADIR%%/wubihua-n.tim
@dirrm %%DATADIR%%
- at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
- at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+ at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+ at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Modified: head/japanese/im-ja/Makefile
==============================================================================
--- head/japanese/im-ja/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/japanese/im-ja/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -8,7 +8,7 @@ CATEGORIES= japanese x11-toolkits
MASTER_SITES= http://im-ja.sourceforge.net/
MAINTAINER= ports at FreeBSD.org
-COMMENT= A Japanese input module for GTK2
+COMMENT= Japanese input module for GTK2
OPTIONS_DEFINE= ANTHY CANNA WNN GNOMEPANEL
OPTIONS_DEFAULT= ANTHY CANNA WNN
@@ -17,34 +17,33 @@ CANNA_DESC= Use Canna
WNN_DESC= Use FreeWnn
GNOMEPANEL_DESC= Build GNOME Panel Applet
-USES= pathfix perl5 gmake pkgconfig
+USES= gmake pathfix perl5 pkgconfig
USE_GNOME= gconf2 gnomeprefix intlhack libglade2
USE_PERL5= build
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-schemas-install # Avoid stage violation
-MAN1= im-ja-conf.1 im-ja-xim-server.1
GCONF_SCHEMAS= im-ja.schemas
CPPFLAGS+= -I${LOCALBASE}/include -DNO_MALLOC_H
LDFLAGS+= -L${LOCALBASE}/lib
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MANTHY}
-LIB_DEPENDS+= anthy.1:${PORTSDIR}/japanese/anthy
+LIB_DEPENDS+= libanthy.so:${PORTSDIR}/japanese/anthy
.else
CONFIGURE_ARGS+= --disable-anthy
.endif
.if ${PORT_OPTIONS:MCANNA}
-LIB_DEPENDS+= RKC.1:${PORTSDIR}/japanese/canna-lib
+LIB_DEPENDS+= libRKC.so:${PORTSDIR}/japanese/canna-lib
.else
CONFIGURE_ARGS+= --disable-canna
.endif
.if ${PORT_OPTIONS:MWNN}
-LIB_DEPENDS+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+LIB_DEPENDS+= libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib
.else
CONFIGURE_ARGS+= --disable-wnn
.endif
@@ -67,8 +66,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|$$(datadir)/gconf|$$(sysconfdir)/gconf|g' \
${WRKSRC}/data/Makefile.in
-post-install:
- ${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
- ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
-
.include <bsd.port.mk>
Modified: head/japanese/im-ja/pkg-plist
==============================================================================
--- head/japanese/im-ja/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/japanese/im-ja/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -6,6 +6,8 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/i
%%GNOMEPANEL%%libexec/im-ja/im-ja-applet
libexec/im-ja/im-ja-helper
libexec/im-ja/kpengine
+man/man1/im-ja-conf.1.gz
+man/man1/im-ja-xim-server.1.gz
share/applications/im-ja.desktop
%%GNOMEPANEL%%share/gnome-2.0/ui/GNOME_ImJaApplet.xml
share/im-ja/01.unistrok
@@ -44,5 +46,5 @@ share/locale/hu/LC_MESSAGES/im-ja.mo
share/locale/ja/LC_MESSAGES/im-ja.mo
@dirrm share/im-ja
@dirrm libexec/im-ja
- at exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
- at unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
+ at exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi
+ at unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi
Modified: head/korean/imhangul/Makefile
==============================================================================
--- head/korean/imhangul/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/korean/imhangul/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -15,13 +15,11 @@ LIB_DEPENDS= hangul:${PORTSDIR}/korean/l
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= gmake pkgconfig
OPTIONS_DEFINE= GTK3 NLS
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK3}
@@ -44,10 +42,4 @@ PLIST_SUB+= NLS=""
PLIST_SUB+= NLS="@comment "
.endif
-.if ${PORT_OPTIONS:MGTK3}
-post-install:
- @${LOCALBASE}/bin/gtk-query-immodules-3.0 > \
- ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
-.endif
-
.include <bsd.port.mk>
Modified: head/korean/imhangul/pkg-plist
==============================================================================
--- head/korean/imhangul/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/korean/imhangul/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -2,9 +2,9 @@ lib/gtk-%%GTKVER%%/immodules/im-hangul.a
lib/gtk-%%GTKVER%%/immodules/im-hangul.la
lib/gtk-%%GTKVER%%/immodules/im-hangul.so
%%GTK2%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
-%%GTK2%%@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK2%%@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@exec %D/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK2%%@unexec %D/bin/gtk-query-immodules-2.0 --update-cache
%%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-3.0.mo
-%%GTK3%%@exec %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%GTK3%%@unexec %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+%%GTK3%%@exec %D/bin/gtk-query-immodules-3.0 --update-cache
+%%GTK3%%@unexec %D/bin/gtk-query-immodules-3.0 --update-cache
@dirrmtry lib/gtk-%%GTKVER%%/immodules
Modified: head/textproc/ibus/Makefile
==============================================================================
--- head/textproc/ibus/Makefile Sat Jan 4 23:09:36 2014 (r338682)
+++ head/textproc/ibus/Makefile Sat Jan 4 23:27:58 2014 (r338683)
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus
${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
librsvg2>=2.0:${PORTSDIR}/graphics/librsvg2
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
USE_PYTHON= yes
USE_GNOME= pygtk2 gconf2
@@ -37,7 +37,6 @@ GTK3_DESC= Install GTK3 client
VALA_DESC= Install vala binding
GINTRO_DESC= Install GObject Introspection data
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MISOCODES}
@@ -91,13 +90,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c #devel/dbus/files/dbus.in
post-install:
- @${MKDIR} ${PREFIX}/etc/xdg/autostart
- @${INSTALL_DATA} ${WRKSRC}/bus/ibus.desktop ${PREFIX}/etc/xdg/autostart
-. if ${PORT_OPTIONS:MGTK3}
- @${LOCALBASE}/bin/gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
-. endif
- @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
- @${CAT} ${PKGMESSAGE}
- @${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
+ @${INSTALL_DATA} ${WRKSRC}/bus/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
.include <bsd.port.mk>
Modified: head/textproc/ibus/pkg-plist
==============================================================================
--- head/textproc/ibus/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/textproc/ibus/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -327,7 +327,7 @@ share/icons/hicolor/scalable/apps/ibus.s
@dirrm include/ibus-1.0
@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg
-%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
- at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
- at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
+ at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
+ at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Modified: head/textproc/scim/pkg-plist
==============================================================================
--- head/textproc/scim/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/textproc/scim/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -166,5 +166,5 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
@dirrmtry lib/scim-1.0/1.4.0/SetupUI
@dirrmtry lib/scim-1.0/1.4.0
@dirrmtry lib/scim-1.0
- at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
- at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+ at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+ at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Modified: head/textproc/uim-gtk/pkg-plist
==============================================================================
--- head/textproc/uim-gtk/pkg-plist Sat Jan 4 23:09:36 2014 (r338682)
+++ head/textproc/uim-gtk/pkg-plist Sat Jan 4 23:27:58 2014 (r338683)
@@ -6,5 +6,5 @@ bin/uim-toolbar-gtk-systray
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.a
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.la
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
- at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
- at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+ at exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+ at unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
More information about the svn-ports-all
mailing list