Date: Fri, 9 Jul 2004 16:51:55 -0600 From: "Jie Gao" <gaoj@cpsc.ucalgary.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68880: [maintainer update]textproc/scim and chinese/scim-chinese follow up USE_LIBTOOL_VER change Message-ID: <200407092251.i69Mptpi000974@imgw1.cpsc.ucalgary.ca> Resent-Message-ID: <200407092300.i69N0cro041167@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 09 23:00:38 GMT 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407092251.i69Mptpi000974>