Sun Nov 3 19:26:22 2019 UTC ()
filesystems: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


(rillig)
diff -r1.20 -r1.21 pkgsrc/filesystems/cloudfuse/Makefile
diff -r1.4 -r1.5 pkgsrc/filesystems/fuse/builtin.mk
diff -r1.8 -r1.9 pkgsrc/filesystems/fuse-ext2/Makefile
diff -r1.20 -r1.21 pkgsrc/filesystems/fuse-gmailfs/Makefile
diff -r1.7 -r1.8 pkgsrc/filesystems/fuse-pcachefs/Makefile
diff -r1.15 -r1.16 pkgsrc/filesystems/fuse-wdfs/Makefile
diff -r1.23 -r1.24 pkgsrc/filesystems/fuse-wikipediafs/Makefile
diff -r1.91 -r1.92 pkgsrc/filesystems/glusterfs/Makefile
diff -r1.17 -r1.18 pkgsrc/filesystems/openafs/Makefile
diff -r1.3 -r1.4 pkgsrc/filesystems/openafs/options.mk
diff -r1.4 -r1.5 pkgsrc/filesystems/openafs-devel/Makefile
diff -r1.1 -r1.2 pkgsrc/filesystems/openafs-devel/options.mk
diff -r1.8 -r1.9 pkgsrc/filesystems/ori/Makefile
diff -r1.12 -r1.13 pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile
diff -r1.35 -r1.36 pkgsrc/filesystems/perfuse/Makefile
diff -r1.2 -r1.3 pkgsrc/filesystems/perfuse/builtin.mk
diff -r1.4 -r1.5 pkgsrc/filesystems/squashfs/Makefile
diff -r1.2 -r1.3 pkgsrc/filesystems/squashfs/options.mk
diff -r1.39 -r1.40 pkgsrc/filesystems/tahoe-lafs/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/filesystems/cloudfuse/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/cloudfuse/Makefile 2019/08/22 12:23:05 1.20
+++ pkgsrc/filesystems/cloudfuse/Makefile 2019/11/03 19:26:20 1.21
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.20 2019/08/22 12:23:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.21 2019/11/03 19:26:20 rillig Exp $
2 2
3DISTNAME= 1003a82 3DISTNAME= 1003a82
4PKGNAME= cloudfuse-20120124 4PKGNAME= cloudfuse-20120124
5PKGREVISION= 16 5PKGREVISION= 16
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= https://github.com/redbo/cloudfuse/tarball/ 7MASTER_SITES= https://github.com/redbo/cloudfuse/tarball/
8DIST_SUBDIR= cloudfuse 8DIST_SUBDIR= cloudfuse
9 9
10MAINTAINER= abs@absd.org 10MAINTAINER= abs@absd.org
11HOMEPAGE= https://redbo.github.com/cloudfuse/ 11HOMEPAGE= https://redbo.github.com/cloudfuse/
12COMMENT= Filesystem (fuse) implemented on Mosso's Cloud Files 12COMMENT= Filesystem (fuse) implemented on Mosso's Cloud Files
13EXTRACT_SUFX= 13EXTRACT_SUFX=
14EXTRACT_CMD= ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} 14EXTRACT_CMD= ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
15LICENSE= mit 15LICENSE= mit
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_TOOLS+= pkg-config tar 18USE_TOOLS+= pkg-config tar
19INSTALLATION_DIRS= share/doc 19INSTALLATION_DIRS= share/doc
20 20
21WRKSRC= ${WRKDIR}/redbo-cloudfuse-${DISTNAME} 21WRKSRC= ${WRKDIR}/redbo-cloudfuse-${DISTNAME}
22 22
23post-install: 23post-install:
24 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cloudfuse.README 24 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cloudfuse.README
25 25
26.include "../../textproc/libxml2/buildlink3.mk" 26.include "../../textproc/libxml2/buildlink3.mk"
27.include "../../www/curl/buildlink3.mk" 27.include "../../www/curl/buildlink3.mk"
28.include "../../filesystems/fuse/buildlink3.mk" 28.include "../../filesystems/fuse/buildlink3.mk"
29 29
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/fuse/builtin.mk (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse/builtin.mk 2016/09/17 05:20:34 1.4
+++ pkgsrc/filesystems/fuse/builtin.mk 2019/11/03 19:26:20 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: builtin.mk,v 1.4 2016/09/17 05:20:34 richard Exp $ 1# $NetBSD: builtin.mk,v 1.5 2019/11/03 19:26:20 rillig Exp $
2 2
3BUILTIN_PKG:= fuse 3BUILTIN_PKG:= fuse
4PKGCONFIG_BASE.fuse= /usr 4PKGCONFIG_BASE.fuse= /usr
5PKGCONFIG_FILE.fuse= /usr/lib/pkgconfig/fuse.pc 5PKGCONFIG_FILE.fuse= /usr/lib/pkgconfig/fuse.pc
6PKGCONFIG_FILE.fuse+= /usr/lib${LIBABISUFFIX}/pkgconfig/fuse.pc 6PKGCONFIG_FILE.fuse+= /usr/lib${LIBABISUFFIX}/pkgconfig/fuse.pc
7 7
8.include "../../mk/buildlink3/pkgconfig-builtin.mk" 8.include "../../mk/buildlink3/pkgconfig-builtin.mk"
9 9
10.if !empty(USE_BUILTIN.fuse:M[yY][eE][sS]) 10.if !empty(USE_BUILTIN.fuse:M[yY][eE][sS])
11BUILDLINK_FILES.fuse+= lib/pkgconfig/fuse.pc 11BUILDLINK_FILES.fuse+= lib/pkgconfig/fuse.pc
12BUILDLINK_FILES.fuse+= lib${LIBABISUFFIX}/pkgconfig/fuse.pc 12BUILDLINK_FILES.fuse+= lib${LIBABISUFFIX}/pkgconfig/fuse.pc
13.endif 13.endif
cvs diff -r1.8 -r1.9 pkgsrc/filesystems/fuse-ext2/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/Makefile 2019/04/10 21:37:51 1.8
+++ pkgsrc/filesystems/fuse-ext2/Makefile 2019/11/03 19:26:20 1.9
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.8 2019/04/10 21:37:51 maya Exp $ 1# $NetBSD: Makefile,v 1.9 2019/11/03 19:26:20 rillig Exp $
2 2
3DISTNAME= fuse-ext2-0.0.7 3DISTNAME= fuse-ext2-0.0.7
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/ 9HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/
10COMMENT= FUSE file-system to mount ext2 and ext3 file system 10COMMENT= FUSE file-system to mount ext2 and ext3 file system
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-* 13ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-*
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= autoheader automake autoreconf gmake pkg-config 17USE_TOOLS+= autoheader automake autoreconf gmake pkg-config
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19INSTALLATION_DIRS= lib/umview/modules 19INSTALLATION_DIRS= lib/umview/modules
20 20
21pre-configure: 21pre-configure:
22 cd ${WRKSRC} && autoreconf --verbose --install --force 22 cd ${WRKSRC} && autoreconf --verbose --install --force
23 23
24.include "../../mk/fuse.buildlink3.mk" 24.include "../../mk/fuse.buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/filesystems/fuse-gmailfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-gmailfs/Makefile 2019/09/02 13:20:21 1.20
+++ pkgsrc/filesystems/fuse-gmailfs/Makefile 2019/11/03 19:26:21 1.21
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.20 2019/09/02 13:20:21 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= gmailfs-0.7.2 3DISTNAME= gmailfs-0.7.2
4PKGREVISION= 4 4PKGREVISION= 4
5PKGNAME= fuse-${DISTNAME} 5PKGNAME= fuse-${DISTNAME}
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= http://richard.jones.name/google-hacks/gmail-filesystem/ 7MASTER_SITES= http://richard.jones.name/google-hacks/gmail-filesystem/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html 10#HOMEPAGE= http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html
11COMMENT= FUSE filesystem which uses Google mail for free space 11COMMENT= FUSE filesystem which uses Google mail for free space
12 12
13NO_BUILD= yes 13NO_BUILD= yes
14REPLACE_PYTHON= gmailfs.py mount.gmailfs 14REPLACE_PYTHON= gmailfs.py mount.gmailfs
15PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings 15PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings
16 16
17CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \ 17CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \
18 ${PKG_SYSCONFDIR}/gmailfs.conf 18 ${PKG_SYSCONFDIR}/gmailfs.conf
19 19
20SUBST_CLASSES+= config 20SUBST_CLASSES+= config
21SUBST_STAGE.config= pre-configure 21SUBST_STAGE.config= pre-configure
22SUBST_FILES.config= gmailfs.py mount.gmailfs 22SUBST_FILES.config= gmailfs.py mount.gmailfs
23SUBST_VARS.config= PKG_SYSCONFDIR 23SUBST_VARS.config= PKG_SYSCONFDIR
24SUBST_VARS.config+= PREFIX 24SUBST_VARS.config+= PREFIX
25SUBST_SED.config+= -e "s|@PYSITELIB@|${PREFIX}/${PYSITELIB}|g" 25SUBST_SED.config+= -e "s|@PYSITELIB@|${PREFIX}/${PYSITELIB}|g"
26SUBST_MESSAGE.config= Fixing paths. 26SUBST_MESSAGE.config= Fixing paths.
27 27
28PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} 28PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
29 29
30INSTALLATION_DIRS= sbin ${PYSITELIB} 30INSTALLATION_DIRS= sbin ${PYSITELIB}
31 31
32do-install: 32do-install:
33 ${INSTALL_SCRIPT} ${WRKSRC}/gmailfs.py \ 33 ${INSTALL_SCRIPT} ${WRKSRC}/gmailfs.py \
34 ${DESTDIR}${PREFIX}/${PYSITELIB}/ 34 ${DESTDIR}${PREFIX}/${PYSITELIB}/
35 ${INSTALL_SCRIPT} ${WRKSRC}/mount.gmailfs \ 35 ${INSTALL_SCRIPT} ${WRKSRC}/mount.gmailfs \
36 ${DESTDIR}${PREFIX}/sbin/mount_gmailfs 36 ${DESTDIR}${PREFIX}/sbin/mount_gmailfs
37 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gmailfs 37 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gmailfs
38 ${INSTALL_DATA} ${WRKSRC}/gmailfs.conf \ 38 ${INSTALL_DATA} ${WRKSRC}/gmailfs.conf \
39 ${DESTDIR}${PREFIX}/share/examples/gmailfs/ 39 ${DESTDIR}${PREFIX}/share/examples/gmailfs/
cvs diff -r1.7 -r1.8 pkgsrc/filesystems/fuse-pcachefs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-pcachefs/Makefile 2019/09/02 13:20:21 1.7
+++ pkgsrc/filesystems/fuse-pcachefs/Makefile 2019/11/03 19:26:21 1.8
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.7 2019/09/02 13:20:21 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2019/11/03 19:26:21 rillig Exp $
2# 2#
3 3
4DISTNAME= fuse-pcachefs-0.0.20160203 4DISTNAME= fuse-pcachefs-0.0.20160203
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= ${MASTER_SITE_GITHUB:=ibizaman/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=ibizaman/}
8GITHUB_PROJECT= pcachefs 8GITHUB_PROJECT= pcachefs
9GITHUB_TAG= 0712601d2b3fc2667112be106133ae162e98d7a5 9GITHUB_TAG= 0712601d2b3fc2667112be106133ae162e98d7a5
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/ibizaman/pcachefs 12HOMEPAGE= https://github.com/ibizaman/pcachefs
13COMMENT= FUSE-based persistent caching filesystem 13COMMENT= FUSE-based persistent caching filesystem
14LICENSE= apache-2.0 14LICENSE= apache-2.0
15 15
16BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools 16BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
17 17
18EGG_NAME= pCacheFS-0.2 18EGG_NAME= pCacheFS-0.2
19PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings 19PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings
20 20
21.include "../../filesystems/py-fuse-bindings/buildlink3.mk" 21.include "../../filesystems/py-fuse-bindings/buildlink3.mk"
22.include "../../lang/python/distutils.mk" 22.include "../../lang/python/distutils.mk"
23.include "../../mk/fuse.buildlink3.mk" 23.include "../../mk/fuse.buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/filesystems/fuse-wdfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-wdfs/Makefile 2016/03/05 11:28:29 1.15
+++ pkgsrc/filesystems/fuse-wdfs/Makefile 2019/11/03 19:26:21 1.16
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.15 2016/03/05 11:28:29 jperkin Exp $ 1# $NetBSD: Makefile,v 1.16 2019/11/03 19:26:21 rillig Exp $
2# 2#
3 3
4DISTNAME= wdfs-1.4.2 4DISTNAME= wdfs-1.4.2
5PKGNAME= fuse-${DISTNAME} 5PKGNAME= fuse-${DISTNAME}
6PKGREVISION= 10 6PKGREVISION= 10
7CATEGORIES= filesystems 7CATEGORIES= filesystems
8MASTER_SITES= http://noedler.de/projekte/wdfs/ 8MASTER_SITES= http://noedler.de/projekte/wdfs/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://noedler.de/projekte/wdfs/ 11HOMEPAGE= http://noedler.de/projekte/wdfs/
12COMMENT= FUSE-based webdav filesystem 12COMMENT= FUSE-based webdav filesystem
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
17PTHREAD_AUTO_VARS= yes 17PTHREAD_AUTO_VARS= yes
18 18
19.if exists(/usr/include/stdbool.h) 19.if exists(/usr/include/stdbool.h)
20CPPFLAGS+= -DHAVE_STDBOOL_H 20CPPFLAGS+= -DHAVE_STDBOOL_H
21.endif 21.endif
22 22
23.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
24.include "../../www/neon/buildlink3.mk" 24.include "../../www/neon/buildlink3.mk"
25 25
26.include "../../mk/fuse.buildlink3.mk" 26.include "../../mk/fuse.buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/filesystems/fuse-wikipediafs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-wikipediafs/Makefile 2019/09/02 13:20:22 1.23
+++ pkgsrc/filesystems/fuse-wikipediafs/Makefile 2019/11/03 19:26:21 1.24
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.23 2019/09/02 13:20:22 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= wikipediafs-0.4 3DISTNAME= wikipediafs-0.4
4PKGNAME= fuse-${DISTNAME} 4PKGNAME= fuse-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wikipediafs/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wikipediafs/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://wikipediafs.sourceforge.net/ 10HOMEPAGE= http://wikipediafs.sourceforge.net/
11COMMENT= FUSE filesystem for accessing the wikipedia 11COMMENT= FUSE filesystem for accessing the wikipedia
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings 14PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings
15EGG_NAME= wikipediafs-0.0.0 15EGG_NAME= wikipediafs-0.0.0
16 16
17SUBST_CLASSES+= config 17SUBST_CLASSES+= config
18SUBST_STAGE.config= pre-configure 18SUBST_STAGE.config= pre-configure
19SUBST_FILES.config= setup.py 19SUBST_FILES.config= setup.py
20SUBST_SED.config+= -e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g" 20SUBST_SED.config+= -e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g"
21SUBST_MESSAGE.config= Fixing paths. 21SUBST_MESSAGE.config= Fixing paths.
22 22
23.include "../../filesystems/py-fuse-bindings/buildlink3.mk" 23.include "../../filesystems/py-fuse-bindings/buildlink3.mk"
24 24
25.include "../../lang/python/distutils.mk" 25.include "../../lang/python/distutils.mk"
26.include "../../mk/fuse.buildlink3.mk" 26.include "../../mk/fuse.buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.91 -r1.92 pkgsrc/filesystems/glusterfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/glusterfs/Makefile 2019/09/02 13:20:21 1.91
+++ pkgsrc/filesystems/glusterfs/Makefile 2019/11/03 19:26:21 1.92
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.91 2019/09/02 13:20:21 adam Exp $ 1# $NetBSD: Makefile,v 1.92 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= glusterfs-3.12.8 3DISTNAME= glusterfs-3.12.8
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ 6MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gluster.org/ 9HOMEPAGE= https://www.gluster.org/
10COMMENT= Cluster filesystem 10COMMENT= Cluster filesystem
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= flex bison pkg-config bash 15USE_TOOLS+= flex bison pkg-config bash
16 16
17CONFIGURE_ARGS+= --disable-fusermount 17CONFIGURE_ARGS+= --disable-fusermount
18CONFIGURE_ARGS+= --localstatedir=${VARBASE} 18CONFIGURE_ARGS+= --localstatedir=${VARBASE}
19 19
20# Make sure we do not attept to link with -lfl 20# Make sure we do not attept to link with -lfl
21# Only libfl.a is available, and libtool wants libfl.so 21# Only libfl.a is available, and libtool wants libfl.so
22MAKE_FLAGS+= LEXLIB="" 22MAKE_FLAGS+= LEXLIB=""
23 23
24PYTHON_VERSIONS_ACCEPTED= 27 # only 2.x supported as of 3.8.x 24PYTHON_VERSIONS_ACCEPTED= 27 # only 2.x supported as of 3.8.x
25 25
26REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py 26REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
27REPLACE_PYTHON+= events/src/glustereventsd.py 27REPLACE_PYTHON+= events/src/glustereventsd.py
28REPLACE_PYTHON+= events/src/peer_eventsapi.py 28REPLACE_PYTHON+= events/src/peer_eventsapi.py
29REPLACE_PYTHON+= events/tools/eventsdash.py 29REPLACE_PYTHON+= events/tools/eventsdash.py
30REPLACE_PYTHON+= extras/ganesha/scripts/generate-epoch.py 30REPLACE_PYTHON+= extras/ganesha/scripts/generate-epoch.py
31REPLACE_PYTHON+= extras/geo-rep/schedule_georep.py.in 31REPLACE_PYTHON+= extras/geo-rep/schedule_georep.py.in
32REPLACE_PYTHON+= extras/snap_scheduler/gcron.py 32REPLACE_PYTHON+= extras/snap_scheduler/gcron.py
33REPLACE_PYTHON+= extras/snap_scheduler/snap_scheduler.py 33REPLACE_PYTHON+= extras/snap_scheduler/snap_scheduler.py
34REPLACE_PYTHON+= geo-replication/src/peer_georep-sshkey.py.in 34REPLACE_PYTHON+= geo-replication/src/peer_georep-sshkey.py.in
35REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.in 35REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.in
36REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.py 36REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.py
37REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.py.in 37REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.py.in
@@ -71,29 +71,29 @@ REPLACE_BASH+= geo-replication/src/gver @@ -71,29 +71,29 @@ REPLACE_BASH+= geo-replication/src/gver
71REPLACE_BASH+= geo-replication/src/peer_gsec_create.in 71REPLACE_BASH+= geo-replication/src/peer_gsec_create.in
72REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh 72REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh
73 73
74 74
75SUBST_CLASSES+= mtab 75SUBST_CLASSES+= mtab
76SUBST_STAGE.mtab= post-build 76SUBST_STAGE.mtab= post-build
77SUBST_FILES.mtab= doc/mount.glusterfs.8 77SUBST_FILES.mtab= doc/mount.glusterfs.8
78SUBST_FILES.mtab= libglusterfs/src/compat.h 78SUBST_FILES.mtab= libglusterfs/src/compat.h
79SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs.in 79SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs.in
80SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g" 80SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g"
81 81
82SUBST_CLASSES+= etc 82SUBST_CLASSES+= etc
83SUBST_STAGE.etc= pre-build 83SUBST_STAGE.etc= pre-build
84SUBST_FILES.etc+= libglusterfs/src/logging.c 84SUBST_FILES.etc+= libglusterfs/src/logging.c
85SUBST_FILES.etc+= extras/ocf/volume 85SUBST_FILES.etc+= extras/ocf/volume
86SUBST_FILES.etc+= doc/glusterfsd.8 86SUBST_FILES.etc+= doc/glusterfsd.8
87SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g" 87SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
88 88
89SUBST_CLASSES+= vol 89SUBST_CLASSES+= vol
90SUBST_STAGE.vol= post-build 90SUBST_STAGE.vol= post-build
91SUBST_FILES.vol= extras/Makefile 91SUBST_FILES.vol= extras/Makefile
92SUBST_SED.vol= -e "/vol_DATA/s/glusterd.vol/glusterd.vol.sample/g" 92SUBST_SED.vol= -e "/vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
93 93
94EGDIR= ${PREFIX}/etc/glusterfs 94EGDIR= ${PREFIX}/etc/glusterfs
95CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol 95CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
96OWN_DIRS+= ${VARBASE}/log/glusterfs 96OWN_DIRS+= ${VARBASE}/log/glusterfs
97BUILD_DEFS+= VARBASE 97BUILD_DEFS+= VARBASE
98 98
99RCD_SCRIPTS= glusterd 99RCD_SCRIPTS= glusterd
@@ -109,29 +109,29 @@ pre-build: @@ -109,29 +109,29 @@ pre-build:
109 cd ${WRKSRC}/extras && \ 109 cd ${WRKSRC}/extras && \
110 ${ECHO} "glusterd.vol.sample: glusterd.vol" >> Makefile && \ 110 ${ECHO} "glusterd.vol.sample: glusterd.vol" >> Makefile && \
111 ${ECHO} " cp glusterd.vol glusterd.vol.sample" >> Makefile 111 ${ECHO} " cp glusterd.vol glusterd.vol.sample" >> Makefile
112 112
113post-install: 113post-install:
114 ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount_glusterfs \ 114 ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount_glusterfs \
115 ${DESTDIR}/${PREFIX}/sbin/mount_glusterfs 115 ${DESTDIR}/${PREFIX}/sbin/mount_glusterfs
116 116
117# Debug 117# Debug
118CFLAGS+= -g 118CFLAGS+= -g
119INSTALL_UNSTRIPPED= yes 119INSTALL_UNSTRIPPED= yes
120CONFIGURE_ARGS+= --enable-debug 120CONFIGURE_ARGS+= --enable-debug
121#.include "../../devel/boehm-gc/buildlink3.mk" 121#.include "../../devel/boehm-gc/buildlink3.mk"
122#CFLAGS+=-DGC_DEBUG 122#CFLAGS+= -DGC_DEBUG
123#CFLAGS+=-include gc.h 123#CFLAGS+= -include gc.h
124#LIBS+=-lgc 124#LIBS+= -lgc
125 125
126.include "../../mk/bsd.prefs.mk" 126.include "../../mk/bsd.prefs.mk"
127 127
128.include "../../security/openssl/buildlink3.mk" 128.include "../../security/openssl/buildlink3.mk"
129.include "../../textproc/libxml2/buildlink3.mk" 129.include "../../textproc/libxml2/buildlink3.mk"
130.include "../../databases/sqlite3/buildlink3.mk" 130.include "../../databases/sqlite3/buildlink3.mk"
131.include "../../devel/userspace-rcu/buildlink3.mk" 131.include "../../devel/userspace-rcu/buildlink3.mk"
132.include "../../lang/python/application.mk" 132.include "../../lang/python/application.mk"
133.include "../../lang/python/extension.mk" 133.include "../../lang/python/extension.mk"
134 134
135.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h) 135.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h)
136LIBS+= -lexecinfo 136LIBS+= -lexecinfo
137.endif 137.endif
cvs diff -r1.17 -r1.18 pkgsrc/filesystems/openafs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/openafs/Makefile 2017/10/08 07:53:05 1.17
+++ pkgsrc/filesystems/openafs/Makefile 2019/11/03 19:26:21 1.18
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1# $NetBSD: Makefile,v 1.17 2017/10/08 07:53:05 sevan Exp $ 1# $NetBSD: Makefile,v 1.18 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= openafs-1.6.21-src 3DISTNAME= openafs-1.6.21-src
4PKGNAME= ${DISTNAME:C/-src//} 4PKGNAME= ${DISTNAME:C/-src//}
5CATEGORIES= filesystems net sysutils 5CATEGORIES= filesystems net sysutils
6MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.21/ 6MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.21/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= gendalia@NetBSD.org 9MAINTAINER= gendalia@NetBSD.org
10HOMEPAGE= http://www.openafs.org/ 10HOMEPAGE= http://www.openafs.org/
11COMMENT= File system for sharing, scalability and transparent data migration 11COMMENT= File system for sharing, scalability and transparent data migration
12LICENSE= ipl-1.0 AND mit AND modified-bsd # AND sun-rpc? 12LICENSE= ipl-1.0 AND mit AND modified-bsd # AND sun-rpc?
13 13
14PREV_PKGPATH= net/openafs 14PREV_PKGPATH= net/openafs
15 15
16CONFLICTS+= arla-[0-9]* 16CONFLICTS+= arla-[0-9]*
17CONFLICTS+= heimdal-[0-9]* 17CONFLICTS+= heimdal-[0-9]*
18CONFLICTS+= lwp-[0-9]* 18CONFLICTS+= lwp-[0-9]*
19CONFLICTS+= rx-[0-9]* 19CONFLICTS+= rx-[0-9]*
20 20
21MAKE_JOBS_SAFE=no 21MAKE_JOBS_SAFE= no
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24USE_TOOLS+= lex 24USE_TOOLS+= lex
25RCD_SCRIPTS+= bosserver 25RCD_SCRIPTS+= bosserver
26 26
27.include "options.mk" 27.include "options.mk"
28 28
29CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
31 31
32USE_GNU_CONFIGURE_HOST= no 32USE_GNU_CONFIGURE_HOST= no
33 33
34WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 34WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
35 35
36PLIST_SRC+= ${.CURDIR}/PLIST 36PLIST_SRC+= ${.CURDIR}/PLIST
37OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs 37OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs
38OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775 38OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775
39OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770 39OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770
40OWN_DIRS+= ${VARBASE}/openafs/logs 40OWN_DIRS+= ${VARBASE}/openafs/logs
41OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 41OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
42 42
43FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 43FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
44 44
45BUILD_DEFS+= VARBASE 45BUILD_DEFS+= VARBASE
46 46
47# attempt to future-proof configuration 47# attempt to future-proof configuration
48pre-patch: 48pre-patch:
49 cd ${WRKSRC}/src/config && for i in 70 80 90; do \ 49 cd ${WRKSRC}/src/config && for i in 70 80 90; do \
50 ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.i386_nbsd60.h > param.i386_nbsd$$i.h; \ 50 ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.i386_nbsd60.h > param.i386_nbsd$$i.h; \
51 ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.amd64_nbsd60.h > param.amd64_nbsd$$i.h; \ 51 ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.amd64_nbsd60.h > param.amd64_nbsd$$i.h; \
52 ${CP} param.nbsd60.h param.nbsd$$i.h; \ 52 ${CP} param.nbsd60.h param.nbsd$$i.h; \
53 done 53 done
54 54
55post-patch: 55post-patch:
56 ${CP} ${WRKSRC}/src/config/param.armv6_nbsd80.h ${WRKSRC}/src/config/param.armv7_nbsd80.h  56 ${CP} ${WRKSRC}/src/config/param.armv6_nbsd80.h ${WRKSRC}/src/config/param.armv7_nbsd80.h
57 57
58MAKE_ENV+= LD_RUN_PATH=${PREFIX}/lib 58MAKE_ENV+= LD_RUN_PATH=${PREFIX}/lib
cvs diff -r1.3 -r1.4 pkgsrc/filesystems/openafs/options.mk (expand / switch to unified diff)

--- pkgsrc/filesystems/openafs/options.mk 2014/02/21 21:33:51 1.3
+++ pkgsrc/filesystems/openafs/options.mk 2019/11/03 19:26:21 1.4
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: options.mk,v 1.3 2014/02/21 21:33:51 gendalia Exp $ 1# $NetBSD: options.mk,v 1.4 2019/11/03 19:26:21 rillig Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.openafs 5PKG_OPTIONS_VAR= PKG_OPTIONS.openafs
6PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei 6PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei
7.if ${MACHINE_ARCH} != "x86_64" 7.if ${MACHINE_ARCH} != "x86_64"
8PKG_SUPPORTED_OPTIONS+= pam 8PKG_SUPPORTED_OPTIONS+= pam
9.endif 9.endif
10PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups 10PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Msupergroups) 14.if !empty(PKG_OPTIONS:Msupergroups)
15CONFIGURE_ARGS+= --enable-supergroups 15CONFIGURE_ARGS+= --enable-supergroups
16.endif 16.endif
17.if !empty(PKG_OPTIONS:Mbitmap-later) 17.if !empty(PKG_OPTIONS:Mbitmap-later)
18CONFIGURE_ARGS+= --enable-bitmap-later 18CONFIGURE_ARGS+= --enable-bitmap-later
19.endif 19.endif
20.if !empty(PKG_OPTIONS:Mkernel-module) 20.if !empty(PKG_OPTIONS:Mkernel-module)
21CONFIGURE_ARGS+= --enable-kernel-module 21CONFIGURE_ARGS+= --enable-kernel-module
22.else 22.else
23CONFIGURE_ARGS+= --disable-kernel-module 23CONFIGURE_ARGS+= --disable-kernel-module
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/openafs-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/openafs-devel/Attic/Makefile 2016/10/03 08:30:13 1.4
+++ pkgsrc/filesystems/openafs-devel/Attic/Makefile 2019/11/03 19:26:21 1.5
@@ -1,56 +1,56 @@ @@ -1,56 +1,56 @@
1# $NetBSD: Makefile,v 1.4 2016/10/03 08:30:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= openafs-1.7.11-src 3DISTNAME= openafs-1.7.11-src
4PKGNAME= ${DISTNAME:C/-src//} 4PKGNAME= ${DISTNAME:C/-src//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= filesystems net sysutils 6CATEGORIES= filesystems net sysutils
7MASTER_SITES= http://www.openafs.org/dl/openafs/1.7.11/ 7MASTER_SITES= http://www.openafs.org/dl/openafs/1.7.11/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= gendalia@NetBSD.org 10MAINTAINER= gendalia@NetBSD.org
11HOMEPAGE= http://www.openafs.org/ 11HOMEPAGE= http://www.openafs.org/
12COMMENT= File system for sharing, scalability and transparent data migration 12COMMENT= File system for sharing, scalability and transparent data migration
13LICENSE= ipl-1.0 AND mit AND modified-bsd # AND sun-rpc? 13LICENSE= ipl-1.0 AND mit AND modified-bsd # AND sun-rpc?
14 14
15CONFLICTS+= arla-[0-9]* 15CONFLICTS+= arla-[0-9]*
16CONFLICTS+= heimdal-[0-9]* 16CONFLICTS+= heimdal-[0-9]*
17CONFLICTS+= rx-[0-9]* 17CONFLICTS+= rx-[0-9]*
18 18
19MAKE_JOBS_SAFE=no 19MAKE_JOBS_SAFE= no
20 20
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22USE_TOOLS+= lex 22USE_TOOLS+= lex
23RCD_SCRIPTS+= bosserver 23RCD_SCRIPTS+= bosserver
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
29CONFIGURE_ARGS+= --with-roken=internal 29CONFIGURE_ARGS+= --with-roken=internal
30 30
31USE_GNU_CONFIGURE_HOST= no 31USE_GNU_CONFIGURE_HOST= no
32 32
33WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 33WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
34 34
35PLIST_SRC+= ${.CURDIR}/PLIST 35PLIST_SRC+= ${.CURDIR}/PLIST
36OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs 36OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs
37OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775 37OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775
38OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770 38OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770
39OWN_DIRS+= ${VARBASE}/openafs/logs 39OWN_DIRS+= ${VARBASE}/openafs/logs
40OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 40OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
41 41
42FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 42FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
43 43
44BUILD_DEFS+= VARBASE 44BUILD_DEFS+= VARBASE
45 45
46# 46#
47# Rename liblwp.a to libafslwp.a to avoid conflict with the lwp package. 47# Rename liblwp.a to libafslwp.a to avoid conflict with the lwp package.
48# 48#
49pre-configure: 49pre-configure:
50 find ${WRKSRC} -name Makefile.in | while read f; do \ 50 find ${WRKSRC} -name Makefile.in | while read f; do \
51 ${SED} -e 's|liblwp.a|libafslwp.a|g' \ 51 ${SED} -e 's|liblwp.a|libafslwp.a|g' \
52 -e 's|-llwp|-lafslwp|g' < $$f > $$f.tmp && \ 52 -e 's|-llwp|-lafslwp|g' < $$f > $$f.tmp && \
53 ${MV} $$f.tmp $$f; done 53 ${MV} $$f.tmp $$f; done
54 54
55.include "../../mk/krb5.buildlink3.mk" 55.include "../../mk/krb5.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/filesystems/openafs-devel/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/filesystems/openafs-devel/Attic/options.mk 2012/08/30 17:37:55 1.1
+++ pkgsrc/filesystems/openafs-devel/Attic/options.mk 2019/11/03 19:26:21 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: options.mk,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ 1# $NetBSD: options.mk,v 1.2 2019/11/03 19:26:21 rillig Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.openafs 5PKG_OPTIONS_VAR= PKG_OPTIONS.openafs
6PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart 6PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart
7PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei 7PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei
8.if ${MACHINE_ARCH} != "x86_64" 8.if ${MACHINE_ARCH} != "x86_64"
9PKG_SUPPORTED_OPTIONS+= pam 9PKG_SUPPORTED_OPTIONS+= pam
10.endif 10.endif
11PKG_SUGGESTED_OPTIONS= server bitmap-later bos-new-config fast-restart 11PKG_SUGGESTED_OPTIONS= server bitmap-later bos-new-config fast-restart
12PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups 12PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
15 15
16.if !empty(PKG_OPTIONS:Msupergroups) 16.if !empty(PKG_OPTIONS:Msupergroups)
17CONFIGURE_ARGS+= --enable-supergroups 17CONFIGURE_ARGS+= --enable-supergroups
18.endif 18.endif
19.if !empty(PKG_OPTIONS:Mbitmap-later) 19.if !empty(PKG_OPTIONS:Mbitmap-later)
20CONFIGURE_ARGS+= --enable-bitmap-later 20CONFIGURE_ARGS+= --enable-bitmap-later
21.endif 21.endif
22.if !empty(PKG_OPTIONS:Mbos-new-config) 22.if !empty(PKG_OPTIONS:Mbos-new-config)
23CONFIGURE_ARGS+= --enable-bos-new-config 23CONFIGURE_ARGS+= --enable-bos-new-config
24.endif 24.endif
25.if !empty(PKG_OPTIONS:Mfast-restart) 25.if !empty(PKG_OPTIONS:Mfast-restart)
cvs diff -r1.8 -r1.9 pkgsrc/filesystems/ori/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/ori/Makefile 2019/09/02 13:20:22 1.8
+++ pkgsrc/filesystems/ori/Makefile 2019/11/03 19:26:21 1.9
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:22 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= ori-0.8.1 3DISTNAME= ori-0.8.1
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= https://bitbucket.org/orifs/ori/downloads/ 6MASTER_SITES= https://bitbucket.org/orifs/ori/downloads/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ori.scs.stanford.edu/ 10HOMEPAGE= http://ori.scs.stanford.edu/
11COMMENT= Secure distributed file system 11COMMENT= Secure distributed file system
12LICENSE= isc 12LICENSE= isc
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
17PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files 17PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files
18 18
19SUBST_CLASSES+= man 19SUBST_CLASSES+= man
20SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," 20SUBST_SED.man+= -e "s,share/man,${PKGMANDIR},"
21SUBST_FILES.man+= SConstruct 21SUBST_FILES.man+= SConstruct
22SUBST_STAGE.man= pre-build 22SUBST_STAGE.man= pre-build
23SUBST_MESSAGE.man= Fixing man page installation path. 23SUBST_MESSAGE.man= Fixing man page installation path.
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27.if ${OPSYS} == "NetBSD" 27.if ${OPSYS} == "NetBSD"
28_WRAP_EXTRA_ARGS.CXX+= -D_KERNTYPES 28_WRAP_EXTRA_ARGS.CXX+= -D_KERNTYPES
29CWRAPPERS_APPEND.cxx+= -D_KERNTYPES 29CWRAPPERS_APPEND.cxx+= -D_KERNTYPES
30.endif 30.endif
cvs diff -r1.12 -r1.13 pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile 2019/08/11 13:20:59 1.12
+++ pkgsrc/filesystems/p5-MooseX-Types-Path-Tiny/Makefile 2019/11/03 19:26:21 1.13
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2019/11/03 19:26:21 rillig Exp $
2 2
3DISTNAME= MooseX-Types-Path-Tiny-0.012 3DISTNAME= MooseX-Types-Path-Tiny-0.012
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel perl5 6CATEGORIES= devel perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MooseX/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MooseX/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://metacpan.org/release/MooseX-Types-Path-Tiny 10HOMEPAGE= https://metacpan.org/release/MooseX-Types-Path-Tiny
11COMMENT= Path::Tiny types and coercions for Moose 11COMMENT= Path::Tiny types and coercions for Moose
12LICENSE= ${PERL5_LICENSE} 12LICENSE= ${PERL5_LICENSE}
13 13
14DEPENDS+= p5-Moose>=2:../../devel/p5-Moose 14DEPENDS+= p5-Moose>=2:../../devel/p5-Moose
15DEPENDS+= p5-MooseX-Getopt-[0-9]*:../../devel/p5-MooseX-Getopt 15DEPENDS+= p5-MooseX-Getopt-[0-9]*:../../devel/p5-MooseX-Getopt
16DEPENDS+= p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types 16DEPENDS+= p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
17DEPENDS+= p5-MooseX-Types-Stringlike-[0-9]*:../../devel/p5-MooseX-Types-Stringlike 17DEPENDS+= p5-MooseX-Types-Stringlike-[0-9]*:../../devel/p5-MooseX-Types-Stringlike
18DEPENDS+= p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny 18DEPENDS+= p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
19# for make test 19# for make test
20BUILD_DEPENDS+= p5-File-pushd-[0-9]*:../../devel/p5-File-pushd 20BUILD_DEPENDS+= p5-File-pushd-[0-9]*:../../devel/p5-File-pushd
21BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager 21BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
22 22
23PERL5_MODULE_TYPE= Module::Build::Tiny 23PERL5_MODULE_TYPE= Module::Build::Tiny
24USE_LANGUAGES= # empty 24USE_LANGUAGES= # empty
25PERL5_PACKLIST= auto/MooseX/Types/Path/Tiny/.packlist 25PERL5_PACKLIST= auto/MooseX/Types/Path/Tiny/.packlist
26 26
27.include "../../lang/perl5/module.mk" 27.include "../../lang/perl5/module.mk"
28.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/filesystems/perfuse/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/perfuse/Makefile 2019/02/25 00:52:07 1.35
+++ pkgsrc/filesystems/perfuse/Makefile 2019/11/03 19:26:22 1.36
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.35 2019/02/25 00:52:07 manu Exp $ 1# $NetBSD: Makefile,v 1.36 2019/11/03 19:26:22 rillig Exp $
2# 2#
3 3
4DISTNAME= perfuse-20190222 4DISTNAME= perfuse-20190222
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/perfuse/ 6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/perfuse/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= manu@NetBSD.org 9MAINTAINER= manu@NetBSD.org
10COMMENT= PUFFS Enabled Relay to FUSE 10COMMENT= PUFFS Enabled Relay to FUSE
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13WRKSRC= ${WRKDIR}/src/ 13WRKSRC= ${WRKDIR}/src/
14BUILD_DIRS= lib/libperfuse usr.sbin/perfused 14BUILD_DIRS= lib/libperfuse usr.sbin/perfused
15BUILDLINK_TRANSFORM= rm:-Werror 15BUILDLINK_TRANSFORM= rm:-Werror
16CPPFLAGS+= -DPERFUSE_DEBUG -D_PATH_PERFUSED=\"${PREFIX}/sbin/perfused\" 16CPPFLAGS+= -DPERFUSE_DEBUG -D_PATH_PERFUSED=\"${PREFIX}/sbin/perfused\"
17CPPFLAGS.NetBSD+= -D_KERNTYPES 17CPPFLAGS.NetBSD+= -D_KERNTYPES
18 18
19CFLAGS+= -g 19CFLAGS+= -g
20 20
21INSTALLATION_DIRS= include lib sbin 21INSTALLATION_DIRS= include lib sbin
22 22
23pre-build: 23pre-build:
24 ${LN} -s ${WRKSRC}/lib/libperfuse/perfuse.h ${BUILDLINK_DIR}/include/ 24 ${LN} -s ${WRKSRC}/lib/libperfuse/perfuse.h ${BUILDLINK_DIR}/include/
25 ${LN} -s ${WRKSRC}/lib/libperfuse/libperfuse.so ${BUILDLINK_DIR}/lib 25 ${LN} -s ${WRKSRC}/lib/libperfuse/libperfuse.so ${BUILDLINK_DIR}/lib
26 26
27do-install: 27do-install:
28 ${INSTALL_DATA} ${WRKSRC}/lib/libperfuse/perfuse.h \ 28 ${INSTALL_DATA} ${WRKSRC}/lib/libperfuse/perfuse.h \
29 ${DESTDIR}/${PREFIX}/include/ 29 ${DESTDIR}/${PREFIX}/include/
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/perfuse/builtin.mk (expand / switch to unified diff)

--- pkgsrc/filesystems/perfuse/builtin.mk 2013/11/23 11:31:47 1.2
+++ pkgsrc/filesystems/perfuse/builtin.mk 2019/11/03 19:26:22 1.3
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:31:47 obache Exp $ 1# $NetBSD: builtin.mk,v 1.3 2019/11/03 19:26:22 rillig Exp $
2 2
3BUILTIN_PKG:= perfuse 3BUILTIN_PKG:= perfuse
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_PERFUSE 5BUILTIN_FIND_HEADERS_VAR:= H_PERFUSE
6BUILTIN_FIND_HEADERS.H_PERFUSE= perfuse.h 6BUILTIN_FIND_HEADERS.H_PERFUSE= perfuse.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if !defined(IS_BUILTIN.perfuse) 14.if !defined(IS_BUILTIN.perfuse)
15IS_BUILTIN.perfuse= no 15IS_BUILTIN.perfuse= no
16. if empty(H_PERFUSE:M__nonexistent__) 16. if empty(H_PERFUSE:M__nonexistent__)
17IS_BUILTIN.perfuse= yes 17IS_BUILTIN.perfuse= yes
18. endif 18. endif
19.endif 19.endif
20MAKEVARS+= IS_BUILTIN.perfuse 20MAKEVARS+= IS_BUILTIN.perfuse
21 21
22### 22###
23### Determine whether we should use the built-in implementation if it 23### Determine whether we should use the built-in implementation if it
24### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 24### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
25### 25###
26.if !defined(USE_BUILTIN.perfuse) 26.if !defined(USE_BUILTIN.perfuse)
27. if ${PREFER.perfuse} == "pkgsrc" 27. if ${PREFER.perfuse} == "pkgsrc"
28USE_BUILTIN.perfuse= no 28USE_BUILTIN.perfuse= no
29. else 29. else
30USE_BUILTIN.perfuse= ${IS_BUILTIN.perfuse} 30USE_BUILTIN.perfuse= ${IS_BUILTIN.perfuse}
31. if defined(BUILTIN_PKG.perfuse) && \ 31. if defined(BUILTIN_PKG.perfuse) && \
32 !empty(IS_BUILTIN.perfuse:M[yY][eE][sS]) 32 !empty(IS_BUILTIN.perfuse:M[yY][eE][sS])
33USE_BUILTIN.perfuse= yes 33USE_BUILTIN.perfuse= yes
34. for _dep_ in ${BUILDLINK_API_DEPENDS.perfuse} 34. for _dep_ in ${BUILDLINK_API_DEPENDS.perfuse}
35. if !empty(USE_BUILTIN.perfuse:M[yY][eE][sS]) 35. if !empty(USE_BUILTIN.perfuse:M[yY][eE][sS])
36USE_BUILTIN.perfuse!= \ 36USE_BUILTIN.perfuse!= \
37 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.perfuse:Q}; then \ 37 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.perfuse:Q}; then \
38 ${ECHO} yes; \ 38 ${ECHO} yes; \
39 else \ 39 else \
40 ${ECHO} no; \ 40 ${ECHO} no; \
41 fi 41 fi
42. endif 42. endif
43. endfor 43. endfor
44. endif 44. endif
45. endif # PREFER.perfuse 45. endif # PREFER.perfuse
46.endif 46.endif
47MAKEVARS+= USE_BUILTIN.perfuse 47MAKEVARS+= USE_BUILTIN.perfuse
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/squashfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/squashfs/Makefile 2017/03/09 16:31:50 1.4
+++ pkgsrc/filesystems/squashfs/Makefile 2019/11/03 19:26:22 1.5
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2017/03/09 16:31:50 kamil Exp $ 1# $NetBSD: Makefile,v 1.5 2019/11/03 19:26:22 rillig Exp $
2 2
3VERSION= 4.3 3VERSION= 4.3
4DISTNAME= squashfs${VERSION} 4DISTNAME= squashfs${VERSION}
5PKGNAME= squashfs-${VERSION} 5PKGNAME= squashfs-${VERSION}
6 6
7PKGREVISION= 2 7PKGREVISION= 2
8CATEGORIES= filesystems 8CATEGORIES= filesystems
9MASTER_SITES= http://downloads.sourceforge.net/project/squashfs/squashfs/${DISTNAME}/ 9MASTER_SITES= http://downloads.sourceforge.net/project/squashfs/squashfs/${DISTNAME}/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://squashfs.sourceforge.net/ 12HOMEPAGE= http://squashfs.sourceforge.net/
13COMMENT= Tools for squashfs archives 13COMMENT= Tools for squashfs archives
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17.include "options.mk" 17.include "options.mk"
18 18
19USE_LANGUAGES= c 19USE_LANGUAGES= c
20 20
21USE_TOOLS+= gmake 21USE_TOOLS+= gmake
22 22
23INSTALLATION_DIRS= bin \ 23INSTALLATION_DIRS= bin \
24 share/doc/squashfs \ 24 share/doc/squashfs \
25 share/doc/squashfs/OLD-READMEs \ 25 share/doc/squashfs/OLD-READMEs \
26 share/examples/squashfs 26 share/examples/squashfs
27 27
28SQUASH_DIR= ${WRKDIR}/${DISTNAME} 28SQUASH_DIR= ${WRKDIR}/${DISTNAME}
29WRKSRC= ${SQUASH_DIR}/squashfs-tools 29WRKSRC= ${SQUASH_DIR}/squashfs-tools
30SQUASH_PKG_DOC= ${DESTDIR}${PREFIX}/share/doc/squashfs 30SQUASH_PKG_DOC= ${DESTDIR}${PREFIX}/share/doc/squashfs
31 31
32MAKE_ENV+= EXTRA_LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib" 32MAKE_ENV+= EXTRA_LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/squashfs/options.mk (expand / switch to unified diff)

