pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 x11: align variable assignments
details: https://anonhg.NetBSD.org/pkgsrc/rev/1b11dfb07962
branches: trunk
changeset: 343375:1b11dfb07962
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Nov 03 09:14:06 2019 +0000
description:
x11: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
diffstat:
x11/Xfixes/Makefile | 4 +-
x11/Xfixes/builtin.mk | 6 +-
x11/Xrender/Makefile | 4 +-
x11/Xrender/builtin.mk | 10 +++---
x11/aterm/Makefile | 32 +++++++++---------
x11/aterm/options.mk | 10 +++---
x11/avant-window-navigator/Makefile | 10 +++---
x11/blt/Makefile | 8 ++--
x11/clipit/Makefile | 6 +-
x11/driconf/Makefile | 8 ++--
x11/eekboard/Makefile | 4 +-
x11/elementary/Makefile | 8 ++--
x11/enlightenment/Makefile | 8 ++--
x11/evieext/builtin.mk | 4 +-
x11/filerunner/Makefile | 8 ++--
x11/fixesproto4/Makefile | 4 +-
x11/fixesproto4/builtin.mk | 6 +-
x11/fltk13/Makefile | 12 +++---
x11/fltk13/buildlink3.mk | 6 +-
x11/gnome-desktop3/Makefile | 8 ++--
x11/gnome-panel/Makefile | 18 +++++-----
x11/gnustep-preferences/Makefile | 4 +-
x11/gtk-sharp/Makefile | 12 +++---
x11/gtk2/Makefile | 4 +-
x11/gtk2/options.mk | 6 +-
x11/gtk3/Makefile | 18 +++++-----
x11/kactivities-stats/buildlink3.mk | 4 +-
x11/kactivities/Makefile | 4 +-
x11/kconfigwidgets/Makefile | 4 +-
x11/kde-workspace4/Makefile | 16 ++++----
x11/kde-workspace4/options.mk | 4 +-
x11/kdelibs4/Makefile | 12 +++---
x11/kdelibs4support/Makefile | 4 +-
x11/kirigami2/buildlink3.mk | 4 +-
x11/kterm/Makefile | 14 ++++----
x11/labltk/Makefile | 4 +-
x11/libFS/builtin.mk | 4 +-
x11/libICE/builtin.mk | 6 +-
x11/libSM/builtin.mk | 6 +-
x11/libX11/Makefile | 4 +-
x11/libX11/builtin.mk | 8 ++--
x11/libXScrnSaver/builtin.mk | 4 +-
x11/libXau/builtin.mk | 6 +-
x11/libXcomposite/builtin.mk | 6 +-
x11/libXdamage/builtin.mk | 4 +-
x11/libXdmcp/builtin.mk | 6 +-
x11/libXevie/builtin.mk | 4 +-
x11/libXext/builtin.mk | 4 +-
x11/libXfixes/builtin.mk | 4 +-
x11/libXfont/Makefile | 4 +-
x11/libXfont/builtin.mk | 4 +-
x11/libXfont2/Makefile | 4 +-
x11/libXfont2/builtin.mk | 4 +-
x11/libXft/builtin.mk | 8 ++--
x11/libXi/builtin.mk | 12 +++---
x11/libXinerama/builtin.mk | 4 +-
x11/libXmu/builtin.mk | 6 +-
x11/libXpm/builtin.mk | 8 ++--
x11/libXpresent/builtin.mk | 4 +-
x11/libXrandr/builtin.mk | 4 +-
x11/libXrender/builtin.mk | 4 +-
x11/libXres/builtin.mk | 4 +-
x11/libXt/builtin.mk | 6 +-
x11/libXtst/builtin.mk | 4 +-
x11/libXv/builtin.mk | 4 +-
x11/libXvMC/builtin.mk | 6 +-
x11/libgnomekbd2/Makefile | 4 +-
x11/libkactivities4/Makefile | 4 +-
x11/liboldXrandr/builtin.mk | 10 +++---
x11/libxcb/builtin.mk | 4 +-
x11/lxlauncher/Makefile | 6 +-
x11/mcookie/Makefile | 4 +-
x11/mlterm/options.mk | 6 +-
x11/motif/Makefile | 20 ++++++------
x11/mowitz/Makefile | 10 +++---
x11/p5-Wx/Makefile | 6 +-
x11/pixman/Makefile | 6 +-
x11/pixman/hacks.mk | 6 +-
x11/py-Pmw/Makefile | 4 +-
x11/py-Xlib/Makefile | 4 +-
x11/py-gnome2-desktop/Makefile | 6 +-
x11/py-gnome2-extras/Makefile | 18 +++++-----
x11/py-gnome2/Makefile | 12 +++---
x11/py-gtk2/Makefile | 10 +++---
x11/py-gtk2/options.mk | 6 +-
x11/py-gtksourceview/Makefile | 14 ++++----
x11/py-kde4/Makefile | 4 +-
x11/py-keybinder/Makefile | 4 +-
x11/py-kiwi/Makefile | 10 +++---
x11/py-qt4/Makefile | 6 +-
x11/py-qwt-qt4/Makefile | 8 ++--
x11/py-terminator/Makefile | 8 ++--
x11/py-vte/Makefile | 4 +-
x11/py-wxWidgets/Makefile | 6 +-
x11/py-xcbgen/Makefile | 4 +-
x11/qt4-libs/Makefile | 8 ++--
x11/qt4-libs/Makefile.common | 36 +++++++++++-----------
x11/qt4-mysql/Makefile | 4 +-
x11/qt4-pgsql/Makefile | 4 +-
x11/qt4-sqlite3/Makefile | 4 +-
x11/qt5-qtbase/Makefile | 60 ++++++++++++++++++------------------
x11/qt5-qtmultimedia/buildlink3.mk | 4 +-
x11/qt5-qtserialport/buildlink3.mk | 4 +-
x11/qt5-qtspeech/buildlink3.mk | 8 ++--
x11/qt5-qtsvg/buildlink3.mk | 4 +-
x11/qt5-qtwebchannel/buildlink3.mk | 4 +-
x11/qt5-qtwebkit/Makefile | 12 +++---
x11/qwt-qt4/Makefile | 4 +-
x11/qwt6-qt5/Makefile | 4 +-
x11/qwt6-qt5/buildlink3.mk | 8 ++--
x11/redshift/Makefile | 12 +++---
x11/rofi/Makefile | 4 +-
x11/rox-session/Makefile | 4 +-
x11/ruby-tk-gem/Makefile | 4 +-
x11/ruby-tk/Makefile | 4 +-
x11/sessreg/Makefile | 6 +-
x11/stalonetray/Makefile | 12 +++---
x11/tk-Tix/options.mk | 4 +-
x11/tk85/options.mk | 6 +-
x11/wmfire/Makefile | 6 +-
x11/wterm/Makefile | 12 +++---
x11/wxGTK28/Makefile.common | 6 +-
x11/xauth/builtin.mk | 6 +-
x11/xbitmaps/builtin.mk | 4 +-
x11/xcb-proto/builtin.mk | 4 +-
x11/xcb-util-xrm/Makefile | 4 +-
x11/xcb-util/builtin.mk | 4 +-
x11/xcb-util036/Makefile | 14 ++++----
x11/xcursor/builtin.mk | 8 ++--
x11/xdaemon/Makefile | 6 +-
x11/xdm3d/Makefile | 12 +++---
x11/xearth/Makefile | 4 +-
x11/xephem/Makefile | 4 +-
x11/xfce4-tumbler/Makefile | 4 +-
x11/xfce4-wmdock-plugin/Makefile | 6 +-
x11/xicc/Makefile | 6 +-
x11/xkbd/Makefile | 4 +-
x11/xlockmore/Makefile | 18 +++++-----
x11/xlockmore/Makefile.common | 16 ++++----
x11/xmindpath/Makefile | 4 +-
x11/xmx/Makefile | 8 ++--
x11/xorgproto/builtin.mk | 4 +-
x11/xosd/Makefile | 4 +-
x11/xpmroot/Makefile | 4 +-
x11/xscribble/Makefile | 4 +-
x11/xterm/Makefile | 12 +++---
x11/xterm/options.mk | 4 +-
x11/xtrans/builtin.mk | 4 +-
148 files changed, 544 insertions(+), 544 deletions(-)
diffs (truncated from 3346 to 300 lines):
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/Xfixes/Makefile
--- a/x11/Xfixes/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/Xfixes/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/09/06 09:03:05 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 09:14:06 rillig Exp $
DISTNAME= libXfixes-2.0.1
PKGNAME= ${DISTNAME:S/libX/X/}
@@ -22,7 +22,7 @@
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead."
+PKG_FAIL_REASON+= "This package is for native X11 only; use libXfixes instead."
.endif
CFLAGS.Darwin+= -fno-common
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/Xfixes/builtin.mk
--- a/x11/Xfixes/builtin.mk Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/Xfixes/builtin.mk Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2012/03/19 12:34:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.13 2019/11/03 09:14:06 rillig Exp $
BUILTIN_PKG:= Xfixes
@@ -18,7 +18,7 @@
IS_BUILTIN.Xfixes= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.Xfixes
+MAKEVARS+= IS_BUILTIN.Xfixes
###
### Determine whether we should use the built-in implementation if it
@@ -45,6 +45,6 @@
. endif
. endif # PREFER.Xfixes
.endif
-MAKEVARS+= USE_BUILTIN.Xfixes
+MAKEVARS+= USE_BUILTIN.Xfixes
.include "../../mk/x11.builtin.mk"
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/Xrender/Makefile
--- a/x11/Xrender/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/Xrender/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/03/07 11:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 09:14:06 rillig Exp $
DISTNAME= libXrender-0.9.0
PKGNAME= ${DISTNAME:S/lib//}
@@ -22,7 +22,7 @@
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead."
+PKG_FAIL_REASON+= "This package is for native X11 only; use libXrender instead."
.endif
.include "../../x11/xorgproto/buildlink3.mk"
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/Xrender/builtin.mk Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2014/03/10 11:56:02 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.22 2019/11/03 09:14:06 rillig Exp $
BUILTIN_PKG:= Xrender
@@ -18,7 +18,7 @@
IS_BUILTIN.Xrender= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.Xrender
+MAKEVARS+= IS_BUILTIN.Xrender
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -50,10 +50,10 @@
. endfor
. endfor
. if defined(BUILTIN_VERSION.Xrender)
-BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender}
+BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender}
. endif
.endif
-MAKEVARS+= BUILTIN_PKG.Xrender
+MAKEVARS+= BUILTIN_PKG.Xrender
###
### Determine whether we should use the built-in implementation if it
@@ -89,7 +89,7 @@
. endif
. endif # PREFER.Xrender
.endif
-MAKEVARS+= USE_BUILTIN.Xrender
+MAKEVARS+= USE_BUILTIN.Xrender
###
### The section below only applies if we are not including this file
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/aterm/Makefile
--- a/x11/aterm/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/aterm/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/07/21 22:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 09:14:07 rillig Exp $
#
DISTNAME= aterm-1.0.1
@@ -17,21 +17,21 @@
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= no
-CONFIGURE_ARGS+=--enable-background-image \
- --enable-transparency \
- --enable-fading \
- --enable-graphics \
- --with-xpm \
- --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \
- --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \
- --with-jpeg \
- --with-jpeg-includes=${JPEGBASE}/include \
- --with-jpeg-library=${JPEGBASE}/lib \
- --with-png \
- --with-png-library=${BUILDLINK_PREFIX.png}/lib \
- --with-png-includes=${BUILDLINK_PREFIX.png}/include \
- --enable-utmp \
- --enable-wtmp
+CONFIGURE_ARGS+= --enable-background-image \
+ --enable-transparency \
+ --enable-fading \
+ --enable-graphics \
+ --with-xpm \
+ --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \
+ --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \
+ --with-jpeg \
+ --with-jpeg-includes=${JPEGBASE}/include \
+ --with-jpeg-library=${JPEGBASE}/lib \
+ --with-png \
+ --with-png-library=${BUILDLINK_PREFIX.png}/lib \
+ --with-png-includes=${BUILDLINK_PREFIX.png}/include \
+ --enable-utmp \
+ --enable-wtmp
.include "options.mk"
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/aterm/options.mk
--- a/x11/aterm/options.mk Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/aterm/options.mk Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2018/11/30 17:25:05 nia Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/03 09:14:07 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.aterm
PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll \
@@ -15,17 +15,17 @@
.endif
.if !empty(PKG_OPTIONS:Materm-big5)
-CONFIGURE_ARGS+=--enable-big5
+CONFIGURE_ARGS+= --enable-big5
.endif
.if !empty(PKG_OPTIONS:Materm-greek)
-CONFIGURE_ARGS+=--enable-greek
+CONFIGURE_ARGS+= --enable-greek
.endif
.if !empty(PKG_OPTIONS:Materm-kanji)
-CONFIGURE_ARGS+=--enable-kanji
+CONFIGURE_ARGS+= --enable-kanji
.endif
.if !empty(PKG_OPTIONS:Materm-xterm-scroll)
-CONFIGURE_ARGS+=--enable-xterm-scroll
+CONFIGURE_ARGS+= --enable-xterm-scroll
.endif
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/avant-window-navigator/Makefile
--- a/x11/avant-window-navigator/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/avant-window-navigator/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/09/02 13:20:14 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 09:14:07 rillig Exp $
DISTNAME= avant-window-navigator-0.4.0
PKGREVISION= 35
@@ -41,10 +41,10 @@
SUBST_FILES.pathfix+= tests/test-overlays.py
SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share,"
-PY_PATCHPLIST= yes
-REPLACE_PYTHON+= awn-settings/awnSettings.py.in
-REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+PY_PATCHPLIST= yes
+REPLACE_PYTHON+= awn-settings/awnSettings.py.in
+REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
.include "../../devel/GConf/schemas.mk"
.include "../../lang/vala/buildlink3.mk"
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/blt/Makefile
--- a/x11/blt/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/blt/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/03/12 11:15:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 09:14:07 rillig Exp $
DISTNAME= BLT2.4z
PKGNAME= blt-2.4z
@@ -6,9 +6,9 @@
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/}
-PATCHFILES= blt2.4z-patch-2
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP=-p1
+PATCHFILES= blt2.4z-patch-2
+PATCH_SITES= ${MASTER_SITES}
+PATCH_DIST_STRIP= -p1
MAINTAINER= brook%nmsu.edu@localhost
HOMEPAGE= http://blt.sourceforge.net/
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/clipit/Makefile
--- a/x11/clipit/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/clipit/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/07/21 22:25:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 09:14:07 rillig Exp $
#
DISTNAME= clipit-1.4.2
@@ -12,8 +12,8 @@
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake
USE_TOOLS+= intltool msgfmt
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/driconf/Makefile
--- a/x11/driconf/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/driconf/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 09:14:07 rillig Exp $
DISTNAME= driconf-0.9.1
PKGREVISION= 11
@@ -17,9 +17,9 @@
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt msgmerge xgettext
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-REPLACE_PYTHON= *.py
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+REPLACE_PYTHON= *.py
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
SUBST_CLASSES+= fix-paths
SUBST_FILES.fix-paths= driconf driconf.desktop
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/eekboard/Makefile
--- a/x11/eekboard/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/eekboard/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.53 2019/07/21 22:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/03 09:14:07 rillig Exp $
DISTNAME= eekboard-1.0.8
PKGREVISION= 23
MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/}
-GITHUB_PROJECT= eekboard
+GITHUB_PROJECT= eekboard
GITHUB_TAG= ${DISTNAME}
CATEGORIES= x11
diff -r 74c101b1fdd4 -r 1b11dfb07962 x11/elementary/Makefile
--- a/x11/elementary/Makefile Sun Nov 03 08:27:07 2019 +0000
+++ b/x11/elementary/Makefile Sun Nov 03 09:14:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/22 12:23:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 09:14:07 rillig Exp $
DISTNAME= elementary-1.7.7
PKGREVISION= 18
@@ -26,9 +26,9 @@
PKGCONFIG_OVERRIDE= elementary
# currently it is like it is
-MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-1.7.7
-PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-1.7.7
+PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
Home |
Main Index |
Thread Index |
Old Index