From cc3b4f7436212cd0095661abd056995d20c1812c Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Mon, 31 Aug 2015 13:40:27 +0200 Subject: [PATCH] chris2: whitespace style fixes --- srcpkgs/AlsaMixer.app/template | 4 ++-- srcpkgs/base-devel/template | 4 ++-- srcpkgs/ht/template | 2 +- srcpkgs/hunspell-fr_FR/template | 2 +- srcpkgs/kona/template | 2 +- srcpkgs/ngetty/template | 6 +++--- srcpkgs/passwdqc/template | 12 ++++++------ srcpkgs/radvd/template | 2 +- srcpkgs/redo/template | 2 +- srcpkgs/slurm/template | 2 +- srcpkgs/squid/template | 2 +- srcpkgs/stack/template | 2 +- srcpkgs/tgt/template | 2 +- srcpkgs/ts/template | 2 +- srcpkgs/xaos/template | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/srcpkgs/AlsaMixer.app/template b/srcpkgs/AlsaMixer.app/template index 19f24fd31ec..f04dae26052 100644 --- a/srcpkgs/AlsaMixer.app/template +++ b/srcpkgs/AlsaMixer.app/template @@ -11,8 +11,8 @@ distfiles="http://distfiles.gentoo.org/distfiles/AlsaMixer.app-${version}.tar.gz checksum=7d55d3ba5ffd82bcddcb546e0aa33ab8638df5d1418aa170e91c42e35c0c8c15 do_build() { - make ${makejobs} CXX="$CXX" CXXFLAGS="$CXXFLAGS" + make ${makejobs} CXX="$CXX" CXXFLAGS="$CXXFLAGS" } do_install() { - vbin AlsaMixer.app + vbin AlsaMixer.app } diff --git a/srcpkgs/base-devel/template b/srcpkgs/base-devel/template index 63c83300c91..0c6884cd50a 100644 --- a/srcpkgs/base-devel/template +++ b/srcpkgs/base-devel/template @@ -7,8 +7,8 @@ noarch=yes depends="autoconf automake bc binutils bison ed flex gcc gcc-c++ gettext groff libtool m4 make patch pkg-config texinfo unzip xz" case "$XBPS_TARGET_MACHINE" in - *-musl) depends+=" musl";; - *) depends+=" glibc-devel";; + *-musl) depends+=" musl";; + *) depends+=" glibc-devel";; esac short_desc="Void Linux development tools meta package" maintainer="Christian Neukirchen " diff --git a/srcpkgs/ht/template b/srcpkgs/ht/template index 7c6291902c5..81cf3a0604d 100644 --- a/srcpkgs/ht/template +++ b/srcpkgs/ht/template @@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/hte/ht-source/${pkgname}-${version}.tar.bz2" checksum=31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70 pre_build() { - make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS= -C tools bin2c + make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS= -C tools bin2c } post_install() { diff --git a/srcpkgs/hunspell-fr_FR/template b/srcpkgs/hunspell-fr_FR/template index 5e61d113fac..10ca0da7490 100644 --- a/srcpkgs/hunspell-fr_FR/template +++ b/srcpkgs/hunspell-fr_FR/template @@ -16,7 +16,7 @@ do_install() { _variant="classique" vinstall fr-${_variant}.aff 644 /usr/share/hunspell fr_FR.aff vinstall fr-${_variant}.dic 644 /usr/share/hunspell fr_FR.dic - vdoc README_dict_fr.txt + vdoc README_dict_fr.txt } hunspell-fr_FR-moderne_package() { diff --git a/srcpkgs/kona/template b/srcpkgs/kona/template index d40ed1f2295..e4c0220d4f0 100644 --- a/srcpkgs/kona/template +++ b/srcpkgs/kona/template @@ -22,4 +22,4 @@ do_build() { do_install() { vbin k vlicense LICENSE -} +} diff --git a/srcpkgs/ngetty/template b/srcpkgs/ngetty/template index f85acb55ac0..6be4cf4ba74 100644 --- a/srcpkgs/ngetty/template +++ b/srcpkgs/ngetty/template @@ -17,8 +17,8 @@ do_build() { cp opts_defs.h opts_defs.h.save cp opts__defs.h opts__defs.h.save make clean - cp opts_defs.h.save opts_defs.h - cp opts__defs.h.save opts__defs.h + cp opts_defs.h.save opts_defs.h + cp opts__defs.h.save opts__defs.h sed -i 's/opts_defs.h: opts_make/opts_defs.h:/' Makefile sed -i '/NGETTY_HELPER/s/sbin/bin/' lib.h @@ -26,7 +26,7 @@ do_build() { cp ${FILESDIR}/Conf . if [ "$build_option_static" ]; then - LDFLAGS+=" -static" + LDFLAGS+=" -static" fi make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" STR=: diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template index 0defb111664..a91311cdfb9 100644 --- a/srcpkgs/passwdqc/template +++ b/srcpkgs/passwdqc/template @@ -19,10 +19,10 @@ do_build() { } passwdqc-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - } + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } } diff --git a/srcpkgs/radvd/template b/srcpkgs/radvd/template index 5b84e459361..d4ae1fd9570 100644 --- a/srcpkgs/radvd/template +++ b/srcpkgs/radvd/template @@ -17,7 +17,7 @@ configure_args="--sbindir=/usr/bin" post_extract() { case "$XBPS_TARGET_MACHINE" in - *-musl) + *-musl) sed -i 's/ARPHRD_IEEE802154_PHY/ARPHRD_IEEE802154_MONITOR/g' \ device-linux.c esac diff --git a/srcpkgs/redo/template b/srcpkgs/redo/template index 406ba3e4079..9faa0374562 100644 --- a/srcpkgs/redo/template +++ b/srcpkgs/redo/template @@ -19,7 +19,7 @@ do_configure() { echo "$CPPFLAGS" >build/cxxflags echo "$CXXFLAGS" >build/cxxflags echo "$LDFLAGS" >build/ldflags -} +} do_build() { ./package/make diff --git a/srcpkgs/slurm/template b/srcpkgs/slurm/template index 7ae57c1392a..46b86211dde 100644 --- a/srcpkgs/slurm/template +++ b/srcpkgs/slurm/template @@ -17,7 +17,7 @@ post_extract() { sed -i '//d' os.h sed -i 's,,,g' os.h sed -i 's,,,g' os.h - + } post_install() { vman slurm.1 diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index c14ef88cf91..5f2bdb77809 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args=" --sbindir=/usr/bin --sysconfdir=/etc/squid - --libexecdir=/usr/libexec/squid + --libexecdir=/usr/libexec/squid --datadir=/usr/share/squid --localstatedir=/var --with-logdir=/var/log/squid diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index b364e2efac9..175b17ae52e 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -25,7 +25,7 @@ do_build() { cabal configure -v --prefix=/usr --libsubdir='$pkg' \ --datasubdir='$pkg' --docdir='$datadir/doc/$pkg' cabal build ${makejobs} -} +} do_install() { vbin dist/build/stack/stack diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template index 5ac189f02d3..3841c7fe511 100644 --- a/srcpkgs/tgt/template +++ b/srcpkgs/tgt/template @@ -20,7 +20,7 @@ post_extract() { sed -i '1i#include ' usr/tgtd.h usr/util.h sed -i '1i#include ' usr/libssc.c sed -i 's/__always_inline/inline/g' usr/util.h - + } post_install() { for f in ${DESTDIR}/etc/tgt/examples/*; do diff --git a/srcpkgs/ts/template b/srcpkgs/ts/template index 89360a571e2..cc5dd425298 100644 --- a/srcpkgs/ts/template +++ b/srcpkgs/ts/template @@ -11,7 +11,7 @@ distfiles="http://vicerveza.homeunix.net/~viric/soft/ts/${pkgname}-${version}.ta checksum=216d09dcfbae2f9bfea7582a71494172fe91c33d65499ea01b3bcac0600de96d do_build() { - make ${makejobs} CC="$CC" CFLAGS="$CFLAGS $CPPFLAGS" LDFLAGS="$LDFLAGS" + make ${makejobs} CC="$CC" CFLAGS="$CFLAGS $CPPFLAGS" LDFLAGS="$LDFLAGS" } do_install() { diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template index afd623a2e4a..e0ec53fd195 100644 --- a/srcpkgs/xaos/template +++ b/srcpkgs/xaos/template @@ -15,7 +15,7 @@ checksum=989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95 CFLAGS+=" -DNOREGISTERS" post_configure() { - sed -i '/install/s/-s//' Makefile + sed -i '/install/s/-s//' Makefile } post_install() {