gnunet: general changes.

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

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Sat Feb 16 14:47:07 2019 +0000
Changeset:	956ccfc13cf590f53c60266f8b625509c20ebb76

Modified Files:
	gnunet/Makefile
	gnunet/options.mk

Log Message:
gnunet: general changes.

pksrc changes:
* apply lint for Makefile.
* fix up options.mk

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

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

diffstat:
 gnunet/Makefile   |  4 +---
 gnunet/options.mk | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index cb38c91576..20f2ddeefa 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -6,11 +6,11 @@
 DISTNAME=	gnunet-0.11.0pre66
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=gnunet/}
-LICENSE=	gnu-agpl-v3
 
 MAINTAINER=	ng0%n0.is@localhost
 HOMEPAGE=	https://gnunet.org/
 COMMENT=	Framework for secure P2P networking
+LICENSE=	gnu-agpl-v3
 
 MAKE_JOBS_SAFE=		no
 
@@ -29,7 +29,6 @@ LDFLAGS+=		-lpthread -lintl
 CONFIGURE_ARGS+=	--with-extractor=${BUILDLINK_PREFIX.libextractor}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 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 \
@@ -54,7 +53,6 @@ post-build:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/libextractor/buildlink3.mk"
 .include "../../devel/libgsf/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 ca342dd4d6..04c96c8214 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -1,18 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:34 thomasklausner Exp $
+# $NetBSD$
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
-PKG_OPTIONS_REQUIRED_GROUPS=	security
-PKG_OPTIONS_GROUP.security=	libgcrypt ssl
-PKG_SUPPORTED_OPTIONS=		bdb gdbm inet6 tdb
-PKG_SUGGESTED_OPTIONS=		inet6
+PKG_SUPPORTED_OPTIONS=		bdb gdbm inet6 tdb doc mdoc ssl libgcrypt idn
+PKG_SUGGESTED_OPTIONS=		inet6 doc ssl libgcrypt
 
-# some sane defaults to use base OS functionality where appropriate
-.if !empty(OPSYS:M*BSD)
-PKG_SUGGESTED_OPTIONS=	ssl
-.else
-PKG_SUGGESTED_OPTIONS=	libgcrypt
-.endif
+# openssl is currently required by:
+# src/transport/gnunet-transport-certificate-creation
+# src/gns/gnunet-gns-proxy-setup-ca
 
 .include "../../mk/bsd.options.mk"
 
@@ -61,5 +56,26 @@ 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
+.endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+CONFIGURE_ARGS+=	--enable-documentation
+.else
+CONFIGURE_ARGS+=	--disable-documentation
+.endif
+
+# build the mdoc output.
+.if !empty(PKG_OPTIONS:Mmdoc)
+BUILD_DEPENDS+=		texi2mdoc-[0-9]*:../../textproc/texi2mdoc
+CONFIGURE_ARGS+=	--enable-texi2mdoc-generation
+.else
+CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
+.endif
+
+.if !empty(PKG_OPTIONS:Midn)
+.include "../../devel/libidn2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libidn2=${BUILDLINK_PREFIX.libidn2}
+.else
+.include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 .endif