Upgrade to 1.0.2.

PR:		ports/96163
Submitted by:	maintainer

4 files changed, 16 insertions, 30 deletions

diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index c4bd4a9a7326..ca664c5e6695 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	oxim
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	chinese textproc
-MASTER_SITES=	ftp://140.111.128.66/odp/OXIM/Source/
+MASTER_SITES=	ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
+		ftp://140.111.128.66/odp/OXIM/Source/
 
 MAINTAINER=	rafan@infor.org
 COMMENT=	Open X Input Method server
 
 # make sure we have the required libchewing
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS=	zh-libchewing>=0.2.7:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS=	zh-libchewing>=0.2.7:${PORTSDIR}/chinese/libchewing \
+BUILD_DEPENDS=	zh-libchewing>=0.2.6:${PORTSDIR}/chinese/libchewing
+RUN_DEPENDS=	zh-libchewing>=0.2.6:${PORTSDIR}/chinese/libchewing \
 		zh-fireflyttf>=0:${PORTSDIR}/chinese/fireflyttf
 
 OPTIONS=	GTK2 "Enable GTK2 input method module" On
@@ -62,6 +63,9 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 post-patch:
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
 			${WRKSRC}/src/gtk-immodule/gtkintl.h
+	${REINPLACE_CMD} 's|^(defint|(define|' \
+			${WRKSRC}/etc/oxim.conf.in
+
 post-install:
 .if !defined(WITHOUT_GTK2)
 	@gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/oxim/distinfo b/chinese/oxim/distinfo
index b8c995e62906..faf3d35cd0ff 100644
--- a/chinese/oxim/distinfo
+++ b/chinese/oxim/distinfo
@@ -1,3 +1,3 @@
-MD5 (oxim-1.0.1.tar.gz) = c884153c122e4110a85184141de53aca
-SHA256 (oxim-1.0.1.tar.gz) = 2099c98f8b0aa9830b92f0dff42fc461cce92ce48d43d81b4d8036bdb4d019a2
-SIZE (oxim-1.0.1.tar.gz) = 3023499
+MD5 (oxim-1.0.2.tar.gz) = 139a17fe691b4e122abcadb1d136489e
+SHA256 (oxim-1.0.2.tar.gz) = 356a80c02065c8107541fc8d3e37d1e2ed2d0479f3e35293dab2bc76cef100b8
+SIZE (oxim-1.0.2.tar.gz) = 3053511
diff --git a/chinese/oxim/files/patch-configure b/chinese/oxim/files/patch-configure
deleted file mode 100644
index 67dc6be897d0..000000000000
--- a/chinese/oxim/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Sat Mar 18 10:57:51 2006
-+++ configure	Sat Mar 18 11:02:32 2006
-@@ -29642,6 +29642,7 @@
-         test $found = y && break
-     done
- fi
-+if  test "$enable_bimsphone_module" = "yes" ; then
- if test $found = n; then
-     echo "$as_me:$LINENO: result: You need Berkeley DB to compile bimsphone module." >&5
- echo "${ECHO_T}You need Berkeley DB to compile bimsphone module." >&6
-@@ -29652,6 +29653,10 @@
- DB_INC=${db_include}
- 
- DB_LIBS=${db_lib}
-+else
-+DB_INC=
-+DB_LIBS=
-+fi
- 
- 
- #-----------------------------------------------------------------------
diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist
index 0067ca38939f..a2c977469bd2 100644
--- a/chinese/oxim/pkg-plist
+++ b/chinese/oxim/pkg-plist
@@ -13,6 +13,8 @@ lib/oxim/modules/gen-inp.la
 lib/oxim/modules/gen-inp.so
 lib/oxim/modules/unicode.la
 lib/oxim/modules/unicode.so
+lib/oxim/panels/defaultkeyboard.conf
+lib/oxim/panels/defaultkeyboard.xpm
 lib/oxim/tables/array30.tab
 lib/oxim/tables/cns11643.tab
 lib/oxim/tables/cnscj.tab
@@ -20,10 +22,11 @@ lib/oxim/tables/cnsimplex.tab
 lib/oxim/tables/cnsphone.tab
 lib/oxim/tables/default.phr
 lib/oxim/tables/ez.tab
-lib/oxim/tables/sys.tab
+lib/oxim/tables/symbol.list
 @dirrm etc/oxim
-@dirrm lib/oxim/tables
 @dirrm lib/oxim/modules
+@dirrm lib/oxim/panels
+@dirrm lib/oxim/tables
 @dirrm lib/oxim
 %%GTK2%%@dirrmtry lib/gtk-2.0/immodules
 %%GTK2%%@dirrmtry lib/gtk-2.0