- Update from 4.9.9 to 4.9.10

- add WITH_MULTIBYTE to support multibyte characters (Chinese...)
- remove synclist feature (From Changelog)
While I'm here.
- Fix plist (removal of *contrib/spanish*)
- Use PORTDOCS macro

PR:                 61478
Submitted by:       Cheng-Lung Sung <clsung@dragon2.net> (maintainer)
Approved by:        erwin (mentor) (implicitly)

2 files changed, 9 insertions, 9 deletions

diff --git a/net/centericq/files/msn-Makefile.in b/net/centericq/files/msn-Makefile.in
index b7808b00e830..1abde2bb2465 100644
--- a/net/centericq/files/msn-Makefile.in
+++ b/net/centericq/files/msn-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Sat Oct 25 15:53:45 2003
-+++ Makefile.in	Mon Nov  3 20:14:01 2003
+--- Makefile.in.orig	Sat Jan 17 04:40:32 2004
++++ Makefile.in	Sat Jan 17 16:49:48 2004
 @@ -92,10 +92,10 @@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
  
--SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 intl po contrib misc share src
-+SUBDIRS = blip-0.1 firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 intl po contrib misc share src
+-SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 intl po misc share src
++SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 intl po misc share blip-0.1 src 
  
  # END OF MOTOR DIST TARGETS #
 -EXTRA_DIST = centericq.1 centericq.motor config.rpath FAQ NEWS TODO README THANKS AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING centericq.spec firetalk-0.1/* kkconsui-0.1/* kkstrtext-0.1/* libicq2000-0.1/* libjabber-0.1/* libyahoo2-0.1/* kksystr-0.1/* connwrap-0.1/*
-+EXTRA_DIST = centericq.1 centericq.motor config.rpath FAQ NEWS TODO README THANKS AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING centericq.spec blip-0.1/* firetalk-0.1/* kkconsui-0.1/* kkstrtext-0.1/* libicq2000-0.1/* libjabber-0.1/* libyahoo2-0.1/* kksystr-0.1/* connwrap-0.1/*
++EXTRA_DIST = centericq.1 centericq.motor config.rpath FAQ NEWS TODO README THANKS AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING centericq.spec firetalk-0.1/* kkconsui-0.1/* kkstrtext-0.1/* libicq2000-0.1/* libjabber-0.1/* libyahoo2-0.1/* kksystr-0.1/* connwrap-0.1/* blip-0.1/*
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -26,7 +26,7 @@
  dist-hook:
  	cd $(top_distdir); subs=`egrep "^[:space:]*SUBDIRS" Makefile.am | sed 's/SUBDIRS[ =]\+//g'`; \
 -	echo "SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 $$subs" >>.makefile.am; \
-+	echo "SUBDIRS = blip-0.1 firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 $$subs" >>.makefile.am; \
++	echo "SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 blip-0.1 $$subs" >>.makefile.am; \
  	egrep -v "^[:space:]*SUBDIRS" Makefile.am >>.makefile.am; \
  	mv .makefile.am Makefile.am; autoconf && automake
  
diff --git a/net/centericq/files/msn-msnhook.cc b/net/centericq/files/msn-msnhook.cc
index 3e00cd68d492..98a92e697040 100644
--- a/net/centericq/files/msn-msnhook.cc
+++ b/net/centericq/files/msn-msnhook.cc
@@ -1,5 +1,5 @@
---- src/hooks/msnhook.cc.orig	Mon Nov  3 20:25:37 2003
-+++ src/hooks/msnhook.cc	Mon Nov  3 20:24:20 2003
+--- src/hooks/msnhook.cc.orig	Sat Jan 17 17:01:03 2004
++++ src/hooks/msnhook.cc	Sat Jan 17 17:05:45 2004
 @@ -0,0 +1,801 @@
 +/*
 +*
@@ -105,7 +105,7 @@
 +    ourstatus = offline;
 +    fonline = false;
 +
-+    fcapabs.insert(hookcapab::synclist);
++//    fcapabs.insert(hookcapab::synclist); // removed from 4.9.10
 +    fcapabs.insert(hookcapab::changedetails);
 +    fcapabs.insert(hookcapab::directadd);
 +//    fcapabs.insert(hookcapab::files);