diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-04 21:50:15 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-04 21:50:15 +0000 |
commit | d889e73ea365ea2b6518dcb7ee1a4cf5cacfbbbb (patch) | |
tree | f5c277fa86e76ff8a7479959cf37006887f5e5a2 | |
parent | 677e9a4c14a2682ef0e190aee0c4c5110d8ebc23 (diff) | |
download | pkgsrc-d889e73ea365ea2b6518dcb7ee1a4cf5cacfbbbb.tar.gz |
wm: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
-rw-r--r-- | wm/9wm/Makefile | 4 | ||||
-rw-r--r-- | wm/amaterus/Makefile | 4 | ||||
-rw-r--r-- | wm/amiwm/Makefile | 4 | ||||
-rw-r--r-- | wm/blackbox70/Makefile | 4 | ||||
-rw-r--r-- | wm/ccsm/Makefile | 4 | ||||
-rw-r--r-- | wm/ctwm/Makefile | 10 | ||||
-rw-r--r-- | wm/ethemes/Makefile | 4 | ||||
-rw-r--r-- | wm/fvwm-themes/Makefile | 8 | ||||
-rw-r--r-- | wm/i3/Makefile | 4 | ||||
-rw-r--r-- | wm/jwm/Makefile | 4 | ||||
-rw-r--r-- | wm/oroborox/Makefile | 4 | ||||
-rw-r--r-- | wm/xmonad-contrib/options.mk | 12 | ||||
-rw-r--r-- | wm/xmonad/Makefile | 8 |
13 files changed, 37 insertions, 37 deletions
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile index f0eb7956341..92483f738ad 100644 --- a/wm/9wm/Makefile +++ b/wm/9wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/05/20 11:50:09 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:50:15 rillig Exp $ DISTNAME= 9wm-1.4.0 PKGREVISION= 1 @@ -14,7 +14,7 @@ LICENSE= mit USE_TOOLS= gmake -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/9wm ${DESTDIR}${PREFIX}/bin diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 578ad6a8c1d..1b7b8860ddd 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:13 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/04 21:50:15 rillig Exp $ DISTNAME= amaterus-0.34.1 PKGREVISION= 6 @@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.taiyaki.org/ COMMENT= GTK+ window manager -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES INSTALLATION_DIRS= share/doc/amaterus post-install: diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile index 68674385f1b..5e8346b1fe1 100644 --- a/wm/amiwm/Makefile +++ b/wm/amiwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2015/02/28 23:46:35 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/04 21:50:15 rillig Exp $ # DISTNAME= amiwm0.20pl48 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html COMMENT= X window manager with Amiga look and feel LICENSE= amiwm-license -RESTRICTED= Distribution limited to non-commercial purposes, unmodified binaries only. +RESTRICTED= Distribution limited to non-commercial purposes, unmodified binaries only. NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile index 6f1c8bef6f6..71ee7e111ab 100644 --- a/wm/blackbox70/Makefile +++ b/wm/blackbox70/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/10/08 02:59:59 gutteridge Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:50:15 rillig Exp $ VERSION= 0.75 DISTNAME= blackbox-${VERSION} @@ -26,7 +26,7 @@ CXXFLAGS.Linux+= -fpermissive CONFIGURE_ARGS+= --enable-nls -BROKEN_GETTEXT_DETECTION=yes +BROKEN_GETTEXT_DETECTION= yes BUILDLINK_DEPMETHOD.libXt?= build diff --git a/wm/ccsm/Makefile b/wm/ccsm/Makefile index 4ca737a1a6c..ed9070b573e 100644 --- a/wm/ccsm/Makefile +++ b/wm/ccsm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:58 adam Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:50:15 rillig Exp $ PKGVER= 0.8.4 DISTNAME= ccsm-${PKGVER} @@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config gmake msgfmt intltool PY_PATCHPLIST= yes PYDISTUTILSPKG= yes REPLACE_PYTHON= ${WRKSRC}/setup.py ${WRKSRC}/ccm/*.py -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile index e43c3adadd6..af86dca880d 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/07/24 20:31:43 rhialto Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/04 21:50:15 rillig Exp $ # DISTNAME= ctwm-4.0.3 @@ -47,10 +47,10 @@ pre-install: ${DESTDIR}${PREFIX}/share/xsessions/ctwm.desktop # The build optionally uses these, if found: -#BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -#BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto -#BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen -#BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex +#BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc +#BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto +#BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen +#BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex # but for consistent builds, we disable them entirely. CMAKE_ARGS+= -DASCIIDOCTOR= diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile index f88aee49601..1547e0c4c63 100644 --- a/wm/ethemes/Makefile +++ b/wm/ethemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2015/09/12 16:54:03 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:50:16 rillig Exp $ DISTNAME= ethemes-0.1 PKGREVISION= 3 @@ -24,7 +24,7 @@ E_DATADIR= share/enlightenment/themes .include "../../mk/bsd.prefs.mk" E_THEMES?= Absolute_E-DR16-199911060830.etheme \ - ApplePlatinum-DR16-200001161300.etheme \ + ApplePlatinum-DR16-200001161300.etheme \ BevelFree-DR16-199908221339.etheme Black-DR16-199911201455.etheme \ E-Tech_Hydro-DR16-199912241355.etheme Ebench-DR16-199911181110.etheme \ Evisio-Green-DR16-199908220707.etheme \ diff --git a/wm/fvwm-themes/Makefile b/wm/fvwm-themes/Makefile index 88cf6f3d5dc..6e987900154 100644 --- a/wm/fvwm-themes/Makefile +++ b/wm/fvwm-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:24:15 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:50:16 rillig Exp $ # DISTNAME= fvwm-themes-${THEM_VER} @@ -30,7 +30,7 @@ REPLACE_PERL+= themes/cde/modules/create-buttonbar-config #### 1 #### SUBST_CLASSES+= Makefile SUBST_FILES.Makefile= Makefile.am Makefile.in -SUBST_SED.Makefile= -e 's|FT_DATADIR=@FT_DATADIR@|FT_DATADIR=${DESTDIR}@FT_DATADIR@|' +SUBST_SED.Makefile= -e 's|FT_DATADIR=@FT_DATADIR@|FT_DATADIR=${DESTDIR}@FT_DATADIR@|' SUBST_STAGE.Makefile= pre-configure SUBST_MESSAGE.Makefile= Modify shell script (Makefile) @@ -48,8 +48,8 @@ SUBST_CLASSES+= fvwm-menuapp SUBST_FILES.fvwm-menuapp= bin/fvwm-themes-menuapp-destdir.in # -my $ftDir = "@FT_DATADIR@" # +my $ftDir = "${DESTDIR}@FT_DATADIR@" -SUBST_SED.fvwm-menuapp= -e 's|$$userDir, $$ftDataDir|$$userDir, \"${DESTDIR}\".$$ftDataDir|' -SUBST_SED.fvwm-menuapp= -e 's|my $$ftDir = "@FT_DATADIR@"|my $$ftDir = \"${DESTDIR}@FT_DATADIR@\"|' +SUBST_SED.fvwm-menuapp= -e 's|$$userDir, $$ftDataDir|$$userDir, \"${DESTDIR}\".$$ftDataDir|' +SUBST_SED.fvwm-menuapp= -e 's|my $$ftDir = "@FT_DATADIR@"|my $$ftDir = \"${DESTDIR}@FT_DATADIR@\"|' SUBST_STAGE.fvwm-menuapp= pre-configure SUBST_MESSAGE.fvwm-menuapp= Fixing FT_DATADIR (fvwm-themes-datadir) diff --git a/wm/i3/Makefile b/wm/i3/Makefile index 18564014e5d..d4632a4b116 100644 --- a/wm/i3/Makefile +++ b/wm/i3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/10/06 12:12:05 nia Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/04 21:50:16 rillig Exp $ DISTNAME= i3-4.17.1 CATEGORIES= wm @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake bison lex yacc pkg-config perl:run USE_LANGUAGES= c99 -CONFIGURE_ARGS+=--disable-builddir +CONFIGURE_ARGS+= --disable-builddir LDFLAGS.SunOS+= -lgen -liconv -lsocket diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index 051fd7fd131..c7e78778ba4 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2019/07/21 22:25:51 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2019/11/04 21:50:16 rillig Exp $ DISTNAME= jwm-2.3.7 PKGREVISION= 6 @@ -37,7 +37,7 @@ SUBST_SED.icondir+= -e 's|/usr/local/share|${PREFIX}/share|g' PKG_SYSCONFSUBDIR= jwm EGDIR= ${PREFIX}/share/examples/jwm -CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc +CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc INSTALLATION_DIRS= bin diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile index ab89f665e42..ce190a204bf 100644 --- a/wm/oroborox/Makefile +++ b/wm/oroborox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/07/21 22:25:52 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/04 21:50:16 rillig Exp $ # DISTNAME= OroboROX-0.9.8 @@ -23,7 +23,7 @@ USE_TOOLS+= autoconf pax pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-xft --with-platform=${PLATFORM:Q} -REPLACE_PYTHON= Configure/OroboScheme/AppRun +REPLACE_PYTHON= Configure/OroboScheme/AppRun REPLACE_PYTHON+= Configure/OroboScheme/AppInfo.py REPLACE_PYTHON+= Configure/OroboScheme/Schemer.py REPLACE_PYTHON+= Configure/Windows/AppRun diff --git a/wm/xmonad-contrib/options.mk b/wm/xmonad-contrib/options.mk index 0d4dabba317..fea4b340e75 100644 --- a/wm/xmonad-contrib/options.mk +++ b/wm/xmonad-contrib/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:40 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:50:16 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xmonad-contrib -PKG_SUPPORTED_OPTIONS= xft2 -PKG_SUGGESTED_OPTIONS= xft2 +PKG_SUPPORTED_OPTIONS= xft2 +PKG_SUGGESTED_OPTIONS= xft2 .include "../../mk/bsd.options.mk" @@ -14,8 +14,8 @@ SUBST_STAGE.1= pre-patch SUBST_FILES.1= xmonad-contrib.cabal SUBST_SED.1= -e "s|render text|render text+ default: False|" -SUBST_CLASSES+= 2 -SUBST_STAGE.2= pre-configure -SUBST_FILES.2= xmonad-contrib.cabal +SUBST_CLASSES+= 2 +SUBST_STAGE.2= pre-configure +SUBST_FILES.2= xmonad-contrib.cabal SUBST_FILTER_CMD.2= ${TR} '+' \\n .endif diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile index 43b2ad3da6f..89130f60eed 100644 --- a/wm/xmonad/Makefile +++ b/wm/xmonad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:50:16 rillig Exp $ DISTNAME= xmonad-0.12 PKGNAME= ${DISTNAME} @@ -14,9 +14,9 @@ SUBST_STAGE.1= pre-patch SUBST_FILES.1= xmonad.cabal SUBST_SED.1= -e "s|executable xmonad|executable xmonad+ buildable: False|" -SUBST_CLASSES+= 2 -SUBST_STAGE.2= pre-configure -SUBST_FILES.2= xmonad.cabal +SUBST_CLASSES+= 2 +SUBST_STAGE.2= pre-configure +SUBST_FILES.2= xmonad.cabal SUBST_FILTER_CMD.2= ${TR} '+' \\n INSTALLATION_DIRS+= ${PKGMANDIR}/man1 |