*: replace round parentheses with curly braces

pkglint -Wall -r -F --only "curly"
This commit is contained in:
Roland Illig 2019-06-30 23:46:34 +02:00
parent 328bdeb177
commit 5b7c1a45fd
33 changed files with 51 additions and 51 deletions

View File

@ -53,7 +53,7 @@ CONFIGURE_ARGS+= -with-doc no
.if !empty(PKG_OPTIONS:Mcoqide)
.include "../../wip/ocaml-lablgtk3/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
CONFIGURE_ARGS+= -coqide $(COQIDE_TYPE)
CONFIGURE_ARGS+= -coqide ${COQIDE_TYPE}
PLIST.coqide= yes
.else
CONFIGURE_ARGS+= -coqide no

View File

@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= dssi.pc.in
.include "options.mk"
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
BUILDLINK_TRANSFORM= rm:-ldl
.endif

View File

@ -21,7 +21,7 @@ USE_TOOLS+= gmake
USE_TOOLS+= pkg-config
NO_CONFIGURE= yes
MAKE_ENV+= REAL_VERSION=${VERSION}
MAKE_ENV+= MANDIR=$(PREFIX)/${PKGMANDIR}
MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"

View File

@ -15,7 +15,7 @@ USE_TOOLS+= gmake
USE_TOOLS+= pkg-config
NO_CONFIGURE= yes
MAKE_ENV+= REAL_VERSION=${VERSION}
MAKE_ENV+= MANDIR=$(PREFIX)/${PKGMANDIR}
MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"

View File

@ -15,7 +15,7 @@ CONFLICTS+= erlang-[0-9]*
DIST_SUBDIR= basho
GITHUB_PROJECT= otp
GITHUB_TAG= ${DISTNAME}
WRKSRC= $(WRKDIR)/otp-${DISTNAME}
WRKSRC= ${WRKDIR}/otp-${DISTNAME}
GNU_CONFIGURE= yes
USE_GNU_CONFIGURE_HOST= ${USE_CROSS_COMPILE}

View File

