Anyone? http://marc.info/?l=openbsd-ports&m=130144886426805&w=2
On Wed, Mar 30, 2011 at 01:38:37AM +0100, Mikolaj Kucharski wrote: > Hi, > > This is heavly based on patch from pld-linux.org. I've tested ekg with > libgadu-1.10.1 from Brad. Works fine so far. Most important part for > using external libgadu is that compiled in (old) libgadu library in > ekg-1.7 doesn't support 8 digit numeric Gadu-Gadu IDs. External libgadu > in our ports system supports that for quite some time now, as libgadu is > actively developed, ekg not really. > > I have one problem with ekg(1), not related to libgadu as issue exists > in current version as well. Not sure when this issue started as I don't > remember this if I look few years back, but I have it for many months > now, but didn't bothered to report it. > > Can anyone confirm that resizing the window, in screen, in tmux, or for > example in putty doesn't quite work in ekg? You don't need to be > registered in Gadu-Gadu network to start the ekg client. You will see > problem straight away after resizing the window. > > Sending to ports@ for review, looking for feedback. > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/ekg/Makefile,v > retrieving revision 1.4 > diff -u -r1.4 Makefile > --- Makefile 18 Oct 2010 18:36:47 -0000 1.4 > +++ Makefile 30 Mar 2011 00:15:10 -0000 > @@ -3,6 +3,7 @@ > COMMENT= Gadu-Gadu IM protocol client > > DISTNAME= ekg-1.7 > +REVISION= 0 > CATEGORIES= net > > HOMEPAGE= http://ekg.chmurka.net/ > @@ -15,21 +16,23 @@ > PERMIT_DISTFILES_FTP= Yes > PERMIT_DISTFILES_CDROM= Yes > > -WANTLIB= ncurses ssl crypto z c pthread > +WANTLIB= c crypto gadu ncurses pthread ssl z > > MASTER_SITES= ${HOMEPAGE} > > +LIB_DEPENDS= net/libgadu > + > CONFIGURE_STYLE=gnu > CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ > CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ > CFLAGS="${CFLAGS} -I${LOCALBASE}/include" > -CONFIGURE_ARGS= --disable-shared \ > +CONFIGURE_ARGS= --enable-dynamic \ > --with-pthread \ > --without-libjpeg \ > --without-libgsm \ > --without-libungif > > -USE_GROFF = Yes > +USE_GROFF= Yes > NO_REGRESS= Yes > > .include <bsd.port.mk> > Index: patches/patch-Makefile_in > =================================================================== > RCS file: patches/patch-Makefile_in > diff -N patches/patch-Makefile_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Makefile_in 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,72 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- Makefile.in.orig Sat Aug 5 16:46:21 2006 > ++++ Makefile.in Tue Mar 29 22:40:31 2011 > +@@ -15,11 +15,8 @@ INSTALL = @INSTALL@ > + > + # > + > +-all: configure libgadu @ekg@ @make_ekgwap@ > ++all: configure @ekg@ @make_ekgwap@ > + > +-libgadu: > +- cd lib && $(MAKE) all > +- > + ekg: > + cd src && $(MAKE) all > + > +@@ -31,11 +28,8 @@ examples: > + > + # > + > +-dep: dep-libgadu @dep_ekg@ > ++dep: @dep_ekg@ > + > +-dep-libgadu: > +- cd lib && $(MAKE) dep > +- > + dep-ekg: > + cd src && $(MAKE) dep > + > +@@ -46,11 +40,8 @@ configure: configure.in m4/* > + > + # > + > +-install: all install-libgadu @install_ekg@ @install_ekgwap@ > ++install: all @install_ekg@ @install_ekgwap@ > + > +-install-libgadu: > +- cd lib && $(MAKE) install > +- > + install-ekg: install-ekg-data install-ekg-man > + cd src && $(MAKE) install > + > +@@ -93,11 +84,8 @@ uninstall-ekg: > + > + # > + > +-clean: clean-libgadu @clean_ekg@ clean-examples clean-compat > ++clean: @clean_ekg@ clean-examples clean-compat > + > +-clean-libgadu: > +- cd lib && $(MAKE) clean > +- > + clean-ekg: > + cd src && $(MAKE) clean > + > +@@ -109,12 +97,9 @@ clean-compat: > + > + # > + > +-distclean: distclean-libgadu @distclean_ekg@ distclean-examples > distclean-compat > ++distclean: @distclean_ekg@ distclean-examples distclean-compat > + rm -f *~ config.log config.cache config.status config.h Makefile > + rm -f config.h.in configure aclocal.m4 > +- > +-distclean-libgadu: > +- cd lib && $(MAKE) distclean > + > + distclean-ekg: > + cd src && $(MAKE) distclean > Index: patches/patch-lib_Makefile_in > =================================================================== > RCS file: /cvs/ports/net/ekg/patches/patch-lib_Makefile_in,v > retrieving revision 1.3 > diff -u -r1.3 patch-lib_Makefile_in > --- patches/patch-lib_Makefile_in 15 Oct 2008 14:59:37 -0000 1.3 > +++ patches/patch-lib_Makefile_in 30 Mar 2011 00:15:10 -0000 > @@ -1,4 +1,7 @@ > $OpenBSD: patch-lib_Makefile_in,v 1.3 2008/10/15 14:59:37 ajacoutot Exp $ > + > +- build without gnu make > + > --- lib/Makefile.in.orig Tue Apr 18 21:05:11 2006 > +++ lib/Makefile.in Mon Oct 13 13:59:13 2008 > @@ -11,7 +11,7 @@ VERSION_MAJOR=3 > Index: patches/patch-src_Makefile_in > =================================================================== > RCS file: /cvs/ports/net/ekg/patches/patch-src_Makefile_in,v > retrieving revision 1.2 > diff -u -r1.2 patch-src_Makefile_in > --- patches/patch-src_Makefile_in 15 Oct 2008 14:59:37 -0000 1.2 > +++ patches/patch-src_Makefile_in 30 Mar 2011 00:15:10 -0000 > @@ -1,13 +1,36 @@ > $OpenBSD: patch-src_Makefile_in,v 1.2 2008/10/15 14:59:37 ajacoutot Exp $ > ---- src/Makefile.in.orig Sat Apr 28 22:02:22 2007 > -+++ src/Makefile.in Mon Oct 13 13:58:12 2008 > -@@ -64,9 +64,3 @@ clean: > + > +- external libgadu support, from cvs.pld-linux.org > +- build without gnu make > + > +--- src/Makefile.in.orig Sat Apr 28 21:02:22 2007 > ++++ src/Makefile.in Wed Mar 30 00:25:28 2011 > +@@ -10,7 +10,7 @@ libexecdir = @libexecdir@ > + sysconfdir = @sysconfdir@ > + > + CC = @CC@ > +-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" > -DSYSCONFDIR=\"${sysconfdir}\" > ++CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" > -DSYSCONFDIR=\"${sysconfdir}\" > + LDFLAGS = @LDFLAGS@ > + LIBS = @LIBS@ > + > +@@ -28,7 +28,7 @@ all: dep ekg @ioctld@ > + > + ekg: $(OBJS) comptime.c @libgadu_a@ > + $(CC) $(CFLAGS) -c -o comptime.o comptime.c > +- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ > $(LDFLAGS) $(LIBS) > ++ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @lgadu@ @libgadu_a@ > $(LDFLAGS) $(LIBS) > + > + ioctld: ioctld.c > + $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@ > +@@ -63,10 +63,4 @@ clean: > + > distclean: clean > rm -f *~ Makefile > - > +- > -# > - > -ifneq ($(wildcard .depend),) > -include .depend > -endif > -- > + > Index: patches/patch-src_commands_c > =================================================================== > RCS file: patches/patch-src_commands_c > diff -N patches/patch-src_commands_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_commands_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/commands.c.orig Sat Apr 28 21:02:22 2007 > ++++ src/commands.c Tue Mar 29 22:40:31 2011 > +@@ -52,7 +52,7 @@ > + #include "configfile.h" > + #include "dynstuff.h" > + #include "events.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "log.h" > + #include "msgqueue.h" > + #ifdef HAVE_OPENSSL > Index: patches/patch-src_dynstuff_c > =================================================================== > RCS file: patches/patch-src_dynstuff_c > diff -N patches/patch-src_dynstuff_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_dynstuff_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/dynstuff.c.orig Sun Mar 11 12:27:18 2007 > ++++ src/dynstuff.c Tue Mar 29 22:40:31 2011 > +@@ -24,7 +24,7 @@ > + #include <stdlib.h> > + #include <string.h> > + > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "dynstuff.h" > + #include "stuff.h" > + #include "xmalloc.h" > Index: patches/patch-src_ekg_c > =================================================================== > RCS file: patches/patch-src_ekg_c > diff -N patches/patch-src_ekg_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_ekg_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/ekg.c.orig Sat Apr 28 21:02:23 2007 > ++++ src/ekg.c Tue Mar 29 22:40:31 2011 > +@@ -60,7 +60,7 @@ > + #include "configfile.h" > + #include "emoticons.h" > + #include "events.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "log.h" > + #include "mail.h" > + #include "msgqueue.h" > Index: patches/patch-src_events_c > =================================================================== > RCS file: patches/patch-src_events_c > diff -N patches/patch-src_events_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_events_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/events.c.orig Sat Apr 28 21:02:24 2007 > ++++ src/events.c Tue Mar 29 22:40:31 2011 > +@@ -40,7 +40,7 @@ > + #include "commands.h" > + #include "emoticons.h" > + #include "events.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "log.h" > + #include "msgqueue.h" > + #ifdef HAVE_OPENSSL > Index: patches/patch-src_events_h > =================================================================== > RCS file: patches/patch-src_events_h > diff -N patches/patch-src_events_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_events_h 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/events.h.orig Fri Feb 18 14:06:17 2005 > ++++ src/events.h Tue Mar 29 22:40:31 2011 > +@@ -21,7 +21,7 @@ > + #ifndef __EVENTS_H > + #define __EVENTS_H > + > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "userlist.h" > + > + struct handler { > Index: patches/patch-src_log_h > =================================================================== > RCS file: patches/patch-src_log_h > diff -N patches/patch-src_log_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_log_h 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/log.h.orig Mon Dec 5 20:20:08 2005 > ++++ src/log.h Tue Mar 29 22:40:31 2011 > +@@ -28,7 +28,7 @@ > + #include <time.h> > + > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + > + struct last { > + int type; /* 0 - przychodząca, 1 - wychodząca */ > Index: patches/patch-src_msgqueue_c > =================================================================== > RCS file: patches/patch-src_msgqueue_c > diff -N patches/patch-src_msgqueue_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_msgqueue_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/msgqueue.c.orig Sat Aug 5 17:02:52 2006 > ++++ src/msgqueue.c Tue Mar 29 22:40:31 2011 > +@@ -32,7 +32,7 @@ > + #include <unistd.h> > + > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "msgqueue.h" > + #include "stuff.h" > + #include "xmalloc.h" > Index: patches/patch-src_msgqueue_h > =================================================================== > RCS file: patches/patch-src_msgqueue_h > diff -N patches/patch-src_msgqueue_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_msgqueue_h 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/msgqueue.h.orig Mon Dec 5 20:20:08 2005 > ++++ src/msgqueue.h Tue Mar 29 22:40:31 2011 > +@@ -25,7 +25,7 @@ > + #include <time.h> > + > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + > + struct msg_queue { > + int msg_class; > Index: patches/patch-src_python_c > =================================================================== > RCS file: patches/patch-src_python_c > diff -N patches/patch-src_python_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_python_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/python.c.orig Thu Aug 24 19:57:56 2006 > ++++ src/python.c Tue Mar 29 22:40:31 2011 > +@@ -27,7 +27,7 @@ > + #include <string.h> > + > + #include "commands.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "stuff.h" > + #include "themes.h" > + #include "ui.h" > Index: patches/patch-src_simlite_c > =================================================================== > RCS file: patches/patch-src_simlite_c > diff -N patches/patch-src_simlite_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_simlite_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/simlite.c.orig Sat Aug 5 17:02:52 2006 > ++++ src/simlite.c Tue Mar 29 22:40:31 2011 > +@@ -35,7 +35,7 @@ > + #include <string.h> > + #include <time.h> > + > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "simlite.h" > + > + #ifndef PATH_MAX > Index: patches/patch-src_stuff_c > =================================================================== > RCS file: patches/patch-src_stuff_c > diff -N patches/patch-src_stuff_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_stuff_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/stuff.c.orig Sat Apr 28 21:02:24 2007 > ++++ src/stuff.c Wed Mar 30 00:32:56 2011 > +@@ -53,9 +53,8 @@ > + #include <unistd.h> > + > + #include "commands.h" > +-#include "compat.h" > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #ifdef HAVE_OPENSSL > + # include "simlite.h" > + #endif > Index: patches/patch-src_stuff_h > =================================================================== > RCS file: patches/patch-src_stuff_h > diff -N patches/patch-src_stuff_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_stuff_h 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/stuff.h.orig Sat Apr 28 21:02:25 2007 > ++++ src/stuff.h Tue Mar 29 22:40:31 2011 > +@@ -35,7 +35,7 @@ > + #include <time.h> > + > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "ioctld.h" > + > + #define DEBUG_MAX_LINES 50 /* ile linii z debug zrzucać do pliku */ > Index: patches/patch-src_ui-ncurses_c > =================================================================== > RCS file: patches/patch-src_ui-ncurses_c > diff -N patches/patch-src_ui-ncurses_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_ui-ncurses_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/ui-ncurses.c.orig Sun Mar 11 12:27:21 2007 > ++++ src/ui-ncurses.c Tue Mar 29 22:40:31 2011 > +@@ -66,7 +66,7 @@ > + #include <unistd.h> > + > + #include "commands.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "mail.h" > + #ifndef HAVE_STRLCAT > + # include "../compat/strlcat.h" > Index: patches/patch-src_userlist_c > =================================================================== > RCS file: patches/patch-src_userlist_c > diff -N patches/patch-src_userlist_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_userlist_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/userlist.c.orig Sat Apr 28 21:02:26 2007 > ++++ src/userlist.c Tue Mar 29 22:40:31 2011 > +@@ -38,7 +38,7 @@ > + > + #include "commands.h" > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #ifndef HAVE_STRLCAT > + # include "../compat/strlcat.h" > + #endif > Index: patches/patch-src_userlist_h > =================================================================== > RCS file: patches/patch-src_userlist_h > diff -N patches/patch-src_userlist_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_userlist_h 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/userlist.h.orig Sat Apr 28 21:02:26 2007 > ++++ src/userlist.h Tue Mar 29 22:40:31 2011 > +@@ -30,7 +30,7 @@ > + #include <stdio.h> > + #include <time.h> > + > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "dynstuff.h" > + #include "stuff.h" > + > Index: patches/patch-src_vars_c > =================================================================== > RCS file: patches/patch-src_vars_c > diff -N patches/patch-src_vars_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_vars_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/vars.c.orig Sat Apr 28 21:02:26 2007 > ++++ src/vars.c Tue Mar 29 22:40:31 2011 > +@@ -28,7 +28,7 @@ > + #include <unistd.h> > + > + #include "dynstuff.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "mail.h" > + #ifndef HAVE_STRLCAT > + # include "../compat/strlcat.h" > Index: patches/patch-src_voice_c > =================================================================== > RCS file: patches/patch-src_voice_c > diff -N patches/patch-src_voice_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_voice_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/voice.c.orig Sun Mar 11 12:27:24 2007 > ++++ src/voice.c Tue Mar 29 22:40:31 2011 > +@@ -29,7 +29,7 @@ > + #include <stdlib.h> > + #include <unistd.h> > + > +-#include "libgadu.h" > ++#include <libgadu.h> > + #include "voice.h" > + #include "stuff.h" > + #include "xmalloc.h" > Index: patches/patch-src_xmalloc_c > =================================================================== > RCS file: patches/patch-src_xmalloc_c > diff -N patches/patch-src_xmalloc_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_xmalloc_c 30 Mar 2011 00:15:10 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- external libgadu support, from cvs.pld-linux.org > + > +--- src/xmalloc.c.orig Thu Apr 3 14:39:07 2003 > ++++ src/xmalloc.c Tue Mar 29 22:40:31 2011 > +@@ -28,7 +28,7 @@ > + #include "configfile.h" > + #include "stuff.h" > + #include "userlist.h" > +-#include "libgadu.h" > ++#include <libgadu.h> > + > + void ekg_oom_handler() > + { > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/ekg/pkg/PLIST,v > retrieving revision 1.2 > diff -u -r1.2 PLIST > --- pkg/PLIST 15 Oct 2008 14:59:37 -0000 1.2 > +++ pkg/PLIST 30 Mar 2011 00:15:10 -0000 > @@ -1,10 +1,5 @@ > @comment $OpenBSD: PLIST,v 1.2 2008/10/15 14:59:37 ajacoutot Exp $ > @bin bin/ekg > -@comment include/libgadu-config.h > -@comment include/libgadu.h > -@comment lib/libgadu.a > -@comment lib/pkgconfig/ > -@comment lib/pkgconfig/libgadu.pc > @man man/man1/ekg.1 > man/pl/ > man/pl/man1/ -- best regards q#
