gnunet: pkglint fixes

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnunet: pkglint fixes
From: nikita <nikita%NetBSD.org@localhost>
Date: Tue, 22 Mar 2022 19:54:58 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Mar 22 20:54:58 2022 +0100
Changeset:	43509e5d3954f874ad3ec7a4c1cc852f649b82ba

Modified Files:
	gnunet/Makefile
	gnunet/PLIST.conversations
	gnunet/PLIST.mysql
	gnunet/buildlink3.mk
	gnunet/options.mk

Log Message:
gnunet: pkglint fixes

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

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

diffstat:
 gnunet/Makefile            |  4 +---
 gnunet/PLIST.conversations |  1 +
 gnunet/PLIST.mysql         |  1 +
 gnunet/buildlink3.mk       | 32 ++++++++++++++++----------------
 gnunet/options.mk          | 42 +++++++++++++++++++++---------------------
 5 files changed, 40 insertions(+), 40 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index c4ecc03b73..2aa7aee6c2 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -51,7 +51,6 @@ OWN_DIRS_PERMS+=	${PKG_HOME.gnunet} ${GNUNET_USER} ${GNUNET_GROUP} 0700
 OWN_DIRS_PERMS+=	${GNUNET_LOG_DIR} ${GNUNET_USER} ${GNUNET_GROUP} 0755
 OWN_DIRS_PERMS+=	${GNUNET_DIR}/data ${GNUNET_USER} ${GNUNET_GROUP} 0700
 
-MAKE_DIRS+=		${PKG_SYSCONFDIR}
 MAKE_DIRS+=		${GNUNET_DIR}
 MAKE_DIRS+=		${GNUNET_LOG_DIR}
 MAKE_DIRS+=		${GNUNET_DIR}/data
@@ -63,11 +62,10 @@ post-extract:
 	${CP} ${FILESDIR}/gnunet.conf ${WRKSRC}/gnunet.conf
 	${CP} ${FILESDIR}/gnunet_user.conf ${WRKSRC}/gnunet_user.conf
 
-# TODO: This should be an .in file, but how.
 SUBST_CLASSES+=			sysconfdir
 SUBST_STAGE.sysconfdir=		pre-configure
 SUBST_MESSAGE.sysconfdir=	Fixing paths in gnunet.conf
-SUBST_FILES.sysconfdir=		${WRKSRC}/gnunet.conf
+SUBST_FILES.sysconfdir=		gnunet.conf
 SUBST_SED.sysconfdir+=		-e 's,^DEFAULTCONFIG.*,DEFAULTCONFIG = ${PKG_SYSCONFDIR}/gnunet.conf,g'
 SUBST_SED.sysconfdir+=		-e 's,^GNUNET_DATA_HOME.*,GNUNET_DATA_HOME = ${GNUNET_DIR}/data,g'
 SUBST_SED.sysconfdir+=		-e 's,^GNUNET_RUNTIME_DIR.*,GNUNET_RUNTIME_DIR = ${GNUNET_DIR},g'
diff --git a/gnunet/PLIST.conversations b/gnunet/PLIST.conversations
index ca22416b61..03f85b9025 100644
--- a/gnunet/PLIST.conversations
+++ b/gnunet/PLIST.conversations
@@ -1,3 +1,4 @@
+@comment $NetBSD$
 bin/gnunet-conversation
 bin/gnunet-conversation-test
 lib/gnunet/libexec/gnunet-helper-audio-playback
diff --git a/gnunet/PLIST.mysql b/gnunet/PLIST.mysql
index e69de29bb2..48d96a5493 100644
--- a/gnunet/PLIST.mysql
+++ b/gnunet/PLIST.mysql
@@ -0,0 +1 @@
+@comment $NetBSD$
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index c6a3beaa59..2e59c2c119 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -11,48 +11,48 @@ BUILDLINK_PKGSRCDIR.gnunet?=	../../wip/gnunet
 pkgbase:= gnunet
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mtests)
+.if ${PKG_BUILD_OPTIONS.gnunet:Mtests}
 .include "../../lang/python/tool.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Midn)
+.if ${PKG_BUILD_OPTIONS.gnunet:Midn}
 .include "../../devel/libidn2/buildlink3.mk"
 .else
 .include "../../devel/libidn/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Msqlite3)
+.if ${PKG_BUILD_OPTIONS.gnunet:Msqlite3}
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mmysql)
+.if ${PKG_BUILD_OPTIONS.gnunet:Mmysql}
 .include "../../mk/mysql.buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mpgsql)
+.if ${PKG_BUILD_OPTIONS.gnunet:Mpgsql}
 .include "../../mk/pgsql.buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Maudio)
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mopus)
+.if ${PKG_BUILD_OPTIONS.gnunet:Maudio}
+.  if ${PKG_BUILD_OPTIONS.gnunet:Mopus}
 .include "../../audio/libopus/buildlink3.mk"
-.endif
+.  endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mogg)
+.  if ${PKG_BUILD_OPTIONS.gnunet:Mogg}
 .include "../../multimedia/libogg/buildlink3.mk"
-.endif
+.  endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mgstreamer)
+.  if ${PKG_BUILD_OPTIONS.gnunet:Mgstreamer}
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.endif
+.  endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mpulseaudio)
+.  if ${PKG_BUILD_OPTIONS.gnunet:Mpulseaudio}
 .include "../../audio/pulseaudio/buildlink3.mk"
-.endif
+.  endif
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mzbar)
+.if ${PKG_BUILD_OPTIONS.gnunet:Mzbar}
 .include "../../graphics/zbar/buildlink3.mk"
 .endif
 
