devel/libhtp: Update to 0.5.15, correctly link to libiconv

- Update to 0.5.15
- Wrangle autoconf/make on linking libiconv with a workaround [1]
- pkg-descr: Remove Author:

[1] https://github.com/ironbee/libhtp/issues/76

devel/libhtp/Makefile

@@ -1,17 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	libhtp
-PORTVERSION=	0.5.12
+PORTVERSION=	0.5.15
 CATEGORIES=	devel
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Security-aware parser for the HTTP protocol
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ironbee
-GH_COMMIT=	a85cb55
+GH_COMMIT=	440da09
 
 USES=		libtool pkgconfig pathfix iconv
 USE_AUTOTOOLS=	libtoolize automake aclocal autoheader
@@ -19,12 +20,15 @@ USE_LDCONFIG=	yes
 
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
+MAKE_ARGS=	LIBS="-lz ${ICONV_LIB}"
 
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 INSTALL_TARGET=		install-strip
 CONFLICTS_INSTALL=	libhtp-suricata-*
 
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} check
 

devel/libhtp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libhtp-0.5.12.tar.gz) = 9f4572194f3ecb5062b02681266094f28051beeae0a51a211b075f308f4145d1
-SIZE (libhtp-0.5.12.tar.gz) = 5765976
+SHA256 (libhtp-0.5.15.tar.gz) = 7748ad03f296b63bb2118f16f0129e1c9b766c2ce5b850dd9f11f799a008b719
+SIZE (libhtp-0.5.15.tar.gz) = 5766467

devel/libhtp/pkg-descr

@@ -19,5 +19,4 @@ follows:
     user in control, allowing him to choose the most desired library
     characteristic.
 
-Author: Ivan Ristic <ivanr@webkreator.com>
 WWW: https://github.com/ironbee/libhtp

devel/libhtp/pkg-plist

@@ -14,8 +14,8 @@ include/htp/htp.h
 include/htp/htp_base64.h
 include/htp/htp_multipart.h
 include/htp/htp_urlencoded.h
-lib/libhtp-0.5.12.so.1
-lib/libhtp-0.5.12.so.1.0.0
+lib/libhtp-%%PORTVERSION%%.so.1
+lib/libhtp-%%PORTVERSION%%.so.1.0.0
 lib/libhtp.a
 lib/libhtp.so
 libdata/pkgconfig/htp.pc