From owner-freebsd-ports Sun Jan 20 6: 4:28 2002 Delivered-To: freebsd-ports@freebsd.org Received: from sahiro.homeip.net (p104-dna05sawada.niigata.ocn.ne.jp [211.122.195.232]) by hub.freebsd.org (Postfix) with ESMTP id AC10837B419 for ; Sun, 20 Jan 2002 06:03:47 -0800 (PST) Date: Sun, 20 Jan 2002 23:04:07 +0900 From: SASAKI Katuhiro Subject: About upgrading net/kxicq2 to 0.7.6. To: andrey@novikov.com Cc: ports@FreeBSD.org Message-ID: <3c4accd7.6568%sahiro@crest.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Hi. Are you planning to upgrade net/kxicq2 (FreeBSD port) to 0.7.6 ? On my 4.4-RC, patch below seems to work well. Please test and review. Thank you. diff -urN /usr/ports/net/kxicq2/Makefile kxicq2/Makefile --- /usr/ports/net/kxicq2/Makefile Fri Apr 6 22:15:28 2001 +++ kxicq2/Makefile Fri Jan 18 22:23:17 2002 @@ -5,15 +5,39 @@ # $FreeBSD: ports/net/kxicq2/Makefile,v 1.1 2001/04/06 13:15:50 demon Exp $ PORTNAME= kxicq2 -PORTVERSION= 0.0.6 +PORTVERSION= 0.7.6 CATEGORIES= net kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kxicq MAINTAINER= andrey@novikov.com +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 + USE_KDELIBS_VER=2 USE_GMAKE= yes GNU_CONFIGURE= yes -.include +_NO_KDE_FINAL= yes + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + +.include + +post-patch: + @${FIND} ${WRKSRC} -type f -name 'Makefile\.am' | ${XARGS} \ + ${PERL} -pi -e 's|-g -O2 -Wall|\@CXXFLAGS\@|g' + +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ + ${GMAKE} -f Makefile.cvs + +.include diff -urN /usr/ports/net/kxicq2/distinfo kxicq2/distinfo --- /usr/ports/net/kxicq2/distinfo Fri Apr 6 22:15:28 2001 +++ kxicq2/distinfo Fri Jan 18 14:10:01 2002 @@ -1 +1 @@ -MD5 (kxicq2-0.0.6.tar.gz) = 4baad94467a624e2f03236a496c94d34 +MD5 (kxicq2-0.7.6.tar.gz) = 6dd77020e604e9c8c90eedb17701f202 diff -urN /usr/ports/net/kxicq2/files/patch-aa kxicq2/files/patch-aa --- /usr/ports/net/kxicq2/files/patch-aa Fri Apr 6 22:15:29 2001 +++ kxicq2/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,64 +0,0 @@ ---- acinclude.m4.orig Sun Mar 4 17:23:28 2001 -+++ acinclude.m4 Thu Apr 5 16:06:32 2001 -@@ -804,9 +804,9 @@ - AC_REQUIRE([KDE_USE_QT]) - kde_qt_was_given=yes - if test -z "$LIBQT"; then -- LIBQT="-lqt" -+ LIBQT="-lqt2" - kde_qt_was_given=no -- kde_int_qt="-lqt" -+ kde_int_qt="-lqt2" - else - kde_int_qt="$LIBQT" - fi ---- aclocal.m4.orig Sun Mar 4 17:23:29 2001 -+++ aclocal.m4 Thu Apr 5 16:06:47 2001 -@@ -815,9 +815,9 @@ - AC_REQUIRE([KDE_USE_QT]) - kde_qt_was_given=yes - if test -z "$LIBQT"; then -- LIBQT="-lqt" -+ LIBQT="-lqt2" - kde_qt_was_given=no -- kde_int_qt="-lqt" -+ kde_int_qt="-lqt2" - else - kde_int_qt="$LIBQT" - fi ---- configure.orig Sun Mar 4 17:23:32 2001 -+++ configure Thu Apr 5 16:07:10 2001 -@@ -5049,9 +5049,9 @@ - - kde_qt_was_given=yes - if test -z "$LIBQT"; then -- LIBQT="-lqt" -+ LIBQT="-lqt2" - kde_qt_was_given=no -- kde_int_qt="-lqt" -+ kde_int_qt="-lqt2" - else - kde_int_qt="$LIBQT" - fi ---- kxicq/Makefile.am.orig Sun Mar 4 17:25:54 2001 -+++ kxicq/Makefile.am Thu Apr 5 16:07:44 2001 -@@ -17,7 +17,7 @@ - -lX11 $\ - -lpng -lz -lm\ - -ljpeg\ -- -lqt $ $ -lXext $ $\ -+ -lqt2 $ $ -lXext $ $\ - -lkdecore\ - -lkdeui\ - -lkfile ---- kxicq/Makefile.in.orig Sun Mar 4 17:29:43 2001 -+++ kxicq/Makefile.in Thu Apr 5 16:07:31 2001 -@@ -202,7 +202,7 @@ - bin_PROGRAMS = kxicq - - kxicq_LDFLAGS = $(all_libraries) --kxicq_LDADD = $(top_srcdir)/kxicq/widgets/libwidgets.a $(top_srcdir)/kxicq/widgets/checklistbox/libchecklistbox.a $(top_srcdir)/kxicq/engine/libengine.a $(top_srcdir)/kxicq/ui/libui.a -lX11 $ -lpng -lz -lm -ljpeg -lqt $ $ -lXext $ $ -lkdecore -lkdeui -lkfile -+kxicq_LDADD = $(top_srcdir)/kxicq/widgets/libwidgets.a $(top_srcdir)/kxicq/widgets/checklistbox/libchecklistbox.a $(top_srcdir)/kxicq/engine/libengine.a $(top_srcdir)/kxicq/ui/libui.a -lX11 $ -lpng -lz -lm -ljpeg -lqt2 $ $ -lXext $ $ -lkdecore -lkdeui -lkfile - - LDFLAGS = - INCLUDES = $(all_includes) -I$(top_srcdir)/ -I$(top_srcdir)/kxicq -I$(top_srcdir)/kxicq/ui -I$(top_srcdir)/kxicq/engine -I$(top_srcdir)/kxicq/widgets -I$(top_srcdir)/kxicq/widgets/checklistbox diff -urN /usr/ports/net/kxicq2/files/patch-ac kxicq2/files/patch-ac --- /usr/ports/net/kxicq2/files/patch-ac Fri Apr 6 22:15:29 2001 +++ kxicq2/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,63 +0,0 @@ ---- kxicq/engine/kxengine.cpp.orig Sat Mar 3 22:27:29 2001 -+++ kxicq/engine/kxengine.cpp Wed Mar 28 11:19:25 2001 -@@ -6,6 +6,7 @@ - #include "kxcontact.h" - #include - #include -+#include "cyrrilic.h" - - kxEngine *kxEngine::ptr=0L; - -@@ -194,6 +195,23 @@ - - void kxEngine::SlotNewMessage(UIN _uin, kxMessageStruct _msg) - { -+ // HACK - recode Cyrrilic chars -+ const char *tt = new char[_msg.message.length()+1]; -+ strcpy((char *)tt,(char *)_msg.message.data()); -+ -+ unsigned char *c = (unsigned char*)tt; -+ unsigned char *d = (unsigned char*)tt; -+ while (*c) { -+ if (*c>=0xA0) *d = trnTablWIN2KOI[*c]; -+ else *d = *c; -+ c++;d++; -+ } -+ *d=0x0; -+ -+ _msg.message = QString::fromLocal8Bit(tt); -+ debug("RECODED FOR RECEIVE: [%s]",_msg.message.data()); -+ delete tt; -+ // END OF HACK - emit SignalNewMessage(_uin, _msg); - emit SignalUpdateDock(); - } -@@ -237,8 +255,28 @@ - } - kxSend *kxEngine::sendMessage(UIN _uin, QString _msg, bool _server) - { - sendSeq++; - kxSend *send; -+ -+ // HACK - recode Cyrrilic chars -+ _msg = _msg.local8Bit().data(); -+ const char *tt = new char[_msg.length()+1]; -+ strcpy((char *)tt,(char *)_msg.data()); -+ -+ unsigned char *c = (unsigned char*)tt; -+ unsigned char *d = (unsigned char*)tt; -+ while (*c) { -+ if (*c>=0xA0) *d = trnTablKOI2WIN[*c]; -+ else *d = *c; -+ c++;d++; -+ } -+ *d=0x0; -+ -+ _msg = QString(tt); -+ delete tt; -+ // END OF HACK -+ -+ debug("RECODED FOR SENDING: [%s]",_msg.data()); - send=new kxSend(MESSAGE_TYPE, sendSeq, _uin, _msg,"",_server); - return send; - } diff -urN /usr/ports/net/kxicq2/files/patch-ad kxicq2/files/patch-ad --- /usr/ports/net/kxicq2/files/patch-ad Fri Apr 6 22:15:29 2001 +++ kxicq2/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- kxicq/engine/kxmessage.cpp.orig Sat Nov 11 00:24:55 2000 -+++ kxicq/engine/kxmessage.cpp Wed Mar 28 11:19:33 2001 -@@ -100,6 +100,7 @@ - tw << size; - file.at(file.size()); - QTextStream t ( &file ); -+ t.setEncoding(QTextStream::Locale); - kxMessageInfoStruct *info; - info=new kxMessageInfoStruct; - info->uin=_uin; diff -urN /usr/ports/net/kxicq2/files/patch-ae kxicq2/files/patch-ae --- /usr/ports/net/kxicq2/files/patch-ae Fri Apr 6 22:15:29 2001 +++ kxicq2/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -1,77 +0,0 @@ ---- kxicq/engine/cyrrilic.h.orig Thu Jan 1 03:00:00 1970 -+++ kxicq/engine/cyrrilic.h Wed Mar 28 11:06:23 2001 -@@ -0,0 +1,74 @@ -+#ifndef CYRRILIC_H -+#define CYRRILIC_H -+ -+static unsigned char trnTablWIN2KOI[]={ -+ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', -+ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f', -+ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', -+ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', -+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27', -+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f', -+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37', -+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f', -+ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', -+ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f', -+ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57', -+ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f', -+ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', -+ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', -+ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', -+ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f', -+ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87', -+ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f', -+ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', -+ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', -+ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7', -+ '\xb3', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf', -+ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7', -+ '\xa3', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf', -+ '\xe1', '\xe2', '\xf7', '\xe7', '\xe4', '\xe5', '\xf6', '\xfa', -+ '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xf0', -+ '\xf2', '\xf3', '\xf4', '\xf5', '\xe6', '\xe8', '\xe3', '\xfe', -+ '\xfb', '\xfd', '\xff', '\xf9', '\xf8', '\xfc', '\xe0', '\xf1', -+ '\xc1', '\xc2', '\xd7', '\xc7', '\xc4', '\xc5', '\xd6', '\xda', -+ '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xd0', -+ '\xd2', '\xd3', '\xd4', '\xd5', '\xc6', '\xc8', '\xc3', '\xde', -+ '\xdb', '\xdd', '\xdf', '\xd9', '\xd8', '\xdc', '\xc0', '\xd1' -+ }; -+ -+static unsigned char trnTablKOI2WIN[]={ -+ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', -+ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f', -+ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', -+ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', -+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27', -+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f', -+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37', -+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f', -+ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', -+ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f', -+ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57', -+ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f', -+ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', -+ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', -+ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', -+ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f', -+ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87', -+ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f', -+ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', -+ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', -+ '\xa0', '\xa1', '\xa2', '\xb8', '\xa4', '\xa5', '\xa6', '\xa7', -+ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf', -+ '\xb0', '\xb1', '\xb2', '\xa8', '\xb4', '\xb5', '\xb6', '\xb7', -+ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf', -+ '\xfe', '\xe0', '\xe1', '\xf6', '\xe4', '\xe5', '\xf4', '\xe3', -+ '\xf5', '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', -+ '\xef', '\xff', '\xf0', '\xf1', '\xf2', '\xf3', '\xe6', '\xe2', -+ '\xfc', '\xfb', '\xe7', '\xf8', '\xfd', '\xf9', '\xf7', '\xfa', -+ '\xde', '\xc0', '\xc1', '\xd6', '\xc4', '\xc5', '\xd4', '\xc3', -+ '\xd5', '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', -+ '\xcf', '\xdf', '\xd0', '\xd1', '\xd2', '\xd3', '\xc6', '\xc2', -+ '\xdc', '\xdb', '\xc7', '\xd8', '\xdd', '\xd9', '\xd7', '\xda' -+}; -+ -+#endif diff -urN /usr/ports/net/kxicq2/files/patch-kxicq::Makefile.am kxicq2/files/patch-kxicq::Makefile.am --- /usr/ports/net/kxicq2/files/patch-kxicq::Makefile.am Thu Jan 1 09:00:00 1970 +++ kxicq2/files/patch-kxicq::Makefile.am Sun Dec 30 22:50:25 2001 @@ -0,0 +1,18 @@ +--- kxicq/Makefile.am.orig Sun Dec 9 03:56:21 2001 ++++ kxicq/Makefile.am Sun Dec 30 22:48:21 2001 +@@ -14,13 +14,8 @@ + $(top_srcdir)/kxicq/engine/libengine.a\ + $(top_srcdir)/kxicq/ui/libui.a\ + $(top_srcdir)/kxicq/wm/libwm.a\ +- -lX11 $\ +- -lpng -lz -lm\ +- -ljpeg\ +- -lqt $ $ -lXext $ $\ +- -lkdecore\ +- -lkdeui\ +- -lkfile -lXpm ++ $(LIB_X11) $(LIBPNG) $(LIBJPEG) $(XPMLIB) \ ++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) + LDFLAGS = + INCLUDES = $(all_includes)\ + -I$(top_srcdir)/\ diff -urN /usr/ports/net/kxicq2/pkg-plist kxicq2/pkg-plist --- /usr/ports/net/kxicq2/pkg-plist Fri Apr 6 22:15:29 2001 +++ kxicq2/pkg-plist Fri Jan 18 15:29:41 2002 @@ -1,9 +1,24 @@ bin/kxicq +share/applnk/Internet/kxicq2.desktop share/apps/kxicq2/pics/available.xpm share/apps/kxicq2/pics/away.xpm +share/apps/kxicq2/pics/config_away.png +share/apps/kxicq2/pics/config_chat.png +share/apps/kxicq2/pics/config_color.png +share/apps/kxicq2/pics/config_deny.png +share/apps/kxicq2/pics/config_main.png +share/apps/kxicq2/pics/config_network.png +share/apps/kxicq2/pics/config_profile.png +share/apps/kxicq2/pics/config_security.png +share/apps/kxicq2/pics/config_sound.png +share/apps/kxicq2/pics/config_text.png +share/apps/kxicq2/pics/contactsms.xpm share/apps/kxicq2/pics/dnd.xpm share/apps/kxicq2/pics/exit.xpm share/apps/kxicq2/pics/ffc.xpm +share/apps/kxicq2/pics/file.xpm +share/apps/kxicq2/pics/groupdown.xpm +share/apps/kxicq2/pics/groupup.xpm share/apps/kxicq2/pics/history.xpm share/apps/kxicq2/pics/invisible.xpm share/apps/kxicq2/pics/na.xpm @@ -14,6 +29,9 @@ share/apps/kxicq2/pics/selectcolor.xpm share/apps/kxicq2/pics/selecttext.xpm share/apps/kxicq2/pics/send.xpm -share/applnk/Internet/kxicq2.desktop +share/apps/kxicq2/pics/url.xpm @dirrm share/apps/kxicq2/pics @dirrm share/apps/kxicq2 +@dirrm share/apps +@dirrm share/applnk/Internet +@dirrm share/applnk ================================================================ SASAKI Katuhiro mailto: sahiro@crest.ocn.ne.jp ================================================================ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message