pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/ekg ekg: updated to 20200119



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdc2e9496b66
branches:  trunk
changeset: 410321:fdc2e9496b66
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Jan 20 17:32:49 2020 +0000

description:
ekg: updated to 20200119

20200119:
- fix for OpenSSL < 1.1.0
- check for systems with separate libncurses and libtinfo
- use LIBS instead of LDFLAGS
- fix some warnings

diffstat:

 chat/ekg/Makefile                       |   18 +-
 chat/ekg/PLIST                          |    8 +-
 chat/ekg/distinfo                       |   17 +-
 chat/ekg/patches/patch-Makefile.in      |   15 +
 chat/ekg/patches/patch-aa               |   28 --
 chat/ekg/patches/patch-ab               |   12 -
 chat/ekg/patches/patch-ac               |   39 ---
 chat/ekg/patches/patch-ad               |   21 --
 chat/ekg/patches/patch-src_Makefile.in  |   26 ++
 chat/ekg/patches/patch-src_ui-ncurses.c |  324 ++++++++++++++++++++++++++++++++
 10 files changed, 386 insertions(+), 122 deletions(-)

diffs (truncated from 591 to 300 lines):

diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/Makefile
--- a/chat/ekg/Makefile Mon Jan 20 17:25:10 2020 +0000
+++ b/chat/ekg/Makefile Mon Jan 20 17:32:49 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2020/01/18 21:47:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.58 2020/01/20 17:32:49 adam Exp $
 
-DISTNAME=      ekg-1.7
-PKGREVISION=   12
+DISTNAME=      ekg-20200116
 CATEGORIES=    chat
 MASTER_SITES=  http://ekg.chmurka.net/
 MASTER_SITES+= http://ekg.chmurka.net/archive/
@@ -9,20 +8,22 @@
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://ekg.chmurka.net/
 COMMENT=       Experimental Gadu-Gadu Client (Polish instant messaging system)
+LICENSE=       gnu-gpl-v2
 
 USE_LIBTOOL=           yes
 USE_NCURSES=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE=    lib/libgadu.pc.in
 CONFIGURE_ARGS+=       --enable-ui-ncurses
 CONFIGURE_ARGS+=       --enable-ui-readline
-CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
+CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.curses}
 CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=       --without-debug
+PKGCONFIG_OVERRIDE=    lib/libgadu.pc.in
+
+FAKE_NCURSES=          yes
 
 .include "../../mk/pthread.buildlink3.mk"
-
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=       --with-pthread
 .endif
@@ -32,9 +33,10 @@
 LIBS+= -lexecinfo
 .endif
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../chat/libgadu/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/PLIST
--- a/chat/ekg/PLIST    Mon Jan 20 17:25:10 2020 +0000
+++ b/chat/ekg/PLIST    Mon Jan 20 17:32:49 2020 +0000
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:37:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/01/20 17:32:49 adam Exp $
 bin/ekg
-include/libgadu-config.h
-include/libgadu.h
-lib/libgadu.la
-lib/pkgconfig/libgadu.pc
 man/man1/ekg.1
 man/pl/man1/ekg.1
 share/ekg/themes/arim.theme
@@ -11,6 +7,8 @@
 share/ekg/themes/eileen.theme
 share/ekg/themes/emers.theme
 share/ekg/themes/feeg.theme
+share/ekg/themes/fi9o.theme
+share/ekg/themes/gophi.theme
 share/ekg/themes/irc.theme
 share/ekg/themes/jamzed.theme
 share/ekg/themes/klith.theme
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/distinfo
--- a/chat/ekg/distinfo Mon Jan 20 17:25:10 2020 +0000
+++ b/chat/ekg/distinfo Mon Jan 20 17:32:49 2020 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.23 2015/11/03 01:20:18 agc Exp $
+$NetBSD: distinfo,v 1.24 2020/01/20 17:32:49 adam Exp $
 
