4 files changed, 81 insertions, 36 deletions

diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index ce5ef872de6d..585f80e9d633 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	skim
-PORTVERSION=	0.9.5
+PORTVERSION=	1.0.0
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~cougar/skim/downloads/
-MASTER_SITE_SUBDIR= scim
+MASTER_SITE_SUBDIR=	scim
 
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	An input method platform based on SCIM library and KDE/QT
@@ -18,10 +18,11 @@ COMMENT=	An input method platform based on SCIM library and KDE/QT
 LIB_DEPENDS=	scim-1.0.5:${PORTSDIR}/textproc/scim
 
 USE_KDELIBS_VER=3
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_INC_LIBTOOL_VER=	15
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -29,14 +30,15 @@ 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+= CXXFLAGS="-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+=	CXXFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport ${CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}"
 .else
-CONFIGURE_ENV+=	CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+CONFIGURE_ENV+=	CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 .endif
+
 pre-configure:
 	${REINPLACE_CMD} "s,-pedantic,,g; \
 		s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
@@ -44,6 +46,6 @@ pre-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/skim/distinfo b/textproc/skim/distinfo
index 7750f39a50f0..5ae9045c13d3 100644
--- a/textproc/skim/distinfo
+++ b/textproc/skim/distinfo
@@ -1,2 +1,2 @@
-MD5 (skim-0.9.5.tar.gz) = 7cf8e5c56f915f6a8c804d182a541ec9
-SIZE (skim-0.9.5.tar.gz) = 879867
+MD5 (skim-1.0.0.tar.bz2) = 82941ec52b29c850b01f870a8d070da4
+SIZE (skim-1.0.0.tar.bz2) = 1413327
diff --git a/textproc/skim/pkg-message b/textproc/skim/pkg-message
index 64eacb808427..a1b31e586427 100644
--- a/textproc/skim/pkg-message
+++ b/textproc/skim/pkg-message
@@ -3,20 +3,20 @@ The installation of skim has finished. You can find correponding menu items in
 KDE's menu and Control Center.
 
 Please note this port contains only KDE/QT frontends and utilities to the SCIM
-platform. If you want to use any actual input method, please install the 
+platform. If you want to use any actual input method, please install the
 following ports as needed:
 
  Chinese:
   chinese/scim-tables	Table based input methods: Array30, CangJie, Cantonese,
                         Dayi, Erbi, EZ, Jyutping, Simplex, Wubi, Ziranma, ZhuYin
   chinese/scim-chinese	Smart pinyin
-    
+
  Korean:
   korean/scim-tables	Table based input methods: Hangul, Hanja
 
  Japanese:
   japanese/scim-tables	Table based input methods: HIRAGANA, KATAKANA, Nippon
 
-You can use the command `skim' to start after properly setting SCIM (please 
+You can use the command `skim' to start after properly setting SCIM (please
 refer to the message displayed by scim installation).
 ------------------------------------------------------------------------------
diff --git a/textproc/skim/pkg-plist b/textproc/skim/pkg-plist
index a10c3f812f33..c62dac67dc4e 100644
--- a/textproc/skim/pkg-plist
+++ b/textproc/skim/pkg-plist
@@ -2,12 +2,14 @@ bin/skim
 bin/scim-panel-kde
 lib/kde3/kcm_skimplugin_configplugin.la
 lib/kde3/kcm_skimplugin_configplugin.so
-lib/kde3/kcm_skimplugin_scim_global.la
-lib/kde3/kcm_skimplugin_scim_global.so
 lib/kde3/kcm_skimplugin_inputwindow.la
 lib/kde3/kcm_skimplugin_inputwindow.so
 lib/kde3/kcm_skimplugin_mainwindow.la
 lib/kde3/kcm_skimplugin_mainwindow.so
+lib/kde3/kcm_skimplugin_scim_global.la
+lib/kde3/kcm_skimplugin_scim_global.so
+lib/kde3/kcm_skimplugin_scim_hangul.la
+lib/kde3/kcm_skimplugin_scim_hangul.so
 lib/kde3/kcm_skimplugin_scim_imengines.la
 lib/kde3/kcm_skimplugin_scim_imengines.so
 lib/kde3/kcm_skimplugin_scim_qtimm.la
@@ -30,39 +32,78 @@ lib/kde3/skimplugin_setupwindow.la
 lib/kde3/skimplugin_setupwindow.so
 lib/kde3/skimplugin_systemtray.la
 lib/kde3/skimplugin_systemtray.so
-lib/skim/libscim-kdeutils.la
-lib/skim/libscim-kdeutils.so
-lib/skim/libscim-kdeutils.so.0
-lib/skim/libskim.la
-lib/skim/libskim.so
-lib/skim/libskim.so.0
+lib/libscim-kdeutils.la
+lib/libscim-kdeutils.so
+lib/libscim-kdeutils.so.0
+lib/libskim.la
+lib/libskim.so
+lib/libskim.so.0
 share/applnk/Utilities/skim.desktop
 share/apps/skim/mainwindowui.rc
-share/apps/skim/pics/full_width_letter.png
-share/apps/skim/pics/full_width_punct.png
-share/apps/skim/pics/half_width_letter.png
-share/apps/skim/pics/half_width_punct.png
-share/apps/skim/pics/keyboard.png
 share/apps/skim/pics/pin_down.png
 share/apps/skim/pics/pin_up.png
