unbreak textproc/iksemel by finalizing the latest upgrade

- patch stage failed as both patches have been incorperated upstream
  while at it, make gnutls usage explicit.
- configure stage fails when checking for python
  as no python dependency has been declared and no python files are
  in pkg-plist, let's assume that the intention was to not build the
  python bindings at this time

Approved by:	just-fix-it

3 files changed, 2 insertions, 46 deletions

diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 07c17db34edc..7b1ad95084bc 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -19,6 +19,8 @@ GH_TAGNAME=	978b733
 
 USES=		autoreconf libtool makeinfo pathfix pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-gnutls=yes \
+		--disable-python
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
diff --git a/textproc/iksemel/files/patch-configure.ac b/textproc/iksemel/files/patch-configure.ac
deleted file mode 100644
index 57a97e228e98..000000000000
--- a/textproc/iksemel/files/patch-configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac.orig	2009-07-23 11:16:36 UTC
-+++ configure.ac
-@@ -45,7 +45,15 @@ AC_SEARCH_LIBS(recv,socket)
- AC_CHECK_FUNCS(getopt_long)
- AC_CHECK_FUNCS(getaddrinfo)
- 
--AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-+dnl Check GNU TLS
-+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) 
-+if test "x$have_gnutls" = "xyes"; then
-+  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
-+  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
-+  AC_SUBST(LIBGNUTLS_CFLAGS)
-+  AC_SUBST(LIBGNUTLS_LIBS)
-+  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) 
-+fi
- 
- dnl Check -Wall flag of GCC
- if test "x$GCC" = "xyes"; then
diff --git a/textproc/iksemel/files/patch-src-stream.c b/textproc/iksemel/files/patch-src-stream.c
deleted file mode 100644
index deddea813245..000000000000
--- a/textproc/iksemel/files/patch-src-stream.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/stream.c.orig	2009-07-23 11:16:35 UTC
-+++ src/stream.c
-@@ -63,11 +63,6 @@ tls_pull (iksparser *prs, char *buffer, 
- static int
- handshake (struct stream_data *data)
- {
--	const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
--	const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
--	const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--	const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
--	const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
- 	int ret;
- 
- 	if (gnutls_global_init () != 0)
-@@ -80,11 +75,7 @@ handshake (struct stream_data *data)
- 		gnutls_certificate_free_credentials (data->cred);
- 		return IKS_NOMEM;
- 	}
--	gnutls_protocol_set_priority (data->sess, protocol_priority);
--	gnutls_cipher_set_priority(data->sess, cipher_priority);
--	gnutls_compression_set_priority(data->sess, comp_priority);
--	gnutls_kx_set_priority(data->sess, kx_priority);
--	gnutls_mac_set_priority(data->sess, mac_priority);
-+	gnutls_set_default_priority(data->sess);
- 	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
- 
- 	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);