From f53f9e11304251a1b4001f6fbe93fabcd754e131 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 22 Jul 2003 10:39:40 +0000 Subject: Changes 1.1: * ekgbot * log viewer * bug fixes Now makes a shared library and uses buildlink2 --- chat/ekg/Makefile | 32 +++++++++++++++++++------------- chat/ekg/PLIST | 12 ++++++------ chat/ekg/distinfo | 9 +++++---- chat/ekg/patches/patch-aa | 37 +++++++++++++++++++++---------------- chat/ekg/patches/patch-ab | 2 +- 5 files changed, 52 insertions(+), 40 deletions(-) diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index ffc69724778..0152e38e8c6 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,31 +1,37 @@ -# $NetBSD: Makefile,v 1.14 2003/07/13 13:50:44 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2003/07/22 10:39:40 adam Exp $ # -DISTNAME= ekg-1.0 -PKGREVISION= 2 +DISTNAME= ekg-1.1 CATEGORIES= chat MASTER_SITES= http://dev.null.pl/ekg/ \ http://dev.null.pl/ekg/stare/ -MAINTAINER= dawszy@arhea.net +MAINTAINER= adam@NetBSD.org HOMEPAGE= http://dev.null.pl/ekg/ COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) +USE_NCURSES= YES USE_GNU_READLINE= YES -USE_NCURSES= # KEY_RESIZE, ncurses internals GNU_CONFIGURE= YES USE_GMAKE= YES USE_BUILDLINK2= YES +USE_LIBTOOL= YES -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 -CONFIGURE_ARGS+= --with-pthread +CONFIGURE_ARGS+=--enable-ui-ncurses +CONFIGURE_ARGS+=--enable-ui-readline +CONFIGURE_ARGS+=--with-curses=${BUILDLINK_PREFIX.ncurses} +CONFIGURE_ARGS+=--with-readline=${BUILDLINK_PREFIX.readline} +CONFIGURE_ARGS+=--without-debug + +.include "../../mk/pthread.buildlink2.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") +CONFIGURE_ARGS+=--with-pthread +.endif .include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ekg/PLIST b/chat/ekg/PLIST index c882288e5f5..fceab5afd31 100644 --- a/chat/ekg/PLIST +++ b/chat/ekg/PLIST @@ -1,11 +1,13 @@ -@comment $NetBSD: PLIST,v 1.8 2003/03/22 01:00:59 salo Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/07/22 10:39:40 adam Exp $ bin/ekg include/libgadu-config.h include/libgadu.h lib/libgadu.a +lib/libgadu.la +lib/libgadu.so +lib/libgadu.so.2 +lib/libgadu.so.2.13 lib/pkgconfig/libgadu.pc -man/man1/ekg.1 -man/pl/man1/ekg.1 share/ekg/themes/arim.theme share/ekg/themes/dj.theme share/ekg/themes/eileen.theme @@ -20,9 +22,7 @@ share/ekg/themes/leon.theme share/ekg/themes/matik.theme share/ekg/themes/old.theme share/ekg/themes/sic.theme -share/ekg/themes/zdzichu.theme +share/ekg/themes/tohver.theme share/ekg/vars.txt @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 6760bc4a4c4..0f526b48d6f 100644 --- a/chat/ekg/distinfo +++ b/chat/ekg/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.9 2003/05/02 07:57:31 zuntum Exp $ +$NetBSD: distinfo,v 1.10 2003/07/22 10:39:40 adam Exp $ -SHA1 (ekg-1.0.tar.gz) = 38819519a45c106d45b1bde63637ff3ccddf1281 -Size (ekg-1.0.tar.gz) = 425682 bytes -SHA1 (patch-aa) = c0d80e90836b7e03ddd5d30be8f64238f7251e25 +SHA1 (ekg-1.1.tar.gz) = d939f88fcf5e360f4d30df849593812540c338a0 +Size (ekg-1.1.tar.gz) = 454156 bytes +SHA1 (patch-aa) = e51f5182b08243d563f6522459c1d10d51350294 SHA1 (patch-ab) = 626765db378e40f08f459df3fb6c4649a5fdc53b +SHA1 (patch-ac) = ae2964fbc998d70a705a3dec82e32e68e7af3cab diff --git a/chat/ekg/patches/patch-aa b/chat/ekg/patches/patch-aa index 38ec7a679ce..1e6a6234f8a 100644 --- a/chat/ekg/patches/patch-aa +++ b/chat/ekg/patches/patch-aa @@ -1,22 +1,27 @@ -$NetBSD: patch-aa,v 1.6 2003/01/16 08:21:53 salo Exp $ +$NetBSD: patch-aa,v 1.7 2003/07/22 10:39:41 adam Exp $ ---- src/Makefile.in.orig Sat Jan 11 19:57:47 2003 -+++ src/Makefile.in -@@ -9,7 +9,7 @@ libexecdir = @libexecdir@ - sysconfdir = @sysconfdir@ +--- src/Makefile.in.orig 2003-05-19 15:36:41.000000000 +0200 ++++ src/Makefile.in 2003-07-22 11:09:38.000000000 +0200 +@@ -25,8 +25,8 @@ - CC = @CC@ --CFLAGS = -I.. -I../lib @CFLAGS@ -Wall -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\" -+CFLAGS = -I.. -I../lib @CFLAGS@ -Wall -DDATADIR=\"${PREFIX}/share/ekg\" -DSYSCONFDIR=\"${PREFIX}/etc\" - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - -@@ -26,7 +26,7 @@ SRCS = $(OBJS:.o=.c) all: dep ekg @ioctld@ - ekg: $(OBJS) @libgadu_a@ -- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib $(LDFLAGS) $(LIBS) @lgadu@ @libgadu_a@ -+ $(CC) $(CFLAGS) -o ekg $(OBJS) -Wl -R${LOCALBASE}/lib -L../lib $(LDFLAGS) $(LIBS) @lgadu@ @libgadu_a@ +-ekg: $(OBJS) @libgadu_a@ +- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS) ++ekg: $(OBJS) ++ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o ekg ../lib/libgadu.la $(OBJS) $(LDFLAGS) $(LIBS) ioctld: ioctld.c - $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) + $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@ +@@ -40,9 +40,8 @@ + + install: all install-ekg @install_ioctld@ + +-install-ekg: @strip_ekg@ +- $(INSTALL) -d $(DESTDIR)$(bindir) +- $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir) ++install-ekg: ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg ${PREFIX}/bin + + install-ioctld: @strip_ioctld@ + $(INSTALL) -d $(DESTDIR)$(libexecdir) diff --git a/chat/ekg/patches/patch-ab b/chat/ekg/patches/patch-ab index 7141b69fc5b..9b4af340c8b 100644 --- a/chat/ekg/patches/patch-ab +++ b/chat/ekg/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2003/01/16 08:21:53 salo Exp $ +$NetBSD: patch-ab,v 1.3 2003/07/22 10:39:41 adam Exp $ --- Makefile.in.orig Sat Jan 4 16:54:48 2003 +++ Makefile.in -- cgit v1.2.3