- 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)

5 files changed, 20 insertions, 23 deletions

diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 8798ef43754b..399f8d90aebe 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	centericq
-PORTVERSION=	4.9.9
+PORTVERSION=	4.9.10
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://centericq.de/archive/source/releases/
@@ -26,6 +26,13 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 CONFIGURE_ARGS=	--with-openssl --disable-konst
 
+.if defined(WITH_MULTIBYTE)
+CONFIGURE_ARGS+=	--enable-locales-fix
+.else
+pre-patch:
+	@${ECHO_CMD} "Type \"make WITH_MULTIBYTE=yes\" if you want multibyte support."
+.endif
+
 .if defined(WITH_FRIBIDI)
 LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
 CONFIGURE_ARGS+=	--with-fribidi
@@ -75,6 +82,7 @@ CONFIGURE_ARGS+=	--disable-lj
 
 MAN1=	cicqconv.1 cicqsync.1
 
+PORTDOCS=	FAQ README
 post-patch:
 .for file in kkconsui-0.1/include/conf.h kkstrtext-0.1/conf.h kksystr-0.1/include/conf.h
 	@(cd ${WRKSRC} ; \
@@ -85,7 +93,7 @@ post-patch:
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} FAQ README ${DOCSDIR})
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/centericq/distinfo b/net/centericq/distinfo
index e4d48c01c7f5..cedecc5f210c 100644
--- a/net/centericq/distinfo
+++ b/net/centericq/distinfo
@@ -1 +1 @@
-MD5 (centericq-4.9.9.tar.gz) = 15c2221b054d53110e056b9c402643d9
+MD5 (centericq-4.9.10.tar.gz) = b461d4e39fa304d177f2990f27573ee8
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);
diff --git a/net/centericq/pkg-plist b/net/centericq/pkg-plist
index a3e891710483..4d700e1699bb 100644
--- a/net/centericq/pkg-plist
+++ b/net/centericq/pkg-plist
@@ -6,14 +6,6 @@ bin/cicqsync
 %%DATADIR%%/online.wav
 %%DATADIR%%/sms.wav
 %%DATADIR%%/url.wav
-%%DATADIR%%/contrib/spanish/ChangeLog
-%%DATADIR%%/contrib/spanish/COPYING
-%%DATADIR%%/contrib/spanish/INSTALL
-%%DATADIR%%/contrib/spanish/FAQ
-%%DATADIR%%/contrib/spanish/README
-@dirrm %%DATADIR%%/contrib/spanish
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
 share/locale/bg/LC_MESSAGES/centericq.mo
 share/locale/cs/LC_MESSAGES/centericq.mo
 share/locale/de/LC_MESSAGES/centericq.mo
@@ -30,6 +22,3 @@ share/locale/ru/LC_MESSAGES/centericq.mo
 share/locale/sv/LC_MESSAGES/centericq.mo
 share/locale/uk/LC_MESSAGES/centericq.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%