@ -70,11 +70,11 @@ PLIST_SUBST+= VERSION.${name}=${version}
.endfor
# Generate PLIST
.for _pkg_ _version_ in $(_VERSIONS)
.for _pkg_ _version_ in ${_VERSIONS}
PRINT_PLIST_AWK+= {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
# documentation:
PRINT_PLIST_AWK+= {gsub(/\/$(_pkg_)-$(_version_)\.pdf/,"/$(_pkg_)-$${VERSION.$(_pkg_)}.pdf", $$0);}
PRINT_PLIST_AWK+= {gsub(/\/$(_pkg_)-${_version_}\.pdf/,"/$(_pkg_)-$${VERSION.$(_pkg_)}.pdf", $$0);}
.endfor
PRINT_PLIST_AWK+= {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
# documentation:
PRINT_PLIST_AWK+= {gsub(/\/otp-system-documentation-$(VERSION.erts)\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}
PRINT_PLIST_AWK+= {gsub(/\/otp-system-documentation-${VERSION.erts}\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}

View File

@ -14,7 +14,7 @@ LICENSE= erlang-public-license
CONFLICTS+= erlang-[0-9]*
DIST_SUBDIR= erlang
WRKSRC= $(WRKDIR)/otp_src_${DIST_VERSION_MAJOR}
WRKSRC= ${WRKDIR}/otp_src_${DIST_VERSION_MAJOR}
MAKE_JOBS_SAFE= no

View File

@ -71,11 +71,11 @@ PLIST_SUBST+= VERSION.${name}=${version}
.endfor
# Generate PLIST
.for _pkg_ _version_ in $(_VERSIONS)
.for _pkg_ _version_ in ${_VERSIONS}
PRINT_PLIST_AWK+= {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
# documentation:
PRINT_PLIST_AWK+= {gsub(/\/$(_pkg_)-$(_version_)\.pdf/,"/$(_pkg_)-$${VERSION.$(_pkg_)}.pdf", $$0);}
PRINT_PLIST_AWK+= {gsub(/\/$(_pkg_)-${_version_}\.pdf/,"/$(_pkg_)-$${VERSION.$(_pkg_)}.pdf", $$0);}
.endfor
PRINT_PLIST_AWK+= {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
# documentation:
PRINT_PLIST_AWK+= {gsub(/\/otp-system-documentation-$(VERSION.erts)\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}
PRINT_PLIST_AWK+= {gsub(/\/otp-system-documentation-${VERSION.erts}\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}

View File

@ -24,7 +24,7 @@ SUBST_MESSAGE.pkgmandir= Fixing PKGMANDIR path.
SUBST_SED.pkgmandir= -e "s|share/man|${PKGMANDIR}|g"
SUBST_STAGE.pkgmandir= post-patch
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
BUILDLINK_TRANSFORM= rm:-ldl
.endif

View File

@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --enable-mpi
.if defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
USE_TOOLS+= perl
TEST_MAKE_FLAGS+= MPIRUN=$(MPI_PREFIX)/bin/mpirun
TEST_MAKE_FLAGS+= MPIRUN=${MPI_PREFIX}/bin/mpirun
.endif
.include "../../devel/libltdl/buildlink3.mk"

View File

@ -30,7 +30,7 @@ GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
# XXX: Using %M requires patched version of gcc (e.g. wip/gcc46)
${SPECS_LIBGCC}:
@${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
@${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
@${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

View File

@ -30,7 +30,7 @@ GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
# XXX: Using %M requires patched version of gcc (e.g. wip/gcc47)
${SPECS_LIBGCC}:
@${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
@${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
@${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

View File

@ -44,14 +44,14 @@ SUBST_STAGE.gksu= post-configure
SUBST_CLASSES+= term
SUBST_FILES.term= gksu.desktop
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
SUBST_SED.term= -e 's,/usr/bin/x-terminal-emulator,${PREFIX}/bin/gnome-terminal,g'
.endif
SUBST_STAGE.term= post-configure
REPLACE_BASH+= gksu-migrate-conf.sh
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
DEPENDS+= gnome-terminal>=2.32.1:../../x11/gnome-terminal
.endif

View File

@ -23,7 +23,7 @@ CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
.include "../../mk/bsd.prefs.mk"
.if $(MACHINE_ARCH) == "i386"
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -msse -msse2
.endif

View File

@ -23,7 +23,7 @@ CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
.include "../../mk/bsd.prefs.mk"
.if $(MACHINE_ARCH) == "i386"
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -msse -msse2
.endif

View File

@ -24,7 +24,7 @@ SUBST_SED.prefix= -e "s|/usr/local|${DESTDIR}${PREFIX}|1"
.include "../../mk/bsd.prefs.mk"
.if $(OPSYS) == "NetBSD"
.if ${OPSYS} == "NetBSD"
MAKE_FILE= makefile.openbsd
.else
MAKE_FILE= makefile.${OPSYS:tl}

View File

@ -22,6 +22,6 @@ USE_LANGUAGES= c c++
BUILD_DIRS= talk/base
post-extract:
$(CP) $(FILESDIR)/Makefile $(WRKSRC)/talk/base/
${CP} ${FILESDIR}/Makefile ${WRKSRC}/talk/base/
.include "../../mk/bsd.pkg.mk"

View File

@ -25,7 +25,7 @@ DEPENDS+= p5-Tree-DAG_Node>=1.04:../../devel/p5-Tree-DAG_Node
DEPENDS+= p5-DBD-Sybase>=0.94:../../databases/p5-DBD-Sybase
# Depend on default MySQL server:
DEPENDS+= mysql-server>=5.0:../../databases/mysql$(MYSQL_VERSION_DEFAULT)-server
DEPENDS+= mysql-server>=5.0:../../databases/mysql${MYSQL_VERSION_DEFAULT}-server
USE_PKGLOCALEDIR= yes

View File

@ -35,7 +35,7 @@ WRKSRC= ${WRKDIR}/maxima
USE_TOOLS+= aclocal automake autoconf
CONFIGURE_ENV+= VERSION=$(PKGVERSION_NOREV) ac_cv_prog_git_found=false
CONFIGURE_ENV+= VERSION=${PKGVERSION_NOREV} ac_cv_prog_git_found=false
SUBST_CLASSES+= fix-version
SUBST_STAGE.fix-version= post-patch
@ -44,7 +44,7 @@ SUBST_FILES.fix-version= configure.in
SUBST_SED.fix-version= -e 's:AC_INIT(\[maxima\], *\[.*\]):AC_INIT([maxima],[${PKGVERSION_NOREV}]):'
PYTHON_FOR_BUILD_ONLY= yes
ALL_ENV+= PYTHONBIN=$(PYTHONBIN:Q)
ALL_ENV+= PYTHONBIN=${PYTHONBIN:Q}
pre-configure:
cd ${WRKSRC}/src && ${CONFIG_SHELL} ../admin/make_share_list

View File

@ -12,7 +12,7 @@ LICENSE= modified-bsd
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake bash
.if defined(MLTON_BOOT) && $(MLTON_BOOT) == "mlton"
.if defined(MLTON_BOOT) && ${MLTON_BOOT} == "mlton"
BUILD_TARGET= all
.else # use SML/NJ
BUILD_DEPENDS+= smlnj-[0-9]*:../../lang/smlnj
@ -22,7 +22,7 @@ BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
GIT_REPOSITORIES= mlton
GIT_REPO.mlton= git://github.com/MLton/mlton.git
WRKSRC= $(WRKDIR)/mlton
WRKSRC= ${WRKDIR}/mlton
REPLACE_PERL= lib/mlrisc-lib/MLRISC/Doc/html/mltex2html \
lib/mlrisc-lib/MLRISC/Doc/html/mltex2html.orig \
@ -38,7 +38,7 @@ REPLACE_BASH= bin/mlton-script
SUBST_CLASSES+= fix-sh
SUBST_STAGE.fix-sh= pre-configure
SUBST_MESSAGE.fix-sh= Fixing broken scripts
SUBST_FILES.fix-sh= $(REPLACE_SH)
SUBST_FILES.fix-sh= ${REPLACE_SH}
#SUBST_SED.fix-sh= -e '1s|^\#![[:space:]]*[^[:space:]]*sh|\#!${SH}|'
SUBST_SED.fix-sh= -e '1s|^\#!.*|\#!${SH}|'

View File

@ -4,7 +4,7 @@
DISTNAME= mopac7-1.11
PKGNAME= lib${DISTNAME}
CATEGORIES= biology
MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=mopac7/)
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mopac7/}
MAINTAINER= jihbed.research@gmail.com
HOMEPAGE= http://sourceforge.net/projects/mopac7/

View File

@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-libctl=${PREFIX}/share/libctl \
--prefix=${MPI_PREFIX:Q} \
--mandir=${MPI_PREFIX:Q}/man
# Prevent picking up wrong sh:
CONFIGURE_ENV+= SH_JOB=$(TOOLS_PATH.sh)
CONFIGURE_ENV+= SH_JOB=${TOOLS_PATH.sh}
CFLAGS+= -DH5_USE_16_API=1

View File

@ -17,7 +17,7 @@ USE_TOOLS+= gsed
CONFIGURE_ARGS+= --with-libctl=${BUILDLINK_PREFIX.libctl}/share/libctl
# Prevent picking up wrong sh:
CONFIGURE_ENV+= SH_JOB=$(TOOLS_PATH.sh)
CONFIGURE_ENV+= SH_JOB=${TOOLS_PATH.sh}
CFLAGS+= -DH5_USE_16_API=1
.include "../../math/blas/buildlink3.mk"

View File

@ -25,7 +25,7 @@ BUILD_DEPENDS+= noweb-[0-9]*:../../devel/noweb
BUILD_MAKE_FLAGS+= TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
CONFIGURE_ENV+= HOST_AWK=$(TOOLS_PATH.awk) # force it
CONFIGURE_ENV+= HOST_AWK=${TOOLS_PATH.awk} # force it
.include "options.mk"

View File

@ -13,7 +13,7 @@ HOMEPAGE= http://www.open-mpi.org/
COMMENT= Open source MPI-2 implementation
MPI_SUBPREFIX= openmpi
MPI_PREFIX= $(LOCALBASE)/$(MPI_SUBPREFIX)
MPI_PREFIX= ${LOCALBASE}/${MPI_SUBPREFIX}
.include "../../mk/bsd.prefs.mk"
@ -37,7 +37,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool \
SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 \
${WRKSRC}/opal/libltdl/m4/libtool.m4
GNU_CONFIGURE_PREFIX= $(MPI_PREFIX)
GNU_CONFIGURE_PREFIX= ${MPI_PREFIX}
.if ${OPSYS} != Darwin && ${OPSYS} != Linux
CONFIGURE_ARGS+= --disable-mpi-fortran
.endif
@ -45,8 +45,8 @@ CONFIGURE_ARGS+= --without-sge
# CONFIGURE_ARGS+= --without-slurm
CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package
CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl
CONFIGURE_ARGS+= --with-hwloc=$(BUILDLINK_PREFIX.hwloc:Q) #external
CONFIGURE_ARGS+= --with-wrapper-ldflags="-L$(MPI_PREFIX)/lib $(COMPILER_RPATH_FLAG)$(MPI_PREFIX)/lib"
CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc:Q} #external
CONFIGURE_ARGS+= --with-wrapper-ldflags="-L$(MPI_PREFIX)/lib ${COMPILER_RPATH_FLAG}$(MPI_PREFIX)/lib"
CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"??
CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0
# Suppress regeneration:

View File

@ -24,7 +24,7 @@ CMAKE_ARGS+= -DX11_ICE_INCLUDE_PATH=${BUILDLINK_PREFIX.libICE}/include/X11/ICE
.include "../../mk/bsd.prefs.mk"
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
BUILDLINK_TRANSFORM= rm:-ldl
CMAKE_ARGS+= -Dlibdl=NO
.else

View File

@ -74,12 +74,12 @@ post-build:
do-install:
cd ${WRKSRC} && BUILD_ROOT=${DESTDIR} INSTALL_ROOT=${PREFIX} MAN_DIR=${PREFIX}/${PKGMANDIR} ${SH} install.sh
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/asdf-install/installer.lisp.orig
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/posix-tests.lisp.orig
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/test-output/write-test.txt
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/test-output/read-test.txt
find $(DESTDIR)$(PREFIX)/lib/sbcl -type d -name CVS -exec rm -rf {} \+
find $(DESTDIR)$(PREFIX)/lib/sbcl -type f -name .cvsignore -exec rm -f {} \+
rm -f ${DESTDIR}${PREFIX}/lib/sbcl/asdf-install/installer.lisp.orig
rm -f ${DESTDIR}${PREFIX}/lib/sbcl/sb-posix/posix-tests.lisp.orig
rm -f ${DESTDIR}${PREFIX}/lib/sbcl/sb-posix/test-output/write-test.txt
rm -f ${DESTDIR}${PREFIX}/lib/sbcl/sb-posix/test-output/read-test.txt
find ${DESTDIR}${PREFIX}/lib/sbcl -type d -name CVS -exec rm -rf {} \+
find ${DESTDIR}${PREFIX}/lib/sbcl -type f -name .cvsignore -exec rm -f {} \+
do-test:
cd ${WRKSRC}/tests && ${SH} ./run-tests.sh

View File

@ -33,7 +33,7 @@ MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q}
MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
MAKE_FLAGS+= CHMOD=${CHMOD:Q}
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
MAKE_FLAGS+= MAN_PREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}/
MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf
EGDIR= ${PREFIX}/share/examples/tuxpaint
CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf

View File

@ -74,7 +74,7 @@ post-patch:
done)
do-configure:
(cd $(WRKSRC) ; \
(cd ${WRKSRC} ; \
cmake \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \

View File

@ -21,7 +21,7 @@ CONF_FILES+= ${EGDIR}/unagi.conf ${PKG_SYSCONFDIR}/xdg/unagi.conf
.include "options.mk"
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
BUILDLINK_TRANSFORM= rm:-ldl
.endif

View File

@ -32,7 +32,7 @@ BUILD_TARGET+= datastuff
INSTALL_TARGET+= manpages install-dat
INSTALLATION_DIRS= ${PKGMANDIR}/man6 ${GAMEDIR}
PLIST_SUBST+= VER=$(VER)
PLIST_SUBST+= VER=${VER}
PLIST_VARS= x11
USE_LANGUAGES= c
@ -49,8 +49,8 @@ BUILD_DEFS+= GAMES_USER GAMES_GROUP
GAMEPERM= ${NETHACK_USER} ${NETHACK_GROUP} 2555
GAMEDIR= ${PREFIX}/share/${NETHACK_DIR}
NETHACK_DIR= unnethackdir$(VER)
VARDIR= /var/games/unnethack$(VER)
NETHACK_DIR= unnethackdir${VER}
VARDIR= /var/games/unnethack${VER}
MAN6DIR= ${PREFIX}/${PKGMANDIR}/man6
#MAKE_ENV+= GAMEDIR=${GAMEDIR:Q}
MAKE_ENV+= MANDIR=${MAN6DIR:Q}

View File

@ -21,7 +21,7 @@ PKGCONFIG_OVERRIDE+= uprof.pc.in
.include "options.mk"
.if $(OPSYS) != "Linux"
.if ${OPSYS} != "Linux"
BUILDLINK_TRANSFORM= rm:-ldl
.endif

View File

@ -16,7 +16,7 @@ USE_LANGUAGES+= c c++
WRKSRC= ${WRKDIR}/Xonotic
BUILD_TARGET= all-zip-source
INSTALL_TARGET= install-data-zip-source install-engine-zip-source install-links
INSTALL_ENV+= LIBDIR=$(PREFIX)/lib
INSTALL_ENV+= LIBDIR=${PREFIX}/lib
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"