-share/apps/skim/pics/skim.png
+share/apps/skim/pics/scim_help.png
 share/config.kcfg/generictable.kcfg
 share/config.kcfg/qtimm.kcfg
+share/config.kcfg/scim_hangul.kcfg
 share/config.kcfg/scimkdeconfig.kcfg
 share/config.kcfg/smartpinyin.kcfg
-share/doc/HTML/en/skim/common
-share/doc/HTML/en/skim/index.cache.bz2
-share/doc/HTML/en/skim/index.docbook
-share/doc/HTML/en/skim/inputwindow.png
+share/doc/HTML/de/skim/skim_configuration110.png
+share/doc/HTML/de/skim/skim_configuration111.png
+share/doc/HTML/de/skim/skim_configuration112.png
+share/doc/HTML/de/skim/skim_contextmenu.png
+share/doc/HTML/de/skim/skim_configuration10.png
+share/doc/HTML/de/skim/skim_configuration11.png
+share/doc/HTML/de/skim/skim_configuration12.png
+share/doc/HTML/de/skim/skim_configuration13.png
+share/doc/HTML/de/skim/skim_configuration14.png
+share/doc/HTML/de/skim/skim_configuration15.png
+share/doc/HTML/de/skim/skim_configuration16.png
+share/doc/HTML/de/skim/skim_configuration17.png
+share/doc/HTML/de/skim/skim_configuration18.png
+share/doc/HTML/de/skim/skim01a.png
+share/doc/HTML/de/skim/skim_configuration19.png
+share/doc/HTML/de/skim/skim_choose_ime.png
+share/doc/HTML/de/skim/skim_toolbar1.png
+share/doc/HTML/de/skim/skim_toolbar3.png
+share/doc/HTML/de/skim/skim_toolbar4.png
+share/doc/HTML/de/skim/skim_toolbar6.png
+share/doc/HTML/de/skim/skim_toolbar8.png
+share/doc/HTML/de/skim/skim02a.png
+share/doc/HTML/de/skim/skim04a.png
+share/doc/HTML/de/skim/skim_configuration1.png
+share/doc/HTML/de/skim/skim_configuration2.png
+share/doc/HTML/de/skim/skim_configuration3.png
+share/doc/HTML/de/skim/skim_configuration4.png
+share/doc/HTML/de/skim/skim_configuration5.png
+share/doc/HTML/de/skim/skim_configuration6.png
+share/doc/HTML/de/skim/skim_configuration7.png
+share/doc/HTML/de/skim/skim_configuration8.png
+share/doc/HTML/de/skim/skim_configuration9.png
+share/doc/HTML/de/skim/index.docbook
+share/doc/HTML/de/skim/skim24c.png
+share/doc/HTML/de/skim/index.cache.bz2
+share/doc/HTML/de/skim/common
 share/doc/HTML/en/skim/kdesystray.png
-share/doc/HTML/en/skim/kdex.dtd
-share/doc/HTML/en/skim/mainwindow.png
 share/doc/HTML/en/skim/setupwindow.png
+share/doc/HTML/en/skim/inputwindow.png
+share/doc/HTML/en/skim/index.docbook
+share/doc/HTML/en/skim/mainwindow.png
+share/doc/HTML/en/skim/index.cache.bz2
+share/doc/HTML/en/skim/common
+share/doc/HTML/skim/kdex.dtd
+share/icons/crystalsvg/32x32/apps/skim.png
+share/icons/crystalsvg/scalable/apps/skim.svgz
+share/locale/de/LC_MESSAGES/skim.mo
+share/locale/ja/LC_MESSAGES/skim.mo
+share/locale/ko/LC_MESSAGES/skim.mo
 share/locale/zh_CN/LC_MESSAGES/skim.mo
+share/locale/zh_TW/LC_MESSAGES/skim.mo
 share/services/skimconfiguredialog/kcm_skimplugin_configplugin_config.desktop
-share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop
 share/services/skimconfiguredialog/skimplugin_inputwindow_config.desktop
 share/services/skimconfiguredialog/skimplugin_mainwindow_config.desktop
+share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop
+share/services/skimconfiguredialog/skimplugin_scim_hangul_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_imengines_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_qtimm_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop
@@ -74,6 +115,7 @@ share/services/skimplugin_mainwindow.desktop
 share/services/skimplugin_scim.desktop
 share/services/skimplugin_setupwindow.desktop
 share/services/skimplugin_systemtray.desktop
+share/servicetypes/skimkcmplugin.desktop
 share/servicetypes/skimplugin.desktop
 share/servicetypes/skimui.desktop
 @cwd %%X11BASE%%
@@ -83,6 +125,7 @@ lib/scim-1.0/1.0.0/Config/kconfig.so.0
 @cwd %%LOCALBASE%%
 @dirrm share/services/skimconfiguredialog
 @dirrm share/doc/HTML/en/skim
+@dirrm share/doc/HTML/de/skim
+@dirrm share/doc/HTML/skim
 @dirrm share/apps/skim/pics
 @dirrm share/apps/skim
-@dirrm lib/skim