--- pkgsrc/filesystems/squashfs/options.mk 2017/02/09 18:16:07 1.2
+++ pkgsrc/filesystems/squashfs/options.mk 2019/11/03 19:26:22 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2017/02/09 18:16:07 scole Exp $ 1# $NetBSD: options.mk,v 1.3 2019/11/03 19:26:22 rillig Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squashfs 3PKG_OPTIONS_VAR= PKG_OPTIONS.squashfs
4PKG_SUPPORTED_OPTIONS= zlib lz4 lzo xz xattr 4PKG_SUPPORTED_OPTIONS= zlib lz4 lzo xz xattr
5PKG_SUGGESTED_OPTIONS= zlib lzo xz 5PKG_SUGGESTED_OPTIONS= zlib lzo xz
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# XXX any other OS support xattr? 9# XXX any other OS support xattr?
10.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= xattr 11PKG_SUGGESTED_OPTIONS+= xattr
12.endif 12.endif
13 13
14.if empty(PKG_OPTIONS:Mzlib) && \ 14.if empty(PKG_OPTIONS:Mzlib) && \
@@ -50,19 +50,19 @@ SQUASH_COMPRESSORS+= xz @@ -50,19 +50,19 @@ SQUASH_COMPRESSORS+= xz
50BUILD_MAKE_FLAGS+= XZ_SUPPORT=0 50BUILD_MAKE_FLAGS+= XZ_SUPPORT=0
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mxattr) 53.if !empty(PKG_OPTIONS:Mxattr)
54BUILD_MAKE_FLAGS+= XATTR_SUPPORT=1 54BUILD_MAKE_FLAGS+= XATTR_SUPPORT=1
55.else 55.else
56BUILD_MAKE_FLAGS+= XATTR_SUPPORT=0 56BUILD_MAKE_FLAGS+= XATTR_SUPPORT=0
57.endif 57.endif
58 58
59# XXX is this ok with pkgsrc framework? 59# XXX is this ok with pkgsrc framework?
60# if default compressor specified (e.g. "bmake COMP_DEFAULT=xz") 60# if default compressor specified (e.g. "bmake COMP_DEFAULT=xz")
61# use that, else use gzip, else use first on list not including xattr 61# use that, else use gzip, else use first on list not including xattr
62.if empty(COMP_DEFAULT) 62.if empty(COMP_DEFAULT)
63.if !empty(PKG_OPTIONS:Mzlib) 63. if !empty(PKG_OPTIONS:Mzlib)
64BUILD_MAKE_FLAGS+= COMP_DEFAULT=gzip 64BUILD_MAKE_FLAGS+= COMP_DEFAULT=gzip
65.else 65. else
66BUILD_MAKE_FLAGS+= COMP_DEFAULT=${SQUASH_COMPRESSORS:Nxattr:[1]} 66BUILD_MAKE_FLAGS+= COMP_DEFAULT=${SQUASH_COMPRESSORS:Nxattr:[1]}
67.endif 67. endif
68.endif 68.endif
cvs diff -r1.39 -r1.40 pkgsrc/filesystems/tahoe-lafs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/tahoe-lafs/Makefile 2019/09/02 13:20:22 1.39
+++ pkgsrc/filesystems/tahoe-lafs/Makefile 2019/11/03 19:26:22 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2019/09/02 13:20:22 adam Exp $ 1# $NetBSD: Makefile,v 1.40 2019/11/03 19:26:22 rillig Exp $
2 2
3DISTNAME= tahoe-lafs-1.12.1 3DISTNAME= tahoe-lafs-1.12.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= https://tahoe-lafs.org/source/tahoe-lafs/tarballs/ 6MASTER_SITES= https://tahoe-lafs.org/source/tahoe-lafs/tarballs/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://tahoe-lafs.org/ 10HOMEPAGE= http://tahoe-lafs.org/
11COMMENT= Distributed fault-tolerant least-authority filesystem 11COMMENT= Distributed fault-tolerant least-authority filesystem
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS= gmake 14USE_TOOLS= gmake
@@ -30,46 +30,46 @@ DEPENDS+= ${PYPKGPREFIX}-pyutil-[0-9]*:. @@ -30,46 +30,46 @@ DEPENDS+= ${PYPKGPREFIX}-pyutil-[0-9]*:.
30# Included egg setuptools_darcs, used (no package yet). 30# Included egg setuptools_darcs, used (no package yet).
31DEPENDS+= ${PYPKGPREFIX}-foolscap>=0.12.6:../../net/py-foolscap 31DEPENDS+= ${PYPKGPREFIX}-foolscap>=0.12.6:../../net/py-foolscap
32DEPENDS+= ${PYPKGPREFIX}-twisted>=16.1.0:../../net/py-twisted 32DEPENDS+= ${PYPKGPREFIX}-twisted>=16.1.0:../../net/py-twisted
33DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.8:../../security/py-asn1 33DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.8:../../security/py-asn1
34DEPENDS+= ${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules 34DEPENDS+= ${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules
35DEPENDS+= ${PYPKGPREFIX}-characteristic>=14.0.0:../../devel/py-characteristic 35DEPENDS+= ${PYPKGPREFIX}-characteristic>=14.0.0:../../devel/py-characteristic
36DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto 36DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
37DEPENDS+= ${PYPKGPREFIX}-cryptopp>=0.6.0:../../security/py-cryptopp 37DEPENDS+= ${PYPKGPREFIX}-cryptopp>=0.6.0:../../security/py-cryptopp
38DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL 38DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
39DEPENDS+= ${PYPKGPREFIX}-nevow>=0.11.1:../../www/py-nevow 39DEPENDS+= ${PYPKGPREFIX}-nevow>=0.11.1:../../www/py-nevow
40DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity 40DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
41DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml 41DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
42 42
43PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver 43PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver
44 44
45# Note that there is an upstream (inherited from setuptools) bug 45# Note that there is an upstream (inherited from setuptools) bug
46# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that 46# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
47# will cause a build to fail if there is a package with bad modes 47# will cause a build to fail if there is a package with bad modes
48# installed. If you get mysterious failures, pkg_delete the installed 48# installed. If you get mysterious failures, pkg_delete the installed
49# version. 49# version.
50 50
51# OK: 1.9.1, 1.9.2, 1.10a2 51# OK: 1.9.1, 1.9.2, 1.10a2
52# BAD: 1.10a1 52# BAD: 1.10a1
53#BAD_DISTFILE_MODES=yes 53#BAD_DISTFILE_MODES=yes
54.if defined(BAD_DISTFILE_MODES) 54.if defined(BAD_DISTFILE_MODES)
55# Distfile has files mode 600, which leads to root-owned 600 files in 55# Distfile has files mode 600, which leads to root-owned 600 files in
56# the binary package. 56# the binary package.
57post-extract: 57post-extract:
58 ${ECHO} "Fixing distfile contents to be world readable:" 58 ${ECHO} "Fixing distfile contents to be world readable:"
59 chmod -R +r ${WRKSRC} 59 chmod -R +r ${WRKSRC}
60.endif 60.endif
61 61
62REPLACE_PYTHON+= src/allmydata/reliability.py 62REPLACE_PYTHON+= src/allmydata/reliability.py
63REPLACE_PYTHON+= src/allmydata/storage/shares.py 63REPLACE_PYTHON+= src/allmydata/storage/shares.py
64REPLACE_PYTHON+= src/buildtest/test_build_with_fake_dist.py 64REPLACE_PYTHON+= src/buildtest/test_build_with_fake_dist.py
65 65
66PKG_GROUPS= tahoes 66PKG_GROUPS= tahoes
67PKG_USERS= tahoes:tahoes 67PKG_USERS= tahoes:tahoes
68PKG_GECOS.tahoes= tahoe server 68PKG_GECOS.tahoes= tahoe server
69 69
70do-test: 70do-test:
71 cd ${WRKSRC} && py.test-2.7 71 cd ${WRKSRC} && py.test-2.7
72 72
73.include "../../lang/python/application.mk" 73.include "../../lang/python/application.mk"
74.include "../../lang/python/egg.mk" 74.include "../../lang/python/egg.mk"
75.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"