diff options
| -rw-r--r-- | chat/ekg/Makefile | 17 | ||||
| -rw-r--r-- | chat/ekg/buildlink3.mk | 8 | ||||
| -rw-r--r-- | chat/ekg/distinfo | 12 | ||||
| -rw-r--r-- | chat/ekg/patches/patch-ac | 8 | ||||
| -rw-r--r-- | chat/ekg/patches/patch-ad | 15 |
5 files changed, 36 insertions, 24 deletions
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index b9a8bf338aa..f00f6a69ecf 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:03 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/04/21 08:53:11 adam Exp $ -DISTNAME= ekg-1.5 -PKGREVISION= 2 +DISTNAME= ekg-1.6rc1 +PKGNAME= ekg-1.6 CATEGORIES= chat MASTER_SITES= http://dev.null.pl/ekg/ \ http://dev.null.pl/ekg/stare/ @@ -10,11 +10,11 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://dev.null.pl/ekg/ COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) +USE_GNU_READLINE= yes USE_GNU_TOOLS+= make -USE_GNU_READLINE= YES -USE_LIBTOOL= YES -USE_NCURSES= YES # ncurses internals -GNU_CONFIGURE= YES +USE_LIBTOOL= yes +USE_NCURSES= yes +GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= lib/libgadu.pc.in CONFIGURE_ARGS+= --enable-ui-ncurses @@ -26,12 +26,13 @@ CONFIGURE_ARGS+= --without-debug .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") -CONFIGURE_ARGS+=--with-pthread +CONFIGURE_ARGS+= --with-pthread .endif .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk index 544724704b0..92f4b6442b2 100644 --- a/chat/ekg/buildlink3.mk +++ b/chat/ekg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:14 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/04/21 08:53:11 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+ @@ -11,14 +11,16 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nekg} BUILDLINK_PACKAGES+= ekg .if !empty(EKG_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.ekg+= ekg>=1.1 -BUILDLINK_RECOMMENDED.ekg?= ekg>=1.5nb1 +BUILDLINK_DEPENDS.ekg+= ekg>=1.6 +BUILDLINK_RECOMMENDED.ekg?= ekg>=1.6 BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg .endif # EKG_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/chat/ekg/distinfo b/chat/ekg/distinfo index b4c9a259d80..075a8a9599b 100644 --- a/chat/ekg/distinfo +++ b/chat/ekg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2005/02/23 15:59:10 agc Exp $ +$NetBSD: distinfo,v 1.16 2005/04/21 08:53:11 adam Exp $ -SHA1 (ekg-1.5.tar.gz) = e23e933ebbf8639a062300b7ffbf7db0a0bb5c42 -RMD160 (ekg-1.5.tar.gz) = bd8e0e1385c82570278496602c418328ccb153a3 -Size (ekg-1.5.tar.gz) = 483606 bytes +SHA1 (ekg-1.6rc1.tar.gz) = 9a9bd2dcfbe8c0a9a4afbe51985d80461ec3d225 +RMD160 (ekg-1.6rc1.tar.gz) = edb997603c4b9652431adabe8ac1d712b31f61cc +Size (ekg-1.6rc1.tar.gz) = 495016 bytes SHA1 (patch-aa) = e51f5182b08243d563f6522459c1d10d51350294 SHA1 (patch-ab) = 626765db378e40f08f459df3fb6c4649a5fdc53b -SHA1 (patch-ac) = a37de741a2487aed25e5876481e9447647360269 -SHA1 (patch-ad) = 928a924f2e57ce97b54dd85d7314814ae11db444 +SHA1 (patch-ac) = 8874f356c7c5ab06fe44dcb0f41bcc969fd3e218 +SHA1 (patch-ad) = e1b138187c7d9121607963ff3b4c6e1bdb2b0e73 diff --git a/chat/ekg/patches/patch-ac b/chat/ekg/patches/patch-ac index bc9d869ba50..0de8c8ce830 100644 --- a/chat/ekg/patches/patch-ac +++ b/chat/ekg/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.2 2003/12/08 16:32:52 adam Exp $ +$NetBSD: patch-ac,v 1.3 2005/04/21 08:53:11 adam Exp $ ---- lib/Makefile.in.orig 2003-11-14 14:58:43.000000000 +0000 +--- lib/Makefile.in.orig 2005-02-22 15:22:25.000000000 +0000 +++ lib/Makefile.in @@ -11,7 +11,7 @@ VERSION_MAJOR=3 - VERSION_MINOR=0 + VERSION_MINOR=2 CC = @CC@ -CFLAGS = @CFLAGS_LIBGADU@ -I. -I.. -Wall @@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.2 2003/12/08 16:32:52 adam Exp $ install-static: install-common - $(INSTALL) -m 755 $(STATIC) $(DESTDIR)$(libdir) -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${STATIC:.a=.la} ${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATIC:.a=.la} ${PREFIX}/lib strip-libgadu-so: $(STRIP) $(SHARED) diff --git a/chat/ekg/patches/patch-ad b/chat/ekg/patches/patch-ad index 383c95c23e4..0dc16b3becb 100644 --- a/chat/ekg/patches/patch-ad +++ b/chat/ekg/patches/patch-ad @@ -1,8 +1,17 @@ -$NetBSD: patch-ad,v 1.3 2004/10/22 09:14:45 adam Exp $ +$NetBSD: patch-ad,v 1.4 2005/04/21 08:53:11 adam Exp $ ---- configure.orig 2004-10-22 10:37:34.000000000 +0000 +--- configure.orig 2005-03-20 12:46:53.000000000 +0000 +++ configure -@@ -4554,7 +4554,6 @@ if test "x$have_openssl" = "xyes"; then +@@ -4224,7 +4224,7 @@ echo "$as_me: WARNING: we do not know ho + echo $ECHO_N "checking if -pthread is sufficient with -shared... $ECHO_C" >&6 + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" +- CFLAGS="-shared -Wl,-z,defs $CFLAGS" ++ CFLAGS="-shared $CFLAGS" + ok="no" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" +@@ -4657,7 +4657,6 @@ if test "x$have_openssl" = "xyes"; then LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_INCLUDES" CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES" |