Index: head/textproc/scim/Makefile =================================================================== --- head/textproc/scim/Makefile (revision 191082) +++ head/textproc/scim/Makefile (revision 191083) @@ -1,56 +1,47 @@ # New ports collection makefile for: scim # Date created: 20 May 2004 # Whom: Jie Gao # # $FreeBSD$ # PORTNAME= scim -PORTVERSION= 1.4.5 -#PORTREVISION= 0 +PORTVERSION= 1.4.6 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=scim MAINTAINER= ports@FreeBSD.org COMMENT= Smart Common Input Method platform USE_GNOME= gnomehack gnomehier gtk20 intlhack USE_AUTOTOOLS= libtool:15 USE_XLIB= yes USE_ICONV= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes +USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .include -.if ${OSVERSION} < 500035 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \ - LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" -EXTRA_PATCHES= ${FILESDIR}/extra-patch-4-stable -.else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" -PLIST_SUB= NOSTABLE="" -.endif post-patch: ${REINPLACE_CMD} 's|$$(datadir)/pixmaps|$$(prefix)/share/gnome/pixmaps|' \ ${WRKSRC}/data/pixmaps/Makefile.in ${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app| ; \ s|$$(datadir)/control|$$(prefix)/share/gnome/control| ; \ /^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \ ${WRKSRC}/extras/setup/Makefile.in post-install: @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 Property changes on: head/textproc/scim/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/textproc/scim/distinfo =================================================================== --- head/textproc/scim/distinfo (revision 191082) +++ head/textproc/scim/distinfo (revision 191083) @@ -1,3 +1,3 @@ -MD5 (scim-1.4.5.tar.gz) = e2c71f9f54eda65cc1a515863a1839d2 -SHA256 (scim-1.4.5.tar.gz) = 3565ecbe7f093254179d8fd216e6a54644859b59a5e5daf48a6c9cff3d5be481 -SIZE (scim-1.4.5.tar.gz) = 3157124 +MD5 (scim-1.4.6.tar.gz) = 4fc993c59a2dd7c8b9d9f240697d5b3b +SHA256 (scim-1.4.6.tar.gz) = 578e605b9549c9a2f44ca31508ad00f1cc6456ab929b89df1593350618c2263f +SIZE (scim-1.4.6.tar.gz) = 3112494 Property changes on: head/textproc/scim/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/textproc/scim/files/extra-patch-4-stable =================================================================== --- head/textproc/scim/files/extra-patch-4-stable (revision 191082) +++ head/textproc/scim/files/extra-patch-4-stable (nonexistent) @@ -1,31 +0,0 @@ ---- modules/Config/scim_simple_config.cpp.orig Mon Jan 10 17:30:45 2005 -+++ modules/Config/scim_simple_config.cpp Wed Mar 2 01:41:40 2005 -@@ -595,13 +595,13 @@ - std::vector strs; - if (scim_split_string_list (strs, it->second, ':') == 2) { - time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10); -- suseconds_t usec = (suseconds_t) strtol (strs [1].c_str (), 0, 10); -+ long usec = (long) strtol (strs [1].c_str (), 0, 10); - - // The config file is newer, so load it. - if (m_update_timestamp.tv_sec < sec || (m_update_timestamp.tv_sec == sec && m_update_timestamp.tv_usec < usec)) { - m_config.swap (config); - m_update_timestamp.tv_sec = (time_t) sec; -- m_update_timestamp.tv_usec = (suseconds_t) usec; -+ m_update_timestamp.tv_usec = (long) usec; - return true; - } - } -Index: modules/Config/scim_socket_config.cpp -diff -u modules/Config/scim_socket_config.cpp.orig modules/Config/scim_socket_config.cpp ---- modules/Config/scim_socket_config.cpp.orig Mon Jan 10 17:30:45 2005 -+++ modules/Config/scim_socket_config.cpp Wed Mar 2 01:41:40 2005 -@@ -582,7 +582,7 @@ - std::vector strs; - if (scim_split_string_list (strs, str, ':') == 2) { - time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10); -- suseconds_t usec = (suseconds_t) strtol (strs [1].c_str (), 0, 10); -+ long usec = (long) strtol (strs [1].c_str (), 0, 10); - - // The config file is newer, so load it. - if (m_update_timestamp.tv_sec < sec || Property changes on: head/textproc/scim/files/extra-patch-4-stable ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/textproc/scim/files/patch-configure =================================================================== --- head/textproc/scim/files/patch-configure (nonexistent) +++ head/textproc/scim/files/patch-configure (revision 191083) @@ -0,0 +1,16 @@ +--- configure.orig Sat Apr 28 17:18:20 2007 ++++ configure Sat Apr 28 17:18:56 2007 +@@ -36874,12 +36874,7 @@ + + fi + GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0` +- if test -z "$GTK_LIBDIR)"; then +- GTK_LIBDIR="$libdir" +- fi +- +- ++ GTK_LIBDIR="$libdir" + + fi + Property changes on: head/textproc/scim/files/patch-configure ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/textproc/scim/pkg-plist =================================================================== --- head/textproc/scim/pkg-plist (revision 191082) +++ head/textproc/scim/pkg-plist (revision 191083) @@ -1,162 +1,163 @@ bin/scim bin/scim-config-agent bin/scim-setup etc/scim/config etc/scim/global include/scim-1.0/gtk/scimkeyselection.h include/scim-1.0/gtk/scimstringview.h include/scim-1.0/gtk/scimtrayicon.h include/scim-1.0/scim.h include/scim-1.0/scim_attribute.h include/scim-1.0/scim_backend.h include/scim-1.0/scim_bind.h include/scim-1.0/scim_compose_key.h include/scim-1.0/scim_config_base.h include/scim-1.0/scim_config_module.h include/scim-1.0/scim_config_path.h include/scim-1.0/scim_connection.h include/scim-1.0/scim_debug.h include/scim-1.0/scim_event.h include/scim-1.0/scim_exception.h include/scim-1.0/scim_filter.h include/scim-1.0/scim_filter_module.h include/scim-1.0/scim_filter_manager.h include/scim-1.0/scim_frontend.h include/scim-1.0/scim_frontend_module.h include/scim-1.0/scim_global_config.h include/scim-1.0/scim_helper.h include/scim-1.0/scim_helper_manager.h include/scim-1.0/scim_helper_module.h include/scim-1.0/scim_hotkey.h include/scim-1.0/scim_iconv.h include/scim-1.0/scim_imengine.h include/scim-1.0/scim_imengine_module.h include/scim-1.0/scim_lookup_table.h include/scim-1.0/scim_module.h include/scim-1.0/scim_object.h include/scim-1.0/scim_panel_agent.h include/scim-1.0/scim_panel_client.h include/scim-1.0/scim_panel_common.h include/scim-1.0/scim_pointer.h include/scim-1.0/scim_property.h include/scim-1.0/scim_signals.h include/scim-1.0/scim_slot.h include/scim-1.0/scim_socket.h include/scim-1.0/scim_trans_commands.h include/scim-1.0/scim_transaction.h include/scim-1.0/scim_types.h include/scim-1.0/scim_utility.h include/scim-1.0/x11/scim_x11_utils.h lib/gtk-2.0/immodules/im-scim.a lib/gtk-2.0/immodules/im-scim.la lib/gtk-2.0/immodules/im-scim.so lib/libscim-1.0.a lib/libscim-1.0.la lib/libscim-1.0.so -lib/libscim-1.0.so.9 +lib/libscim-1.0.so.10 lib/libscim-gtkutils-1.0.a lib/libscim-gtkutils-1.0.la lib/libscim-gtkutils-1.0.so -lib/libscim-gtkutils-1.0.so.9 +lib/libscim-gtkutils-1.0.so.10 lib/libscim-x11utils-1.0.a lib/libscim-x11utils-1.0.la lib/libscim-x11utils-1.0.so -lib/libscim-x11utils-1.0.so.9 +lib/libscim-x11utils-1.0.so.10 lib/scim-1.0/1.4.0/Config/simple.a lib/scim-1.0/1.4.0/Config/simple.la lib/scim-1.0/1.4.0/Config/simple.so lib/scim-1.0/1.4.0/Config/socket.a lib/scim-1.0/1.4.0/Config/socket.la lib/scim-1.0/1.4.0/Config/socket.so lib/scim-1.0/1.4.0/Filter/sctc.a lib/scim-1.0/1.4.0/Filter/sctc.la lib/scim-1.0/1.4.0/Filter/sctc.so lib/scim-1.0/1.4.0/FrontEnd/socket.a lib/scim-1.0/1.4.0/FrontEnd/socket.la lib/scim-1.0/1.4.0/FrontEnd/socket.so lib/scim-1.0/1.4.0/FrontEnd/x11.a lib/scim-1.0/1.4.0/FrontEnd/x11.la lib/scim-1.0/1.4.0/FrontEnd/x11.so lib/scim-1.0/1.4.0/Helper/setup.a lib/scim-1.0/1.4.0/Helper/setup.la lib/scim-1.0/1.4.0/Helper/setup.so lib/scim-1.0/1.4.0/IMEngine/rawcode.a lib/scim-1.0/1.4.0/IMEngine/rawcode.la lib/scim-1.0/1.4.0/IMEngine/rawcode.so lib/scim-1.0/1.4.0/IMEngine/socket.a lib/scim-1.0/1.4.0/IMEngine/socket.la lib/scim-1.0/1.4.0/IMEngine/socket.so lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.a lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.la lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.so lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.a lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.la lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.so lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.a lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.la lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so lib/scim-1.0/scim-helper-launcher lib/scim-1.0/scim-helper-manager lib/scim-1.0/scim-launcher lib/scim-1.0/scim-panel-gtk libdata/pkgconfig/scim-gtkutils.pc libdata/pkgconfig/scim-x11utils.pc libdata/pkgconfig/scim.pc share/gnome/applications/scim-setup.desktop share/gnome/control-center-2.0/capplets/scim-setup.desktop share/gnome/pixmaps/scim-setup.png share/locale/cs/LC_MESSAGES/scim.mo share/locale/de/LC_MESSAGES/scim.mo share/locale/fi/LC_MESSAGES/scim.mo share/locale/fr/LC_MESSAGES/scim.mo share/locale/it/LC_MESSAGES/scim.mo share/locale/ja/LC_MESSAGES/scim.mo share/locale/ko/LC_MESSAGES/scim.mo +share/locale/nl/LC_MESSAGES/scim.mo share/locale/pa/LC_MESSAGES/scim.mo share/locale/sv/LC_MESSAGES/scim.mo share/locale/zh_CN/LC_MESSAGES/scim.mo share/locale/zh_TW/LC_MESSAGES/scim.mo %%DATADIR%%/icons/down.png %%DATADIR%%/icons/full-letter.png %%DATADIR%%/icons/full-punct.png %%DATADIR%%/icons/half-letter.png %%DATADIR%%/icons/half-punct.png %%DATADIR%%/icons/help.png %%DATADIR%%/icons/keyboard.png %%DATADIR%%/icons/left.png %%DATADIR%%/icons/menu.png %%DATADIR%%/icons/pin-down.png %%DATADIR%%/icons/pin-up.png %%DATADIR%%/icons/rawcode.png %%DATADIR%%/icons/right.png %%DATADIR%%/icons/sctc.png %%DATADIR%%/icons/sctc-sc-to-tc.png %%DATADIR%%/icons/sctc-tc-to-sc.png %%DATADIR%%/icons/setup.png %%DATADIR%%/icons/trademark.png %%DATADIR%%/icons/up.png @dirrm etc/scim @dirrm include/scim-1.0/x11 @dirrm include/scim-1.0/gtk @dirrm include/scim-1.0 @dirrmtry lib/gtk-2.0/immodules @dirrm lib/scim-1.0/1.4.0/Config @dirrm lib/scim-1.0/1.4.0/Filter @dirrm lib/scim-1.0/1.4.0/FrontEnd @dirrm lib/scim-1.0/1.4.0/Helper @dirrm lib/scim-1.0/1.4.0/IMEngine @dirrm lib/scim-1.0/1.4.0/SetupUI @dirrm lib/scim-1.0/1.4.0 @dirrm lib/scim-1.0 @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @dirrmtry share/locale/zh_TW/LC_MESSAGES @dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_CN/LC_MESSAGES @dirrmtry share/locale/zh_CN @dirrmtry share/locale/ko/LC_MESSAGES @dirrmtry share/locale/ko @dirrmtry share/locale/cs/LC_MESSAGES @dirrmtry share/locale/cs Property changes on: head/textproc/scim/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property