Date: Tue, 04 Nov 2003 17:48:59 +0100 (CET) From: Markus Brueffer <brueffer@phoenix-systems.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58931: [maintainer update] net/simicq to 0.9 Message-ID: <20031104164859.81DED130@maquis.hitnet.rwth-aachen.de> Resent-Message-ID: <200311041650.hA4GoMpB025265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58931
>Category: ports
>Synopsis: [maintainer update] net/simicq to 0.9
>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: Tue Nov 04 08:50:22 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Markus Brueffer
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.1-CURRENT FreeBSD 5.1-CURRENT #9: Mon Oct 13 14:46:55 CEST 2003 brueffer@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386
>Description:
Update port: net/simicq to 0.9
Changes:
Simicq is now a multi protocol messenger. Supported protocols are:
* Oscar - ICQ and AIM support
* Jabber
* MSN
Non-trivial port changes:
* patch-sim::libicq::icqclient.cpp removed (was applied upstream)
* gkrellm-plugin related patches removed (gkrellm-plugin was removed in 0.9)
* patch-icqlogin.cpp added to deal with the latest ICQ login issues (obtained from cvs)
>How-To-Repeat:
>Fix:
--- simicq.diff begins here ---
diff -ruN simicq.orig/Makefile simicq/Makefile
--- simicq.orig/Makefile Sun Nov 2 15:54:48 2003
+++ simicq/Makefile Tue Nov 4 14:23:26 2003
@@ -5,39 +5,56 @@
# $FreeBSD: ports/net/simicq/Makefile,v 1.9 2003/08/29 20:15:01 krion Exp $
PORTNAME= simicq
-PORTVERSION= 0.8.3
+PORTVERSION= 0.9
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/mi/m-i/}
DISTNAME= ${PORTNAME:S/icq//}-${PORTVERSION}
MAINTAINER= brueffer@phoenix-systems.de
-COMMENT= ICQ client which supports Version 8 of the ICQ protocol (ICQ 2001)
+COMMENT= Plugin-based instant messenger
USE_GMAKE= yes
USE_QT_VER= 3
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
+INSTALLS_SHLIB= yes
+
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
+PLIST_SUB+= SSL=""
.else
CONFIGURE_ARGS+=--disable-openssl
+PLIST_SUB+= SSL="@comment "
.endif
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.if defined(WITHOUT_KDE)
-CONFIGURE_ARGS+= --disable-kde --enable-mt
+CONFIGURE_ARGS+=--disable-kde --enable-mt
+PLIST_SUB+= KDE="@comment "
.else
-USE_KDELIBS_VER= 3
+USE_KDELIBS_VER=3
+PLIST_SUB+= KDE=""
.endif
-post-patch:
-.if defined(WITHOUT_KDE)
- ${REINPLACE_CMD} -e "s,qtlib=\"qt\",qtlib=\"qt-mt -pthread\"," \
- ${WRKSRC}/configure
+pre-everything:
+.if !defined(WITHOUT_SSL)
+ @${ECHO_MSG} "You can disable SSL support by defining WITHOUT_SSL."
+.endif
+.if !defined(WITHOUT_KDE)
+ @${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
.endif
- ${REINPLACE_CMD} -e 's/-O2//g' ${CONFIGURE_WRKSRC}/configure
-.include <bsd.port.mk>
+post-extract:
+ @${TOUCH} ${WRKSRC}/plugins/splash/Makefile.in
+
+post-patch:
+ @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
+ ${CONFIGURE_WRKSRC}/configure
+
+.include <bsd.port.post.mk>
+
diff -ruN simicq.orig/distinfo simicq/distinfo
--- simicq.orig/distinfo Sun Nov 2 15:54:48 2003
+++ simicq/distinfo Tue Nov 4 09:48:20 2003
@@ -1 +1 @@
-MD5 (sim-0.8.3.tar.gz) = a981b7aa4330bf050a46e144942d2726
+MD5 (sim-0.9.tar.gz) = 3c2cd29c2150414d67c3882464416f1c
diff -ruN simicq.orig/files/patch-Makefile.in simicq/files/patch-Makefile.in
--- simicq.orig/files/patch-Makefile.in Sun Nov 2 15:54:48 2003
+++ simicq/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Sun Jun 22 16:38:25 2003
-+++ Makefile.in Sun Jun 22 16:38:50 2003
-@@ -591,8 +591,6 @@
- uninstall-info-recursive uninstall-recursive
-
-
--$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
- $(top_srcdir)/subdirs:
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
diff -ruN simicq.orig/files/patch-configure simicq/files/patch-configure
--- simicq.orig/files/patch-configure Sun Nov 2 15:54:48 2003
+++ simicq/files/patch-configure Tue Nov 4 09:53:45 2003
@@ -1,10 +1,10 @@
---- configure.orig Sun Jun 22 16:33:46 2003
-+++ configure Sun Jun 22 16:33:56 2003
-@@ -25216,7 +25216,6 @@
-
- ac_config_files="$ac_config_files ./Makefile"
-
--ac_config_files="$ac_config_files gkrellm_plugin/Makefile"
-
- ac_config_files="$ac_config_files pict/Makefile"
-
+--- configure.orig Tue Nov 4 09:52:54 2003
++++ configure Tue Nov 4 09:53:21 2003
+@@ -19002,6 +19002,7 @@
+ ;;
+ freebsd*)
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
++ LIBS="$LIBS -lpthread"
+ echo "Setting FreeBSD pthread compilation options"
+ ;;
+ aix*)
diff -ruN simicq.orig/files/patch-icqicmb.cpp simicq/files/patch-icqicmb.cpp
--- simicq.orig/files/patch-icqicmb.cpp Thu Jan 1 01:00:00 1970
+++ simicq/files/patch-icqicmb.cpp Tue Nov 4 13:06:45 2003
@@ -0,0 +1,20 @@
+--- plugins/icq/icqicmb.cpp.orig Mon Nov 3 01:18:29 2003
++++ plugins/icq/icqicmb.cpp Mon Nov 3 02:27:56 2003
+@@ -1375,7 +1375,7 @@
+ msgBuf.pack(cc[j].alias);
+ m_send.id.id_l = rand();
+ m_send.id.id_h = rand();
+- sendType2(m_send.screen.c_str(), msgBuf, m_send.id, CAP_AIM_BUDDYLIST, false, false, false);
++ sendType2(m_send.screen.c_str(), msgBuf, m_send.id, CAP_AIM_BUDDYLIST, false, 0);
+ return;
+ }
+ case MessageUrl:{
+@@ -1573,7 +1573,7 @@
+ msgBuf.pack((unsigned long)(this->data.owner.Port));
+ msgBuf.pack((unsigned short)8);
+ msgBuf.pack((unsigned long)m_nMsgSequence);
+- sendType2(m_send.screen.c_str(), msgBuf, m_send.id, CAP_DIRECT, false, false, false);
++ sendType2(m_send.screen.c_str(), msgBuf, m_send.id, CAP_DIRECT, false, 0);
+ return;
+ }
+ if (m_send.flags == PLUGIN_AR){
diff -ruN simicq.orig/files/patch-icqlogin.cpp simicq/files/patch-icqlogin.cpp
--- simicq.orig/files/patch-icqlogin.cpp Thu Jan 1 01:00:00 1970
+++ simicq/files/patch-icqlogin.cpp Tue Nov 4 13:05:58 2003
@@ -0,0 +1,11 @@
+--- plugins/icq/icqlogin.cpp.orig Tue Nov 4 12:58:23 2003
++++ plugins/icq/icqlogin.cpp Tue Nov 4 13:05:21 2003
+@@ -139,7 +139,7 @@
+ m_socket->writeBuffer.tlv(0x0017, 0x0014);
+ m_socket->writeBuffer.tlv(0x0018, 0x0009);
+ m_socket->writeBuffer.tlv(0x0019, 0x0000);
+- m_socket->writeBuffer.tlv(0x001A, 0x04E5);
++ m_socket->writeBuffer.tlv(0x001A, 0x0515);
+ m_socket->writeBuffer.tlv(0x0014, 0x0000043DL);
+ m_socket->writeBuffer.tlv(0x000f, "en");
+ m_socket->writeBuffer.tlv(0x000e, "us");
diff -ruN simicq.orig/files/patch-sim::libicq::icqclient.cpp simicq/files/patch-sim::libicq::icqclient.cpp
--- simicq.orig/files/patch-sim::libicq::icqclient.cpp Sun Nov 2 15:54:48 2003
+++ simicq/files/patch-sim::libicq::icqclient.cpp Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- sim/libicq/icqclient.cpp.orig Tue Sep 2 01:47:04 2003
-+++ sim/libicq/icqclient.cpp Tue Sep 2 01:47:21 2003
-@@ -128,7 +128,7 @@
- time_t now;
- time(&now);
- struct tm *tm = localtime(&now);
-- if (((tm->tm_mon + 1) == month) && ((tm->tm_mday + 1) == day))
-+ if (((tm->tm_mon + 1) == month) && (tm->tm_mday == day))
- m_bBirthday = true;
- }
- if ((m_bBirthday != oldValue) && (m_state == Logged))
diff -ruN simicq.orig/pkg-descr simicq/pkg-descr
--- simicq.orig/pkg-descr Sun Nov 2 15:54:48 2003
+++ simicq/pkg-descr Tue Nov 4 12:57:42 2003
@@ -1,20 +1,16 @@
-SIM (Simple Instant Messenger) is an unpretentious ICQ client which supports
-many of the features of Version 8 of the ICQ protocol (ICQ 2001).
+SIM (Simple Instant Messenger) is a plugin-based instant messenger with
+support for various protocols.
(QT is needed, can be build for KDE).
-Special Features
-
- * sending and receiving SMS
- * server-side contact lists
- * phone directories
- * file transfers
- * chat
- * user search
- * proxy support (SOCKS4, SOCKS5, HTTP)
- * a SPAM filter
- * secure direct connections with SIM and Licq
- * message or chat mode for the user window
- * keyboard shortcuts
- * message forwarding
+All protocols support richtext-messages, file transfer, typing notification,
+server-side contact list (with postponed synchronization - you can change
+contact list in offline mode and after log on all changes will be
+synchronized with server), new account registration and various searches.
+You can use several accounts for each protocol.
+
+Supported protocols:
+ * Oscar - ICQ and AIM support
+ * Jabber
+ * MSN
WWW: http://sim-icq.sourceforge.net/
diff -ruN simicq.orig/pkg-plist simicq/pkg-plist
--- simicq.orig/pkg-plist Sun Nov 2 15:54:48 2003
+++ simicq/pkg-plist Tue Nov 4 09:57:53 2003
@@ -1,22 +1,59 @@
bin/sim
-bin/simctrl
+lib/libsimapi.la
+lib/libsimapi.so
+lib/libsimapi.so.0
+lib/libsimui.la
+lib/libsimui.so
+lib/libsimui.so.0
lib/menu/sim-kde.menu
share/applnk/Internet/sim.desktop
+share/apps/sim/COPYING
+share/apps/sim/pict/connect.mng
share/apps/sim/pict/splash.png
+share/apps/sim/plugins/__homedir.so
+share/apps/sim/plugins/__migrate.so
+share/apps/sim/plugins/_core.so
+share/apps/sim/plugins/about.so
+share/apps/sim/plugins/autoaway.so
+share/apps/sim/plugins/background.so
+share/apps/sim/plugins/dock.so
+share/apps/sim/plugins/filter.so
+share/apps/sim/plugins/floaty.so
+share/apps/sim/plugins/forward.so
+share/apps/sim/plugins/icons.so
+share/apps/sim/plugins/icq.so
+share/apps/sim/plugins/jabber.so
+share/apps/sim/plugins/logger.so
+%%SSL%%share/apps/sim/plugins/msn.so
+share/apps/sim/plugins/navigate.so
+share/apps/sim/plugins/netmonitor.so
+%%KDE%%share/apps/sim/plugins/ontop.so
+share/apps/sim/plugins/osd.so
+share/apps/sim/plugins/proxy.so
+share/apps/sim/plugins/shortcuts.so
+share/apps/sim/plugins/sound.so
+share/apps/sim/plugins/splash.so
+%%KDE%%share/apps/sim/plugins/transparent.so
+share/apps/sim/plugins/update.so
share/apps/sim/sounds/alert.wav
share/apps/sim/sounds/auth.wav
-share/apps/sim/sounds/chat.wav
+share/apps/sim/sounds/contacts.wav
+share/apps/sim/sounds/error.wav
share/apps/sim/sounds/file.wav
share/apps/sim/sounds/filedone.wav
+share/apps/sim/sounds/mailpager.wav
share/apps/sim/sounds/message.wav
+share/apps/sim/sounds/msgsent.wav
share/apps/sim/sounds/sms.wav
share/apps/sim/sounds/startup.wav
share/apps/sim/sounds/url.wav
+share/apps/sim/sounds/web.wav
share/icons/hicolor/16x16/apps/sim.png
share/icons/hicolor/32x32/apps/sim.png
share/icons/locolor/16x16/apps/sim.png
share/icons/locolor/32x32/apps/sim.png
share/locale/bg/LC_MESSAGES/sim.mo
+share/locale/ca/LC_MESSAGES/sim.mo
share/locale/cs/LC_MESSAGES/sim.mo
share/locale/de/LC_MESSAGES/sim.mo
share/locale/es/LC_MESSAGES/sim.mo
@@ -25,8 +62,10 @@
share/locale/it/LC_MESSAGES/sim.mo
share/locale/nl/LC_MESSAGES/sim.mo
share/locale/pl/LC_MESSAGES/sim.mo
+share/locale/pt_BR/LC_MESSAGES/sim.mo
share/locale/ru/LC_MESSAGES/sim.mo
share/locale/sk/LC_MESSAGES/sim.mo
+share/locale/sw/LC_MESSAGES/sim.mo
share/locale/tr/LC_MESSAGES/sim.mo
share/locale/uk/LC_MESSAGES/sim.mo
share/locale/zh_TW/LC_MESSAGES/sim.mo
@@ -36,10 +75,14 @@
@unexec rmdir %D/share/locale/uk 2>/dev/null || true
@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw 2>/dev/null || true
@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/sk 2>/dev/null || true
@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
@@ -56,6 +99,8 @@
@unexec rmdir %D/share/locale/de 2>/dev/null || true
@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca 2>/dev/null || true
@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/bg 2>/dev/null || true
@unexec rmdir %D/share/locale 2>/dev/null || true
@@ -71,10 +116,10 @@
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 2>/dev/null || true
@dirrm share/apps/sim/sounds
+@dirrm share/apps/sim/plugins
@dirrm share/apps/sim/pict
-@dirrm share/apps/sim/icons
@dirrm share/apps/sim
@unexec rmdir %D/share/apps 2>/dev/null || true
@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
@unexec rmdir %D/share/applnk 2>/dev/null || true
-@dirrm lib/menu
+@unexec rmdir %D/lib/menu 2>/dev/null || true
--- simicq.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?20031104164859.81DED130>