Index: head/textproc/iksemel/files/patch-configure.ac =================================================================== --- head/textproc/iksemel/files/patch-configure.ac (revision 568260) +++ head/textproc/iksemel/files/patch-configure.ac (nonexistent) @@ -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 Property changes on: head/textproc/iksemel/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/iksemel/files/patch-src-stream.c =================================================================== --- head/textproc/iksemel/files/patch-src-stream.c (revision 568260) +++ head/textproc/iksemel/files/patch-src-stream.c (nonexistent) @@ -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); Property changes on: head/textproc/iksemel/files/patch-src-stream.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/iksemel/Makefile =================================================================== --- head/textproc/iksemel/Makefile (revision 568260) +++ head/textproc/iksemel/Makefile (revision 568261) @@ -1,33 +1,35 @@ # Created by: trasz # $FreeBSD$ PORTNAME= iksemel PORTVERSION= 1.5 CATEGORIES= textproc MAINTAINER= ports@FreeBSD.org COMMENT= XML parser library mainly designed for Jabber applications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls USE_GITHUB= yes GH_ACCOUNT= meduketto 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 INSTALL_TARGET= install-strip INFO= iksemel post-patch: @${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \ ${WRKSRC}/doc/iksemel.texi .include