diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-03 19:26:20 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-03 19:26:20 +0000 |
commit | 883c0fc32fc2ee0ddd64eb1fa9a18a0ef397db30 (patch) | |
tree | 62f08c547e899ee0d4effdeff9f6dfff62a033b4 /filesystems | |
parent | 76f5c8d81b8b4d4a63e55f70a228e6271fab8a24 (diff) | |
download | pkgsrc-883c0fc32fc2ee0ddd64eb1fa9a18a0ef397db30.tar.gz |
filesystems: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
Diffstat (limited to 'filesystems')
-rw-r--r-- | filesystems/cloudfuse/Makefile | 8 | ||||
-rw-r--r-- | filesystems/fuse-ext2/Makefile | 10 | ||||
-rw-r--r-- | filesystems/fuse-gmailfs/Makefile | 10 | ||||
-rw-r--r-- | filesystems/fuse-pcachefs/Makefile | 4 | ||||
-rw-r--r-- | filesystems/fuse-wdfs/Makefile | 4 | ||||
-rw-r--r-- | filesystems/fuse-wikipediafs/Makefile | 6 | ||||
-rw-r--r-- | filesystems/fuse/builtin.mk | 4 | ||||
-rw-r--r-- | filesystems/glusterfs/Makefile | 16 | ||||
-rw-r--r-- | filesystems/openafs-devel/Makefile | 8 | ||||
-rw-r--r-- | filesystems/openafs-devel/options.mk | 14 | ||||
-rw-r--r-- | filesystems/openafs/Makefile | 8 | ||||
-rw-r--r-- | filesystems/openafs/options.mk | 10 | ||||
-rw-r--r-- | filesystems/ori/Makefile | 4 | ||||
-rw-r--r-- | filesystems/p5-MooseX-Types-Path-Tiny/Makefile | 6 | ||||
-rw-r--r-- | filesystems/perfuse/Makefile | 8 | ||||
-rw-r--r-- | filesystems/perfuse/builtin.mk | 6 | ||||
-rw-r--r-- | filesystems/squashfs/Makefile | 22 | ||||
-rw-r--r-- | filesystems/squashfs/options.mk | 8 | ||||
-rw-r--r-- | filesystems/tahoe-lafs/Makefile | 14 |
19 files changed, 85 insertions, 85 deletions
diff --git a/filesystems/cloudfuse/Makefile b/filesystems/cloudfuse/Makefile index 83f9c9f72af..774d7f081dc 100644 --- a/filesystems/cloudfuse/Makefile +++ b/filesystems/cloudfuse/Makefile @@ -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} diff --git a/filesystems/fuse-ext2/Makefile b/filesystems/fuse-ext2/Makefile index 75f64180fde..8e0d7dd1628 100644 --- a/filesystems/fuse-ext2/Makefile +++ b/filesystems/fuse-ext2/Makefile @@ -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: diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile index 13d306451d2..0e3af9a682c 100644 --- a/filesystems/fuse-gmailfs/Makefile +++ b/filesystems/fuse-gmailfs/Makefile @@ -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.gmailfs 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} diff --git a/filesystems/fuse-pcachefs/Makefile b/filesystems/fuse-pcachefs/Makefile index 67cf3815b96..533ae8c40d8 100644 --- a/filesystems/fuse-pcachefs/Makefile +++ b/filesystems/fuse-pcachefs/Makefile @@ -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" diff --git a/filesystems/fuse-wdfs/Makefile b/filesystems/fuse-wdfs/Makefile index 1dd151cafb7..b54797432f4 100644 --- a/filesystems/fuse-wdfs/Makefile +++ b/filesystems/fuse-wdfs/Makefile @@ -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 diff --git a/filesystems/fuse-wikipediafs/Makefile b/filesystems/fuse-wikipediafs/Makefile index 18d3a47e9f7..d0536341f81 100644 --- a/filesystems/fuse-wikipediafs/Makefile +++ b/filesystems/fuse-wikipediafs/Makefile @@ -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.net/ 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" diff --git a/filesystems/fuse/builtin.mk b/filesystems/fuse/builtin.mk index 2d06f990574..493389f0ddd 100644 --- a/filesystems/fuse/builtin.mk +++ b/filesystems/fuse/builtin.mk @@ -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 diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile index 490b1d27926..251009b25c7 100644 --- a/filesystems/glusterfs/Makefile +++ b/filesystems/glusterfs/Makefile @@ -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=${VARBASE} # 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/mounts,g" 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" diff --git a/filesystems/openafs-devel/Makefile b/filesystems/openafs-devel/Makefile index 1ccec7e456a..dc6c59995cd 100644 --- a/filesystems/openafs-devel/Makefile +++ b/filesystems/openafs-devel/Makefile @@ -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=${VARBASE:Q} 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 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 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. diff --git a/filesystems/openafs-devel/options.mk b/filesystems/openafs-devel/options.mk index e284f24927e..536d1e76a6a 100644 --- a/filesystems/openafs-devel/options.mk +++ b/filesystems/openafs-devel/options.mk @@ -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" diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile index f3219361202..eea1d8915f3 100644 --- a/filesystems/openafs/Makefile +++ b/filesystems/openafs/Makefile @@ -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 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} -BUILD_DEFS+= VARBASE +BUILD_DEFS+= VARBASE # attempt to future-proof configuration pre-patch: diff --git a/filesystems/openafs/options.mk b/filesystems/openafs/options.mk index 79fe81cece0..c51b7bdee2b 100644 --- a/filesystems/openafs/options.mk +++ b/filesystems/openafs/options.mk @@ -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" diff --git a/filesystems/ori/Makefile b/filesystems/ori/Makefile index 79a9d469ad1..ea59a38a467 100644 --- a/filesystems/ori/Makefile +++ b/filesystems/ori/Makefile @@ -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}," diff --git a/filesystems/p5-MooseX-Types-Path-Tiny/Makefile b/filesystems/p5-MooseX-Types-Path-Tiny/Makefile index 8bc33524a3c..7c91f476778 100644 --- a/filesystems/p5-MooseX-Types-Path-Tiny/Makefile +++ b/filesystems/p5-MooseX-Types-Path-Tiny/Makefile @@ -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]*:../../devel/p5-File-pushd 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" diff --git a/filesystems/perfuse/Makefile b/filesystems/perfuse/Makefile index decf2811bb1..b1287cffa2c 100644 --- a/filesystems/perfuse/Makefile +++ b/filesystems/perfuse/Makefile @@ -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 diff --git a/filesystems/perfuse/builtin.mk b/filesystems/perfuse/builtin.mk index bb6ca5a0726..2f17574dc9a 100644 --- a/filesystems/perfuse/builtin.mk +++ b/filesystems/perfuse/builtin.mk @@ -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 diff --git a/filesystems/squashfs/Makefile b/filesystems/squashfs/Makefile index 50e68c032a8..853849b0941 100644 --- a/filesystems/squashfs/Makefile +++ b/filesystems/squashfs/Makefile @@ -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 diff --git a/filesystems/squashfs/options.mk b/filesystems/squashfs/options.mk index fb70f87fd61..725180b8994 100644 --- a/filesystems/squashfs/options.mk +++ b/filesystems/squashfs/options.mk @@ -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 diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile index 775bf790c69..b8a7265eabd 100644 --- a/filesystems/tahoe-lafs/Makefile +++ b/filesystems/tahoe-lafs/Makefile @@ -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:../../www/py-nevow 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: |