From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 23 20:40:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72973106568B for ; Fri, 23 Oct 2009 20:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 32C828FC13 for ; Fri, 23 Oct 2009 20:40:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NKe4QJ067606 for ; Fri, 23 Oct 2009 20:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9NKe48w067605; Fri, 23 Oct 2009 20:40:04 GMT (envelope-from gnats) Resent-Date: Fri, 23 Oct 2009 20:40:04 GMT Resent-Message-Id: <200910232040.n9NKe48w067605@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marc Lagrange Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4669B106568B for ; Fri, 23 Oct 2009 20:36:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 35FA08FC25 for ; Fri, 23 Oct 2009 20:36:02 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NKa1Qs022589 for ; Fri, 23 Oct 2009 20:36:01 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n9NKa1wp022588; Fri, 23 Oct 2009 20:36:01 GMT (envelope-from nobody) Message-Id: <200910232036.n9NKa1wp022588@www.freebsd.org> Date: Fri, 23 Oct 2009 20:36:01 GMT From: Marc Lagrange To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139871: Add patch to fix GnuTLS detection for textproc/iksemel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2009 20:40:04 -0000 >Number: 139871 >Category: ports >Synopsis: Add patch to fix GnuTLS detection for textproc/iksemel >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: Fri Oct 23 20:40:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Marc Lagrange >Release: FreeBSD 8.0-RC1 amd64 >Organization: >Environment: FreeBSD melkor 8.0-RC1 FreeBSD 8.0-RC1 #7 r197835: Fri Oct 16 23:44:52 CEST 2009 root@melkor:/usr/obj/usr/src/sys/MELKOR amd64 >Description: Remove patchs (patch-doc-Makefile.in and patch-Makefile.in) and replace with a ${REINPLACE_CMD}. Fix GnuTLS detection, patch from upstream unless new release. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Naur iksemel.orig/Makefile iksemel/Makefile --- iksemel.orig/Makefile 2009-08-26 18:22:59.000000000 +0200 +++ iksemel/Makefile 2009-10-21 13:32:10.000000000 +0200 @@ -7,6 +7,7 @@ PORTNAME= iksemel PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -15,7 +16,8 @@ LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls -USE_AUTOTOOLS= libtool:22 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 +ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -23,4 +25,12 @@ INFO= iksemel -.include +.include + +post-patch: + @${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \ + ${WRKSRC}/doc/iksemel.texi + @${REINPLACE_CMD} -e 's|pkgconfigdir=$$(libdir)/pkgconfig|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \ + ${WRKSRC}/Makefile.am + +.include diff -Naur iksemel.orig/files/patch-Makefile.in iksemel/files/patch-Makefile.in --- iksemel.orig/files/patch-Makefile.in 2007-10-04 13:17:26.000000000 +0200 +++ iksemel/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2007-08-02 12:49:14.000000000 +0200 -+++ Makefile.in 2007-10-01 18:22:45.000000000 +0200 -@@ -187,7 +187,7 @@ - target_alias = @target_alias@ - SUBDIRS = include src tools test doc - EXTRA_DIST = HACKING iksemel.pc.in --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = ${prefix}/libdata/pkgconfig - pkgconfig_DATA = iksemel.pc - all: all-recursive - diff -Naur iksemel.orig/files/patch-configure.ac iksemel/files/patch-configure.ac --- iksemel.orig/files/patch-configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ iksemel/files/patch-configure.ac 2009-10-21 13:29:35.000000000 +0200 @@ -0,0 +1,19 @@ +--- ./configure.ac.orig 2009-07-23 11:16:36.000000000 +0000 ++++ ./configure.ac 2009-10-21 11:57:12.768114881 +0000 +@@ -45,7 +45,15 @@ + 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 -Naur iksemel.orig/files/patch-doc-Makefile.in iksemel/files/patch-doc-Makefile.in --- iksemel.orig/files/patch-doc-Makefile.in 2007-10-04 13:17:26.000000000 +0200 +++ iksemel/files/patch-doc-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- doc/Makefile.in.orig 2007-08-02 12:49:13.000000000 +0200 -+++ doc/Makefile.in 2007-10-01 21:14:31.000000000 +0200 -@@ -46,7 +46,7 @@ - CONFIG_CLEAN_FILES = - SOURCES = - DIST_SOURCES = --INFO_DEPS = $(srcdir)/iksemel -+INFO_DEPS = $(srcdir)/iksemel.info - am__TEXINFO_TEX_DIR = $(srcdir) - DVIS = iksemel.dvi - PDFS = iksemel.pdf -@@ -207,7 +207,7 @@ - distclean-libtool: - -rm -f libtool - --$(srcdir)/iksemel: iksemel.texi -+$(srcdir)/iksemel.info: iksemel.texi - restore=: && backupdir="$(am__leading_dot)am$$$$" && \ - am__cwd=`pwd` && cd $(srcdir) && \ - rm -rf $$backupdir && mkdir $$backupdir && \ >Release-Note: >Audit-Trail: >Unformatted: