Upgrade textproc/scim and related ports:

  textproc/scim         0.99.6 --> 1.0.0
  chinese/scim-chinese  0.4.1  --> 0.4.2
  chinese/scim-tables   0.4.1  --> 0.4.3
  korean/scim-tables    0.4.1  --> 0.4.3
  japanese/scim-tables  0.4.1  --> 0.4.3
  textproc/skim         0.9.5  --> 1.0.0

Pet portlint.

PR:		ports/71919
Submitted by:	maintainer.

3 files changed, 33 insertions, 30 deletions

diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 80316b79c437..fad7bea54f2b 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	scim
-PORTVERSION=	0.99.6
+PORTVERSION=	1.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~suzhe/sources/
 MASTER_SITE_SUBDIR=scim
+
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	Smart Common Input Method platform
 
@@ -28,10 +29,10 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 .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}"
+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
 PLIST_SUB=	NOSTABLE="@comment "
 .else
@@ -48,6 +49,6 @@ post-configure:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO} To display this message again, type make post-install
+	@${ECHO} To display this message again, type pkg_info -D ${PKGNAME}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/scim/distinfo b/textproc/scim/distinfo
index 1eb0382c7e86..067851884f0e 100644
--- a/textproc/scim/distinfo
+++ b/textproc/scim/distinfo
@@ -1,2 +1,2 @@
-MD5 (scim-0.99.6.tar.gz) = df8c165c4340427ac57687c141fc36b2
-SIZE (scim-0.99.6.tar.gz) = 2254643
+MD5 (scim-1.0.0.tar.gz) = 810741700b2ea73467eb3de6b61f3330
+SIZE (scim-1.0.0.tar.gz) = 2309045
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index e71388829854..5afe14c87deb 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -2,7 +2,7 @@ bin/scim
 bin/scim-config-agent
 %%NOSTABLE%%bin/scim-make-table
 bin/scim-setup
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/scim.schemas >/dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/scim.schemas >/dev/null 2>&1 || /usr/bin/true
 etc/gconf/schemas/scim.schemas
 etc/scim/config
 etc/scim/global
@@ -63,26 +63,28 @@ libdata/pkgconfig/scim-gtkutils.pc
 libdata/pkgconfig/scim.pc
 share/applications/scim-setup.desktop
 share/control-center-2.0/capplets/scim-setup.desktop
+share/locale/de/LC_MESSAGES/scim.mo
+share/locale/ja/LC_MESSAGES/scim.mo
+share/locale/ko/LC_MESSAGES/scim.mo
 share/locale/zh_CN/LC_MESSAGES/scim.mo
 share/locale/zh_TW/LC_MESSAGES/scim.mo
-share/locale/ja/LC_MESSAGES/scim.mo
 share/pixmaps/scim-setup.png
-share/scim/icons/down.png
-share/scim/icons/full-letter.png
-share/scim/icons/full-punct.png
-share/scim/icons/half-letter.png
-share/scim/icons/half-punct.png
-share/scim/icons/help.png
-share/scim/icons/keyboard.png
-share/scim/icons/left.png
-share/scim/icons/pin-down.png
-share/scim/icons/pin-up.png
-share/scim/icons/rawcode.png
-share/scim/icons/right.png
-share/scim/icons/setup.png
-share/scim/icons/table.png
-share/scim/icons/trademark.png
-share/scim/icons/up.png
+%%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/pin-down.png
+%%DATADIR%%/icons/pin-up.png
+%%DATADIR%%/icons/rawcode.png
+%%DATADIR%%/icons/right.png
+%%DATADIR%%/icons/setup.png
+%%DATADIR%%/icons/table.png
+%%DATADIR%%/icons/trademark.png
+%%DATADIR%%/icons/up.png
 @dirrm etc/scim
 @dirrm include/scim-1.0/gtk
 @dirrm include/scim-1.0
@@ -95,7 +97,7 @@ share/scim/icons/up.png
 @dirrm lib/scim-1.0
 @dirrm share/control-center-2.0/capplets
 @dirrm share/control-center-2.0
-@dirrm share/pixmaps
-@dirrm share/scim/icons
-@dirrm share/scim
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/scim.schemas >/dev/null || /usr/bin/true
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/scim.schemas >/dev/null 2>&1 || /usr/bin/true