From d99d962c4de49a1d8c9aa3ae18a049d1ac0dff12 Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sun, 25 Feb 2007 07:32:46 +0000
Subject: - Update to 1.7 RC2 - Remove default aspell. Add option for that.

PR:		ports/109487
Submitted by:	Aleksander Fafula (maintainer)
---
 polish/ekg/Makefile              | 22 +++++++++++++++-------
 polish/ekg/distinfo              |  6 +++---
 polish/ekg/files/patch-configure | 24 ++++++++++++++++--------
 3 files changed, 34 insertions(+), 18 deletions(-)

(limited to 'polish')

diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 7970bc90a8c6..067f6bd25b0e 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -5,29 +5,37 @@
 # $FreeBSD$
 
 PORTNAME=		ekg
-PORTVERSION=		1.6
-PORTREVISION=		1
+PORTVERSION=		1.7.r2
 PORTEPOCH=		2
 CATEGORIES=		polish net-im
 MASTER_SITES=		http://ekg.chmurka.net/
+DISTNAME=		${PORTNAME}-1.7rc2
 
 MAINTAINER=		alex@bsdguru.org
 COMMENT=		Text-mode Gadu-Gadu client
 
-LIB_DEPENDS=		aspell.16:${PORTSDIR}/polish/aspell \
-			gadu.3:${PORTSDIR}/polish/libgadu
+LIB_DEPENDS=		gadu.3:${PORTSDIR}/polish/libgadu
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_GNOME=		gnomehack pkgconfig
 CONFIGURE_ARGS+=	--disable-shared \
 			--disable-static \
-			--enable-dynamic \
-			--enable-aspell
+			--enable-dynamic
+
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 			CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
+OPTIONS=	ASPELL "Build with ASPELL support" off
+		
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+=		aspell.16:${PORTSDIR}/polish/aspell
+CONFIGURE_ARGS+=	--enable-aspell
+.endif
+
 USE_LDCONFIG=	yes
 
 MAN1=		ekg.1
@@ -37,4 +45,4 @@ MANCOMPRESSED=	no
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/ekg
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/polish/ekg/distinfo b/polish/ekg/distinfo
index c9ce5d32ebcb..e35b47d26770 100644
--- a/polish/ekg/distinfo
+++ b/polish/ekg/distinfo
@@ -1,3 +1,3 @@
-MD5 (ekg-1.6.tar.gz) = 1094eee5062d9b9900c4b28bd68fb564
-SHA256 (ekg-1.6.tar.gz) = c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
-SIZE (ekg-1.6.tar.gz) = 503852
+MD5 (ekg-1.7rc2.tar.gz) = b4ea482130e163af1456699e2e6983d9
+SHA256 (ekg-1.7rc2.tar.gz) = 17b42147dfe4ef8b7d901e285d68c490f7c645240c6934c23f0db82e61ace915
+SIZE (ekg-1.7rc2.tar.gz) = 514073
diff --git a/polish/ekg/files/patch-configure b/polish/ekg/files/patch-configure
index 7891a5354efb..725418386980 100644
--- a/polish/ekg/files/patch-configure
+++ b/polish/ekg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Jul  2 17:24:39 2006
-+++ configure	Sun Jul  2 17:25:50 2006
-@@ -3813,12 +3813,6 @@
+--- configure.orig	Sat Feb 24 16:28:42 2007
++++ configure	Sat Feb 24 16:29:20 2007
+@@ -3821,12 +3821,6 @@
  	lib_static_enabled=no
  fi
  
@@ -13,11 +13,19 @@
  # Check whether --enable-dynamic or --disable-dynamic was given.
  if test "${enable_dynamic+set}" = set; then
    enableval="$enable_dynamic"
-@@ -4770,7 +4764,6 @@
- 	LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS"
- 	CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
- 	CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES"
--	PC_REQUIRES="$PC_REQUIRES openssl"
+@@ -3834,7 +3828,6 @@
+ fi;
+ 
+ 
+-
+ # Check whether --with-c99-vsnprintf or --without-c99-vsnprintf was given.
+ if test "${with_c99_vsnprintf+set}" = set; then
+   withval="$with_c99_vsnprintf"
+@@ -4786,7 +4779,6 @@
+ 	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
-- 
cgit v1.2.3