From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 23 21:40:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A82FA924 for ; Sun, 23 Mar 2014 21:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 816ED969 for ; Sun, 23 Mar 2014 21:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NLe0R8035680 for ; Sun, 23 Mar 2014 21:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2NLe0c7035679; Sun, 23 Mar 2014 21:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 23 Mar 2014 21:40:00 GMT Resent-Message-Id: <201403232140.s2NLe0c7035679@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, Tijl Coosemans Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4841D658 for ; Sun, 23 Mar 2014 21:30:20 +0000 (UTC) Received: from mailrelay009.isp.belgacom.be (mailrelay009.isp.belgacom.be [195.238.6.176]) by mx1.freebsd.org (Postfix) with ESMTP id D9AA2919 for ; Sun, 23 Mar 2014 21:30:19 +0000 (UTC) Received: from 104.105-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.105.104]) by relay.skynet.be with ESMTP; 23 Mar 2014 22:30:12 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s2NLUAic044594 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sun, 23 Mar 2014 22:30:11 +0100 (CET) (envelope-from tijl@kalimero.tijl.coosemans.org) Received: (from tijl@localhost) by kalimero.tijl.coosemans.org (8.14.8/8.14.8/Submit) id s2NLUA6B044593; Sun, 23 Mar 2014 22:30:10 +0100 (CET) (envelope-from tijl) Message-Id: <201403232130.s2NLUA6B044593@kalimero.tijl.coosemans.org> Date: Sun, 23 Mar 2014 22:30:10 +0100 (CET) From: Tijl Coosemans To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/187860: [patch] ftp/proftpd: prefer libc iconv X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Tijl Coosemans List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 21:40:00 -0000 >Number: 187860 >Category: ports >Synopsis: [patch] ftp/proftpd: prefer libc iconv >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 23 21:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 11.0-CURRENT i386 >Organization: >Environment: >Description: - Add DOCS option. - When the NLS option is enabled the configure script looks for iconv_open() and libiconv_open() functions in libiconv before trying libc. This means that on FreeBSD 10 proftpd depends on converters/libiconv when it is installed but it should use iconv from libc instead. To fix this add ac_cv_lib_iconv_iconv_open=no and ac_cv_lib_iconv_libiconv_open=no to CONFIGURE_ARGS to bypass those configure tests when ICONV_LIB is empty. - Remove references to -lintl. The configure script detects it correctly. Redports: https://redports.org/buildarchive/20140323211200-59723/ >How-To-Repeat: >Fix: --- proftpd.patch begins here --- Index: ftp/proftpd/Makefile =================================================================== --- ftp/proftpd/Makefile (revision 348785) +++ ftp/proftpd/Makefile (working copy) @@ -5,7 +5,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ @@ -85,7 +85,7 @@ PLIST_FILES+= libexec/proftpd/${m}.a \ .endfor PLIST_DIRSTRY+= libexec/proftpd .else -OPTIONS_DEFINE= HTMLDOCS IPV6 NLS MEMCACHE PCRE +OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE OPTIONS_DEFAULT= IPV6 NLS PCRE HTMLDOCS_DESC= Include HTML documentation @@ -158,8 +158,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --enable-nls -USES+= gettext -PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib +USES+= gettext iconv PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " @@ -198,12 +197,16 @@ CONFIGURE_ARGS+= --with-shared=${_MODULE CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} +.include + .if !defined(_BUILDING_PROFTPD_MODULE) -post-patch: -.if ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g' ${WRKSRC}/Makefile.in +.if empty(ICONV_LIB) +CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=no \ + ac_cv_lib_iconv_libiconv_open=no .endif + +post-patch: @${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in pre-configure: @@ -247,4 +250,4 @@ post-install: @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ .endif #!defined(_BUILDING_PROFTPD_MODULE) -.include +.include --- proftpd.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: