From gaoj@cpsc.ucalgary.ca  Wed Mar  2 02:04:06 2005
Return-Path: <gaoj@cpsc.ucalgary.ca>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5934E16A4CE
	for <freebsd-gnats-submit@freebsd.org>; Wed,  2 Mar 2005 02:04:06 +0000 (GMT)
Received: from ensa.cpsc.ucalgary.ca (ensa.cpsc.ucalgary.ca [136.159.2.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F0AE43D2D
	for <freebsd-gnats-submit@freebsd.org>; Wed,  2 Mar 2005 02:04:05 +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 j2221Qj0011148
	for <freebsd-gnats-submit@freebsd.org>; Tue, 1 Mar 2005 19:01:26 -0700
Received: from localhost (localhost [127.0.0.1])
	by imgw1.cpsc.ucalgary.ca (8.13.3/8.13.3) with ESMTP id j2221Q5G016585
	for <freebsd-gnats-submit@freebsd.org>; Tue, 1 Mar 2005 19:01:26 -0700
Received: from imgw1.cpsc.ucalgary.ca ([127.0.0.1])
 by localhost (imgw1 [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 16519-03 for <freebsd-gnats-submit@freebsd.org>;
 Tue,  1 Mar 2005 19:01:26 -0700 (MST)
Received: from localhost.cpsc.ucalgary.ca (sana-sa [136.159.7.231])
	by imgw1.cpsc.ucalgary.ca (8.13.3/8.13.3) with ESMTP id j2221NQc016579
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 1 Mar 2005 19:01:23 -0700
Received: from localhost.cpsc.ucalgary.ca (localhost [127.0.0.1])
	by localhost.cpsc.ucalgary.ca (8.13.1/8.13.1) with ESMTP id j2221Nh2029818
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 1 Mar 2005 19:01:23 -0700 (MST)
	(envelope-from gaoj@localhost.cpsc.ucalgary.ca)
Received: (from gaoj@localhost)
	by localhost.cpsc.ucalgary.ca (8.13.1/8.13.1/Submit) id j2221N8n029817;
	Tue, 1 Mar 2005 19:01:23 -0700 (MST)
	(envelope-from gaoj)
Message-Id: <200503020201.j2221N8n029817@localhost.cpsc.ucalgary.ca>
Date: Tue, 1 Mar 2005 19:01:23 -0700 (MST)
From: Jie Gao <gaoj@cpsc.ucalgary.ca>
Reply-To: Jie Gao <gaoj@cpsc.ucalgary.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] Upgrade textproc/skim to 1.2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         78263
>Category:       ports
>Synopsis:       [maintainer] Upgrade textproc/skim to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    clsung
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 02 02:10:16 GMT 2005
>Closed-Date:    Tue Mar 22 08:14:57 GMT 2005
>Last-Modified:  Tue Mar 22 08:14:57 GMT 2005
>Originator:     Jie Gao
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD aibsd 5.3-STABLE FreeBSD 5.3-STABLE #3: Sat Jan 15 20:23:09 MST 2005 root@aibsd:/usr/obj/usr/src/sys/AIBSD i386


	
>Description:
	
Upgrade textproc/skim to the latest stable version: 1.2.0.
This PR depends on PR ports/78260 .

>How-To-Repeat:
	
N/A
>Fix:

	
Apply the following patch

--- patch-textproc-skim begins here ---
Index: textproc/skim/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- textproc/skim/Makefile	1 Mar 2005 18:36:11 -0000	1.12
+++ textproc/skim/Makefile	2 Mar 2005 01:33:20 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	skim
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2.0
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scim
@@ -14,7 +14,7 @@
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	An input method platform based on SCIM library and KDE/QT
 
-LIB_DEPENDS=	scim-1.0.5:${PORTSDIR}/textproc/scim
+LIB_DEPENDS=	scim-1.0.6:${PORTSDIR}/textproc/scim
 
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
@@ -24,6 +24,8 @@
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_INC_LIBTOOL_VER=	15
+
+USE_GNOME=	gnomehack
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
Index: textproc/skim/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- textproc/skim/distinfo	30 Jan 2005 00:13:46 -0000	1.6
+++ textproc/skim/distinfo	2 Mar 2005 01:33:20 -0000
@@ -1,2 +1,2 @@
-MD5 (skim-1.0.3.tar.bz2) = 7dc9e8f51d2239a2c8fdeaa256ce4060
-SIZE (skim-1.0.3.tar.bz2) = 1398272
+MD5 (skim-1.2.0.tar.bz2) = 0679961db34d79a4274294733dfc6fe0
+SIZE (skim-1.2.0.tar.bz2) = 1410725
Index: textproc/skim/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- textproc/skim/pkg-plist	30 Jan 2005 00:13:46 -0000	1.4
+++ textproc/skim/pkg-plist	2 Mar 2005 01:33:20 -0000
@@ -1,5 +1,16 @@
 bin/scim-panel-kde
 bin/skim
+include/skim/skimglobalactions.h
+include/skim/skimkeygrabber.h
+include/skim/skimplugin.h
+include/skim/skimpluginmanager.h
+include/skim/socketserverthread.h
+include/skim/utils/kautocmodule.h
+include/skim/utils/scimactions.h
+include/skim/utils/scimdragableframe.h
+include/skim/utils/scimmovehandle.h
+include/skim/utils/scimtoolbar.h
+include/skim/utils/scimxmlguibuilder.h
 lib/kde3/kcm_skimplugin_configplugin.la
 lib/kde3/kcm_skimplugin_configplugin.so
 lib/kde3/kcm_skimplugin_inputwindow.la
@@ -12,8 +23,6 @@
 lib/kde3/kcm_skimplugin_scim_hangul.so
 lib/kde3/kcm_skimplugin_scim_imengines.la
 lib/kde3/kcm_skimplugin_scim_imengines.so
-lib/kde3/kcm_skimplugin_scim_qtimm.la
-lib/kde3/kcm_skimplugin_scim_qtimm.so
 lib/kde3/kcm_skimplugin_scim_smartpinyin.la
 lib/kde3/kcm_skimplugin_scim_smartpinyin.so
 lib/kde3/kcm_skimplugin_scim_tables.la
@@ -38,6 +47,8 @@
 lib/libskim.la
 lib/libskim.so
 lib/libskim.so.0
+libdata/pkgconfig/scim_kdeutils.pc
+libdata/pkgconfig/skim.pc
 share/applnk/Utilities/skim.desktop
 share/apps/skim/mainwindowui.rc
 share/apps/skim/pics/pin_down.png
@@ -45,7 +56,6 @@
 share/apps/skim/pics/scim_help.png
 share/autostart/skim.desktop
 share/config.kcfg/generictable.kcfg
-share/config.kcfg/qtimm.kcfg
 share/config.kcfg/scim_hangul.kcfg
 share/config.kcfg/scimkdeconfig.kcfg
 share/config.kcfg/smartpinyin.kcfg
@@ -97,6 +107,7 @@
 share/icons/crystalsvg/scalable/apps/skim.svgz
 share/locale/de/LC_MESSAGES/skim.mo
 share/locale/fr/LC_MESSAGES/skim.mo
+share/locale/it/LC_MESSAGES/skim.mo
 share/locale/ja/LC_MESSAGES/skim.mo
 share/locale/ko/LC_MESSAGES/skim.mo
 share/locale/zh_CN/LC_MESSAGES/skim.mo
@@ -107,7 +118,6 @@
 share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_hangul_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_imengines_config.desktop
-share/services/skimconfiguredialog/skimplugin_scim_qtimm_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop
 share/services/skimconfiguredialog/skimplugin_scim_x_config.desktop
@@ -121,10 +131,11 @@
 share/servicetypes/skimplugin.desktop
 share/servicetypes/skimui.desktop
 @cwd %%X11BASE%%
-lib/scim-1.0/1.0.0/Config/kconfig.la
-lib/scim-1.0/1.0.0/Config/kconfig.so
-lib/scim-1.0/1.0.0/Config/kconfig.so.0
+lib/scim-1.0/1.2.0/Config/kconfig.la
+lib/scim-1.0/1.2.0/Config/kconfig.so
 @cwd %%LOCALBASE%%
+@dirrm include/skim/utils
+@dirrm include/skim
 @dirrm share/services/skimconfiguredialog
 @dirrm share/doc/HTML/en/skim
 @dirrm share/doc/HTML/de/skim
--- patch-textproc-skim ends here ---


>Release-Note:
>Audit-Trail:

From: Jie Gao <gaoj@cpsc.ucalgary.ca>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/78263: [maintainer] Upgrade textproc/skim to 1.2.0
Date: Thu, 3 Mar 2005 08:52:35 -0700

 Can anyone handle ports/78263, ports/78264, ports/78265 and ports/78266 ? 
 With ports/78260 (scim upgrade) committed, all existing versions of scim 
 dependent in ports will be broken until they are upgraded as well by the 
 above-mentioned PRs.
 
 Thanks.
Responsible-Changed-From-To: freebsd-ports-bugs->clsung 
Responsible-Changed-By: clsung 
Responsible-Changed-When: Thu Mar 3 16:03:26 GMT 2005 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78263 

From: Jie Gao <gaoj@cpsc.ucalgary.ca>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/78263: [maintainer] Upgrade textproc/skim to 1.2.0
Date: Mon, 21 Mar 2005 20:29:21 -0700 (MST)

 The port was changed during gnome-2.10 upgrade. The old patch was no longer
 applicable.
 
 New patch is:
 
 diff -ruN textproc/skim.old/Makefile textproc/skim/Makefile
 --- textproc/skim.old/Makefile	Fri Mar 18 10:03:57 2005
 +++ textproc/skim/Makefile	Mon Mar 21 20:12:26 2005
 @@ -2,12 +2,11 @@
  # Date created:		21 July 2004
  # Whom:			Jie Gao	<gaoj@cpsc.ucalgary.ca>
  #
 -# $FreeBSD: ports/textproc/skim/Makefile,v 1.13 2005/03/17 11:06:09 ahze Exp $
 +# $FreeBSD$
  #
  
  PORTNAME=	skim
 -PORTVERSION=	1.0.3
 -PORTREVISION=	2
 +PORTVERSION=	1.2.0
  CATEGORIES=	textproc kde
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	scim
 @@ -26,12 +25,14 @@
  USE_REINPLACE=	yes
  USE_INC_LIBTOOL_VER=	15
  
 +USE_GNOME=	gnomehack
 +
  CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
  		PTHREAD_LIBS="${PTHREAD_LIBS}"
  
  .include <bsd.port.pre.mk>
  
 -.if ${ARCH} == "amd64"
 +.if ${ARCH} == amd64
  BROKEN=		Does not compile
  .endif
  
 diff -ruN textproc/skim.old/distinfo textproc/skim/distinfo
 --- textproc/skim.old/distinfo	Tue Jan 25 08:43:41 2005
 +++ textproc/skim/distinfo	Mon Mar 21 20:12:26 2005
 @@ -1,2 +1,2 @@
 -MD5 (skim-1.0.3.tar.bz2) = 7dc9e8f51d2239a2c8fdeaa256ce4060
 -SIZE (skim-1.0.3.tar.bz2) = 1398272
 +MD5 (skim-1.2.0.tar.bz2) = 0679961db34d79a4274294733dfc6fe0
 +SIZE (skim-1.2.0.tar.bz2) = 1410725
 diff -ruN textproc/skim.old/pkg-plist textproc/skim/pkg-plist
 --- textproc/skim.old/pkg-plist	Tue Jan 25 08:43:41 2005
 +++ textproc/skim/pkg-plist	Mon Mar 21 20:12:26 2005
 @@ -1,5 +1,16 @@
  bin/scim-panel-kde
  bin/skim
 +include/skim/skimglobalactions.h
 +include/skim/skimkeygrabber.h
 +include/skim/skimplugin.h
 +include/skim/skimpluginmanager.h
 +include/skim/socketserverthread.h
 +include/skim/utils/kautocmodule.h
 +include/skim/utils/scimactions.h
 +include/skim/utils/scimdragableframe.h
 +include/skim/utils/scimmovehandle.h
 +include/skim/utils/scimtoolbar.h
 +include/skim/utils/scimxmlguibuilder.h
  lib/kde3/kcm_skimplugin_configplugin.la
  lib/kde3/kcm_skimplugin_configplugin.so
  lib/kde3/kcm_skimplugin_inputwindow.la
 @@ -12,8 +23,6 @@
  lib/kde3/kcm_skimplugin_scim_hangul.so
  lib/kde3/kcm_skimplugin_scim_imengines.la
  lib/kde3/kcm_skimplugin_scim_imengines.so
 -lib/kde3/kcm_skimplugin_scim_qtimm.la
 -lib/kde3/kcm_skimplugin_scim_qtimm.so
  lib/kde3/kcm_skimplugin_scim_smartpinyin.la
  lib/kde3/kcm_skimplugin_scim_smartpinyin.so
  lib/kde3/kcm_skimplugin_scim_tables.la
 @@ -38,6 +47,8 @@
  lib/libskim.la
  lib/libskim.so
  lib/libskim.so.0
 +libdata/pkgconfig/scim_kdeutils.pc
 +libdata/pkgconfig/skim.pc
  share/applnk/Utilities/skim.desktop
  share/apps/skim/mainwindowui.rc
  share/apps/skim/pics/pin_down.png
 @@ -45,7 +56,6 @@
  share/apps/skim/pics/scim_help.png
  share/autostart/skim.desktop
  share/config.kcfg/generictable.kcfg
 -share/config.kcfg/qtimm.kcfg
  share/config.kcfg/scim_hangul.kcfg
  share/config.kcfg/scimkdeconfig.kcfg
  share/config.kcfg/smartpinyin.kcfg
 @@ -97,6 +107,7 @@
  share/icons/crystalsvg/scalable/apps/skim.svgz
  share/locale/de/LC_MESSAGES/skim.mo
  share/locale/fr/LC_MESSAGES/skim.mo
 +share/locale/it/LC_MESSAGES/skim.mo
  share/locale/ja/LC_MESSAGES/skim.mo
  share/locale/ko/LC_MESSAGES/skim.mo
  share/locale/zh_CN/LC_MESSAGES/skim.mo
 @@ -107,7 +118,6 @@
  share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop
  share/services/skimconfiguredialog/skimplugin_scim_hangul_config.desktop
  share/services/skimconfiguredialog/skimplugin_scim_imengines_config.desktop
 -share/services/skimconfiguredialog/skimplugin_scim_qtimm_config.desktop
  share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop
  share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop
  share/services/skimconfiguredialog/skimplugin_scim_x_config.desktop
 @@ -121,10 +131,11 @@
  share/servicetypes/skimplugin.desktop
  share/servicetypes/skimui.desktop
  @cwd %%X11BASE%%
 -lib/scim-1.0/1.0.0/Config/kconfig.la
 -lib/scim-1.0/1.0.0/Config/kconfig.so
 -lib/scim-1.0/1.0.0/Config/kconfig.so.0
 +lib/scim-1.0/1.2.0/Config/kconfig.la
 +lib/scim-1.0/1.2.0/Config/kconfig.so
  @cwd %%LOCALBASE%%
 +@dirrm include/skim/utils
 +@dirrm include/skim
  @dirrm share/services/skimconfiguredialog
  @dirrm share/doc/HTML/en/skim
  @dirrm share/doc/HTML/de/skim
State-Changed-From-To: open->closed 
State-Changed-By: clsung 
State-Changed-When: Tue Mar 22 08:14:46 GMT 2005 
State-Changed-Why:  
Committed, Thank you. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78263 
>Unformatted:
