pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/w*: fix pkglint indentation warnings
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Sun Jan 28 00:00:51 2018 +0000
Changeset: 476f2717e9048cb1f3285d2fde41a79da62af1ed
Modified Files:
wanderer/Makefile
wang-ttf/Makefile
wayland/Makefile
webcleaner/Makefile
why/Makefile
why3/Makefile
wicd/Makefile
wicd/options.mk
wine-devel/PLIST.wine32
wine-devel/PLIST.wine64
wjelement/Makefile
wkhtmltopdf/Makefile
wmname/Makefile
wolf4SDL/Makefile
workrave/Makefile
wp2md-git/Makefile
wvstreams/Makefile
wvstreams/buildlink3.mk
wxmaxima-git/Makefile
Log Message:
wip/w*: fix pkglint indentation warnings
pkglint -Wall -F -o aligned w*/
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=476f2717e9048cb1f3285d2fde41a79da62af1ed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wanderer/Makefile | 22 +++++++++++-----------
wang-ttf/Makefile | 2 +-
wayland/Makefile | 8 ++++----
webcleaner/Makefile | 10 +++++-----
why/Makefile | 2 +-
why3/Makefile | 2 +-
wicd/Makefile | 8 ++++----
wicd/options.mk | 10 +++++-----
wine-devel/PLIST.wine32 | 4 ++--
wine-devel/PLIST.wine64 | 4 ++--
wjelement/Makefile | 2 +-
wkhtmltopdf/Makefile | 2 +-
wmname/Makefile | 22 +++++++++++-----------
wolf4SDL/Makefile | 10 +++++-----
workrave/Makefile | 6 +++---
wp2md-git/Makefile | 4 ++--
wvstreams/Makefile | 14 +++++++-------
wvstreams/buildlink3.mk | 2 +-
wxmaxima-git/Makefile | 2 +-
19 files changed, 68 insertions(+), 68 deletions(-)
diffs:
diff --git a/wanderer/Makefile b/wanderer/Makefile
index e2d4ec22db..1f8928a848 100644
--- a/wanderer/Makefile
+++ b/wanderer/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= wanderer_dev-3.2.1
-PKGREVISION= 1
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/_dev//}
DIST_SUBDIR= ${PKGVERSION_NOREV}
CATEGORIES= games
@@ -13,21 +13,21 @@ HOMEPAGE= http://e271.net/~marina/wanderer.html
COMMENT= Wanderer is a game similar to Boulderdash, Repton, XOR and others
LICENSE= gnu-gpl-v2
-SUBST_CLASSES+= wanderer
-SUBST_STAGE.wanderer= pre-build
-SUBST_FILES.wanderer= wand_head.h
-SUBST_SED.wanderer= -e "s,/usr/local/share/wanderer/screens,${PREFIX}/share/wanderer/screens,"
+SUBST_CLASSES+= wanderer
+SUBST_STAGE.wanderer= pre-build
+SUBST_FILES.wanderer= wand_head.h
+SUBST_SED.wanderer= -e "s,/usr/local/share/wanderer/screens,${PREFIX}/share/wanderer/screens,"
-SUBST_CLASSES+= wand-mk
-SUBST_STAGE.wand-mk= pre-build
-SUBST_FILES.wand-mk= Makefile
-SUBST_SED.wand-mk= -e 's|${DESTDIR}||'
-SUBST_SED.wand-mk+= -e "s,/usr/local/,${PREFIX}/,"
+SUBST_CLASSES+= wand-mk
+SUBST_STAGE.wand-mk= pre-build
+SUBST_FILES.wand-mk= Makefile
+SUBST_SED.wand-mk= -e 's|${DESTDIR}||'
+SUBST_SED.wand-mk+= -e "s,/usr/local/,${PREFIX}/,"
USE_GAMESGROUP= yes
SPECIAL_PERMS= bin/wanderer ${SETGID_GAMES_PERMS}
-INSTALLATION_DIRS+= man ${PKGMANDIR}/man6 bin share/wanderer share/wanderer/screens games
+INSTALLATION_DIRS+= man ${PKGMANDIR}/man6 bin share/wanderer share/wanderer/screens games
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wanderer ${DESTDIR}${PREFIX}/bin/wanderer
diff --git a/wang-ttf/Makefile b/wang-ttf/Makefile
index 3451e9f1b8..0e05c709c8 100644
--- a/wang-ttf/Makefile
+++ b/wang-ttf/Makefile
@@ -32,7 +32,7 @@ NO_BUILD= yes
FONTS_DIRS.ttf+= ${PREFIX}/lib/X11/fonts/TTF
REQD_DIRS+= ${PREFIX}/lib/X11/fonts/TTF
-DOCDIR= ${PREFIX}/share/doc/wang-ttf
+DOCDIR= ${PREFIX}/share/doc/wang-ttf
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/wayland/Makefile b/wayland/Makefile
index bc4ff15954..f5afbe9b72 100644
--- a/wayland/Makefile
+++ b/wayland/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE= http://wayland.freedesktop.org
COMMENT= Computer display server protocol
LICENSE= mit
-USE_TOOLS+= autoconf automake autoreconf gmake pkg-config
-USE_LANGUAGES+= c c++
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_TOOLS+= autoconf automake autoreconf gmake pkg-config
+USE_LANGUAGES+= c c++
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
CONFIGURE_ARGS+= --disable-documentation
PKGCONFIG_OVERRIDE+= src/wayland-client.pc.in
diff --git a/webcleaner/Makefile b/webcleaner/Makefile
index 281e8096c2..1fe4b796df 100644
--- a/webcleaner/Makefile
+++ b/webcleaner/Makefile
@@ -12,11 +12,11 @@ DEPENDS+= ${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto
DEPENDS+= ${PYPKGPREFIX}-imaging>=0:../../graphics/py-imaging
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-GNU_CONFIGURE= yes
-PY_PATCHPLIST= yes
+USE_PKGLOCALEDIR= yes
+USE_LIBTOOL= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+GNU_CONFIGURE= yes
+PY_PATCHPLIST= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-imaging
do-configure:
diff --git a/why/Makefile b/why/Makefile
index abb7730b39..ea2da243a2 100644
--- a/why/Makefile
+++ b/why/Makefile
@@ -10,7 +10,7 @@ COMMENT= Why is a software verification platform
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
.include "../../lang/ocaml/buildlink3.mk"
.include "../../devel/nspr/buildlink3.mk"
diff --git a/why3/Makefile b/why3/Makefile
index 496bfed7d9..e377e9a89a 100644
--- a/why3/Makefile
+++ b/why3/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-lgpl-v2.1
DEPENDS+= menhir-[0-9]*:../../devel/menhir
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
#CONFIGURE_ARGS+= --enable-frama-c
CONFIGURE_ARGS+= --disable-ide
diff --git a/wicd/Makefile b/wicd/Makefile
index 1f781c5a29..ce471f6bbe 100644
--- a/wicd/Makefile
+++ b/wicd/Makefile
@@ -15,15 +15,15 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2
DEPENDS+= ${PYPKGPREFIX}-dbus>=0.80:../../sysutils/py-dbus
DEPENDS+= ${PYPKGPREFIX}-urwid>=0.9.9:../../devel/py-urwid
-PY_PATCHPLIST = YES
-PYSETUP = setup.py
+PY_PATCHPLIST = YES
+PYSETUP = setup.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
USE_TOOLS+= pkg-config
USE_TOOLS+= intltool
-RCD_SCRIPTS= wicd
+RCD_SCRIPTS= wicd
RCD_SCRIPT_SRC.wicd= ${FILESDIR}/wicd.sh
# Adjust setup.py
@@ -39,7 +39,7 @@ SUBST_SED.setup+= -e 's,/usr/bin/,${PREFIX}/bin/,g'
SUBST_SED.setup+= -e 's,/usr/sbin/,${PREFIX}/sbin/,g'
SUBST_SED.setup+= -e 's,/usr/bin/python,${PYTHONBIN},g'
-ONLY_FOR_PLATFORM= Linux-*-*
+ONLY_FOR_PLATFORM= Linux-*-*
do-configure:
cd ${WRKSRC}; \
diff --git a/wicd/options.mk b/wicd/options.mk
index 705ef186e2..ca2b6cc7b0 100644
--- a/wicd/options.mk
+++ b/wicd/options.mk
@@ -1,19 +1,19 @@
# $NetBSD: options.mk,v 1.1.1.1 2011/01/05 13:23:14 rubengonzalez Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.wicd
-PKG_SUPPORTED_OPTIONS= dhcpcd net-tools wireless-tools
+PKG_OPTIONS_VAR= PKG_OPTIONS.wicd
+PKG_SUPPORTED_OPTIONS= dhcpcd net-tools wireless-tools
PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdhcpcd)
-DEPENDS+= dhcpcd>=5.2.7:../../net/dhcpcd
+DEPENDS+= dhcpcd>=5.2.7:../../net/dhcpcd
.endif
.if !empty(PKG_OPTIONS:Mnet-tools)
-DEPENDS+= net-tools>=1.60:../../wip/net-tools
+DEPENDS+= net-tools>=1.60:../../wip/net-tools
.endif
.if !empty(PKG_OPTIONS:Mwireless-tools)
-DEPENDS+= wireless-tools>=27:../../wip/wireless-tools
+DEPENDS+= wireless-tools>=27:../../wip/wireless-tools
.endif
diff --git a/wine-devel/PLIST.wine32 b/wine-devel/PLIST.wine32
index cd664cd16f..3009e88b96 100755
--- a/wine-devel/PLIST.wine32
+++ b/wine-devel/PLIST.wine32
@@ -1806,6 +1806,7 @@ lib/wine/fakedlls/wineoss.drv
lib/wine/fakedlls/winepath.exe
lib/wine/fakedlls/wineps.drv
lib/wine/fakedlls/wineps16.drv16
+${PLIST.pulseaudio}lib/wine/fakedlls/winepulse.drv
lib/wine/fakedlls/winevdm.exe
lib/wine/fakedlls/winex11.drv
lib/wine/fakedlls/wing.dll16
@@ -2402,6 +2403,7 @@ lib/wine/wineoss.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.drv.so
lib/wine/wineps16.drv16.so
+${PLIST.pulseaudio}lib/wine/winepulse.drv.so
lib/wine/winevdm.exe.so
lib/wine/winex11.drv.so
lib/wine/wing.dll16.so
@@ -2543,5 +2545,3 @@ share/wine/fonts/vgasyst.fon
share/wine/fonts/wingding.ttf
share/wine/l_intl.nls
share/wine/wine.inf
-${PLIST.pulseaudio}lib/wine/fakedlls/winepulse.drv
-${PLIST.pulseaudio}lib/wine/winepulse.drv.so
diff --git a/wine-devel/PLIST.wine64 b/wine-devel/PLIST.wine64
index 68fa1a3e21..bd5e871021 100755
--- a/wine-devel/PLIST.wine64
+++ b/wine-devel/PLIST.wine64
@@ -1742,6 +1742,7 @@ lib/wine/fakedlls/winemsibuilder.exe
lib/wine/fakedlls/wineoss.drv
lib/wine/fakedlls/winepath.exe
lib/wine/fakedlls/wineps.drv
+${PLIST.pulseaudio}lib/wine/fakedlls/winepulse.drv
lib/wine/fakedlls/winex11.drv
lib/wine/fakedlls/wing32.dll
lib/wine/fakedlls/winhlp32.exe
@@ -2282,6 +2283,7 @@ lib/wine/winemsibuilder.exe.so
lib/wine/wineoss.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.drv.so
+${PLIST.pulseaudio}lib/wine/winepulse.drv.so
lib/wine/winex11.drv.so
lib/wine/wing32.dll.so
lib/wine/winhlp32.exe.so
@@ -2411,5 +2413,3 @@ share/wine/fonts/vgasyst.fon
share/wine/fonts/wingding.ttf
share/wine/l_intl.nls
share/wine/wine.inf
-${PLIST.pulseaudio}lib/wine/fakedlls/winepulse.drv
-${PLIST.pulseaudio}lib/wine/winepulse.drv.so
diff --git a/wjelement/Makefile b/wjelement/Makefile
index eceb0f1bb3..709a53b510 100644
--- a/wjelement/Makefile
+++ b/wjelement/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2
USE_CMAKE= yes
CHECK_PORTABILITY_SKIP= src/cli/wje
-REPLACE_SH= src/cli/wje
+REPLACE_SH= src/cli/wje
.include "../../mk/bsd.prefs.mk"
diff --git a/wkhtmltopdf/Makefile b/wkhtmltopdf/Makefile
index 32aa172098..1a22330041 100644
--- a/wkhtmltopdf/Makefile
+++ b/wkhtmltopdf/Makefile
@@ -3,7 +3,7 @@
DISTNAME= wkhtmltox-0.12.2.1
PKGNAME= ${DISTNAME:S/tox/topdf/}
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
MASTER_SITES= http://download.gna.org/wkhtmltopdf/0.12/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.bz2
diff --git a/wmname/Makefile b/wmname/Makefile
index 68258ba3e5..1784a94795 100644
--- a/wmname/Makefile
+++ b/wmname/Makefile
@@ -2,7 +2,7 @@
#
DISTNAME= wmname-0.1
-CATEGORIES= x11
+CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/
MAINTAINER= rga%sdf.lonestar.org@localhost
@@ -10,20 +10,20 @@ HOMEPAGE= http://tools.suckless.org/wmname
COMMENT= Prints/sets the window manager name property of the root window
LICENSE= mit
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
# Adjust config.mk
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile= config.mk
-SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
+SUBST_CLASSES+= makefile
+SUBST_STAGE.makefile= pre-build
+SUBST_MESSAGE.makefile= Fixing config.mk
+SUBST_FILES.makefile= config.mk
+SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
# no manual avaiable
#SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
+SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
# no manual avaiable
#INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/wolf4SDL/Makefile b/wolf4SDL/Makefile
index 5c0bcdd398..c183eabbaa 100644
--- a/wolf4SDL/Makefile
+++ b/wolf4SDL/Makefile
@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.1 2015/08/17 20:10:44 yhardy Exp $
#
-DISTNAME= Wolf4SDL-1.7-src
-PKGNAME= Wolf4SDL-1.7
-CATEGORIES= games
-MASTER_SITES= http://homepage.o2mail.de/mkroll/bins/
-EXTRACT_SUFX= .zip
+DISTNAME= Wolf4SDL-1.7-src
+PKGNAME= Wolf4SDL-1.7
+CATEGORIES= games
+MASTER_SITES= http://homepage.o2mail.de/mkroll/bins/
+EXTRACT_SUFX= .zip
EXTRACT_OPTS_ZIP= -aqo
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/workrave/Makefile b/workrave/Makefile
index 3330fd8ff7..d34978a14a 100644
--- a/workrave/Makefile
+++ b/workrave/Makefile
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+= --docdir="${PREFIX}/share/doc/${PKGBASE}"
CXXFLAGS+= -D_ISOC99_SOURCE
INSTALL_MAKE_FLAGS+= utilsdir=${EGDIR}/sound/events
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+= ${EGDIR}/sound/events/workrave.soundlist \
- ${PKG_SYSCONFDIR}/sound/events/workrave.soundlist
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+= ${EGDIR}/sound/events/workrave.soundlist \
+ ${PKG_SYSCONFDIR}/sound/events/workrave.soundlist
.include "options.mk"
diff --git a/wp2md-git/Makefile b/wp2md-git/Makefile
index ad251903dd..f74ca8640d 100644
--- a/wp2md-git/Makefile
+++ b/wp2md-git/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
-DISTNAME= wp2md-0.8.1
-CATEGORIES= textproc
+DISTNAME= wp2md-0.8.1
+CATEGORIES= textproc
GIT_REPOSITORIES= wp2md
GIT_REPO.wp2md= https://github.com/dreikanter/wp2md.git
diff --git a/wvstreams/Makefile b/wvstreams/Makefile
index 52b1346d74..95f5375bc5 100644
--- a/wvstreams/Makefile
+++ b/wvstreams/Makefile
@@ -14,14 +14,14 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
-EGDIR= ${PREFIX}/share/examples/wvstreams
-CONF_FILES= ${EGDIR}/uniconf.conf ${PKG_SYSCONFDIR}/uniconf.conf
+EGDIR= ${PREFIX}/share/examples/wvstreams
+CONF_FILES= ${EGDIR}/uniconf.conf ${PKG_SYSCONFDIR}/uniconf.conf
-SUBST_CLASSES+= etc
-SUBST_STAGE.etc= pre-install
-SUBST_FILES.etc= install.mk
-SUBST_SED.etc= -e 's:$$(sysconfdir):${EGDIR}:g'
-SUBST_MESSAGE.etc= Fixing examples directory
+SUBST_CLASSES+= etc
+SUBST_STAGE.etc= pre-install
+SUBST_FILES.etc= install.mk
+SUBST_SED.etc= -e 's:$$(sysconfdir):${EGDIR}:g'
+SUBST_MESSAGE.etc= Fixing examples directory
PKGCONFIG_OVERRIDE+= pkgconfig/libwvtest.pc.in
PKGCONFIG_OVERRIDE+= pkgconfig/libwvstreams.pc.in
diff --git a/wvstreams/buildlink3.mk b/wvstreams/buildlink3.mk
index 8bbf712241..09b86e3c8e 100644
--- a/wvstreams/buildlink3.mk
+++ b/wvstreams/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wvstreams
WVSTREAMS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wvstreams+= wvstreams>=4.5.1
-BUILDLINK_PKGSRCDIR.wvstreams?= ../../wip/wvstreams
+BUILDLINK_PKGSRCDIR.wvstreams?= ../../wip/wvstreams
.endif # WVSTREAMS_BUILDLINK3_MK
BUILDLINK_TREE+= -wvstreams
diff --git a/wxmaxima-git/Makefile b/wxmaxima-git/Makefile
index bff40e6af3..6a1d2a585a 100644
--- a/wxmaxima-git/Makefile
+++ b/wxmaxima-git/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= wxmaxima
GIT_REPO.wxmaxima= git://github.com/andrejv/wxmaxima.git
-WRKSRC= ${WRKDIR}/wxmaxima
+WRKSRC= ${WRKDIR}/wxmaxima
DEPENDS+= maxima>=5.15.0:../../math/maxima
DEPENDS+= gnuplot>=4.2.3:../../graphics/gnuplot
Home |
Main Index |
Thread Index |
Old Index