Update to 1.4.6, a bugfix release.

Approved by:	edwin (mentor)

5 files changed, 26 insertions, 49 deletions

diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 374a2c13508f..613b2548aa7a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim
-PORTVERSION=	1.4.5
-#PORTREVISION=	0
+PORTVERSION=	1.4.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -21,24 +20,16 @@ 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 <bsd.port.pre.mk>
 
-.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|' \
diff --git a/textproc/scim/distinfo b/textproc/scim/distinfo
index e21eecfa5d36..ff525c60ac43 100644
--- a/textproc/scim/distinfo
+++ b/textproc/scim/distinfo
@@ -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
diff --git a/textproc/scim/files/extra-patch-4-stable b/textproc/scim/files/extra-patch-4-stable
deleted file mode 100644
index 4507a5e57d57..000000000000
--- a/textproc/scim/files/extra-patch-4-stable
+++ /dev/null
@@ -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 <String> 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 <String> 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 ||
diff --git a/textproc/scim/files/patch-configure b/textproc/scim/files/patch-configure
new file mode 100644
index 000000000000..e909c892001c
--- /dev/null
+++ b/textproc/scim/files/patch-configure
@@ -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
+ 
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 38970f7a7998..7a9990299b19 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -53,15 +53,15 @@ 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
@@ -112,6 +112,7 @@ 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