ports/93147: [maintainer] Update to scim-1.4.4

Jie Gao gaoj at cpsc.ucalgary.ca
Fri Feb 10 21:30:08 UTC 2006 

>Number:         93147
>Category:       ports
>Synopsis:       [maintainer] Update to scim-1.4.4
>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 Feb 10 21:30:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jie Gao
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD aibsd 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #1: Sun Feb 5 22:42:06 MST 2006 gaoj at aibsd:/usr/obj/usr/src/sys/AIBSD i386


	
>Description:
	
Update the following ports to the latest version:

	textproc/scim: 1.4.4
	textproc/skim: 1.4.4
	textproc/scim-table-imengine: 0.5.6

This time there is no need to bump dependents' PORTREVISION because no shared
library version number is changed.

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

Apply patches below. textproc/skim has one file removed, and
textproc/scim-table-imengine has one file added.

	

--- patch-textproc-scim.diff begins here ---
Index: textproc/scim/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/scim/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- textproc/scim/Makefile	10 Feb 2006 15:59:26 -0000	1.16
+++ textproc/scim/Makefile	10 Feb 2006 21:10:27 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.4.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
Index: textproc/scim/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/scim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- textproc/scim/distinfo	10 Feb 2006 15:59:26 -0000	1.9
+++ textproc/scim/distinfo	10 Feb 2006 21:10:27 -0000
@@ -1,3 +1,3 @@
-MD5 (scim-1.4.2.tar.gz) = 024cc7b98f68b56b23dd24535ec0388d
-SHA256 (scim-1.4.2.tar.gz) = c9e62cc5ee18ed0982dde6b6a258a239f5812ff9a6807283472ff16df1e6421e
-SIZE (scim-1.4.2.tar.gz) = 2574997
+MD5 (scim-1.4.4.tar.gz) = 6805403b2151e89f17f5686e7ebcd515
+SHA256 (scim-1.4.4.tar.gz) = a0bc87a5e779250a6ae7cdc56c2fbfb3ca09aec8ae01d90b2f18116fa624110c
+SIZE (scim-1.4.4.tar.gz) = 2610165
--- patch-textproc-scim.diff ends here ---

--- patch-textproc-skim.diff begins here ---
Index: textproc/skim/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- textproc/skim/Makefile	10 Feb 2006 19:15:31 -0000	1.17
+++ textproc/skim/Makefile	10 Feb 2006 21:11:47 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	skim
-PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTVERSION=	1.4.4
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scim
@@ -51,7 +50,9 @@
 
 post-configure:
 	${REINPLACE_CMD} \
-		s,/usr/local/lib/pkgconfig,${PREFIX}/libdata/pkgconfig,g \
+		-e s,/usr/local/lib/pkgconfig,${PREFIX}/libdata/pkgconfig,g \
+		-e s,/usr/lib/pkgconfig,${PREFIX}/libdata/pkgconfig,g \
+		-e s,lib/pkgconfig,libdata/pkgconfig,g \
 		${WRKSRC}/cache/pkg.cache.py
 do-build:
 	@cd ${WRKSRC} && ./scons
Index: textproc/skim/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- textproc/skim/distinfo	10 Feb 2006 19:15:31 -0000	1.11
+++ textproc/skim/distinfo	10 Feb 2006 21:11:47 -0000
@@ -1,3 +1,3 @@
-MD5 (skim-1.4.2.tar.bz2) = 0f1b783b4cd7e834656912be53eb644b
-SHA256 (skim-1.4.2.tar.bz2) = b199e48ea240171f511ead4ec0926d7d111d822320121f9dc0fd5a1970b8a826
-SIZE (skim-1.4.2.tar.bz2) = 1062345
+MD5 (skim-1.4.4.tar.bz2) = fb01a32b13008112e2b866b33f602e68
+SHA256 (skim-1.4.4.tar.bz2) = 8a3a8d3e59c685ec12760312e8c6788971c9a1b1f4820666ee8790d220b94a2e
+SIZE (skim-1.4.4.tar.bz2) = 1071174
Index: textproc/skim/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- textproc/skim/pkg-plist	2 Aug 2005 19:46:53 -0000	1.6
+++ textproc/skim/pkg-plist	10 Feb 2006 21:11:47 -0000
@@ -113,6 +113,7 @@
 share/locale/it/LC_MESSAGES/skim.mo
 share/locale/ja/LC_MESSAGES/skim.mo
 share/locale/ko/LC_MESSAGES/skim.mo
+share/locale/pa/LC_MESSAGES/skim.mo
 share/locale/zh_CN/LC_MESSAGES/skim.mo
 share/locale/zh_TW/LC_MESSAGES/skim.mo
 share/services/skimconfiguredialog/kcm_skimplugin_configplugin_config.desktop
Index: textproc/skim/files/patch-plugins_setupwindow-scim-global.ui
===================================================================
RCS file: textproc/skim/files/patch-plugins_setupwindow-scim-global.ui
diff -N textproc/skim/files/patch-plugins_setupwindow-scim-global.ui
--- textproc/skim/files/patch-plugins_setupwindow-scim-global.ui	21 Oct 2005 02:15:26 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- plugins/setupwindow/scim_global.ui.orig	Wed Sep 28 11:20:20 2005
-+++ plugins/setupwindow/scim_global.ui	Wed Sep 28 11:20:39 2005
-@@ -943,16 +943,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>klineedit.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>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
- </includehints>
- </UI>
--- patch-textproc-skim.diff ends here ---

