[Midnightbsd-cvs] mports [17651] trunk/ftp/wget/Makefile: modernize wget port

[laffer1 at midnightbsd.org]

Revision: 17651
          http://svnweb.midnightbsd.org/mports/?rev=17651
Author:   laffer1
Date:     2014-09-28 19:11:54 -0400 (Sun, 28 Sep 2014)
Log Message:
-----------
modernize wget port

Modified Paths:
--------------
    trunk/ftp/wget/Makefile

Modified: trunk/ftp/wget/Makefile
===================================================================
--- trunk/ftp/wget/Makefile	2014-09-28 23:08:34 UTC (rev 17650)
+++ trunk/ftp/wget/Makefile	2014-09-28 23:11:54 UTC (rev 17651)
@@ -2,19 +2,20 @@
 
 PORTNAME=	wget
 DISTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Retrieve files from the Net via HTTP(s) and FTP
+COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
 LICENSE=	gpl3
 
-USES=		charsetfix gmake tar:xz
-USE_PERL5_BUILD=yes
+USES=		charsetfix gmake makeinfo perl5 tar:xz
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
+OPTIONS_SUB=	yes
 
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=GNUTLS OPENSSL
@@ -23,6 +24,23 @@
 
 PCRE_DESC=	Support Perl regular expressions in addition to POSIX
 
+IPV6_CONFIGURE_ENABLE=	ipv6
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CPPFLAGS=		-I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
+
+IDN_USES=		iconv
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_CONFIGURE_ENABLE=	iri
+IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
+
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CPPFLAGS=		-I${LOCALBASE}/include
+PCRE_LDFLAGS=		-L${LOCALBASE}/lib
+PCRE_CONFIGURE_ENV_OFF=	ac_cv_header_pcre_h=no
+
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -31,7 +49,7 @@
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -39,40 +57,6 @@
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--enable-ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=--enable-iri --with-libidn=${LOCALBASE}
-USES+=		iconv
-.else
-CONFIGURE_ARGS+=--disable-iri
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-# Wget will pick pcre automatically and link with it if it is present.
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
-.endif
-
 INFO=		wget
 
 # eliminate gmakism