Revision: 3634 http://gar.svn.sourceforge.net/gar/?rev=3634&view=rev Author: skayser Date: 2009-03-08 16:32:37 +0000 (Sun, 08 Mar 2009)
Log Message: ----------- mcabber: Initial commit Added Paths: ----------- csw/mgar/pkg/mcabber/ csw/mgar/pkg/mcabber/branches/ csw/mgar/pkg/mcabber/tags/ csw/mgar/pkg/mcabber/trunk/ csw/mgar/pkg/mcabber/trunk/Makefile csw/mgar/pkg/mcabber/trunk/checksums csw/mgar/pkg/mcabber/trunk/files/ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff Property changes on: csw/mgar/pkg/mcabber/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,55 @@ +GARNAME = mcabber +GARVERSION = 0.9.9 +CATEGORIES = utils + +DESCRIPTION = A small Jabber console client +define BLURB +mcabber is a small Jabber console client. mcabber includes features such as +SSL support, MUC (Multi-User Chat) support, history logging, command +completion, OpenPGP encryption, OTR (Off-the-Record Messaging) support and +external action triggers. +endef + +MASTER_SITES = http://www.lilotux.net/~mikael/mcabber/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +SPKG_SOURCEURL = http://www.lilotux.net/~mikael/mcabber/ + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWncurses CSWosslrt CSWotr +REQUIRED_PKGS = CSWaspell CSWggettextrt CSWglib2 +REQUIRED_PKGS = CSWgpgerr CSWgpgme CSWiconv + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=/opt/csw/lib +CONFIGURE_ARGS += --enable-otr +CONFIGURE_ARGS += --enable-aspell + +# mcabber is geared towards gcc and heavily uses inline functions without +# static/extern storage qualifiers. Sun Studio needs to emulate gcc +# behaviour with regards to these inline functions. +# +# For details see http://blogs.sun.com/dew/entry/c99_inline_function +# +EXTRA_CFLAGS = -features=no%extinl + +EXTRA_LDFLAGS = -lsocket +EXTRA_INC = /opt/csw/lib/ncurses + +# Get rid of inline functions which are referenced externally (no%extinl +# makes inline functions static and would break linking otherwise) +PATCHFILES = patch-inline.diff + +# Solaris 8 doesn't have iswlbank(), provide replacement macro +PATCHFILES = patch-iswblank.diff + +include gar/category.mk + +pre-build-modulated: + @perl -pi -e 's|#! /bin/sh|#!/bin/bash|' $(WORKSRC)/hgcset.sh + @perl -pi -e 's|-O2||' \ + $(WORKSRC)/Makefile \ + $(WORKSRC)/src/Makefile \ + $(WORKSRC)/libjabber/Makefile Added: csw/mgar/pkg/mcabber/trunk/checksums =================================================================== --- csw/mgar/pkg/mcabber/trunk/checksums (rev 0) +++ csw/mgar/pkg/mcabber/trunk/checksums 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,2 @@ +189fb9d23f5a8412bc660884528475ea download/mcabber-0.9.9.tar.bz2 +756f80c0584594d5e66d3bdeadc5ca56 download/patch-iswblank.diff Added: csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff (rev 0) +++ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,128 @@ +--- mcabber-0.9.9/src/histolog.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/histolog.c 2009-03-08 16:35:25.758629698 +0100 +@@ -398,7 +398,7 @@ + return UseFileLogging; + } + +-inline void hlog_write_message(const char *bjid, time_t timestamp, int sent, ++void hlog_write_message(const char *bjid, time_t timestamp, int sent, + const char *msg) + { + guchar info; +@@ -415,7 +415,7 @@ + write_histo_line(bjid, timestamp, 'M', info, msg); + } + +-inline void hlog_write_status(const char *bjid, time_t timestamp, ++void hlog_write_status(const char *bjid, time_t timestamp, + enum imstatus status, const char *status_msg) + { + // XXX Check status value? +diff -ur mcabber-0.9.9/src/jabglue.c work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c +--- mcabber-0.9.9/src/jabglue.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c 2009-03-08 15:49:11.552806445 +0100 +@@ -171,7 +171,7 @@ + jc = NULL; + } + +-inline void jb_reset_keepalive() ++void jb_reset_keepalive() + { + time(&LastPingTime); + } +@@ -344,12 +344,12 @@ + } + } + +-inline enum imstatus jb_getstatus() ++enum imstatus jb_getstatus() + { + return mystatus; + } + +-inline const char *jb_getstatusmsg() ++const char *jb_getstatusmsg() + { + return mystatusmsg; + } +@@ -554,7 +554,7 @@ + + // jb_setprevstatus() + // Set previous status. This wrapper function is used after a disconnection. +-inline void jb_setprevstatus(void) ++void jb_setprevstatus(void) + { + jb_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE); + } +diff -ur mcabber-0.9.9/src/screen.c work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c +--- mcabber-0.9.9/src/screen.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c 2009-03-08 16:45:11.929482636 +0100 +@@ -155,8 +156,8 @@ + unsigned int prefix_flags, int force_show, + unsigned mucnicklen); + +-inline void scr_UpdateBuddyWindow(void); +-inline void scr_set_chatmode(int enable); ++void scr_UpdateBuddyWindow(void); ++void scr_set_chatmode(int enable); + + #ifdef HAVE_ASPELL_H + #define ASPELLBADCHAR 5 +@@ -1257,7 +1258,7 @@ + // (Re)Display the current window. + // If chatmode is enabled, call scr_ShowBuddyWindow(), + // else display the chat window. +-inline void scr_UpdateBuddyWindow(void) ++void scr_UpdateBuddyWindow(void) + { + if (chatmode) { + scr_ShowBuddyWindow(); +@@ -2153,7 +2154,7 @@ + } + + #if defined JEP0022 || defined JEP0085 +-inline long int scr_GetChatStatesTimeout(time_t now) ++long int scr_GetChatStatesTimeout(time_t now) + { + // Check if we're currently composing... + if (chatstate != 1 || !chatstate_timestamp) +@@ -2801,7 +2802,7 @@ + + // scr_set_chatmode() + // Public function to (un)set chatmode... +-inline void scr_set_chatmode(int enable) ++void scr_set_chatmode(int enable) + { + chatmode = enable; + scr_UpdateChatStatus(TRUE); +@@ -2809,14 +2810,14 @@ + + // scr_get_chatmode() + // Public function to get chatmode state. +-inline int scr_get_chatmode(void) ++int scr_get_chatmode(void) + { + return chatmode; + } + + // scr_get_multimode() + // Public function to get multimode status... +-inline int scr_get_multimode(void) ++int scr_get_multimode(void) + { + return multimode; + } +diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h +--- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 +@@ -20,6 +20,10 @@ + //static void spellcheck(char*, char*); + #endif + ++#ifndef HAVE_ISWBLANK ++#define iswblank(wc) iswctype(wc, wctype("blank")) ++#endif ++ + #include "hbuf.h" + #include "logprint.h" + Added: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff (rev 0) +++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,14 @@ +diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h +--- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 +@@ -20,6 +20,10 @@ + //static void spellcheck(char*, char*); + #endif + ++#ifndef HAVE_ISWBLANK ++#define iswblank(wc) iswctype(wc, wctype("blank")) ++#endif ++ + #include "hbuf.h" + #include "logprint.h" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel