svn commit: r377991 - in head: devel/libhtp security/suricata

[Kubilay Kocak]

On 27/01/2015 9:47 PM, Kubilay Kocak wrote:
> Author: koobs
> Date: Tue Jan 27 10:47:48 2015
> New Revision: 377991
> URL: https://svnweb.freebsd.org/changeset/ports/377991
> QAT: https://qat.redports.org/buildarchive/r377991/
> 
> Log:
>   devel/libhtp, security/suricata: Use iconv:translit
>   
>   Use translit for USES=iconv, fixing a build error on specific (10-STABLE r???)
>   versions of FreeBSD that dont contain a libiconv implementation with certain
>   features [1] in base.
>   
>   PR:		196720 [1]
>   Reported by:	<trond.endrestol ximalas info>
> 
> Modified:
>   head/devel/libhtp/Makefile
>   head/security/suricata/Makefile
> 
> Modified: head/devel/libhtp/Makefile
> ==============================================================================
> --- head/devel/libhtp/Makefile	Tue Jan 27 10:01:02 2015	(r377990)
> +++ head/devel/libhtp/Makefile	Tue Jan 27 10:47:48 2015	(r377991)
> @@ -14,7 +14,7 @@ USE_GITHUB=	yes
>  GH_ACCOUNT=	OISF
>  GH_COMMIT=	4cb1b99
>  
> -USES=		autoreconf libtool pkgconfig pathfix iconv
> +USES=		autoreconf iconv:translit libtool pathfix pkgconfig
>  USE_LDCONFIG=	yes
>  
>  GNU_CONFIGURE=	yes
> 
> Modified: head/security/suricata/Makefile
> ==============================================================================
> --- head/security/suricata/Makefile	Tue Jan 27 10:01:02 2015	(r377990)
> +++ head/security/suricata/Makefile	Tue Jan 27 10:47:48 2015	(r377991)
> @@ -17,7 +17,7 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/deve
>  		libnet.so:${PORTSDIR}/net/libnet \
>  		libyaml.so:${PORTSDIR}/textproc/libyaml
>  
> -USES=		autoreconf gmake pkgconfig libtool pathfix
> +USES=		autoreconf gmake libtool pathfix pkgconfig
>  USE_LDCONFIG=	yes
>  USE_RC_SUBR=	${PORTNAME}
>  GNU_CONFIGURE=	yes
> @@ -52,7 +52,7 @@ HTP_PORT_LIB_DEPENDS=		libhtp.so:${PORTS
>  HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
>  HTP_PORT_CONFIGURE_OFF=		--enable-bundled-htp
>  HTP_PORT_CONFLICTS_INSTALL_OFF=	libhtp-[0-9]* libhtp-suricata
> -HTP_PORT_USES_OFF=		iconv
> +HTP_PORT_USES_OFF=		iconv:translit
>  
>  IPFW_CONFIGURE_ON=		--enable-ipfw
>  
> 

While I'm here:

- Sort USES (cc danfe@)

./koobs