@@ -72,7 +72,7 @@ pkgbase:= gnunet
 .include "../../www/libmicrohttpd/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-.if ${OPSYS} == "Linux" && !empty(PKG_BUILD_OPTIONS.gnunet:Mbluez)
+.if ${OPSYS} == "Linux" && ${PKG_BUILD_OPTIONS.gnunet:Mbluez}
 .include "../../wip/bluez-libs/buildlink3.mk"
 .endif
 
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 7d16c96532..e965167a68 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -33,7 +33,7 @@ PLIST_SRC=			PLIST
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mtests)
+.if ${PKG_OPTIONS:Mtests}
 .include "../../lang/python/tool.mk"
 PYTHON_FOR_BUILD_ONLY=	yes
 CONFIGURE_ARGS+=	--enable-testruns
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-testruns
 CONFIGURE_ARGS+=	--disable-testruns
 .endif
 
-.if !empty(PKG_OPTIONS:Mdoc)
+.if ${PKG_OPTIONS:Mdoc}
 USE_TOOLS+=		makeinfo
 INFO_FILES=		yes
 CONFIGURE_ARGS+=	--enable-documentation
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-documentation
 .endif
 
 # Build the texi2mdoc output.
-.if !empty(PKG_OPTIONS:Mmdoc)
+.if ${PKG_OPTIONS:Mmdoc}
 BUILD_DEPENDS+=		texi2mdoc-[0-9]*:../../textproc/texi2mdoc
 CONFIGURE_ARGS+=	--enable-texi2mdoc-generation
 PLIST_SRC+=		PLIST.mdoc
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
 
 # idn is mandatory but idn or idn2 can be used with a preference for
 # idn2.
-.if !empty(PKG_OPTIONS:Midn)
+.if ${PKG_OPTIONS:Midn}
 .include "../../devel/libidn2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn2}
 .else
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 # you can have mysql, pgsql, and the default all built in.
 # ideally we would check for at least sqlite3 existing, but
 # the build won't build when you have none of them.
-.if !empty(PKG_OPTIONS:Msqlite3)
+.if ${PKG_OPTIONS:Msqlite3}
 .include "../../databases/sqlite3/buildlink3.mk"
 PLIST_SRC+=		PLIST.sqlite3
 .else
@@ -83,24 +83,24 @@ CONFIGURE_ARGS+=	--without-sqlite3
 # \todo:
 # checking for mysql version... < 4.1
 # mysql version >= 4.1 required. Will not use MySQL
-.if !empty(PKG_OPTIONS:Mmysql)
+.if ${PKG_OPTIONS:Mmysql}
 .include "../../mk/mysql.buildlink3.mk"
 PLIST_SRC+=		PLIST.mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if !empty(PKG_OPTIONS:Mpgsql)
+.if ${PKG_OPTIONS:Mpgsql}
 .include "../../mk/pgsql.buildlink3.mk"
 PLIST_SRC+=		PLIST.pgsql
 .else
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if !empty(PKG_OPTIONS:Mexperimental)
+.if ${PKG_OPTIONS:Mexperimental}
 CONFIGURE_ARGS+=	--enable-experimental
 PLIST_SRC+=		PLIST.experimental
-.  if !empty(PKG_OPTIONS:Mverbose-logging)
+.  if ${PKG_OPTIONS:Mverbose-logging}
 CONFIGURE_ARGS+=	--enable-logging=verbose
 .  endif
 .else
@@ -111,30 +111,30 @@ CONFIGURE_ARGS+=	--disable-experimental
 # exists, pulseaudio is not necessary. gnunet-gtk
 # conditionally builds a binary if the conversation
 # submodule is build by gnunet.
-.if !empty(PKG_OPTIONS:Maudio)
-.if !empty(PKG_OPTIONS:Mopus)
+.if ${PKG_OPTIONS:Maudio}
+.  if ${PKG_OPTIONS:Mopus}
 .include "../../audio/libopus/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mogg)
+.  if ${PKG_OPTIONS:Mogg}
 .include "../../multimedia/libogg/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mgstreamer)
+.  if ${PKG_OPTIONS:Mgstreamer}
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mpulseaudio)
+.  if ${PKG_OPTIONS:Mpulseaudio}
 .include "../../audio/pulseaudio/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
-.endif
+.  endif
 .endif
 
-.if !empty(PKG_OPTIONS:Mzbar)
+.if ${PKG_OPTIONS:Mzbar}
 .include "../../graphics/zbar/buildlink3.mk"
 PLIST.zbar=		yes
 .else
@@ -151,7 +151,7 @@ CONFIGURE_ARGS+=	--without-zbar
 # PKG_FAIL_REASON+=	"Requires the unbound option enabled in gnutls"
 # .endif
 
-.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mbluez)
+.if ${OPSYS} == "Linux" && ${PKG_OPTIONS:Mbluez}
 # Do we need more for bluez?
 .include "../../wip/bluez-libs/buildlink3.mk"
 PLIST.bluez=		yes
@@ -164,7 +164,7 @@ CONFIGURE_ARGS+=	--without-libbluetooth
 # create the appropriate PLIST files with content.
 
 # Fix the perl path
-.if !empty(PKG_OPTIONS:Mperl)
+.if ${PKG_OPTIONS:Mperl}
 USE_TOOLS+=		perl:run
 PLIST_SRC+=		PLIST.perl
 CONFIGURE_ARGS+=	--with-gnunet-logread
Prev by Date: gnunet: Linux: do not make bluez suggested. update package in wip.
Next by Date: gnurl: pkglint fixes
Previous by Thread: gnunet: Linux: do not make bluez suggested. update package in wip.
Next by Thread: gnurl: pkglint fixes
Indexes:
Home | Main Index | Thread Index | Old Index