ports/141745: [PATCH] chinese/zh-oxim: update to 1.4.1

Fri Dec 18 13:30:04 UTC 2009

>Number:         141745
>Category:       ports
>Synopsis:       [PATCH] chinese/zh-oxim: update to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 18 13:30:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 8.0-RELEASE-p1 amd64
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD going04.iis.sinica.edu.tw 8.0-RELEASE-p1 FreeBSD 8.0-RELEASE-p1 #0: Tue Dec  8 14:31:43 CST
>Description:
- Update to 1.4.1

Removed file(s):
- files/patch-configure
- files/patch-src__util__oxim-setup__Makefile.in

Port maintainer (rafan at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- zh-oxim-1.4.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/oxim/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- Makefile	31 Jul 2009 13:49:26 -0000	1.30
+++ Makefile	18 Dec 2009 13:10:23 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oxim
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.4.1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
 		ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
@@ -32,15 +31,18 @@
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_QT_VER=	3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-bimsphone-module \
 		--disable-static \
+		--with-qt-dir=${LOCALBASE} \
 		--with-conf-dir=${PREFIX}/etc/${PORTNAME}
 # oxim requires qinputcontextplugin.h which only exists in Debian package
 CONFIGURE_ARGS+=--disable-qt-immodule
+MAN1=		oxim.1
 
 .include <bsd.port.pre.mk>
 
@@ -55,8 +57,8 @@
 
 .if !defined(WITHOUT_CHEWING)
 # make sure we have the required libchewing
-BUILD_DEPENDS+=	zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS+=	zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing
+BUILD_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
+RUN_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
 
 CONFIGURE_ARGS+=	--enable-chewing-module
 CONFIGURE_ENV+=	CHEWING_CFLAGS=-I${LOCALBASE}/include
@@ -80,7 +82,6 @@
 CONFIGURE_ARGS+=	--enable-setup-tool
 PLIST_SUB+=	SETUP=""
 
-USE_QT_VER=	3
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 
 QMAKESPEC?=	freebsd-g++
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/chinese/oxim/distinfo,v
retrieving revision 1.12
diff -u -u -r1.12 distinfo
--- distinfo	9 Mar 2008 08:14:44 -0000	1.12
+++ distinfo	18 Dec 2009 13:10:23 -0000
@@ -1,3 +1,3 @@
-MD5 (oxim-1.1.6.tar.gz) = dd317909d4cebfecdf6bfd60b44ba0a2
-SHA256 (oxim-1.1.6.tar.gz) = 450f4a3e80488e1b62ccfb894764f853847999914ffd1c74512509e1dff98d04
-SIZE (oxim-1.1.6.tar.gz) = 1900040
+MD5 (oxim-1.4.1.tar.gz) = 13b368f5af7f6023d0e8523f709816bd
+SHA256 (oxim-1.4.1.tar.gz) = 84f0a066b94f1327efff04e41ef2e610fc0a3edc2c6f2a1318554ea60dbd3ad3
+SIZE (oxim-1.4.1.tar.gz) = 2132893
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/chinese/oxim/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist	21 May 2009 18:09:15 -0000	1.7
+++ pkg-plist	18 Dec 2009 13:10:23 -0000
@@ -1,6 +1,5 @@
 bin/oxim
-bin/oxim-conv
-%%SETUP%%bin/oxim-setup
+bin/oxim-agent
 bin/oxim2tab
 etc/oxim/locale.list
 etc/oxim/oxim.conf
@@ -24,9 +23,11 @@
 lib/oxim/tables/cnsphone.tab
 lib/oxim/tables/default.phr
 lib/oxim/tables/symbol.list
-share/applications/oxim-setup.desktop
-share/pixmaps/oxim-setup.png
- at dirrmtry share/applications
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/oxim.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/oxim.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/oxim.mo
+ at dirrmtry share/locale/zh_HK/LC_MESSAGES
+ at dirrmtry share/locale/zh_HK
 @dirrm etc/oxim
 @dirrm lib/oxim/immodules
 @dirrm lib/oxim/modules
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/chinese/oxim/files/patch-Makefile.in,v
retrieving revision 1.3
diff -u -u -r1.3 patch-Makefile.in
--- files/patch-Makefile.in	22 Feb 2008 15:05:21 -0000	1.3
+++ files/patch-Makefile.in	18 Dec 2009 13:10:23 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2008-02-22 10:48:20.000000000 +0800
-+++ Makefile.in	2008-02-22 10:48:24.000000000 +0800
-@@ -677,8 +677,6 @@
+--- Makefile.in.orig	2009-11-09 11:02:41.000000000 +0800
++++ Makefile.in	2009-12-18 16:53:05.000000000 +0800
+@@ -789,8 +789,6 @@
  
  
  install-exec-local:
 -	$(mkinstalldirs) $(DESTDIR)/$(input_d_dir)
 -	sed 's|@OXIM_IM_MODULE_DIR@|$(IM_MODULES_DIR)|' oxim-start.sh.in > $(DESTDIR)/$(input_d_dir)/oxim
- @ENABLE_SETUP_TOOL_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(datadir)/applications
- @ENABLE_SETUP_TOOL_TRUE@	$(INSTALL_DATA) oxim-setup.desktop $(DESTDIR)/$(datadir)/applications
- @ENABLE_SETUP_TOOL_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(datadir)/pixmaps
+ 	$(mkinstalldirs) $(DESTDIR)/$(mandir)/man1/
+ 	$(INSTALL_DATA) oxim.1 $(DESTDIR)/$(mandir)/man1/oxim.1
+ @ENABLE_EEEPC_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(xsession_d_dir)
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure	9 Oct 2006 01:55:52 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- ./configure.orig	Fri Sep 22 17:19:58 2006
-+++ ./configure	Mon Oct  9 09:38:36 2006
-@@ -29055,9 +29055,9 @@
- 
-     echo "$as_me:$LINENO: checking for qmake" >&5
- echo $ECHO_N "checking for qmake... $ECHO_C" >&6
--    if test -f ${qt_dir}/bin/qmake ; then
--	echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5
--echo "${ECHO_T}${qt_dir}/bin/qmake" >&6
-+    if test -f ${LOCALBASE}/bin/qmake ; then
-+	echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5
-+echo "${ECHO_T}${LOCALBASE}/bin/qmake" >&6
- 	have_qmake="yes"
-     else
- 	echo "$as_me:$LINENO: result: not found!" >&5
Index: files/patch-gtk-immodule-gtkintl.h
===================================================================
RCS file: /home/pcvs/ports/chinese/oxim/files/patch-gtk-immodule-gtkintl.h,v
retrieving revision 1.1
diff -u -u -r1.1 patch-gtk-immodule-gtkintl.h
--- files/patch-gtk-immodule-gtkintl.h	29 Mar 2006 15:32:26 -0000	1.1
+++ files/patch-gtk-immodule-gtkintl.h	18 Dec 2009 13:10:23 -0000
@@ -1,11 +1,10 @@
---- src/gtk-immodule/gtkintl.h.orig	Thu Mar 23 08:43:55 2006
-+++ src/gtk-immodule/gtkintl.h	Thu Mar 23 08:46:33 2006
-@@ -1,7 +1,7 @@
+--- src/gtk-immodule/gtkintl.h.orig	2009-01-07 11:32:19.000000000 +0800
++++ src/gtk-immodule/gtkintl.h	2009-12-18 16:57:23.000000000 +0800
+@@ -1,6 +1,6 @@
  #ifndef __GTKINTL_H__
  #define __GTKINTL_H__
- #define ENABLE_NLS 1
 -#define GTK_LOCALEDIR "/usr/share/locale"
 +#define GTK_LOCALEDIR "%%PREFIX%%/share/locale"
  #define GETTEXT_PACKAGE "gtk20"
  
- #ifdef ENABLE_NLS
+ #include <langinfo.h>
Index: files/patch-src__util__oxim-setup__Makefile.in
===================================================================
RCS file: files/patch-src__util__oxim-setup__Makefile.in
diff -N files/patch-src__util__oxim-setup__Makefile.in
--- files/patch-src__util__oxim-setup__Makefile.in	9 Oct 2006 01:55:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- ./src/util/oxim-setup/Makefile.in.orig	Fri Sep 22 17:20:09 2006
-+++ ./src/util/oxim-setup/Makefile.in	Mon Oct  9 09:39:52 2006
-@@ -474,8 +474,8 @@
- @ENABLE_SETUP_TOOL_TRUE@		    main.cpp 
- 
- @ENABLE_SETUP_TOOL_TRUE at oxim-setup: oxim-setup.pro
-- at ENABLE_SETUP_TOOL_TRUE@	$(QTDIR)/bin/qmake oxim-setup.pro -o Makefile.qt
-- at ENABLE_SETUP_TOOL_TRUE@	QTDIR=$(QTDIR) make -f Makefile.qt
-+ at ENABLE_SETUP_TOOL_TRUE@	QMAKESPEC=$(QMAKESPEC) $(LOCALBASE)/bin/qmake oxim-setup.pro -o Makefile.qt
-+ at ENABLE_SETUP_TOOL_TRUE@	QTDIR=$(QTDIR) $(MAKE) -f Makefile.qt
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- zh-oxim-1.4.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

