svn commit: r312400 - in head/chinese/scim-pinyin: . files

Sun Feb 17 04:18:24 UTC 2013

Author: pclin
Date: Sun Feb 17 04:18:23 2013
New Revision: 312400
URL: http://svnweb.freebsd.org/changeset/ports/312400

Log:
  - Update to 0.5.92
  - Add OPTIONS for NLS
  - Remove SKIM support since textproc/skim has been marked as deprecated
  - Remove unused CONFIGURE_ENV in Makefile and overdated patch files
  - Take maintainership
  
  PR:		ports/174862
  Approved by:	swills (mentor)

Deleted:
  head/chinese/scim-pinyin/files/
Modified:
  head/chinese/scim-pinyin/Makefile   (contents, props changed)
  head/chinese/scim-pinyin/distinfo   (contents, props changed)
  head/chinese/scim-pinyin/pkg-plist   (contents, props changed)

Modified: head/chinese/scim-pinyin/Makefile
==============================================================================

--- head/chinese/scim-pinyin/Makefile	Sun Feb 17 04:09:29 2013	(r312399)
+++ head/chinese/scim-pinyin/Makefile	Sun Feb 17 04:18:23 2013	(r312400)
@@ -1,20 +1,15 @@
-# New ports collection makefile for:    zh-scim-chinese
-# Date created:		20 May 2004
-# Whom:			Jie Gao	<gaoj at cpsc.ucalgary.ca>
-#
+# Created by: Jie Gao <gaoj at cpsc.ucalgary.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	scim-pinyin
-PORTVERSION=	0.5.91
-PORTREVISION=	9
+PORTVERSION=	0.5.92
 CATEGORIES=	chinese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	pclin at FreeBSD.org
 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,24 @@ USE_ICONV=	yes
 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>

Modified: head/chinese/scim-pinyin/distinfo
==============================================================================
--- head/chinese/scim-pinyin/distinfo	Sun Feb 17 04:09:29 2013	(r312399)
+++ head/chinese/scim-pinyin/distinfo	Sun Feb 17 04:18:23 2013	(r312400)
@@ -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

Modified: head/chinese/scim-pinyin/pkg-plist
==============================================================================
--- head/chinese/scim-pinyin/pkg-plist	Sun Feb 17 04:09:29 2013	(r312399)
+++ head/chinese/scim-pinyin/pkg-plist	Sun Feb 17 04:18:23 2013	(r312400)
@@ -4,32 +4,18 @@ lib/scim-1.0/1.4.0/IMEngine/pinyin.so
 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
