Changes 1.7:

* Bug fixes

7 files changed, 42 insertions, 42 deletions

diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index fcd975178ec..4c93fd30597 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/10/14 07:48:52 adam Exp $
 
-DISTNAME=	ekg-1.6
-PKGREVISION=	4
+DISTNAME=	ekg-1.7
 CATEGORIES=	chat
-MASTER_SITES=	http://dev.null.pl/ekg/ \
-		http://dev.null.pl/ekg/stare/
+MASTER_SITES=	http://ekg.chmurka.net/ \
+		http://ekg.chmurka.net/archive/
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://dev.null.pl/ekg/
+HOMEPAGE=	http://ekg.chmurka.net/
 COMMENT=	Experimental Gadu-Gadu Client (Polish instant messaging system)
 
 USE_GNU_READLINE=	yes
diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index 22c77b6582c..26d3e9fc65b 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/10/14 07:48:52 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EKG_BUILDLINK3_MK:=	${EKG_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	ekg
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ekg
 
 .if !empty(EKG_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ekg+=		ekg>=1.6
-BUILDLINK_ABI_DEPENDS.ekg?=	ekg>=1.6nb4
+BUILDLINK_API_DEPENDS.ekg+=	ekg>=1.6
+BUILDLINK_ABI_DEPENDS.ekg+=	ekg>=1.6nb4
 BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg
 .endif	# EKG_BUILDLINK3_MK
 
diff --git a/chat/ekg/distinfo b/chat/ekg/distinfo
index 9bd9b60d996..b2631497567 100644
--- a/chat/ekg/distinfo
+++ b/chat/ekg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2006/01/17 20:49:13 adam Exp $
+$NetBSD: distinfo,v 1.20 2007/10/14 07:48:52 adam Exp $
 
-SHA1 (ekg-1.6.tar.gz) = 1b0cebd960c4aab1593a7ee6349bd57726ea1765
-RMD160 (ekg-1.6.tar.gz) = 6c601ceaf1b77c3c726a44b0712cd98b4d307fc4
-Size (ekg-1.6.tar.gz) = 503852 bytes
-SHA1 (patch-aa) = e51f5182b08243d563f6522459c1d10d51350294
-SHA1 (patch-ab) = 626765db378e40f08f459df3fb6c4649a5fdc53b
-SHA1 (patch-ac) = 411c5be6f85dc28a1aafa24dea7a5e29b3c51a26
-SHA1 (patch-ad) = 7fd701b208ec6096b853e826d18afd084548fb68
+SHA1 (ekg-1.7.tar.gz) = 3b02d2e9fff440783a202f343bda62dc6ad24815
+RMD160 (ekg-1.7.tar.gz) = 1832b34e5d8081fd8b04c85cd87be8cc07908b05
+Size (ekg-1.7.tar.gz) = 530314 bytes
+SHA1 (patch-aa) = 9a5fba8121c3ff6bff6d5971f1d99aa442441cfc
+SHA1 (patch-ab) = 26323cd967c5358e3e5bbab5ab61b9d8d0ee7f1e
+SHA1 (patch-ac) = 67420ae770893ed429d90a3b0bf496fef6fd97b5
+SHA1 (patch-ad) = 228df5c7890dfbb863956cb258f994b08e168c04
diff --git a/chat/ekg/patches/patch-aa b/chat/ekg/patches/patch-aa
index 1e6a6234f8a..934b2128577 100644
--- a/chat/ekg/patches/patch-aa
+++ b/chat/ekg/patches/patch-aa
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2003/07/22 10:39:41 adam Exp $
+$NetBSD: patch-aa,v 1.8 2007/10/14 07:48:52 adam Exp $
 
---- 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 @@
+--- src/Makefile.in.orig	2007-04-28 22:02:22.000000000 +0200
++++ src/Makefile.in
+@@ -26,9 +26,9 @@ SRCS = $(OBJS:.o=.c) comptime.c
  
  all:	dep ekg @ioctld@
  
--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)
+-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@
-@@ -40,9 +40,8 @@
+@@ -42,9 +42,8 @@ dep:	.depend
  
  install: all install-ekg @install_ioctld@
  
diff --git a/chat/ekg/patches/patch-ab b/chat/ekg/patches/patch-ab
index 9b4af340c8b..d7eaa9a8bb6 100644
--- a/chat/ekg/patches/patch-ab
+++ b/chat/ekg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/07/22 10:39:41 adam Exp $
+$NetBSD: patch-ab,v 1.4 2007/10/14 07:48:52 adam Exp $
 
---- Makefile.in.orig	Sat Jan  4 16:54:48 2003
+--- Makefile.in.orig	2006-08-05 17:46:21.000000000 +0200
 +++ Makefile.in
-@@ -41,7 +41,6 @@ dep-ekg:
+@@ -42,7 +42,6 @@ dep-ekg:
  #
  
  configure:	configure.in m4/*
diff --git a/chat/ekg/patches/patch-ac b/chat/ekg/patches/patch-ac
index 2a61a9f875f..1109d45f3f5 100644
--- a/chat/ekg/patches/patch-ac
+++ b/chat/ekg/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2005/07/13 15:05:55 adam Exp $
+$NetBSD: patch-ac,v 1.5 2007/10/14 07:48:52 adam Exp $
 
---- lib/Makefile.in.orig	2005-07-12 21:26:10.000000000 +0000
+--- lib/Makefile.in.orig	2006-04-18 21:05:11.000000000 +0200
 +++ lib/Makefile.in
 @@ -11,7 +11,7 @@ VERSION_MAJOR=3
- VERSION_MINOR=3
+ VERSION_MINOR=5
  
  CC = @CC@ 
--CFLAGS = @CFLAGS_LIBGADU@ -I. -I.. -Wall
-+CFLAGS += @CFLAGS_LIBGADU@ -I. -I.. -Wall
+-CFLAGS = @CFLAGS_LIBGADU@ -I. -I..
++CFLAGS += @CFLAGS_LIBGADU@ -I. -I..
  LIBS = @LIBS_LIBGADU@
  
  MAKE = @MAKE@
diff --git a/chat/ekg/patches/patch-ad b/chat/ekg/patches/patch-ad
index 5bfafa1152c..e2191584562 100644
--- a/chat/ekg/patches/patch-ad
+++ b/chat/ekg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2005/07/13 15:05:55 adam Exp $
+$NetBSD: patch-ad,v 1.6 2007/10/14 07:48:52 adam Exp $
 
---- configure.orig	2005-07-12 21:33:02.000000000 +0000
+--- configure.orig	2007-04-28 22:57:00.000000000 +0200
 +++ configure
-@@ -4312,7 +4312,7 @@ echo "${ECHO_T}yes" >&6
+@@ -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.
@@ -11,11 +11,11 @@ $NetBSD: patch-ad,v 1.5 2005/07/13 15:05:55 adam Exp $
  		LIBS="$PTHREAD_LIBS $LIBS"
  		CC="$PTHREAD_CC"
  
-@@ -4770,7 +4770,6 @@ if test "x$have_openssl" = "xyes"; then
- 	LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS"
- 	CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
- 	CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES"
--	PC_REQUIRES="$PC_REQUIRES openssl"
+@@ -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