CVS commit: pkgsrc/wm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Mon, 4 Nov 2019 21:50:17 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Nov  4 21:50:16 UTC 2019

Modified Files:
        pkgsrc/wm/9wm: Makefile
        pkgsrc/wm/amaterus: Makefile
        pkgsrc/wm/amiwm: Makefile
        pkgsrc/wm/blackbox70: Makefile
        pkgsrc/wm/ccsm: Makefile
        pkgsrc/wm/ctwm: Makefile
        pkgsrc/wm/ethemes: Makefile
        pkgsrc/wm/fvwm-themes: Makefile
        pkgsrc/wm/i3: Makefile
        pkgsrc/wm/jwm: Makefile
        pkgsrc/wm/oroborox: Makefile
        pkgsrc/wm/xmonad: Makefile
        pkgsrc/wm/xmonad-contrib: options.mk

Log Message:
wm: align variable assignments

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

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/9wm/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/wm/amaterus/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/wm/amiwm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/wm/blackbox70/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/wm/ccsm/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/wm/ctwm/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/wm/ethemes/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/wm/fvwm-themes/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/wm/i3/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/wm/jwm/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/wm/oroborox/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/wm/xmonad/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/xmonad-contrib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/9wm/Makefile
diff -u pkgsrc/wm/9wm/Makefile:1.19 pkgsrc/wm/9wm/Makefile:1.20
--- pkgsrc/wm/9wm/Makefile:1.19 Sat May 20 11:50:09 2017
+++ pkgsrc/wm/9wm/Makefile      Mon Nov  4 21:50:15 2019
@@ -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

Index: pkgsrc/wm/amaterus/Makefile
diff -u pkgsrc/wm/amaterus/Makefile:1.22 pkgsrc/wm/amaterus/Makefile:1.23
--- pkgsrc/wm/amaterus/Makefile:1.22    Tue Oct 23 10:24:13 2012
+++ pkgsrc/wm/amaterus/Makefile Mon Nov  4 21:50:15 2019
@@ -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@localhost
 HOMEPAGE=      http://www.taiyaki.org/
 COMMENT=       GTK+ window manager
 
-GNU_CONFIGURE= YES
+GNU_CONFIGURE=         YES
 INSTALLATION_DIRS=     share/doc/amaterus
 
 post-install:

Index: pkgsrc/wm/amiwm/Makefile
diff -u pkgsrc/wm/amiwm/Makefile:1.31 pkgsrc/wm/amiwm/Makefile:1.32
--- pkgsrc/wm/amiwm/Makefile:1.31       Sat Feb 28 23:46:35 2015
+++ pkgsrc/wm/amiwm/Makefile    Mon Nov  4 21:50:15 2019
@@ -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/~mar
 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}

Index: pkgsrc/wm/blackbox70/Makefile
diff -u pkgsrc/wm/blackbox70/Makefile:1.21 pkgsrc/wm/blackbox70/Makefile:1.22
--- pkgsrc/wm/blackbox70/Makefile:1.21  Tue Oct  8 02:59:59 2019
+++ pkgsrc/wm/blackbox70/Makefile       Mon Nov  4 21:50:15 2019
@@ -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
 

Index: pkgsrc/wm/ccsm/Makefile
diff -u pkgsrc/wm/ccsm/Makefile:1.25 pkgsrc/wm/ccsm/Makefile:1.26
--- pkgsrc/wm/ccsm/Makefile:1.25        Mon Sep  2 13:19:58 2019
+++ pkgsrc/wm/ccsm/Makefile     Mon Nov  4 21:50:15 2019
@@ -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 int
 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}
 

Index: pkgsrc/wm/ctwm/Makefile
diff -u pkgsrc/wm/ctwm/Makefile:1.38 pkgsrc/wm/ctwm/Makefile:1.39
--- pkgsrc/wm/ctwm/Makefile:1.38        Wed Jul 24 20:31:43 2019
+++ pkgsrc/wm/ctwm/Makefile     Mon Nov  4 21:50:15 2019
@@ -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=

Index: pkgsrc/wm/ethemes/Makefile
diff -u pkgsrc/wm/ethemes/Makefile:1.23 pkgsrc/wm/ethemes/Makefile:1.24
--- pkgsrc/wm/ethemes/Makefile:1.23     Sat Sep 12 16:54:03 2015
+++ pkgsrc/wm/ethemes/Makefile  Mon Nov  4 21:50:16 2019
@@ -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 \

Index: pkgsrc/wm/fvwm-themes/Makefile
diff -u pkgsrc/wm/fvwm-themes/Makefile:1.16 pkgsrc/wm/fvwm-themes/Makefile:1.17
--- pkgsrc/wm/fvwm-themes/Makefile:1.16 Sun Aug 11 13:24:15 2019
+++ pkgsrc/wm/fvwm-themes/Makefile      Mon Nov  4 21:50:16 2019
@@ -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
 #### 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)
 

Index: pkgsrc/wm/i3/Makefile
diff -u pkgsrc/wm/i3/Makefile:1.31 pkgsrc/wm/i3/Makefile:1.32
--- pkgsrc/wm/i3/Makefile:1.31  Sun Oct  6 12:12:05 2019
+++ pkgsrc/wm/i3/Makefile       Mon Nov  4 21:50:16 2019
@@ -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
 

Index: pkgsrc/wm/jwm/Makefile
diff -u pkgsrc/wm/jwm/Makefile:1.40 pkgsrc/wm/jwm/Makefile:1.41
--- pkgsrc/wm/jwm/Makefile:1.40 Sun Jul 21 22:25:51 2019
+++ pkgsrc/wm/jwm/Makefile      Mon Nov  4 21:50:16 2019
@@ -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/sha
 
 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
 

Index: pkgsrc/wm/oroborox/Makefile
diff -u pkgsrc/wm/oroborox/Makefile:1.58 pkgsrc/wm/oroborox/Makefile:1.59
--- pkgsrc/wm/oroborox/Makefile:1.58    Sun Jul 21 22:25:52 2019
+++ pkgsrc/wm/oroborox/Makefile Mon Nov  4 21:50:16 2019
@@ -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

Index: pkgsrc/wm/xmonad/Makefile
diff -u pkgsrc/wm/xmonad/Makefile:1.9 pkgsrc/wm/xmonad/Makefile:1.10
--- pkgsrc/wm/xmonad/Makefile:1.9       Wed Jul  4 13:40:40 2018
+++ pkgsrc/wm/xmonad/Makefile   Mon Nov  4 21:50:16 2019
@@ -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

Index: pkgsrc/wm/xmonad-contrib/options.mk
diff -u pkgsrc/wm/xmonad-contrib/options.mk:1.2 pkgsrc/wm/xmonad-contrib/options.mk:1.3
--- pkgsrc/wm/xmonad-contrib/options.mk:1.2     Wed Jul  4 13:40:40 2018
+++ pkgsrc/wm/xmonad-contrib/options.mk Mon Nov  4 21:50:16 2019
@@ -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

Prev by Date: CVS commit: pkgsrc/textproc
Next by Date: CVS commit: pkgsrc/www
Previous by Thread: CVS commit: pkgsrc/textproc
Next by Thread: CVS commit: pkgsrc/www
Indexes:

Home | Main Index | Thread Index | Old Index