7 files changed, 16 insertions, 27 deletions

diff --git a/textproc/scim-bridge/Makefile b/textproc/scim-bridge/Makefile
index d79cfd385cb1..96c0d3a475e0 100644
--- a/textproc/scim-bridge/Makefile
+++ b/textproc/scim-bridge/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	scim-bridge
 PORTVERSION=	0.4.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index d6769223df1c..8dc10b904a3c 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/${PORTNAME}/0.1.3/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/scim-m17n/Makefile b/textproc/scim-m17n/Makefile
index 4e5bd81c8958..136b70a5b214 100644
--- a/textproc/scim-m17n/Makefile
+++ b/textproc/scim-m17n/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-m17n
 PORTVERSION=	0.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 2529a1789f8d..957265cd063d 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-openvanilla
 PORTVERSION=	0.7.2.20070514
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/rafan
 DISTNAME=	openvanilla-${PORTVERSION}
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index c27dceab57c2..515a663b1e22 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/scim-tables/${PORTVERSION}
 DISTNAME=	scim-tables-${PORTVERSION}
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 1605bae08cf2..364a5b01175f 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim
 PORTVERSION=	1.4.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -12,14 +12,15 @@ COMMENT=	Smart Common Input Method platform
 
 LICENSE=	LGPL21
 
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		gettext gmake iconv libtool pathfix pkgconfig
 USE_GNOME=	gnomehier gtk20 intlhack
 USE_XORG=	x11 xpm
 USE_LDCONFIG=	yes
-USES=		gettext gmake iconv pathfix pkgconfig
-GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${ICONV_LIB}
+LIBS+=		-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's/-lstdc++//'				\
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index ee2d5a4d4a57..b7cb49d8d302 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -48,52 +48,40 @@ 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.10
+lib/libscim-1.0.so.8
+lib/libscim-1.0.so.8.2.4
 lib/libscim-gtkutils-1.0.a
-lib/libscim-gtkutils-1.0.la
 lib/libscim-gtkutils-1.0.so
-lib/libscim-gtkutils-1.0.so.10
+lib/libscim-gtkutils-1.0.so.8
+lib/libscim-gtkutils-1.0.so.8.2.4
 lib/libscim-x11utils-1.0.a
-lib/libscim-x11utils-1.0.la
 lib/libscim-x11utils-1.0.so
-lib/libscim-x11utils-1.0.so.10
+lib/libscim-x11utils-1.0.so.8
+lib/libscim-x11utils-1.0.so.8.2.4
 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