Date: Fri, 23 Oct 2009 20:36:01 GMT From: Marc Lagrange <markocpc@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/139871: Add patch to fix GnuTLS detection for textproc/iksemel Message-ID: <200910232036.n9NKa1wp022588@www.freebsd.org> Resent-Message-ID: <200910232040.n9NKe48w067605@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+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 <bsd.port.post.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910232036.n9NKa1wp022588>