Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_167542923715090"
MIME-Version: 1.0
Date: Fri, 3 Feb 2023 13:00:37 +0000
From: "Nikita" <nikita@netbsd.org>
Subject: CVS commit: pkgsrc/net/gnunet
To: pkgsrc-changes@NetBSD.org
Reply-To: nikita@netbsd.org
Message-Id: <20230203130037.B38AAFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_167542923715090
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nikita
Date:		Fri Feb  3 13:00:37 UTC 2023

Modified Files:
	pkgsrc/net/gnunet: Makefile options.mk
Removed Files:
	pkgsrc/net/gnunet: PLIST.perl

Log Message:
gnunet: fix build, move perl plist files


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/gnunet/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/gnunet/PLIST.perl
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/gnunet/options.mk

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


--_----------=_167542923715090
Content-Disposition: inline
Content-Length: 2345
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/gnunet/Makefile
diff -u pkgsrc/net/gnunet/Makefile:1.4 pkgsrc/net/gnunet/Makefile:1.5
--- pkgsrc/net/gnunet/Makefile:1.4	Fri Feb  3 00:07:09 2023
+++ pkgsrc/net/gnunet/Makefile	Fri Feb  3 13:00:37 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2023/02/03 00:07:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/02/03 13:00:37 nikita Exp $
 
 DISTNAME=		gnunet-0.19.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=gnunet/}
 

Index: pkgsrc/net/gnunet/options.mk
diff -u pkgsrc/net/gnunet/options.mk:1.2 pkgsrc/net/gnunet/options.mk:1.3
--- pkgsrc/net/gnunet/options.mk:1.2	Wed Feb  1 19:03:03 2023
+++ pkgsrc/net/gnunet/options.mk	Fri Feb  3 13:00:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/02/01 19:03:03 nikita Exp $
+# $NetBSD: options.mk,v 1.3 2023/02/03 13:00:37 nikita Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 
@@ -6,9 +6,10 @@ PKG_SUPPORTED_OPTIONS+=		doc idn mysql p
 PKG_SUPPORTED_OPTIONS+=		experimental pulseaudio
 PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 audio
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
+PKG_SUPPORTED_OPTIONS+=		latex-generate
 
 PKG_SUGGESTED_OPTIONS+=		audio gstreamer opus ogg
-PKG_SUGGESTED_OPTIONS+=		idn doc sqlite3
+PKG_SUGGESTED_OPTIONS+=		idn doc sqlite3 latex-generate
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -52,6 +53,16 @@ INFO_FILES=yes
 CONFIGURE_ARGS+=	--disable-documentation
 .endif
 
+# gnunet-bcd
+PLIST_VARS+=	latex
+.if ${PKG_OPTIONS:Mlatex-generate}
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+DEPENDS+=	tex-pgf-[0-9]*:../../print/tex-pgf
+DEPENDS+=	tex-qrcode-[0-9]*:../../graphics/tex-qrcode
+DEPENDS+=	tex-labels-[0-9]*:../../print/tex-labels
+PLIST.latex=	yes
+.endif
+
 # idn is mandatory but idn or idn2 can be used with a preference for
 # idn2.
 .if ${PKG_OPTIONS:Midn}
@@ -167,10 +178,11 @@ CONFIGURE_ARGS+=	--without-pulse
 # and on both of them.  I have neither of them. If you do, please
 # create the appropriate PLIST files with content.
 
+PLIST_VARS+=		perl
 # Fix the perl path
 .if ${PKG_OPTIONS:Mperl}
+PLIST.perl=		yes
 USE_TOOLS+=		perl:run
-PLIST_SRC+=		PLIST.perl
 CONFIGURE_ARGS+=	--with-gnunet-logread
 REPLACE_INTERPRETER+=	envperl
 REPLACE.envperl.old=	.*@PERLEXE@


--_----------=_167542923715090--