gnunet: Adjust comment in Makefile. Adjust options.mk to make it build

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

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Mon Feb 11 19:51:26 2019 +0000
Changeset:	a1ae73cdeb0419e1ae21cdeb5c70f2b551468f97

Modified Files:
	gnunet/Makefile
	gnunet/options.mk

Log Message:
gnunet: Adjust comment in Makefile. Adjust options.mk to make it build

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

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

diffstat:
 gnunet/Makefile   | 9 +++++----
 gnunet/options.mk | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 7d11aa1b6a..cb38c91576 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -2,7 +2,7 @@
 #
 
 # This is a pre-release, with 0.11 release coming soon. pre66 being best for
-# testing the package.
+# testing the package. This prerelease will fail to build.
 DISTNAME=	gnunet-0.11.0pre66
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=gnunet/}
@@ -14,7 +14,7 @@ COMMENT=	Framework for secure P2P networking
 
 MAKE_JOBS_SAFE=		no
 
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake msgfmt
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 PLIST_SRC=		${WRKDIR}/PLIST.src
@@ -28,7 +28,8 @@ LDFLAGS+=		-lpthread -lintl
 
 CONFIGURE_ARGS+=	--with-extractor=${BUILDLINK_PREFIX.libextractor}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
+CONFIGURE_ARGS+=	--with-nss=${BUILDLINK_PREFIX.nss}/lib
+CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 
 post-patch:
 	cd ${WRKSRC} && for f in contrib/gnunet.* src/include/gnunet_util.h doc/man/*.?; do \
@@ -53,7 +54,7 @@ post-build:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/libextractor/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libidn2/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python27/buildlink3.mk"
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 5643dea387..ca342dd4d6 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -61,5 +61,5 @@ CONFIGURE_ARGS+=	--without-crypto
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-crypto=${BUILDLINK_PREFIX.libgcrypt}
-CONFIGURE_ENV+=		LIBGCRYPT_CONFIG=/nonexistent
+# CONFIGURE_ENV+=		LIBGCRYPT_CONFIG=/nonexistent
 .endif