-SHA1 (ekg-1.7.tar.gz) = 3b02d2e9fff440783a202f343bda62dc6ad24815
-RMD160 (ekg-1.7.tar.gz) = 1832b34e5d8081fd8b04c85cd87be8cc07908b05
-SHA512 (ekg-1.7.tar.gz) = 5ddfbe422d0e958d739f9847d949ab6509f3d478973af87de3dba8d9a58cda35c09fd4827a470f3c9cc91aad6d0fbd43dd17fc1363279d3641e99df7e3d0a3fe
-Size (ekg-1.7.tar.gz) = 530314 bytes
-SHA1 (patch-aa) = 8da65a969af2eac2dfcfee1d34e4581094c71adc
-SHA1 (patch-ab) = 26323cd967c5358e3e5bbab5ab61b9d8d0ee7f1e
-SHA1 (patch-ac) = f9c0acdda1665bed11b1c5d0d47b2c708d122eac
-SHA1 (patch-ad) = 228df5c7890dfbb863956cb258f994b08e168c04
+SHA1 (ekg-20200116.tar.gz) = fd07911e92218c7a0a79f9732ca17ec1ff033a47
+RMD160 (ekg-20200116.tar.gz) = 033133c290178b59fc650004ecea2a55c94a94cc
+SHA512 (ekg-20200116.tar.gz) = db5c26973ebd0b7a622ba25c0a6f099eb94eefa43cb5c57fc7afedb7a1aed1285445d66d24de0d61ff08a2dce78a416107fe061e0118be7406e33fbd9d0ea2d3
+Size (ekg-20200116.tar.gz) = 4254772 bytes
+SHA1 (patch-Makefile.in) = 7a08b075b62bc72eac773cb86e0826dbe55de908
+SHA1 (patch-src_Makefile.in) = 2012b518cd643275d7a603864f3bc2c336a7bc32
+SHA1 (patch-src_ui-ncurses.c) = f526452651b793d68e69d0aaac72307e0e4033f8
 SHA1 (patch-src_ui-readline.c) = ab216cff95baa7121f80e4f70b922e188a6a17be
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ekg/patches/patch-Makefile.in        Mon Jan 20 17:32:49 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/01/20 17:32:49 adam Exp $
+
+Do not run 'configure' when building.
+
+--- Makefile.in.orig   2020-01-16 21:00:11.000000000 +0000
++++ Makefile.in
+@@ -16,7 +16,7 @@ INSTALL = @INSTALL@
+ 
+ #
+ 
+-all:  configure compat @ekg@ @make_ekgwap@
++all:  compat @ekg@ @make_ekgwap@
+ 
+ ekg:  
+       cd src && $(MAKE) all
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-aa
--- a/chat/ekg/patches/patch-aa Mon Jan 20 17:25:10 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2008/03/05 15:01:06 jlam Exp $
-
---- src/Makefile.in.orig       2007-04-28 16:02:22.000000000 -0400
-+++ src/Makefile.in
-@@ -26,9 +26,9 @@ SRCS = $(OBJS:.o=.c) comptime.c
- 
- all:  dep ekg @ioctld@
- 
--ekg:  $(OBJS) comptime.c @libgadu_a@
-+ekg:  $(OBJS) comptime.c
-       $(CC) $(CFLAGS) -c -o comptime.o comptime.c
--      $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o ../lib/libgadu.la $(LDFLAGS) $(LIBS)
- 
- ioctld:       ioctld.c
-       $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
-@@ -42,9 +42,9 @@ dep: .depend
- 
- install: all install-ekg @install_ioctld@
- 
--install-ekg:  @strip_ekg@
-+install-ekg:
-       $(INSTALL) -d $(DESTDIR)$(bindir)
--      $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg $(DESTDIR)$(bindir)
- 
- install-ioctld:       @strip_ioctld@
-       $(INSTALL) -d $(DESTDIR)$(libexecdir)
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-ab
--- a/chat/ekg/patches/patch-ab Mon Jan 20 17:25:10 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/10/14 07:48:52 adam Exp $
-
---- Makefile.in.orig   2006-08-05 17:46:21.000000000 +0200
-+++ Makefile.in
-@@ -42,7 +42,6 @@ dep-ekg:
- #
- 
- configure:    configure.in m4/*
--      ./autogen.sh
- 
- #
- 
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-ac
--- a/chat/ekg/patches/patch-ac Mon Jan 20 17:25:10 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2008/03/05 15:01:06 jlam Exp $
-
---- lib/Makefile.in.orig       2006-04-18 21:05:11.000000000 +0200
-+++ lib/Makefile.in
-@@ -11,7 +11,7 @@ VERSION_MAJOR=3
- VERSION_MINOR=5
- 
- CC = @CC@ 
--CFLAGS = @CFLAGS_LIBGADU@ -I. -I..
-+CFLAGS += @CFLAGS_LIBGADU@ -I. -I..
- LIBS = @LIBS_LIBGADU@
- 
- MAKE = @MAKE@
-@@ -45,13 +45,12 @@ distclean: clean
- static: dep $(STATIC)
- 
- $(STATIC): $(OBJS)
--      $(AR) r $(STATIC) $(OBJS) 
--      $(RANLIB) $(STATIC)
-+      ${LIBTOOL} --mode=link ${CC} -o ${STATIC:.a=.la} ${OBJS:.o=.lo} -rpath $(libdir) -version-info ${VERSION_MAJOR}:${VERSION_MINOR}
- 
- #
- 
--%.lo: %.c
--      $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC $< -o $@
-+%.o:  %.c
-+      ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
- 
- shared:       dep $(SHARED)
- 
-@@ -86,7 +85,7 @@ install-shared:      install-common @strip_li
-       cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDMM)
- 
- install-static:       install-common
--      $(INSTALL) -m 755 $(STATIC) $(DESTDIR)$(libdir)
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATIC:.a=.la} $(DESTDIR)$(libdir)
- 
- strip-libgadu-so:
-       $(STRIP) $(SHARED)
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-ad
--- a/chat/ekg/patches/patch-ad Mon Jan 20 17:25:10 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2007/10/14 07:48:52 adam Exp $
-
---- configure.orig     2007-04-28 22:57:00.000000000 +0200
-+++ configure
-@@ -5437,7 +5437,7 @@ echo "${ECHO_T}yes" >&6; }
-               # FIXME: -fPIC is required for -shared on many architectures,
-               # so we specify it here, but the right way would probably be to
-               # properly detect whether it is actually required.
--              CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
-+              CFLAGS="-shared -fPIC $CFLAGS $PTHREAD_CFLAGS"
-               LIBS="$PTHREAD_LIBS $LIBS"
-               CC="$PTHREAD_CC"
- 
-@@ -5941,7 +5941,6 @@ if test "x$have_openssl" = "xyes"; then
-       if test "x$enable_libgadu_openssl" != "xno"; then
-               LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS"
-               CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES"
--              PC_REQUIRES="$PC_REQUIRES openssl"
- 
-       sed 's/#undef __GG_LIBGADU_HAVE_OPENSSL/#define __GG_LIBGADU_HAVE_OPENSSL/' < lib/libgadu-config.h > lib/libgadu-config.h-
-       mv -f lib/libgadu-config.h- lib/libgadu-config.h
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-src_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ekg/patches/patch-src_Makefile.in    Mon Jan 20 17:32:49 2020 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2020/01/20 17:32:49 adam Exp $
+
+Use LIBTOOL.
+
+--- src/Makefile.in.orig       2020-01-16 21:00:12.000000000 +0000
++++ src/Makefile.in
+@@ -34,6 +34,7 @@ all: dep ekg @ioctld@
+ 
+ ekg:  $(OBJS) $(srcdir)/comptime.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o comptime.o $(srcdir)/comptime.c
++      ${LIBTOOL} --mode=link \
+       $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o $(LDFLAGS) $(LIBS)
+ 
+ ioctld:       $(srcdir)/ioctld.c
+@@ -48,9 +49,9 @@ dep: .depend
+ 
+ install: all install-ekg @install_ioctld@
+ 
+-install-ekg:  @strip_ekg@
++install-ekg:
+       $(INSTALL) -d $(DESTDIR)$(bindir)
+-      $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg $(DESTDIR)$(bindir)
+ 
+ install-ioctld:       @strip_ioctld@
+       $(INSTALL) -d $(DESTDIR)$(libexecdir)
diff -r 837fd8423faf -r fdc2e9496b66 chat/ekg/patches/patch-src_ui-ncurses.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ekg/patches/patch-src_ui-ncurses.c   Mon Jan 20 17:32:49 2020 +0000
@@ -0,0 +1,324 @@
+$NetBSD: patch-src_ui-ncurses.c,v 1.1 2020/01/20 17:32:49 adam Exp $
+
+Fix curses.
+
+--- src/ui-ncurses.c.orig      2020-01-20 16:47:44.000000000 +0000
++++ src/ui-ncurses.c
+@@ -351,7 +351,7 @@ int contacts_size()
+       if (!config_contacts)
+               return 0;
+ 
+-      if (config_contacts_size + 2 > (stdscr->_maxx + 1) / 2)
++      if (config_contacts_size + 2 > (getmaxx(stdscr) + 1) / 2)
+               return 0;
+ 
+       return config_contacts_size + (contacts_frame) ? 1 : 0;
+@@ -618,9 +618,9 @@ void window_resize()
+       list_t l;
+ 
+       left = 0;
+-      right = stdscr->_maxx + 1;
++      right = getmaxx(stdscr) + 1;
+       top = config_header_size;
+-      bottom = stdscr->_maxy + 1 - input_size - config_statusbar_size;
++      bottom = getmaxy(stdscr) + 1 - input_size - config_statusbar_size;
+       width = right - left;
+       height = bottom - top;
+ 
+@@ -737,13 +737,13 @@ void window_resize()
+ 
+               if (w->left < 0)
+                       w->left = 0;
+-              if (w->left > stdscr->_maxx)
+-                      w->left = stdscr->_maxx;



Home | Main Index | Thread Index | Old Index