Received: by mail.netbsd.org (Postfix, from userid 605) id B60A584D65; Sun, 3 Nov 2019 19:26:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3E39E84D61 for ; Sun, 3 Nov 2019 19:26:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id z2-bSc9fARsN for ; Sun, 3 Nov 2019 19:26:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BB07484C6C for ; Sun, 3 Nov 2019 19:26:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AF38FFA93; Sun, 3 Nov 2019 19:26:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572809182276760" MIME-Version: 1.0 Date: Sun, 3 Nov 2019 19:26:22 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/filesystems To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20191103192622.AF38FFA93@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572809182276760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sun Nov 3 19:26:22 UTC 2019 Modified Files: pkgsrc/filesystems/cloudfuse: Makefile pkgsrc/filesystems/fuse: builtin.mk pkgsrc/filesystems/fuse-ext2: Makefile pkgsrc/filesystems/fuse-gmailfs: Makefile pkgsrc/filesystems/fuse-pcachefs: Makefile pkgsrc/filesystems/fuse-wdfs: Makefile pkgsrc/filesystems/fuse-wikipediafs: Makefile pkgsrc/filesystems/glusterfs: Makefile pkgsrc/filesystems/openafs: Makefile options.mk pkgsrc/filesystems/openafs-devel: Makefile options.mk pkgsrc/filesystems/ori: Makefile pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny: Makefile pkgsrc/filesystems/perfuse: Makefile builtin.mk pkgsrc/filesystems/squashfs: Makefile options.mk pkgsrc/filesystems/tahoe-lafs: Makefile Log Message: filesystems: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/filesystems/cloudfuse/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/fuse/builtin.mk cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse-ext2/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/filesystems/fuse-gmailfs/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/filesystems/fuse-pcachefs/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/filesystems/fuse-wdfs/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/filesystems/fuse-wikipediafs/Makefile cvs rdiff -u -r1.91 -r1.92 pkgsrc/filesystems/glusterfs/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/filesystems/openafs/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/openafs/options.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/openafs-devel/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/openafs-devel/options.mk cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/ori/Makefile cvs rdiff -u -r1.12 -r1.13 \ pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/filesystems/perfuse/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/perfuse/builtin.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/squashfs/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/squashfs/options.mk cvs rdiff -u -r1.39 -r1.40 pkgsrc/filesystems/tahoe-lafs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572809182276760 Content-Disposition: inline Content-Length: 19308 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/cloudfuse/Makefile diff -u pkgsrc/filesystems/cloudfuse/Makefile:1.20 pkgsrc/filesystems/cloudfuse/Makefile:1.21 --- pkgsrc/filesystems/cloudfuse/Makefile:1.20 Thu Aug 22 12:23:05 2019 +++ pkgsrc/filesystems/cloudfuse/Makefile Sun Nov 3 19:26:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/22 12:23:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:26:20 rillig Exp $ DISTNAME= 1003a82 PKGNAME= cloudfuse-20120124 @@ -14,9 +14,9 @@ EXTRACT_SUFX= EXTRACT_CMD= ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} LICENSE= mit -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config tar -INSTALLATION_DIRS= share/doc +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config tar +INSTALLATION_DIRS= share/doc WRKSRC= ${WRKDIR}/redbo-cloudfuse-${DISTNAME} Index: pkgsrc/filesystems/fuse/builtin.mk diff -u pkgsrc/filesystems/fuse/builtin.mk:1.4 pkgsrc/filesystems/fuse/builtin.mk:1.5 --- pkgsrc/filesystems/fuse/builtin.mk:1.4 Sat Sep 17 05:20:34 2016 +++ pkgsrc/filesystems/fuse/builtin.mk Sun Nov 3 19:26:20 2019 @@ -1,6 +1,6 @@ -# $NetBSD: builtin.mk,v 1.4 2016/09/17 05:20:34 richard Exp $ +# $NetBSD: builtin.mk,v 1.5 2019/11/03 19:26:20 rillig Exp $ -BUILTIN_PKG:= fuse +BUILTIN_PKG:= fuse PKGCONFIG_BASE.fuse= /usr PKGCONFIG_FILE.fuse= /usr/lib/pkgconfig/fuse.pc PKGCONFIG_FILE.fuse+= /usr/lib${LIBABISUFFIX}/pkgconfig/fuse.pc Index: pkgsrc/filesystems/fuse-ext2/Makefile diff -u pkgsrc/filesystems/fuse-ext2/Makefile:1.8 pkgsrc/filesystems/fuse-ext2/Makefile:1.9 --- pkgsrc/filesystems/fuse-ext2/Makefile:1.8 Wed Apr 10 21:37:51 2019 +++ pkgsrc/filesystems/fuse-ext2/Makefile Sun Nov 3 19:26:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/04/10 21:37:51 maya Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 19:26:20 rillig Exp $ DISTNAME= fuse-ext2-0.0.7 PKGREVISION= 2 @@ -12,10 +12,10 @@ LICENSE= gnu-gpl-v2 ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-* -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= autoheader automake autoreconf gmake pkg-config -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= autoheader automake autoreconf gmake pkg-config +USE_LANGUAGES= c c++ INSTALLATION_DIRS= lib/umview/modules pre-configure: Index: pkgsrc/filesystems/fuse-gmailfs/Makefile diff -u pkgsrc/filesystems/fuse-gmailfs/Makefile:1.20 pkgsrc/filesystems/fuse-gmailfs/Makefile:1.21 --- pkgsrc/filesystems/fuse-gmailfs/Makefile:1.20 Mon Sep 2 13:20:21 2019 +++ pkgsrc/filesystems/fuse-gmailfs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:20:21 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:26:21 rillig Exp $ DISTNAME= gmailfs-0.7.2 PKGREVISION= 4 @@ -10,9 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html COMMENT= FUSE filesystem which uses Google mail for free space -NO_BUILD= yes -REPLACE_PYTHON= gmailfs.py mount.gmailfs -PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings +NO_BUILD= yes +REPLACE_PYTHON= gmailfs.py mount.gmailfs +PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \ ${PKG_SYSCONFDIR}/gmailfs.conf @@ -23,7 +23,7 @@ SUBST_FILES.config= gmailfs.py mount.gma SUBST_VARS.config= PKG_SYSCONFDIR SUBST_VARS.config+= PREFIX SUBST_SED.config+= -e "s|@PYSITELIB@|${PREFIX}/${PYSITELIB}|g" -SUBST_MESSAGE.config= Fixing paths. +SUBST_MESSAGE.config= Fixing paths. PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} Index: pkgsrc/filesystems/fuse-pcachefs/Makefile diff -u pkgsrc/filesystems/fuse-pcachefs/Makefile:1.7 pkgsrc/filesystems/fuse-pcachefs/Makefile:1.8 --- pkgsrc/filesystems/fuse-pcachefs/Makefile:1.7 Mon Sep 2 13:20:21 2019 +++ pkgsrc/filesystems/fuse-pcachefs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/09/02 13:20:21 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 19:26:21 rillig Exp $ # DISTNAME= fuse-pcachefs-0.0.20160203 @@ -16,7 +16,7 @@ LICENSE= apache-2.0 BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools EGG_NAME= pCacheFS-0.2 -PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings +PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings .include "../../filesystems/py-fuse-bindings/buildlink3.mk" .include "../../lang/python/distutils.mk" Index: pkgsrc/filesystems/fuse-wdfs/Makefile diff -u pkgsrc/filesystems/fuse-wdfs/Makefile:1.15 pkgsrc/filesystems/fuse-wdfs/Makefile:1.16 --- pkgsrc/filesystems/fuse-wdfs/Makefile:1.15 Sat Mar 5 11:28:29 2016 +++ pkgsrc/filesystems/fuse-wdfs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/03/05 11:28:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 19:26:21 rillig Exp $ # DISTNAME= wdfs-1.4.2 @@ -14,7 +14,7 @@ COMMENT= FUSE-based webdav filesystem GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -PTHREAD_AUTO_VARS= yes +PTHREAD_AUTO_VARS= yes .if exists(/usr/include/stdbool.h) CPPFLAGS+= -DHAVE_STDBOOL_H Index: pkgsrc/filesystems/fuse-wikipediafs/Makefile diff -u pkgsrc/filesystems/fuse-wikipediafs/Makefile:1.23 pkgsrc/filesystems/fuse-wikipediafs/Makefile:1.24 --- pkgsrc/filesystems/fuse-wikipediafs/Makefile:1.23 Mon Sep 2 13:20:22 2019 +++ pkgsrc/filesystems/fuse-wikipediafs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/09/02 13:20:22 adam Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 19:26:21 rillig Exp $ DISTNAME= wikipediafs-0.4 PKGNAME= fuse-${DISTNAME} @@ -11,14 +11,14 @@ HOMEPAGE= http://wikipediafs.sourceforge COMMENT= FUSE filesystem for accessing the wikipedia LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings +PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings EGG_NAME= wikipediafs-0.0.0 SUBST_CLASSES+= config SUBST_STAGE.config= pre-configure SUBST_FILES.config= setup.py SUBST_SED.config+= -e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g" -SUBST_MESSAGE.config= Fixing paths. +SUBST_MESSAGE.config= Fixing paths. .include "../../filesystems/py-fuse-bindings/buildlink3.mk" Index: pkgsrc/filesystems/glusterfs/Makefile diff -u pkgsrc/filesystems/glusterfs/Makefile:1.91 pkgsrc/filesystems/glusterfs/Makefile:1.92 --- pkgsrc/filesystems/glusterfs/Makefile:1.91 Mon Sep 2 13:20:21 2019 +++ pkgsrc/filesystems/glusterfs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2019/09/02 13:20:21 adam Exp $ +# $NetBSD: Makefile,v 1.92 2019/11/03 19:26:21 rillig Exp $ DISTNAME= glusterfs-3.12.8 PKGREVISION= 4 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA # Only libfl.a is available, and libtool wants libfl.so MAKE_FLAGS+= LEXLIB="" -PYTHON_VERSIONS_ACCEPTED= 27 # only 2.x supported as of 3.8.x +PYTHON_VERSIONS_ACCEPTED= 27 # only 2.x supported as of 3.8.x REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py REPLACE_PYTHON+= events/src/glustereventsd.py @@ -81,9 +81,9 @@ SUBST_SED.mtab= -e "s,/etc/mtab,/proc/m SUBST_CLASSES+= etc SUBST_STAGE.etc= pre-build -SUBST_FILES.etc+= libglusterfs/src/logging.c -SUBST_FILES.etc+= extras/ocf/volume -SUBST_FILES.etc+= doc/glusterfsd.8 +SUBST_FILES.etc+= libglusterfs/src/logging.c +SUBST_FILES.etc+= extras/ocf/volume +SUBST_FILES.etc+= doc/glusterfsd.8 SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g" SUBST_CLASSES+= vol @@ -119,9 +119,9 @@ CFLAGS+= -g INSTALL_UNSTRIPPED= yes CONFIGURE_ARGS+= --enable-debug #.include "../../devel/boehm-gc/buildlink3.mk" -#CFLAGS+=-DGC_DEBUG -#CFLAGS+=-include gc.h -#LIBS+=-lgc +#CFLAGS+= -DGC_DEBUG +#CFLAGS+= -include gc.h +#LIBS+= -lgc .include "../../mk/bsd.prefs.mk" Index: pkgsrc/filesystems/openafs/Makefile diff -u pkgsrc/filesystems/openafs/Makefile:1.17 pkgsrc/filesystems/openafs/Makefile:1.18 --- pkgsrc/filesystems/openafs/Makefile:1.17 Sun Oct 8 07:53:05 2017 +++ pkgsrc/filesystems/openafs/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/10/08 07:53:05 sevan Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 19:26:21 rillig Exp $ DISTNAME= openafs-1.6.21-src PKGNAME= ${DISTNAME:C/-src//} @@ -18,7 +18,7 @@ CONFLICTS+= heimdal-[0-9]* CONFLICTS+= lwp-[0-9]* CONFLICTS+= rx-[0-9]* -MAKE_JOBS_SAFE=no +MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= lex @@ -29,7 +29,7 @@ RCD_SCRIPTS+= bosserver CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -USE_GNU_CONFIGURE_HOST= no +USE_GNU_CONFIGURE_HOST= no WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -42,7 +42,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/openafs/db $ FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} -BUILD_DEFS+= VARBASE +BUILD_DEFS+= VARBASE # attempt to future-proof configuration pre-patch: Index: pkgsrc/filesystems/openafs/options.mk diff -u pkgsrc/filesystems/openafs/options.mk:1.3 pkgsrc/filesystems/openafs/options.mk:1.4 --- pkgsrc/filesystems/openafs/options.mk:1.3 Fri Feb 21 21:33:51 2014 +++ pkgsrc/filesystems/openafs/options.mk Sun Nov 3 19:26:21 2019 @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.3 2014/02/21 21:33:51 gendalia Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 19:26:21 rillig Exp $ .include "../../mk/bsd.prefs.mk" -PKG_OPTIONS_VAR= PKG_OPTIONS.openafs -PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei +PKG_OPTIONS_VAR= PKG_OPTIONS.openafs +PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei .if ${MACHINE_ARCH} != "x86_64" -PKG_SUPPORTED_OPTIONS+= pam +PKG_SUPPORTED_OPTIONS+= pam .endif -PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups +PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups .include "../../mk/bsd.options.mk" Index: pkgsrc/filesystems/openafs-devel/Makefile diff -u pkgsrc/filesystems/openafs-devel/Makefile:1.4 pkgsrc/filesystems/openafs-devel/Makefile:1.5 --- pkgsrc/filesystems/openafs-devel/Makefile:1.4 Mon Oct 3 08:30:13 2016 +++ pkgsrc/filesystems/openafs-devel/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/10/03 08:30:13 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:26:21 rillig Exp $ DISTNAME= openafs-1.7.11-src PKGNAME= ${DISTNAME:C/-src//} @@ -16,7 +16,7 @@ CONFLICTS+= arla-[0-9]* CONFLICTS+= heimdal-[0-9]* CONFLICTS+= rx-[0-9]* -MAKE_JOBS_SAFE=no +MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= lex @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-roken=internal -USE_GNU_CONFIGURE_HOST= no +USE_GNU_CONFIGURE_HOST= no WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -41,7 +41,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/openafs/db $ FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} -BUILD_DEFS+= VARBASE +BUILD_DEFS+= VARBASE # # Rename liblwp.a to libafslwp.a to avoid conflict with the lwp package. Index: pkgsrc/filesystems/openafs-devel/options.mk diff -u pkgsrc/filesystems/openafs-devel/options.mk:1.1 pkgsrc/filesystems/openafs-devel/options.mk:1.2 --- pkgsrc/filesystems/openafs-devel/options.mk:1.1 Thu Aug 30 17:37:55 2012 +++ pkgsrc/filesystems/openafs-devel/options.mk Sun Nov 3 19:26:21 2019 @@ -1,15 +1,15 @@ -# $NetBSD: options.mk,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:26:21 rillig Exp $ .include "../../mk/bsd.prefs.mk" -PKG_OPTIONS_VAR= PKG_OPTIONS.openafs -PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart -PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei +PKG_OPTIONS_VAR= PKG_OPTIONS.openafs +PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart +PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei .if ${MACHINE_ARCH} != "x86_64" -PKG_SUPPORTED_OPTIONS+= pam +PKG_SUPPORTED_OPTIONS+= pam .endif -PKG_SUGGESTED_OPTIONS= server bitmap-later bos-new-config fast-restart -PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups +PKG_SUGGESTED_OPTIONS= server bitmap-later bos-new-config fast-restart +PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups .include "../../mk/bsd.options.mk" Index: pkgsrc/filesystems/ori/Makefile diff -u pkgsrc/filesystems/ori/Makefile:1.8 pkgsrc/filesystems/ori/Makefile:1.9 --- pkgsrc/filesystems/ori/Makefile:1.8 Mon Sep 2 13:20:22 2019 +++ pkgsrc/filesystems/ori/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:22 adam Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 19:26:21 rillig Exp $ DISTNAME= ori-0.8.1 PKGREVISION= 2 @@ -14,7 +14,7 @@ LICENSE= isc USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config -PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files +PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files SUBST_CLASSES+= man SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," Index: pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile diff -u pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile:1.12 pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile:1.13 --- pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile:1.12 Sun Aug 11 13:20:59 2019 +++ pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile Sun Nov 3 19:26:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:59 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 19:26:21 rillig Exp $ DISTNAME= MooseX-Types-Path-Tiny-0.012 PKGNAME= p5-${DISTNAME} @@ -21,8 +21,8 @@ BUILD_DEPENDS+= p5-File-pushd-[0-9]*:../ BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager PERL5_MODULE_TYPE= Module::Build::Tiny -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/MooseX/Types/Path/Tiny/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/MooseX/Types/Path/Tiny/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/filesystems/perfuse/Makefile diff -u pkgsrc/filesystems/perfuse/Makefile:1.35 pkgsrc/filesystems/perfuse/Makefile:1.36 --- pkgsrc/filesystems/perfuse/Makefile:1.35 Mon Feb 25 00:52:07 2019 +++ pkgsrc/filesystems/perfuse/Makefile Sun Nov 3 19:26:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/02/25 00:52:07 manu Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 19:26:22 rillig Exp $ # DISTNAME= perfuse-20190222 @@ -10,10 +10,10 @@ MAINTAINER= manu@NetBSD.org COMMENT= PUFFS Enabled Relay to FUSE LICENSE= 2-clause-bsd -WRKSRC= ${WRKDIR}/src/ -BUILD_DIRS= lib/libperfuse usr.sbin/perfused +WRKSRC= ${WRKDIR}/src/ +BUILD_DIRS= lib/libperfuse usr.sbin/perfused BUILDLINK_TRANSFORM= rm:-Werror -CPPFLAGS+= -DPERFUSE_DEBUG -D_PATH_PERFUSED=\"${PREFIX}/sbin/perfused\" +CPPFLAGS+= -DPERFUSE_DEBUG -D_PATH_PERFUSED=\"${PREFIX}/sbin/perfused\" CPPFLAGS.NetBSD+= -D_KERNTYPES CFLAGS+= -g Index: pkgsrc/filesystems/perfuse/builtin.mk diff -u pkgsrc/filesystems/perfuse/builtin.mk:1.2 pkgsrc/filesystems/perfuse/builtin.mk:1.3 --- pkgsrc/filesystems/perfuse/builtin.mk:1.2 Sat Nov 23 11:31:47 2013 +++ pkgsrc/filesystems/perfuse/builtin.mk Sun Nov 3 19:26:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:31:47 obache Exp $ +# $NetBSD: builtin.mk,v 1.3 2019/11/03 19:26:22 rillig Exp $ BUILTIN_PKG:= perfuse @@ -17,7 +17,7 @@ IS_BUILTIN.perfuse= no IS_BUILTIN.perfuse= yes . endif .endif -MAKEVARS+= IS_BUILTIN.perfuse +MAKEVARS+= IS_BUILTIN.perfuse ### ### Determine whether we should use the built-in implementation if it @@ -44,4 +44,4 @@ USE_BUILTIN.perfuse!= \ . endif . endif # PREFER.perfuse .endif -MAKEVARS+= USE_BUILTIN.perfuse +MAKEVARS+= USE_BUILTIN.perfuse Index: pkgsrc/filesystems/squashfs/Makefile diff -u pkgsrc/filesystems/squashfs/Makefile:1.4 pkgsrc/filesystems/squashfs/Makefile:1.5 --- pkgsrc/filesystems/squashfs/Makefile:1.4 Thu Mar 9 16:31:50 2017 +++ pkgsrc/filesystems/squashfs/Makefile Sun Nov 3 19:26:22 2019 @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.4 2017/03/09 16:31:50 kamil Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:26:22 rillig Exp $ -VERSION= 4.3 -DISTNAME= squashfs${VERSION} -PKGNAME= squashfs-${VERSION} +VERSION= 4.3 +DISTNAME= squashfs${VERSION} +PKGNAME= squashfs-${VERSION} PKGREVISION= 2 -CATEGORIES= filesystems -MASTER_SITES= http://downloads.sourceforge.net/project/squashfs/squashfs/${DISTNAME}/ +CATEGORIES= filesystems +MASTER_SITES= http://downloads.sourceforge.net/project/squashfs/squashfs/${DISTNAME}/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://squashfs.sourceforge.net/ -COMMENT= Tools for squashfs archives -LICENSE= gnu-gpl-v2 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://squashfs.sourceforge.net/ +COMMENT= Tools for squashfs archives +LICENSE= gnu-gpl-v2 .include "../../mk/bsd.prefs.mk" .include "options.mk" -USE_LANGUAGES= c +USE_LANGUAGES= c USE_TOOLS+= gmake Index: pkgsrc/filesystems/squashfs/options.mk diff -u pkgsrc/filesystems/squashfs/options.mk:1.2 pkgsrc/filesystems/squashfs/options.mk:1.3 --- pkgsrc/filesystems/squashfs/options.mk:1.2 Thu Feb 9 18:16:07 2017 +++ pkgsrc/filesystems/squashfs/options.mk Sun Nov 3 19:26:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/02/09 18:16:07 scole Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 19:26:22 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squashfs PKG_SUPPORTED_OPTIONS= zlib lz4 lzo xz xattr @@ -60,9 +60,9 @@ BUILD_MAKE_FLAGS+= XATTR_SUPPORT=0 # if default compressor specified (e.g. "bmake COMP_DEFAULT=xz") # use that, else use gzip, else use first on list not including xattr .if empty(COMP_DEFAULT) -.if !empty(PKG_OPTIONS:Mzlib) +. if !empty(PKG_OPTIONS:Mzlib) BUILD_MAKE_FLAGS+= COMP_DEFAULT=gzip -.else +. else BUILD_MAKE_FLAGS+= COMP_DEFAULT=${SQUASH_COMPRESSORS:Nxattr:[1]} -.endif +. endif .endif Index: pkgsrc/filesystems/tahoe-lafs/Makefile diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.39 pkgsrc/filesystems/tahoe-lafs/Makefile:1.40 --- pkgsrc/filesystems/tahoe-lafs/Makefile:1.39 Mon Sep 2 13:20:22 2019 +++ pkgsrc/filesystems/tahoe-lafs/Makefile Sun Nov 3 19:26:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/09/02 13:20:22 adam Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/03 19:26:22 rillig Exp $ DISTNAME= tahoe-lafs-1.12.1 PKGREVISION= 1 @@ -40,7 +40,7 @@ DEPENDS+= ${PYPKGPREFIX}-nevow>=0.11.1:. DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml -PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver +PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver # Note that there is an upstream (inherited from setuptools) bug # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that @@ -59,12 +59,12 @@ post-extract: chmod -R +r ${WRKSRC} .endif -REPLACE_PYTHON+= src/allmydata/reliability.py -REPLACE_PYTHON+= src/allmydata/storage/shares.py -REPLACE_PYTHON+= src/buildtest/test_build_with_fake_dist.py +REPLACE_PYTHON+= src/allmydata/reliability.py +REPLACE_PYTHON+= src/allmydata/storage/shares.py +REPLACE_PYTHON+= src/buildtest/test_build_with_fake_dist.py -PKG_GROUPS= tahoes -PKG_USERS= tahoes:tahoes +PKG_GROUPS= tahoes +PKG_USERS= tahoes:tahoes PKG_GECOS.tahoes= tahoe server do-test: --_----------=_1572809182276760--