Sun Nov 3 11:55:30 2019 UTC ()
benchmarks: align variable assignments

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

No manual corrections.


(rillig)
diff -r1.15 -r1.16 pkgsrc/benchmarks/glmark2/Makefile
diff -r1.60 -r1.61 pkgsrc/benchmarks/hbench/Makefile
diff -r1.1 -r1.2 pkgsrc/benchmarks/iozone/options.mk
diff -r1.13 -r1.14 pkgsrc/benchmarks/netperf/Makefile
diff -r1.28 -r1.29 pkgsrc/benchmarks/skampi/Makefile
diff -r1.4 -r1.5 pkgsrc/benchmarks/sysbench/options.mk
diff -r1.10 -r1.11 pkgsrc/benchmarks/ubench/Makefile
diff -r1.26 -r1.27 pkgsrc/benchmarks/xengine/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/benchmarks/glmark2/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/glmark2/Makefile 2019/09/02 13:20:10 1.15
+++ pkgsrc/benchmarks/glmark2/Makefile 2019/11/03 11:55:29 1.16
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.15 2019/09/02 13:20:10 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2019/11/03 11:55:29 rillig Exp $
2 2
3DISTNAME= glmark2-2017.07 3DISTNAME= glmark2-2017.07
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= benchmarks 5CATEGORIES= benchmarks
6MASTER_SITES= ${MASTER_SITE_GITHUB:=glmark2/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=glmark2/}
7GITHUB_TAG= 168d2f1650c84be3f13d1a5b76ccec8cbb89188e 7GITHUB_TAG= 168d2f1650c84be3f13d1a5b76ccec8cbb89188e
8 8
9MAINTAINER= prlw1@cam.ac.uk 9MAINTAINER= prlw1@cam.ac.uk
10HOMEPAGE= https://github.com/glmark2/glmark2 10HOMEPAGE= https://github.com/glmark2/glmark2
11COMMENT= OpenGL 2.0 and ES 2.0 benchmark 11COMMENT= OpenGL 2.0 and ES 2.0 benchmark
12LICENSE= gnu-gpl-v3 AND modified-bsd 12LICENSE= gnu-gpl-v3 AND modified-bsd
13 13
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
15 15
16PYTHON_VERSIONS_ACCEPTED= 27 16PYTHON_VERSIONS_ACCEPTED= 27
17 17
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20.include "../../mk/dlopen.buildlink3.mk" 20.include "../../mk/dlopen.buildlink3.mk"
21.if empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS]) 21.if empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS])
22SUBST_CLASSES+= rmdl 22SUBST_CLASSES+= rmdl
23SUBST_STAGE.rmdl= pre-configure 23SUBST_STAGE.rmdl= pre-configure
24SUBST_MESSAGE.rmdl= remove -ldl 24SUBST_MESSAGE.rmdl= remove -ldl
25SUBST_FILES.rmdl= src/wscript_build 25SUBST_FILES.rmdl= src/wscript_build
26SUBST_SED.rmdl= -e "s/, 'dl'//" 26SUBST_SED.rmdl= -e "s/, 'dl'//"
27.endif 27.endif
28 28
29#./waf configure --with-flavors=<drm-gl,drm-glesv2,mir-gl,mir-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-glesv2> [--data-path=DATA_PATH --prefix=PREFIX] 29#./waf configure --with-flavors=<drm-gl,drm-glesv2,mir-gl,mir-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-glesv2> [--data-path=DATA_PATH --prefix=PREFIX]
cvs diff -r1.60 -r1.61 pkgsrc/benchmarks/hbench/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/hbench/Makefile 2019/08/11 13:17:58 1.60
+++ pkgsrc/benchmarks/hbench/Makefile 2019/11/03 11:55:29 1.61
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.60 2019/08/11 13:17:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.61 2019/11/03 11:55:29 rillig Exp $
2 2
3DISTNAME= hbench-OS-1.1 3DISTNAME= hbench-OS-1.1
4PKGNAME= hbench-1.1 4PKGNAME= hbench-1.1
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= benchmarks 6CATEGORIES= benchmarks
7#MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/ 7#MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/
8 8
9PATCHFILES= hbench-OS-1.1-provisional-patch1.diff 9PATCHFILES= hbench-OS-1.1-provisional-patch1.diff
10PATCH_SITES= http://www.eecs.harvard.edu/~dholland/netbsd/ 10PATCH_SITES= http://www.eecs.harvard.edu/~dholland/netbsd/
11PATCH_DIST_STRIP= -p1 11PATCH_DIST_STRIP= -p1
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14#HOMEPAGE= http://www.eecs.harvard.edu/vino/perf/hbench/ 14#HOMEPAGE= http://www.eecs.harvard.edu/vino/perf/hbench/
15COMMENT= Suite of portable benchmarks to measure the OS and the hardware 15COMMENT= Suite of portable benchmarks to measure the OS and the hardware
16 16
17DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 17DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
18 18
19WRKSRC= ${WRKDIR}/HBenchOS 19WRKSRC= ${WRKDIR}/HBenchOS
20OSVERSION_SPECIFIC= YES 20OSVERSION_SPECIFIC= YES
21BUILD_TARGET= build 21BUILD_TARGET= build
22USE_TOOLS+= perl:run 22USE_TOOLS+= perl:run
23OVERRIDE_GNU_CONFIG_SCRIPTS= yes 23OVERRIDE_GNU_CONFIG_SCRIPTS= yes
24MAKE_JOBS_SAFE= no 24MAKE_JOBS_SAFE= no
25 25
26GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//' 26GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//'
27GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^[^-]*-[^-]*-//;s/-.*$$//' 27GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^[^-]*-[^-]*-//;s/-.*$$//'
28PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q} 28PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q}
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32BUILDLINK_TRANSFORM.SunOS+= rm:-static 32BUILDLINK_TRANSFORM.SunOS+= rm:-static
33 33
34HB_HOSTNAME!= ${UNAME} -n 34HB_HOSTNAME!= ${UNAME} -n
35HB_SHORTNAME= ${HB_HOSTNAME:C/\..*//} 35HB_SHORTNAME= ${HB_HOSTNAME:C/\..*//}
36 36
37post-extract: 37post-extract:
cvs diff -r1.1 -r1.2 pkgsrc/benchmarks/iozone/options.mk (expand / switch to unified diff)

--- pkgsrc/benchmarks/iozone/options.mk 2008/08/29 06:14:22 1.1
+++ pkgsrc/benchmarks/iozone/options.mk 2019/11/03 11:55:29 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.1 2008/08/29 06:14:22 bjs Exp $ 1# $NetBSD: options.mk,v 1.2 2019/11/03 11:55:29 rillig Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.iozone 4PKG_OPTIONS_VAR= PKG_OPTIONS.iozone
5PKG_SUPPORTED_OPTIONS= threads 5PKG_SUPPORTED_OPTIONS= threads
6 6
7CHECK_BUILTIN.pthread:= yes 7CHECK_BUILTIN.pthread:= yes
8. include "../../mk/pthread.builtin.mk" 8.include "../../mk/pthread.builtin.mk"
9CHECK_BUILTIN.pthread:= no 9CHECK_BUILTIN.pthread:= no
10 10
11.if !empty(USE_BUILTIN.pthread:M[Yy][Ee][Ss]) 11.if !empty(USE_BUILTIN.pthread:M[Yy][Ee][Ss])
12PKG_SUGGESTED_OPTIONS= threads 12PKG_SUGGESTED_OPTIONS= threads
13.endif 13.endif
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17.if !empty(PKG_OPTIONS:Mthreads) 17.if !empty(PKG_OPTIONS:Mthreads)
18BUILDLINK_TRANSFORM+= opt:-DNO_THREADS:-DTHREADS 18BUILDLINK_TRANSFORM+= opt:-DNO_THREADS:-DTHREADS
19PTHREAD_AUTO_VARS= yes 19PTHREAD_AUTO_VARS= yes
20PTHREAD_OPTS+= require 20PTHREAD_OPTS+= require
21.endif 21.endif
cvs diff -r1.13 -r1.14 pkgsrc/benchmarks/netperf/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/netperf/Makefile 2018/02/01 13:40:27 1.13
+++ pkgsrc/benchmarks/netperf/Makefile 2019/11/03 11:55:29 1.14
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.13 2018/02/01 13:40:27 jperkin Exp $ 1# $NetBSD: Makefile,v 1.14 2019/11/03 11:55:29 rillig Exp $
2 2
3DISTNAME= netperf-2.7.0 3DISTNAME= netperf-2.7.0
4CATEGORIES= benchmarks 4CATEGORIES= benchmarks
5MASTER_SITES= ftp://ftp.netperf.org/netperf/ 5MASTER_SITES= ftp://ftp.netperf.org/netperf/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.netperf.org/ 9HOMEPAGE= http://www.netperf.org/
10COMMENT= Rick Jones' network performance benchmarking package 10COMMENT= Rick Jones' network performance benchmarking package
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14INFO_FILES= yes 14INFO_FILES= yes
15 15
16CFLAGS.IRIX+= -DIRIX 16CFLAGS.IRIX+= -DIRIX
17 17
18.include "../../mk/compiler.mk" 18.include "../../mk/compiler.mk"
19 19
20. if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) 20.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
21CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 21CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
22.else 22.else
23CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ 23CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
24.endif 24.endif
25 25
26INSTALLATION_DIRS= ${PKGMANDIR}/man1 26INSTALLATION_DIRS= ${PKGMANDIR}/man1
27 27
28# The sources assume <malloc.h> exists. Create a fake one for platforms 28# The sources assume <malloc.h> exists. Create a fake one for platforms
29# that don't have it. 29# that don't have it.
30.if !exists(/usr/include/malloc.h) 30.if !exists(/usr/include/malloc.h)
31post-wrapper: 31post-wrapper:
32 ${ECHO} "#include <stdlib.h>" > ${BUILDLINK_DIR}/include/malloc.h 32 ${ECHO} "#include <stdlib.h>" > ${BUILDLINK_DIR}/include/malloc.h
33.endif 33.endif
cvs diff -r1.28 -r1.29 pkgsrc/benchmarks/skampi/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/skampi/Makefile 2018/01/01 18:16:35 1.28
+++ pkgsrc/benchmarks/skampi/Makefile 2019/11/03 11:55:29 1.29
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.28 2018/01/01 18:16:35 rillig Exp $ 1# $NetBSD: Makefile,v 1.29 2019/11/03 11:55:29 rillig Exp $
2# 2#
3 3
4DISTNAME= skampi 4DISTNAME= skampi
5PKGNAME= skampi-5.0.4.355 5PKGNAME= skampi-5.0.4.355
6CATEGORIES= benchmarks parallel 6CATEGORIES= benchmarks parallel
7#MASTER_SITES= http://liinwww.ira.uka.de/~skampi/download/ 7#MASTER_SITES= http://liinwww.ira.uka.de/~skampi/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://liinwww.ira.uka.de/~skampi/ 10#HOMEPAGE= http://liinwww.ira.uka.de/~skampi/
11COMMENT= MPI (Message Passing Interface) benchmarks 11COMMENT= MPI (Message Passing Interface) benchmarks
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DIST_SUBDIR= ${PKGNAME_NOREV} 14DIST_SUBDIR= ${PKGNAME_NOREV}
15WRKSRC= ${WRKDIR}/skampi-5.0.4-r0355 15WRKSRC= ${WRKDIR}/skampi-5.0.4-r0355
16 16
17USE_TOOLS+= gmake pax 17USE_TOOLS+= gmake pax
18BUILD_TARGET= skampi 18BUILD_TARGET= skampi
19INSTALLATION_DIRS= bin 19INSTALLATION_DIRS= bin
20 20
21# Force file regeneration: 21# Force file regeneration:
22post-extract: 22post-extract:
23 rm ${WRKSRC}/Makefile.dep 23 rm ${WRKSRC}/Makefile.dep
24 24
25do-install: 25do-install:
26 ${INSTALL_PROGRAM} ${WRKSRC}/skampi ${DESTDIR}${PREFIX}/bin/skampi 26 ${INSTALL_PROGRAM} ${WRKSRC}/skampi ${DESTDIR}${PREFIX}/bin/skampi
27 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/skampi 27 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/skampi
28 (cd ${WRKSRC} && pax -rw ski ${DESTDIR}${PREFIX}/share/skampi) 28 (cd ${WRKSRC} && pax -rw ski ${DESTDIR}${PREFIX}/share/skampi)
29 (cd ${WRKSRC} && pax -rw doc ${DESTDIR}${PREFIX}/share/skampi) 29 (cd ${WRKSRC} && pax -rw doc ${DESTDIR}${PREFIX}/share/skampi)
30 30
31.include "../../mk/mpi.buildlink3.mk" 31.include "../../mk/mpi.buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/benchmarks/sysbench/options.mk (expand / switch to unified diff)

