pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games games/*: fix alignment of variable values
details: https://anonhg.NetBSD.org/pkgsrc/rev/b6ec15396cf9
branches: trunk
changeset: 374053:b6ec15396cf9
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Jan 14 17:33:57 2018 +0000
description:
games/*: fix alignment of variable values
pkglint -Wall -r --autofix --only aligned
After running the above command, three packages had to be adjusted
manually:
In maelstrom-x11, pkglint didn't see that a commented variable
assignment should have been re-aligned as well.
In netmaze, there was a single line that didn't align well with all the
others, but pkglint decided to adjust the whole paragraph to this single
line. The result would have been ok, but not good.
In tscp, there was a paragraph where some of the lines were indented
one space more than the others. This rule is useful when one variable
name is very long compared to the others, but not in this case.
diffstat:
games/4stAttack/Makefile | 4 +-
games/MyGoGrinder/Makefile | 6 ++--
games/amaze/Makefile | 4 +-
games/armagetronad/Makefile.common | 8 +++---
games/arx-libertatis/Makefile | 4 +-
games/blindmine/Makefile | 4 +-
games/bzflag/Makefile | 12 +++++-----
games/doom1/Makefile | 4 +-
games/duckmaze/Makefile | 6 ++--
games/exult-audio/Makefile | 4 +-
games/exult/Makefile | 6 ++--
games/fortune-strfile/Makefile | 4 +-
games/freeciv-share/Makefile.common | 4 +-
games/frozen-bubble/Makefile | 4 +-
games/gargoyle/Makefile | 4 +-
games/gate88/Makefile | 4 +-
games/gcompris/Makefile | 4 +-
games/ggz-client-libs/ggz-client.mk | 6 ++--
games/gnome-games/Makefile | 4 +-
games/golddig/Makefile | 6 ++--
games/hugo/Makefile | 4 +-
games/ioquake3-raspberrypi/Makefile | 4 +-
games/jetpack/Makefile | 4 +-
games/jools/Makefile | 4 +-
games/koth/Makefile | 6 ++--
games/kye/Makefile | 4 +-
games/libggz/Makefile | 8 +++---
games/maelstrom-x11/Makefile | 4 +-
games/marathon-trilogy/Makefile | 4 +-
games/monsterz/Makefile | 4 +-
games/moria/Makefile | 4 +-
games/netmaze/Makefile | 4 +-
games/neverball/Makefile | 4 +-
games/newvox/Makefile | 4 +-
games/openttd-data/Makefile | 20 +++++++++---------
games/prboom-plus/Makefile | 4 +-
games/prboom/Makefile | 4 +-
games/puzzles/Makefile | 10 ++++----
games/py-easyAI/Makefile | 4 +-
games/pysolfc/Makefile | 4 +-
games/pytraffic/Makefile | 14 ++++++------
games/quakedata/Makefile | 4 +-
games/scummvm-tools/Makefile | 8 +++---
games/simgear/Makefile | 4 +-
games/sudoku-cli/Makefile | 12 +++++-----
games/supertuxkart/Makefile | 16 +++++++-------
games/teeworlds/Makefile | 4 +-
games/tscp/Makefile | 12 +++++-----
games/urban/Makefile | 4 +-
games/wesnoth/Makefile | 40 ++++++++++++++++++------------------
games/wtf/Makefile | 4 +-
games/xbat/Makefile | 6 ++--
games/xboard/Makefile | 12 +++++-----
games/xcowsay/Makefile | 4 +-
games/xemeraldia/Makefile | 6 ++--
games/xpipeman/Makefile | 4 +-
games/xskat/options.mk | 4 +-
games/xvier/Makefile | 6 ++--
58 files changed, 187 insertions(+), 187 deletions(-)
diffs (truncated from 1181 to 300 lines):
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/4stAttack/Makefile
--- a/games/4stAttack/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/4stAttack/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/01/01 14:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/01/14 17:33:57 rillig Exp $
DISTNAME= 4stAttack-2.1.4
PKGREVISION= 18
@@ -13,7 +13,7 @@
USE_TOOLS+= pax
-REPLACE_PYTHON= 4stattack.py
+REPLACE_PYTHON= 4stattack.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.1.4
FIND_EXCLUDE= \( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \)
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/MyGoGrinder/Makefile
--- a/games/MyGoGrinder/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/MyGoGrinder/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/03 08:53:09 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/01/14 17:33:57 rillig Exp $
DISTNAME= MyGoGrinder-2.3.0
CATEGORIES= games
@@ -13,8 +13,8 @@
WRKSRC= ${WRKDIR}/MyGoGrinder
USE_LANGUAGES= # none
-USE_JAVA= run
-USE_JAVA2= yes
+USE_JAVA= run
+USE_JAVA2= yes
USE_TOOLS+= pax
INSTALLATION_DIRS+= bin
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/amaze/Makefile
--- a/games/amaze/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/amaze/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/08/16 20:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/01/14 17:33:57 rillig Exp $
#
DISTNAME= amaze
@@ -6,7 +6,7 @@
PKGREVISION= 1
CATEGORIES= games
#MASTER_SITES= http://adaptive-enterprises.com/~d/software/amaze/
-DIST_SUBDIR= ${PKGNAME_NOREV}
+DIST_SUBDIR= ${PKGNAME_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
#HOMEPAGE= http://adaptive-enterprises.com/~d/software/amaze/
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/armagetronad/Makefile.common
--- a/games/armagetronad/Makefile.common Sun Jan 14 16:12:08 2018 +0000
+++ b/games/armagetronad/Makefile.common Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2016/12/15 23:52:43 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2018/01/14 17:33:57 rillig Exp $
#
# used by games/armagetronad/Makefile
# used by games/armagetronad-server/Makefile
@@ -15,9 +15,9 @@
DISTINFO_FILE= ${.CURDIR}/../../games/armagetronad/distinfo
PATCHDIR= ${.CURDIR}/../../games/armagetronad/patches
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= bash gmake
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= bash gmake
REPLACE_PYTHON+= language/update.py
SUBST_CLASSES+= bash
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/arx-libertatis/Makefile
--- a/games/arx-libertatis/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/arx-libertatis/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/02 16:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/14 17:33:57 rillig Exp $
DISTNAME= arx-libertatis-1.1.2
CATEGORIES= games
@@ -22,7 +22,7 @@
PLIST_VARS+= NotDarwin
.if ${OPSYS} != "Darwin"
-PLIST.NotDarwin= yes
+PLIST.NotDarwin= yes
.endif
.include "../../audio/openal-soft/buildlink3.mk"
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/blindmine/Makefile
--- a/games/blindmine/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/blindmine/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/01/01 14:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/14 17:33:58 rillig Exp $
DISTNAME= blindmine-0.3-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -21,7 +21,7 @@
SUBST_FILES.path= blindmine.py sdl_ui.py
SUBST_SED.path= -e 's,/usr/bin/env python,${PYTHONBIN},g'
-PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
+PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.3
INSTALLATION_DIRS= bin share/doc/blindmine share/blindmine/data
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/bzflag/Makefile
--- a/games/bzflag/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/bzflag/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2018/01/01 21:18:24 adam Exp $
+# $NetBSD: Makefile,v 1.60 2018/01/14 17:33:58 rillig Exp $
DISTNAME= bzflag-2.4.2
PKGREVISION= 14
@@ -20,11 +20,11 @@
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Linux"
-SUBST_CLASSES+= fixme
-SUBST_STAGE.fixme= post-patch
-SUBST_FILES.fixme= src/platform/Makefile.in
-SUBST_SED.fixme= -e "s|@LINUX_TRUE@||g"
-SUBST_SED.fixme+= -e "s|@LINUX_FALSE@|\#|g"
+SUBST_CLASSES+= fixme
+SUBST_STAGE.fixme= post-patch
+SUBST_FILES.fixme= src/platform/Makefile.in
+SUBST_SED.fixme= -e "s|@LINUX_TRUE@||g"
+SUBST_SED.fixme+= -e "s|@LINUX_FALSE@|\#|g"
.endif
CONFIGURE_ARGS+= --with-ncurses
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/doom1/Makefile
--- a/games/doom1/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/doom1/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/04 18:08:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/14 17:33:58 rillig Exp $
DISTNAME= doom-1.8.wad
PKGNAME= doom1-1.8
@@ -16,7 +16,7 @@
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= share/doom
-NO_BUILD= YES
+NO_BUILD= YES
do-install:
${INSTALL_DATA} ${WRKSRC}/doom-1.8.wad \
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/duckmaze/Makefile
--- a/games/duckmaze/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/duckmaze/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:22:54 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/14 17:33:58 rillig Exp $
#
DISTNAME= duckmaze-pc-0.2
@@ -15,9 +15,9 @@
USE_LANGUAGES= # none
USE_TOOLS+= pax
-DM= ${WRKDIR}/duckmaze
+DM= ${WRKDIR}/duckmaze
-REPLACE_PYTHON=level.py level_editor.py mopelib/mopelib.py duckmaze.py
+REPLACE_PYTHON= level.py level_editor.py mopelib/mopelib.py duckmaze.py
do-build:
${ECHO} "#!/bin/sh" >${DM}
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/exult-audio/Makefile
--- a/games/exult-audio/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/exult-audio/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/04/19 19:35:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/14 17:33:58 rillig Exp $
DISTNAME= exult_audio
PKGNAME= exultaudio-1.0
@@ -11,7 +11,7 @@
COMMENT= Digital music and digital wave sound effects data for Exult
LICENSE= gnu-gpl-v2
-DEPENDS+= exult>=1.4.9rc1:../../games/exult
+DEPENDS+= exult>=1.4.9rc1:../../games/exult
DIST_SUBDIR= ${PKGNAME_NOREV}
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/exult/Makefile
--- a/games/exult/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/exult/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/12/03 22:30:00 wiedi Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/14 17:33:58 rillig Exp $
DISTNAME= exult-1.4.9rc1
PKGREVISION= 2
@@ -14,8 +14,8 @@
USE_LANGUAGES= c c++
USE_TOOLS+= yacc flex
-CFLAGS+= -fpermissive
-LDFLAGS+= -lz
+CFLAGS+= -fpermissive
+LDFLAGS+= -lz
CONFIGURE_ARGS+= --disable-sdltest --disable-oggtest --disable-vorbistest
.include "../../devel/zlib/buildlink3.mk"
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/fortune-strfile/Makefile
--- a/games/fortune-strfile/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/fortune-strfile/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:38 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/14 17:33:58 rillig Exp $
DISTNAME= fortune-strfile-0
CATEGORIES= games
@@ -7,7 +7,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Tool to prepare a fortune database
-WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}
USE_BSD_MAKEFILE= yes
USE_TOOLS+= nroff groff
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/freeciv-share/Makefile.common
--- a/games/freeciv-share/Makefile.common Sun Jan 14 16:12:08 2018 +0000
+++ b/games/freeciv-share/Makefile.common Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2017/01/01 14:43:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.50 2018/01/14 17:33:58 rillig Exp $
# used by games/freeciv-share/Makefile
# used by games/freeciv-client/Makefile
@@ -24,7 +24,7 @@
DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo
PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches
-REPLACE_PYTHON= ${WRKSRC}/common/generate_packets.py
+REPLACE_PYTHON= ${WRKSRC}/common/generate_packets.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.3.2
SUBST_CLASSES+= data
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/frozen-bubble/Makefile
--- a/games/frozen-bubble/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/frozen-bubble/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/10/05 10:05:43 leot Exp $
+# $NetBSD: Makefile,v 1.58 2018/01/14 17:33:58 rillig Exp $
DISTNAME= frozen-bubble-2.2.1-beta1
PKGNAME= ${DISTNAME:S/-beta/beta/}
@@ -32,7 +32,7 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man6
PERL5_MODULE_TYPE= Module::Build
-PERL5_PACKLIST= auto/Games/FrozenBubble/.packlist
+PERL5_PACKLIST= auto/Games/FrozenBubble/.packlist
.include "../../audio/SDL_mixer/buildlink3.mk"
BUILDLINK_API_DEPENDS.SDL_Pango= SDL_Pango>=0.1.2nb8
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/gargoyle/Makefile
--- a/games/gargoyle/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/gargoyle/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/07/29 06:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/14 17:33:59 rillig Exp $
DISTNAME= gargoyle-2011.1
CATEGORIES= games
@@ -13,7 +13,7 @@
WRKSRC= ${WRKDIR}/garglk-stable-2011.1
-BUILD_DEPENDS+= jam-[0-9]*:../../devel/jam
+BUILD_DEPENDS+= jam-[0-9]*:../../devel/jam
USE_TOOLS+= pkg-config
USE_LANGUAGES+= c c++
diff -r 15ba43eb6b14 -r b6ec15396cf9 games/gate88/Makefile
--- a/games/gate88/Makefile Sun Jan 14 16:12:08 2018 +0000
+++ b/games/gate88/Makefile Sun Jan 14 17:33:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/06 11:54:39 asau Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/14 17:33:59 rillig Exp $
#
DISTNAME= Gate88_Mar19_05
@@ -11,7 +11,7 @@
COMMENT= Deep space intergalactic battle
Home |
Main Index |
Thread Index |
Old Index