From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 21 18:10:15 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9243916A41F for ; Fri, 21 Oct 2005 18:10:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3ABB343D48 for ; Fri, 21 Oct 2005 18:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9LIADbG067429 for ; Fri, 21 Oct 2005 18:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9LIADov067428; Fri, 21 Oct 2005 18:10:13 GMT (envelope-from gnats) Resent-Date: Fri, 21 Oct 2005 18:10:13 GMT Resent-Message-Id: <200510211810.j9LIADov067428@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jie Gao Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 596A716A41F; Fri, 21 Oct 2005 18:02:58 +0000 (GMT) (envelope-from gaoj@cpsc.ucalgary.ca) Received: from ensa.cpsc.ucalgary.ca (ensa.cpsc.ucalgary.ca [136.159.2.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7C2E43D45; Fri, 21 Oct 2005 18:02:57 +0000 (GMT) (envelope-from gaoj@cpsc.ucalgary.ca) Received: from imgw1.cpsc.ucalgary.ca (imgw1 [136.159.5.9]) by ensa.cpsc.ucalgary.ca (8.12.11/8.12.11) with ESMTP id j9LHvSWV016140; Fri, 21 Oct 2005 11:57:28 -0600 Received: from localhost (localhost [127.0.0.1]) by imgw1.cpsc.ucalgary.ca (8.13.4/8.13.3) with ESMTP id j9LHvIUV005366; Fri, 21 Oct 2005 11:57:18 -0600 Received: from imgw1.cpsc.ucalgary.ca ([127.0.0.1]) by localhost (imgw1 [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05361-01; Fri, 21 Oct 2005 11:57:17 -0600 (MDT) Received: from localhost.cpsc.ucalgary.ca (sana-sa [136.159.7.231]) by imgw1.cpsc.ucalgary.ca (8.13.4/8.13.3) with ESMTP id j9L4fNRS017195; Thu, 20 Oct 2005 22:41:23 -0600 Received: from localhost.cpsc.ucalgary.ca (localhost [127.0.0.1]) by localhost.cpsc.ucalgary.ca (8.13.4/8.13.4) with ESMTP id j9L4fNR2017624; Thu, 20 Oct 2005 22:41:23 -0600 (MDT) (envelope-from gaoj@localhost.cpsc.ucalgary.ca) Received: (from gaoj@localhost) by localhost.cpsc.ucalgary.ca (8.13.4/8.13.4/Submit) id j9L4fNYA017623; Thu, 20 Oct 2005 22:41:23 -0600 (MDT) (envelope-from gaoj) Message-Id: <200510210441.j9L4fNYA017623@localhost.cpsc.ucalgary.ca> Date: Thu, 20 Oct 2005 22:41:23 -0600 (MDT) From: Jie Gao To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: nork@FreeBSD.org Subject: ports/87799: [maintainer] textproc/scim-table-imengine: Upgrade to 0.5.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jie Gao List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2005 18:10:15 -0000 >Number: 87799 >Category: ports >Synopsis: [maintainer] textproc/scim-table-imengine: Upgrade to 0.5.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 21 18:10:13 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jie Gao >Release: FreeBSD 6.0-RC1 i386 >Organization: >Environment: System: FreeBSD aibsd 6.0-RC1 FreeBSD 6.0-RC1 #0: Thu Oct 13 20:34:38 MDT 2005 gaoj@aibsd:/usr/obj/usr/src/sys/AIBSD i386 >Description: Upgrade scim-table-imengine to 0.5.2 New in this version: setup UI for skim is split into this port. A knob WITH_SKIM is added to switch it. Auto detected if skim is installed in normal place. >How-To-Repeat: N/A >Fix: Apply the patch below --- patch-textproc-scim-table-imengine begins here --- Index: textproc/scim-table-imengine/Makefile =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- textproc/scim-table-imengine/Makefile 21 Oct 2005 02:11:19 -0000 1.3 +++ textproc/scim-table-imengine/Makefile 21 Oct 2005 04:35:58 -0000 @@ -6,8 +6,7 @@ # PORTNAME= scim-table-imengine -PORTVERSION= 0.5.1 -PORTREVISION= 4 +PORTVERSION= 0.5.2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=scim @@ -34,6 +33,27 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" +PLIST_SUB= SKIM="@comment " + +pre-fetch: + @${ECHO_MSG} Define WITH_SKIM to enable skim support + +.if exists(${LOCALBASE}/bin/skim) +WITH_SKIM= yes +pre-patch: + @${ECHO_MSG} Skim is detected, support enabled. +.endif + +.if defined(WITH_SKIM) +BUILD_DEPENDS+= skim:${PORTSDIR}/textproc/skim +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +PLIST_SUB= SKIM="" +post-patch: + @${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \ + -e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \ + ${WRKSRC}/Makefile.in +.endif + post-install: .if ${OSVERSION} < 500035 @${INSTALL_SCRIPT} ${FILESDIR}/scim-make-table.sh ${PREFIX}/bin/scim-make-table Index: textproc/scim-table-imengine/distinfo =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- textproc/scim-table-imengine/distinfo 7 Mar 2005 20:17:00 -0000 1.1 +++ textproc/scim-table-imengine/distinfo 21 Oct 2005 04:35:58 -0000 @@ -1,2 +1,2 @@ -MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c -SIZE (scim-tables-0.5.1.tar.gz) = 4718906 +MD5 (scim-tables-0.5.2.tar.gz) = 04749a3341bd37af20820497f1d68f7a +SIZE (scim-tables-0.5.2.tar.gz) = 5539476 Index: textproc/scim-table-imengine/pkg-plist =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- textproc/scim-table-imengine/pkg-plist 7 Mar 2005 20:17:01 -0000 1.1 +++ textproc/scim-table-imengine/pkg-plist 21 Oct 2005 04:35:58 -0000 @@ -8,5 +8,24 @@ share/locale/ko/LC_MESSAGES/scim-tables.mo share/locale/de/LC_MESSAGES/scim-tables.mo share/locale/fr/LC_MESSAGES/scim-tables.mo +share/locale/it/LC_MESSAGES/scim-tables.mo +%%SKIM%%@cwd %%LOCALBASE%% +%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.la +%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.so +%%SKIM%%share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop +%%SKIM%%share/config.kcfg/generictable.kcfg +%%SKIM%%share/locale/zh_CN/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/zh_TW/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/de/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/fr/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/ja/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/it/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/locale/ko/LC_MESSAGES/skim-scim-tables.mo +%%SKIM%%share/apps/skim/pics/scim-tables.png +%%SKIM%%@unexec rmdir %D/share/apps/skim/pics 2>/dev/null || true +%%SKIM%%@unexec rmdir %D/share/apps/skim 2>/dev/null || true +%%SKIM%%@unexec rmdir %D/share/config.kcfg 2>/dev/null || true +%%SKIM%%@unexec rmdir %D/share/services/skimconfiguredialog 2>/dev/null || true +%%SKIM%%@cwd %%X11BASE%% @unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true @unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true Index: textproc/scim-table-imengine/files/patch-Makefile.in =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/files/patch-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile.in --- textproc/scim-table-imengine/files/patch-Makefile.in 7 Mar 2005 20:17:01 -0000 1.1 +++ textproc/scim-table-imengine/files/patch-Makefile.in 21 Oct 2005 04:35:58 -0000 @@ -1,11 +1,22 @@ ---- Makefile.in.orig Tue Mar 1 14:02:56 2005 -+++ Makefile.in Tue Mar 1 14:03:08 2005 -@@ -247,7 +247,7 @@ +--- Makefile.in.orig Sun Aug 7 21:42:34 2005 ++++ Makefile.in Thu Oct 20 22:13:30 2005 +@@ -75,7 +75,7 @@ + uninstall-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = intl m4 src zh ja ko ne additional icons po skim ++DIST_SUBDIRS = intl m4 src icons po skim + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -258,8 +258,8 @@ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec AUTOMAKE_OPTIONS = gnu --SUBDIRS = intl m4 src zh ja ko additional icons po -+SUBDIRS = intl m4 src icons po +-@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim +-SUBDIRS = intl m4 src zh ja ko ne additional icons po $(SKIM_SUBDIR) ++@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = ++SUBDIRS = intl m4 src icons po $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) CLEANFILES = *.bak ACLOCAL_AMFLAGS = -I m4 Index: textproc/scim-table-imengine/files/patch-icons-Makefile.in =================================================================== RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/files/patch-icons-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-icons-Makefile.in --- textproc/scim-table-imengine/files/patch-icons-Makefile.in 7 Mar 2005 20:17:01 -0000 1.1 +++ textproc/scim-table-imengine/files/patch-icons-Makefile.in 21 Oct 2005 04:35:58 -0000 @@ -1,6 +1,6 @@ ---- icons/Makefile.in.orig Tue Mar 1 14:02:22 2005 -+++ icons/Makefile.in Tue Mar 1 14:02:45 2005 -@@ -222,33 +222,7 @@ +--- icons/Makefile.in.orig Sun Aug 7 21:42:32 2005 ++++ icons/Makefile.in Thu Oct 20 21:11:30 2005 +@@ -233,37 +233,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ MAINTAINERCLEANFILES = Makefile.in @@ -23,13 +23,17 @@ - HIRAGANA.png \ - Jyutping.png \ - KATAKANA.png \ +- LaTeX.png \ +- Nepali.png \ - Nippon.png \ - Simplex.png \ - Viqr.png \ +- Wu.png \ - Wubi.png \ - Yawerty.png \ - ZhuYin.png \ -- Ziranma.png +- Ziranma.png \ +- IPA-X-SAMPA.png - +INST_ICONS = table.png EXTRA_DIST = $(INST_ICONS) --- patch-textproc-scim-table-imengine ends here --- >Release-Note: >Audit-Trail: >Unformatted: