Attachment 130850 Details for Bug 174862 – scim-pinyin-0.5.92.patch

[patch] scim-pinyin-0.5.92.patch

scim-pinyin-0.5.92.patch (text/plain), 7.14 KB, created by Po-Chien Lin on 2012-12-31 16:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chien Lin

Created: 2012-12-31 16:50:00 UTC

Size: 7.14 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/Makefile ./Makefile
>--- /usr/ports/chinese/scim-pinyin/Makefile	2012-12-26 19:45:05.000000000 +0800
>+++ ./Makefile	2013-01-01 00:38:44.000000000 +0800
>@@ -1,20 +1,15 @@
>-# New ports collection makefile for:    zh-scim-chinese
>-# Date created:		20 May 2004
>-# Whom:			Jie Gao	<gaoj@cpsc.ucalgary.ca>
>-#
>+# Created by: Jie Gao <gaoj@cpsc.ucalgary.ca>
> # $FreeBSD: ports/chinese/scim-pinyin/Makefile,v 1.33 2012/11/17 05:54:58 svnexp Exp $
>-#
> 
> PORTNAME=	scim-pinyin
>-PORTVERSION=	0.5.91
>-PORTREVISION=	9
>+PORTVERSION=	0.5.92
> CATEGORIES=	chinese
> MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	linpc@cs.nctu.edu.tw
> COMMENT=	SCIM Chinese Smart Pinyin input method
> 
>-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
>+BUILD_DEPENDS=	scim>=1.2.0:${PORTSDIR}/textproc/scim
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USE_GNOME=	gnomehack lthack
>@@ -22,39 +17,25 @@
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	libtool
> 
>-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>-		PTHREAD_LIBS="${PTHREAD_LIBS}"
>+CONFIGURE_ARGS+=	--disable-skim-support
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
> LDFLAGS+=	-L${LOCALBASE}/lib -lintl
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=	NLS
> 
>-PLIST_SUB=	SKIM="@comment "
>+.include <bsd.port.options.mk>
> 
>-pre-fetch:
>-.if exists(${LOCALBASE}/bin/skim)
>-	@${ECHO_MSG} "===>  Skim is detected, support enabled."
>+.if ${PORT_OPTIONS:MNLS}
>+USE_GETTEXT=	yes
>+PLIST_SUB+=	NLS=""
> .else
>-	@${ECHO_MSG} "Define WITH_SKIM to enable skim support."
>-.endif
>-
>-.if exists(${LOCALBASE}/bin/skim)
>-WITH_SKIM=	yes
>-.endif
>-
>-.if !defined(WITH_SKIM)
>-CONFIGURE_ARGS+=--disable-skim-support
>-.else
>-BUILD_DEPENDS+=	skim:${PORTSDIR}/textproc/skim
>-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
>-PLIST_SUB=	SKIM="" PREFIX="${PREFIX}"
>+CONFIGURE_ARGS+=	--disable-nls
>+PLIST_SUB+=	NLS="@comment "
> .endif
> 
> post-install:
> 	@${CAT} ${PKGMESSAGE}
>-	@${ECHO}
> 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
>-	@${ECHO}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/distinfo ./distinfo
>--- /usr/ports/chinese/scim-pinyin/distinfo	2012-12-26 19:45:05.000000000 +0800
>+++ ./distinfo	2012-12-31 16:40:40.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (scim-pinyin-0.5.91.tar.gz) = 9b6b24af841cbf0353b919df7f56be931850fccf3b914172af7a39b6db726653
>-SIZE (scim-pinyin-0.5.91.tar.gz) = 5492055
>+SHA256 (scim-pinyin-0.5.92.tar.gz) = 70727224a642c2f2c7739b82ebd0b4d6a6f444c9ad4311cf2a3c76230dd21d9e
>+SIZE (scim-pinyin-0.5.92.tar.gz) = 4769203
>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/files/patch-ltmain.sh ./files/patch-ltmain.sh
>--- /usr/ports/chinese/scim-pinyin/files/patch-ltmain.sh	2012-12-26 19:45:05.000000000 +0800
>+++ ./files/patch-ltmain.sh	1970-01-01 08:00:00.000000000 +0800
>@@ -1,12 +0,0 @@
>---- ./ltmain.sh.orig	Thu Aug 11 21:04:29 2005
>-+++ ./ltmain.sh	Sun Feb 18 20:49:45 2007
>-@@ -2196,6 +2196,9 @@
>- 	  alldeplibs=yes
>- 	  continue
>- 	  ;;
>-+	-pthread)
>-+	  continue
>-+	  ;;
>- 	esac # case $deplib
>- 	if test "$found" = yes || test -f "$lib"; then :
>- 	else
>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/files/patch-skim-setupui-smartpinyinui.ui ./files/patch-skim-setupui-smartpinyinui.ui
>--- /usr/ports/chinese/scim-pinyin/files/patch-skim-setupui-smartpinyinui.ui	2012-12-26 19:45:05.000000000 +0800
>+++ ./files/patch-skim-setupui-smartpinyinui.ui	1970-01-01 08:00:00.000000000 +0800
>@@ -1,23 +0,0 @@
>---- skim/setupui/smartpinyinui.ui~	Wed Mar 23 11:45:03 2005
>-+++ skim/setupui/smartpinyinui.ui	Fri Feb 10 21:05:09 2006
>-@@ -863,20 +863,4 @@
>-     <tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
>- </tabstops>
>- <layoutdefaults spacing="6" margin="11"/>
>--<includehints>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--    <includehint>skimeditshortcutbutton.h</includehint>
>--    <includehint>klineedit.h</includehint>
>--</includehints>
>- </UI>
>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/files/patch-skim__admin__ltmain.sh ./files/patch-skim__admin__ltmain.sh
>--- /usr/ports/chinese/scim-pinyin/files/patch-skim__admin__ltmain.sh	2012-12-26 19:45:05.000000000 +0800
>+++ ./files/patch-skim__admin__ltmain.sh	1970-01-01 08:00:00.000000000 +0800
>@@ -1,12 +0,0 @@
>---- ./skim/admin/ltmain.sh.orig	Sun Jun 19 11:43:45 2005
>-+++ ./skim/admin/ltmain.sh	Sun Feb 18 20:50:18 2007
>-@@ -2007,6 +2007,9 @@
>- 	  alldeplibs=yes
>- 	  continue
>- 	  ;;
>-+	-pthread)
>-+	  continue
>-+	  ;;
>- 	esac # case $deplib
>- 	if test "$found" = yes || test -f "$lib"; then :
>- 	else
>diff -ruN --exclude=CVS /usr/ports/chinese/scim-pinyin/pkg-plist ./pkg-plist
>--- /usr/ports/chinese/scim-pinyin/pkg-plist	2012-12-26 19:45:05.000000000 +0800
>+++ ./pkg-plist	2012-12-31 23:57:56.000000000 +0800
>@@ -4,32 +4,18 @@
> lib/scim-1.0/1.4.0/SetupUI/pinyin-imengine-setup.a
> lib/scim-1.0/1.4.0/SetupUI/pinyin-imengine-setup.la
> lib/scim-1.0/1.4.0/SetupUI/pinyin-imengine-setup.so
>-share/locale/de/LC_MESSAGES/scim-pinyin.mo
>-share/locale/fr/LC_MESSAGES/scim-pinyin.mo
>-share/locale/ko/LC_MESSAGES/scim-pinyin.mo
>-share/locale/it/LC_MESSAGES/scim-pinyin.mo
>-share/locale/ja/LC_MESSAGES/scim-pinyin.mo
>-share/locale/zh_CN/LC_MESSAGES/scim-pinyin.mo
>-share/locale/zh_TW/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/ja/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/ko/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/nl/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/scim-pinyin.mo
>+%%NLS%%share/locale/zh_TW/LC_MESSAGES/scim-pinyin.mo
> share/scim/pinyin/phrase_lib
> share/scim/pinyin/pinyin_phrase_index
> share/scim/pinyin/pinyin_phrase_lib
> share/scim/pinyin/pinyin_table
> share/scim/pinyin/special_table
> share/scim/icons/smart-pinyin.png
>-%%SKIM%%@cwd %%LOCALBASE%%
>-%%SKIM%%lib/kde3/kcm_skimplugin_scim_smartpinyin.a
>-%%SKIM%%lib/kde3/kcm_skimplugin_scim_smartpinyin.la
>-%%SKIM%%lib/kde3/kcm_skimplugin_scim_smartpinyin.so
>-%%SKIM%%share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop
>-%%SKIM%%share/config.kcfg/smartpinyin.kcfg
>-%%SKIM%%share/locale/zh_CN/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/zh_TW/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/de/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/fr/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/ja/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/it/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/locale/ko/LC_MESSAGES/skim-scim-pinyin.mo
>-%%SKIM%%share/apps/skim/pics/smart-pinyin.png
>-%%SKIM%%@cwd %%PREFIX%%
> @dirrm share/scim/pinyin

Actions: View | Diff

Attachments on bug 174862: 130850