ports/109487: [patch] polish/ekg to rc2 of version 1.7

[Aleksander Fafula]

>Number:         109487
>Category:       ports
>Synopsis:       [patch] polish/ekg to rc2 of version 1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 24 14:30:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Aleksander Fafula
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
. 
>Environment:


System: FreeBSD 7.0-CURRENT #0: Sat Feb 17 19:31:11 CET 2007
    root at o:/home/obj/usr/src/sys/ALEX



>Description:


Upgrade to 1.7.rc2. Removed default aspell but added option for this.


>How-To-Repeat:





>Fix:


--- ekg_to_17rc2.patch begins here ---
diff -ruN ekg.orig/Makefile ekg/Makefile
--- ekg.orig/Makefile	Wed Jan 17 01:39:47 2007
+++ ekg/Makefile	Sat Feb 24 15:00:41 2007
@@ -5,17 +5,16 @@
 # $FreeBSD: ports/polish/ekg/Makefile,v 1.22 2006/11/05 08:06:09 lawrance Exp $
 
 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 at 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
@@ -23,11 +22,21 @@
 CONFIGURE_ARGS+=	--disable-shared \
 			--disable-static \
 			--enable-dynamic \
-			--enable-aspell
+			--enable-shared 
+
 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 +46,4 @@
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/ekg
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN ekg.orig/distinfo ekg/distinfo
--- ekg.orig/distinfo	Wed Jan 17 01:39:47 2007
+++ ekg/distinfo	Sat Feb 24 15:00:50 2007
@@ -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 -ruN ekg.orig/files/patch-configure ekg/files/patch-configure
--- ekg.orig/files/patch-configure	Wed Jan 17 01:39:47 2007
+++ ekg/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,23 +0,0 @@
---- configure.orig	Sun Jul  2 17:24:39 2006
-+++ configure	Sun Jul  2 17:25:50 2006
-@@ -3813,12 +3813,6 @@
- 	lib_static_enabled=no
- fi
- 
--if test "x$enable_static" = "xno" -a "x$enable_shared" != "xyes"; then
--  { { echo "$as_me:$LINENO: error: You must choose either static or shared version of libgadu." >&5
--echo "$as_me: error: You must choose either static or shared version of libgadu." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
- # 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"
- 
- 	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
--- ekg_to_17rc2.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: