Update to 20020918, by Dawid Szymanski in PR 18335.

Some fixes and buildlink2ing by me.
Changes:
        - bugfixes
        - new ncurses based interface (like irssi)

5 files changed, 53 insertions, 16 deletions

diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index 0ed5ea5e6ad..949e2ec9ef4 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/07/13 03:05:38 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/25 18:05:17 wiz Exp $
 #
 
-DISTNAME=	ekg-20020709
-PKGNAME=	ekg-0.20020709
+DISTNAME=	ekg-20020918
+PKGNAME=	ekg-0.20020918
 CATEGORIES=	chat
 MASTER_SITES=	http://people.arhea.net/dawszy/NetBSD/ekg/
 
@@ -11,13 +11,18 @@ HOMEPAGE=	http://dev.null.pl/ekg/
 COMMENT=	Experimental Gadu-Gadu Client (Polish instant messaging system)
 
 USE_GNU_READLINE=	YES
-HAS_CONFIGURE=		YES
+USE_NCURSES=		YES # Package insist on it (patch it out?)
+GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
+USE_BUILDLINK2=		YES
 
-CONFIGURE_ARGS+=	--with-readline=${PREFIX}
+CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 CONFIGURE_ARGS+=	--without-debug
+CONFIGURE_ARGS+=	--enable-ui-ncurses
 
-.include "../../devel/readline/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ekg/PLIST b/chat/ekg/PLIST
index 29426127986..ca1fccb1d4e 100644
--- a/chat/ekg/PLIST
+++ b/chat/ekg/PLIST
@@ -1,15 +1,25 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/13 03:05:38 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/09/25 18:05:17 wiz Exp $
 bin/ekg
+bin/ekgsearch
+include/libgadu.h
 lib/libgadu.a
 man/man1/ekg.1
+man/man1/ekgsearch.1
+man/pl/man1/ekg.1
+man/pl/man1/ekgsearch.1
 share/ekg/themes/2k2.theme
 share/ekg/themes/arim.theme
+share/ekg/themes/dj.theme
 share/ekg/themes/emers.theme
 share/ekg/themes/feeg.theme
+share/ekg/themes/irc.theme
 share/ekg/themes/jamzed.theme
 share/ekg/themes/klith.theme
 share/ekg/themes/lcamtuf.theme
+share/ekg/themes/matik.theme
 share/ekg/themes/sic.theme
 share/ekg/themes/zdzichu.theme
 @dirrm share/ekg/themes
 @dirrm share/ekg
+@dirrm man/pl/man1
+@dirrm man/pl
diff --git a/chat/ekg/distinfo b/chat/ekg/distinfo
index 320c571cdc2..e042ca51001 100644
--- a/chat/ekg/distinfo
+++ b/chat/ekg/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/07/13 03:05:38 rh Exp $
+$NetBSD: distinfo,v 1.6 2002/09/25 18:05:17 wiz Exp $
 
-SHA1 (ekg-20020709.tar.gz) = f4276ec6ca45220d2f1879909b0b21df4b881b34
-Size (ekg-20020709.tar.gz) = 245668 bytes
-SHA1 (patch-aa) = 6458a9c98a1bf13e7fb1ced4b8550686a908aa88
+SHA1 (ekg-20020918.tar.gz) = 6a580ef60d0d3c37ffdec40e27c81fb5cdff75fe
+Size (ekg-20020918.tar.gz) = 278501 bytes
+SHA1 (patch-aa) = 8bbde6094cc69d49ce7c16b70903e283a312b161
+SHA1 (patch-ab) = d926158ccc2045ac0e8a4aa3e1905700843e4e7b
diff --git a/chat/ekg/patches/patch-aa b/chat/ekg/patches/patch-aa
index 72aadbe033b..70c497e9cad 100644
--- a/chat/ekg/patches/patch-aa
+++ b/chat/ekg/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2002/07/13 03:05:38 rh Exp $
+$NetBSD: patch-aa,v 1.5 2002/09/25 18:05:18 wiz Exp $
 
---- src/Makefile.in.orig	Fri Jun 28 11:57:01 2002
+--- src/Makefile.in.orig	Sun Sep  1 17:39:21 2002
 +++ src/Makefile.in
-@@ -19,7 +19,7 @@ OBJS = stuff.o commands.o events.o theme
+@@ -8,7 +8,7 @@ bindir = @bindir@
+ libexecdir = @libexecdir@
+ 
+ CC = @CC@ 
+-CFLAGS = -I.. -I../lib @CFLAGS@ -Wall -DTHEMES_DIR=\"${datadir}/ekg/themes\"
++CFLAGS = -I.. -I../lib @CFLAGS@ -Wall -DTHEMES_DIR=\"${PREFIX}/share/ekg/themes\"
+ LIBS = @LIBS@
+ 
+ MAKE = @MAKE@
+@@ -23,7 +23,7 @@ OBJS = stuff.o commands.o events.o theme
  all:	ekg @ioctld@
  
  ekg:	$(OBJS)
--	$(CC) $(CFLAGS) -o ekg $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -o ekg $(OBJS) $(LIBS) -Wl -R${LOCALBASE}/lib
+-	$(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib $(LIBS) @lgadu@
++	$(CC) $(CFLAGS) -o ekg $(OBJS) -Wl -R${LOCALBASE}/lib -L../lib $(LIBS) @lgadu@
  
  ioctld:	ioctld.c
  	$(CC) $(CFLAGS) ioctld.c -o ioctld
diff --git a/chat/ekg/patches/patch-ab b/chat/ekg/patches/patch-ab
new file mode 100644
index 00000000000..9de277029a4
--- /dev/null
+++ b/chat/ekg/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2002/09/25 18:05:18 wiz Exp $
+
+--- Makefile.in.orig	Wed Sep 11 17:23:06 2002
++++ Makefile.in
+@@ -30,7 +30,6 @@ examples:
+ #
+ 
+ configure:	configure.in m4/* acconfig.h
+-	./autogen.sh
+ 
+ #
+