--- patch-textproc-scim-table-imengine.diff begins here ---
Index: textproc/scim-table-imengine/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- textproc/scim-table-imengine/Makefile	10 Feb 2006 19:03:06 -0000	1.4
+++ textproc/scim-table-imengine/Makefile	10 Feb 2006 21:13:17 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim-table-imengine
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.5.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
Index: textproc/scim-table-imengine/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- textproc/scim-table-imengine/distinfo	10 Feb 2006 19:03:06 -0000	1.2
+++ textproc/scim-table-imengine/distinfo	10 Feb 2006 21:13:17 -0000
@@ -1,3 +1,3 @@
-MD5 (scim-tables-0.5.4.tar.gz) = 69ce8f1945ba2ab4bf820386e76c2cd9
-SHA256 (scim-tables-0.5.4.tar.gz) = 784cbdecb40a42dee50c2d4ef0614ebd58728c8ee15ac0f2d08acfeef73ec4ad
-SIZE (scim-tables-0.5.4.tar.gz) = 5608023
+MD5 (scim-tables-0.5.6.tar.gz) = ff8d59e8f3dedb7dd7c6d87c8fc408db
+SHA256 (scim-tables-0.5.6.tar.gz) = 408cddeed4f5f9105f61822388fcd8947b1f2ba2d66bdabfa2be4e4f1d9393d0
+SIZE (scim-tables-0.5.6.tar.gz) = 7058913
Index: textproc/scim-table-imengine/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/scim-table-imengine/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- textproc/scim-table-imengine/pkg-plist	10 Feb 2006 19:03:06 -0000	1.2
+++ textproc/scim-table-imengine/pkg-plist	10 Feb 2006 21:13:17 -0000
@@ -9,6 +9,7 @@
 share/locale/de/LC_MESSAGES/scim-tables.mo
 share/locale/fr/LC_MESSAGES/scim-tables.mo
 share/locale/it/LC_MESSAGES/scim-tables.mo
+share/locale/pa/LC_MESSAGES/scim-tables.mo
 %%SKIM%%@cwd %%LOCALBASE%%
 %%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.la
 %%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.so
@@ -21,6 +22,7 @@
 %%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/locale/pa/LC_MESSAGES/skim-scim-tables.mo
 %%SKIM%%share/apps/skim/pics/scim-tables.png
 %%SKIM%%@dirrmtry share/apps/skim/pics
 %%SKIM%%@dirrmtry share/apps/skim
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.2
diff -u -r1.2 patch-Makefile.in
--- textproc/scim-table-imengine/files/patch-Makefile.in	10 Feb 2006 19:03:06 -0000	1.2
+++ textproc/scim-table-imengine/files/patch-Makefile.in	10 Feb 2006 21:13:17 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Oct 30 22:07:39 2005
-+++ Makefile.in	Tue Nov  1 22:58:26 2005
+--- Makefile.in.orig	Fri Feb 10 12:04:25 2006
++++ Makefile.in	Fri Feb 10 12:09:21 2006
 @@ -75,7 +75,7 @@
  	uninstall-recursive
  ETAGS = etags
  CTAGS = ctags
--DIST_SUBDIRS = intl icons m4 po src tables skim
-+DIST_SUBDIRS = intl icons m4 po src skim
+-DIST_SUBDIRS = docs intl icons m4 po src tables skim
++DIST_SUBDIRS = docs intl icons m4 po src skim
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
@@ -14,9 +14,9 @@
  EXTRA_DIST = config.rpath mkinstalldirs  bootstrap scim-tables.spec
  AUTOMAKE_OPTIONS = gnu
 - at SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim
--SUBDIRS = intl icons m4 po src tables $(SKIM_SUBDIR)
+-SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR)
 + at SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = 
-+SUBDIRS = intl icons m4 po src $(SKIM_SUBDIR)
++SUBDIRS = docs intl icons m4 po src $(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.2
diff -u -r1.2 patch-icons-Makefile.in
--- textproc/scim-table-imengine/files/patch-icons-Makefile.in	10 Feb 2006 19:03:06 -0000	1.2
+++ textproc/scim-table-imengine/files/patch-icons-Makefile.in	10 Feb 2006 21:13:17 -0000
@@ -1,6 +1,6 @@
---- icons/Makefile.in.orig	Sun Oct 30 22:07:35 2005
-+++ icons/Makefile.in	Tue Nov  1 22:58:55 2005
-@@ -234,53 +234,7 @@
+--- icons/Makefile.in.orig	Thu Jan 12 02:00:26 2006
++++ icons/Makefile.in	Fri Feb 10 13:34:59 2006
+@@ -234,54 +234,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
@@ -14,6 +14,7 @@
 -			  CangJie3.png	\
 -			  Cantonese.png \
 -			  CantonHK.png	\
+-			  CNS11643.png	\
 -			  Quick.png	\
 -			  Stroke5.png	\
 -			  Dayi.png      \
Index: textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui
===================================================================
RCS file: textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui
diff -N textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui	10 Feb 2006 21:13:17 -0000
@@ -0,0 +1,19 @@
+--- skim/setupui/generictableui.ui~	Wed Mar 23 11:53:02 2005
++++ skim/setupui/generictableui.ui	Fri Feb 10 13:45:14 2006
+@@ -336,16 +336,4 @@
+     </connection>
+ </connections>
+ <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>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-</includehints>
+ </UI>
--- patch-textproc-scim-table-imengine.diff ends here ---


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

More information about the freebsd-ports-bugs mailing list