--- pkgsrc/benchmarks/sysbench/options.mk 2010/05/27 10:49:07 1.4
+++ pkgsrc/benchmarks/sysbench/options.mk 2019/11/03 11:55:29 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.4 2010/05/27 10:49:07 adam Exp $ 1# $NetBSD: options.mk,v 1.5 2019/11/03 11:55:29 rillig Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.sysbench 3PKG_OPTIONS_VAR= PKG_OPTIONS.sysbench
4PKG_SUPPORTED_OPTIONS+= mysql pgsql doc 4PKG_SUPPORTED_OPTIONS+= mysql pgsql doc
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mmysql) 8.if !empty(PKG_OPTIONS:Mmysql)
9CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} 9CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
10. include "../../mk/mysql.buildlink3.mk" 10. include "../../mk/mysql.buildlink3.mk"
11.else 11.else
12CONFIGURE_ARGS+= --without-mysql 12CONFIGURE_ARGS+= --without-mysql
13.endif 13.endif
14 14
15.if !empty(PKG_OPTIONS:Mpgsql) 15.if !empty(PKG_OPTIONS:Mpgsql)
16CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} 16CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX}
17. include "../../mk/pgsql.buildlink3.mk" 17. include "../../mk/pgsql.buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/benchmarks/ubench/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/ubench/Makefile 2015/12/29 19:49:17 1.10
+++ pkgsrc/benchmarks/ubench/Makefile 2019/11/03 11:55:29 1.11
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.10 2015/12/29 19:49:17 dholland Exp $ 1# $NetBSD: Makefile,v 1.11 2019/11/03 11:55:29 rillig Exp $
2# 2#
3 3
4DISTNAME= ubench-0.32 4DISTNAME= ubench-0.32
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= benchmarks 6CATEGORIES= benchmarks
7MASTER_SITES= http://www.phystech.com/ftp/ 7MASTER_SITES= http://www.phystech.com/ftp/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.phystech.com/download/ubench.html 10HOMEPAGE= http://www.phystech.com/download/ubench.html
11COMMENT= The Unix Benchmark utility 11COMMENT= The Unix Benchmark utility
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_TARGET= ubench 14BUILD_TARGET= ubench
15INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/ubench 15INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/ubench
16 16
17CFLAGS.SunOS+= -DSunOS 17CFLAGS.SunOS+= -DSunOS
18CFLAGS.Linux+= -D_POSIX_SOURCE 18CFLAGS.Linux+= -D_POSIX_SOURCE
19 19
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/benchmarks/xengine/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/xengine/Makefile 2014/10/09 14:06:00 1.26
+++ pkgsrc/benchmarks/xengine/Makefile 2019/11/03 11:55:30 1.27
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.26 2014/10/09 14:06:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.27 2019/11/03 11:55:30 rillig Exp $
2 2
3DISTNAME= xengine-1.0.1 3DISTNAME= xengine-1.0.1
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= benchmarks 5CATEGORIES= benchmarks
6MASTER_SITES= ftp://ftp.42.org/pub/OLD/x/xengine/ 6MASTER_SITES= ftp://ftp.42.org/pub/OLD/x/xengine/
7DISTFILES= part01.z patch1.z 7DISTFILES= part01.z patch1.z
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Reciprocating engine for X 10COMMENT= Reciprocating engine for X
11 11
12WRKSRC= ${WRKDIR} 12WRKSRC= ${WRKDIR}
13DIST_SUBDIR= xengine 13DIST_SUBDIR= xengine
14USE_IMAKE= yes 14USE_IMAKE= yes
15PATCH_DIST_STRIP= -p1 15PATCH_DIST_STRIP= -p1
16 16
17USE_TOOLS+= gzcat patch sed 17USE_TOOLS+= gzcat patch sed
18 18
19EXTRACT_CMD= ${GZCAT} $$extract_file | ${SED} "1,/\#!/d" | ${SH} 19EXTRACT_CMD= ${GZCAT} $$extract_file | ${SED} "1,/\#!/d" | ${SH}
20 20
21pre-configure: 21pre-configure:
22 cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < xengine.patch1 22 cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < xengine.patch1
23 23
24INSTALLATION_DIRS= share/doc/xengine 24INSTALLATION_DIRS= share/doc/xengine
25 25
26post-install: 26post-install:
27 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xengine 27 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xengine