gnurl: Sort Makefile lines, apply partial fixes from review.

[ng0 <ng0%n0.is@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Mon Jan 21 13:43:55 2019 +0000
Changeset:	4fa2544f89450dd6abca40d087c6b44162abe9b4

Modified Files:
	gnurl/Makefile

Log Message:
gnurl: Sort Makefile lines, apply partial fixes from review.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4fa2544f89450dd6abca40d087c6b44162abe9b4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnurl/Makefile | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diffs:
diff --git a/gnurl/Makefile b/gnurl/Makefile
index 787b3ef170..51d92d2ec3 100644
--- a/gnurl/Makefile
+++ b/gnurl/Makefile
@@ -2,13 +2,13 @@
 
 DISTNAME=	gnurl-7.63.0
 CATEGORIES=	www
-MASTER_SITES=   ${MASTER_SITE_GNU:=gnunet/}
+MASTER_SITES=	${MASTER_SITE_GNU:=gnunet/}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ng0%n0.is@localhost
 HOMEPAGE=	https://gnunet.org/gnurl
 COMMENT=	Client that groks URLs (curl fork)
-# not completely, but near enough
+# not completely, the curl license is inspired by mit
 LICENSE=	mit
 
 # list it into IPv6-ready packages
@@ -16,35 +16,25 @@ BUILD_DEFS+=	IPV6_READY
 
 USE_TOOLS+=		nroff perl pkg-config
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+GNU_CONFIGURE=		yes # make install depends on it
 PKGCONFIG_OVERRIDE=	libgnurl.pc.in
-
 INSTALLATION_DIRS=	share/doc/gnurl
 
 .include "../../mk/bsd.prefs.mk"
 
 TEST_TARGET=		check
 
-# This fork of curl implies a hardcoded set of configurations,
-# therefore keep the the following configure arguments intact!
-
-CONFIGURE_ARGS+= --disable-ntml-wb
-
-# This might be configurable.
-CONFIGURE_ARGS+= --enable-ipv6
-
-# We want GnuTLS with Dane.
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../security/gnutls/libgnutls-config.mk"
-CONFIGURE_ARGS+= --with-gnutls
-
-.include "../../devel/libidn2/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libidn2
-
-CONFIGURE_ARGS+= --without-gssapi
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--disable-ntml-wb
+CONFIGURE_ARGS+=	--enable-ipv6
+# We need this for gnurl to know the certificate location out of the box
+CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
+# CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
+# Optionally, We want GnuTLS with Dane.
+CONFIGURE_ARGS+=	--with-gnutls
+CONFIGURE_ARGS+=	--with-libidn2
+# Do not pick up GSS, should be fixed in upstream.
+CONFIGURE_ARGS+=	--without-gssapi
 
 .include "options.mk"
 
@@ -53,6 +43,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DESTDIR}${PREFIX}/share/doc/gnurl/
 .endfor
 
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../security/gnutls/libgnutls-config.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"