From gaoj@cpsc.ucalgary.ca  Fri Jul  9 22:55:32 2004
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 85D6A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Jul 2004 22:55:32 +0000 (GMT)
Received: from ensc.cpsc.ucalgary.ca (ensc.cpsc.ucalgary.ca [136.159.2.4])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D7D543D39
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Jul 2004 22:55:32 +0000 (GMT)
	(envelope-from gaoj@cpsc.ucalgary.ca)
Received: from imgw1.cpsc.ucalgary.ca (imgw1.cpsc.ucalgary.ca [136.159.5.9])
	by ensc.cpsc.ucalgary.ca (8.12.11/8.12.10) with ESMTP id i69Mq0pV021941
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 9 Jul 2004 16:52:00 -0600 (MDT)
Received: from aibsd (sana-sa [136.159.7.231])
	by imgw1.cpsc.ucalgary.ca (8.12.10/8.12.10) with SMTP id i69Mptpi000974
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 9 Jul 2004 16:51:55 -0600
Received: by aibsd (sSMTP sendmail emulation); Fri,  9 Jul 2004 16:51:55 -0600
Message-Id: <200407092251.i69Mptpi000974@imgw1.cpsc.ucalgary.ca>
Date: Fri,  9 Jul 2004 16:51:55 -0600
From: "Jie Gao" <gaoj@cpsc.ucalgary.ca>
Reply-To: Jie Gao <gaoj@cpsc.ucalgary.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update]textproc/scim and chinese/scim-chinese follow up USE_LIBTOOL_VER change
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         68880
>Category:       ports
>Synopsis:       [maintainer update]textproc/scim and chinese/scim-chinese follow up USE_LIBTOOL_VER change
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 09 23:00:38 GMT 2004
>Closed-Date:    Sun Jul 11 19:19:58 GMT 2004
>Last-Modified:  Sun Jul 11 19:19:58 GMT 2004
>Originator:     Jie Gao <gaoj@cpsc.ucalgary.ca>
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD aibsd 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Mon May 3 02:43:15 MDT 2004 gaoj@aibsd:/usr/obj/usr/src/sys/AIBSD i386


	
>Description:
	
To follow up the change of behaviour in USE_LIBTOOL_VER:
 
    remove the no longer necessary local patch of libtool in textproc/scim
    fix plist of chinese/scim-chinese (*.la no longer being installed)
>How-To-Repeat:
	
>Fix:

	

The following patches update the two ports respectively (please remove empty 
file and directory after patch):

--- patch-textproc::scim.diff begins here ---
diff -ruN textproc/scim.old/files/patch-ltmain.sh textproc/scim/files/patch-ltmain.sh
--- textproc/scim.old/files/patch-ltmain.sh	Fri Jul  9 15:38:40 2004
+++ textproc/scim/files/patch-ltmain.sh	Wed Dec 31 17:00:00 1969
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
-+++ ltmain.sh	Tue Dec  9 14:09:01 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- patch-textproc::scim.diff ends here ---

--- patch-chinese::scim-chinese.diff begins here ---
diff -ruN chinese/scim-chinese.old/pkg-plist chinese/scim-chinese/pkg-plist
--- chinese/scim-chinese.old/pkg-plist	Fri Jul  9 15:37:46 2004
+++ chinese/scim-chinese/pkg-plist	Fri Jul  9 15:38:06 2004
@@ -1,10 +1,6 @@
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/scim-chinese.schemas >/dev/null || /usr/bin/true
 etc/gconf/schemas/scim-chinese.schemas
-lib/scim-1.0/IMEngine/pinyin.a
-lib/scim-1.0/IMEngine/pinyin.la
 lib/scim-1.0/IMEngine/pinyin.so
-lib/scim-1.0/SetupUI/pinyin-imengine-setup.a
-lib/scim-1.0/SetupUI/pinyin-imengine-setup.la
 lib/scim-1.0/SetupUI/pinyin-imengine-setup.so
 share/locale/zh_CN/LC_MESSAGES/scim-chinese.mo
 share/locale/zh_TW/LC_MESSAGES/scim-chinese.mo
--- patch-chinese::scim-chinese.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vanilla 
State-Changed-When: Sun Jul 11 19:19:44 GMT 2004 
State-Changed-Why:  
Committed, thanks. 

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