pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/u*: fix pkglint indentation warnings

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 23:56:03 2018 +0000
Changeset:	d0711624de865f75c02bbb6291372531d22df129

Modified Files:
	uade/PLIST
	ubit/PLIST
	udhcp/Makefile
	udp-ping/Makefile
	udunits2/Makefile
	ufc/Makefile
	uhd-git/Makefile
	uhd-git/buildlink3.mk
	umurmur/Makefile
	unagi/options.mk
	unicorn5hc/Makefile
	unnethack/Makefile
	unnethack/options.mk
	unpaper/Makefile
	upower/Makefile
	ups-monitor/Makefile
	uptimed/Makefile
	using-mpi/Makefile
	utf8proc/buildlink3.mk
	uthash/PLIST

Log Message:
wip/u*: fix pkglint indentation warnings

pkglint -Wall -F -o aligned u*/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d0711624de865f75c02bbb6291372531d22df129

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

diffstat:
 uade/PLIST             |  2 +-
 ubit/PLIST             |  6 +++---
 udhcp/Makefile         |  6 +++---
 udp-ping/Makefile      |  2 +-
 udunits2/Makefile      |  8 ++++----
 ufc/Makefile           |  2 +-
 uhd-git/Makefile       |  6 +++---
 uhd-git/buildlink3.mk  |  8 ++++----
 umurmur/Makefile       |  2 +-
 unagi/options.mk       |  2 +-
 unicorn5hc/Makefile    |  6 +++---
 unnethack/Makefile     | 18 +++++++++---------
 unnethack/options.mk   |  6 +++---
 unpaper/Makefile       |  2 +-
 upower/Makefile        |  8 ++++----
 ups-monitor/Makefile   |  8 ++++----
 uptimed/Makefile       |  6 +++---
 using-mpi/Makefile     |  4 ++--
 utf8proc/buildlink3.mk |  4 ++--
 uthash/PLIST           |  1 -
 20 files changed, 53 insertions(+), 54 deletions(-)

diffs:
diff --git a/uade/PLIST b/uade/PLIST
index b793790158..9fda761185 100644
--- a/uade/PLIST
+++ b/uade/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD: PLIST,v 1.6 2013/02/17 21:19:26 othyro Exp $
 bin/mod2ogg2.sh
 bin/uade123
-lib/uade2/uadecore
 lib/pkgconfig/uade.pc
+lib/uade2/uadecore
 man/uade123.1
 share/uade2/eagleplayer.conf
 share/uade2/players/ADPCM_mono
diff --git a/ubit/PLIST b/ubit/PLIST
index ad1ca1c01b..46da998416 100644
--- a/ubit/PLIST
+++ b/ubit/PLIST
@@ -11,9 +11,9 @@ include/ubit/ubit.hpp
 include/ubit/ubit_config.h
 include/ubit/uborder.hpp
 include/ubit/ubox.hpp
-include/ubit/uboxes.hpp
 include/ubit/uboxGeom.hpp
 include/ubit/uboxLayout.hpp
+include/ubit/uboxes.hpp
 include/ubit/ubrick.hpp
 include/ubit/ubuttons.hpp
 include/ubit/ucall.hpp
@@ -39,8 +39,8 @@ include/ubit/udom.hpp
 include/ubit/uedit.hpp
 include/ubit/uerror.hpp
 include/ubit/uevent.hpp
-include/ubit/ueventflow.hpp
 include/ubit/ueventImpl.hpp
+include/ubit/ueventflow.hpp
 include/ubit/ufile.hpp
 include/ubit/ufilebox.hpp
 include/ubit/ufinder.hpp
@@ -51,7 +51,6 @@ include/ubit/ufontImpl.hpp
 include/ubit/ufontMetrics.hpp
 include/ubit/ugeom.hpp
 include/ubit/uglpane.hpp
-include/ubit/uplugpane.hpp
 include/ubit/ugraph.hpp
 include/ubit/ugroup.hpp
 include/ubit/uhtml.hpp
@@ -80,6 +79,7 @@ include/ubit/update.hpp
 include/ubit/upiemenu.hpp
 include/ubit/upix.hpp
 include/ubit/upixmaps.hpp
+include/ubit/uplugpane.hpp
 include/ubit/uprop.hpp
 include/ubit/uscrollbar.hpp
 include/ubit/uscrollpane.hpp
diff --git a/udhcp/Makefile b/udhcp/Makefile
index 1644ba7123..14744940af 100644
--- a/udhcp/Makefile
+++ b/udhcp/Makefile
@@ -14,9 +14,9 @@ USE_TOOLS+=	gmake
 
 ONLY_FOR_PlATFORM=	Linux-*-*
 
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix=pre-build
-SUBST_FILES.prefix=Makefile
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-build
+SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=\
 	-e "s|prefix=|prefix=${PREFIX}\#|" \
 	-e "s|SBINDIR=|SBINDIR=${PREFIX}/sbin \#|"
diff --git a/udp-ping/Makefile b/udp-ping/Makefile
index 0bc9c24cf6..7ca8697c04 100644
--- a/udp-ping/Makefile
+++ b/udp-ping/Makefile
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/UDPing
 USE_LANGUAGES=	c++
 NO_CONFIGURE=	YES
 
-INSTALLATION_DIRS+=	 bin sbin
+INSTALLATION_DIRS+=	bin sbin
 
 do-build:
 		cd ${WRKSRC} &&  \
diff --git a/udunits2/Makefile b/udunits2/Makefile
index f43181b8a1..1ee3a08a84 100644
--- a/udunits2/Makefile
+++ b/udunits2/Makefile
@@ -38,10 +38,10 @@ COMMENT=	Library for manipulating units of physical quantities
 MAKE_JOBS_SAFE=	no
 
 # Just assuming C and C++: Adjust this!
-USE_LANGUAGES=	fortran c c++
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+USE_LANGUAGES=		fortran c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--disable-shared
 
 CONFIGURE_ENV+=	ac_cv_header_CUnit_CUnit_h=no
diff --git a/ufc/Makefile b/ufc/Makefile
index 92d788705d..00a0f8d77c 100644
--- a/ufc/Makefile
+++ b/ufc/Makefile
@@ -28,7 +28,7 @@ CXXFLAGS+=	-I${PREFIX}/${PYINC}
 PKGCONFIG_OVERRIDE+=	cmake/ufc-1.pc.in
 
 # Stolen from lang/python/extension.mk
-PLIST_SUBST+=   PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
 
 MMVERSION=	2.2
 
diff --git a/uhd-git/Makefile b/uhd-git/Makefile
index 14f59bb75c..eae9c10491 100644
--- a/uhd-git/Makefile
+++ b/uhd-git/Makefile
@@ -8,9 +8,9 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 COMMENT=		USRP (Universal Software Radio Peripheral) Hardware Drivers
 LICENSE=		gnu-gpl-v2
 
-GIT_REPOSITORIES=       master
-GIT_REPO.master=        git://github.com/EttusResearch/uhd.git
-GIT_MODULE.master=      uhd
+GIT_REPOSITORIES=	master
+GIT_REPO.master=	git://github.com/EttusResearch/uhd.git
+GIT_MODULE.master=	uhd
 
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake
diff --git a/uhd-git/buildlink3.mk b/uhd-git/buildlink3.mk
index e4c145bab8..9c614556f4 100644
--- a/uhd-git/buildlink3.mk
+++ b/uhd-git/buildlink3.mk
@@ -1,12 +1,12 @@
 # $NetBSD: buildlink3.mk,v 1.1 2014/09/05 05:57:23 makoto Exp $
 
-BUILDLINK_TREE+=        uhd
+BUILDLINK_TREE+=	uhd
 
 .if !defined(UHD_BUILDLINK3_MK)
 UHD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.uhd+=    uhd>=2.22
-BUILDLINK_PKGSRCDIR.uhd?=              ../../wip/uhd-git
+BUILDLINK_API_DEPENDS.uhd+=	uhd>=2.22
+BUILDLINK_PKGSRCDIR.uhd?=	../../wip/uhd-git
 .endif # UHD_BUILDLINK3_MK
 
-BUILDLINK_TREE+=        -uhd
+BUILDLINK_TREE+=	-uhd
diff --git a/umurmur/Makefile b/umurmur/Makefile
index dba45bf625..a1e4544a43 100644
--- a/umurmur/Makefile
+++ b/umurmur/Makefile
@@ -14,7 +14,7 @@ LICENSE=	modified-bsd
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
-LDFLAGS.SunOS+= -lresolv -lsocket -lnsl
+LDFLAGS.SunOS+=	-lresolv -lsocket -lnsl
 
 INSTALLATION_DIRS=	sbin share/examples/umurmur
 
diff --git a/unagi/options.mk b/unagi/options.mk
index a366427821..9c004b1018 100644
--- a/unagi/options.mk
+++ b/unagi/options.mk
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS+=	# blank
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdoxygen)
-DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
+DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 CONFIGURE_ARGS+=	--enable-doxygen-dot --enable-doxygen-man
 CONFIGURE_ARGS+=	--enable-doxygen-rtf --enable-doxygen-xml
 CONFIGURE_ARGS+=	--enable-doxygen-chm --enable-doxygen-pdf
diff --git a/unicorn5hc/Makefile b/unicorn5hc/Makefile
index 2230f4252a..772dd61e83 100644
--- a/unicorn5hc/Makefile
+++ b/unicorn5hc/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Quest for the Unicorn version 5, a rogue-like game, Hard Core edition
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-WRKSRC=		${WRKDIR}/unicorn5RL
-USE_LANGUAGES=	c
-BUILD_TARGET=	unicorn5
+WRKSRC=			${WRKDIR}/unicorn5RL
+USE_LANGUAGES=		c
+BUILD_TARGET=		unicorn5
 INSTALLATION_DIRS+=	bin share/doc/unicorn
 
 post-extract:
diff --git a/unnethack/Makefile b/unnethack/Makefile
index 36d1fd7bac..3c74af716e 100644
--- a/unnethack/Makefile
+++ b/unnethack/Makefile
@@ -15,23 +15,23 @@ LICENSE=	nethack-license
 GNU_CONFIGURE=	YES
 MAKE_JOBS_SAFE=	no
 
-CONFIGURE_ARGS+=--enable-wizmode=rhialto
-CONFIGURE_ARGS+=--enable-curses-graphics
-CONFIGURE_ARGS+=--enable-tty-graphics
+CONFIGURE_ARGS+=	--enable-wizmode=rhialto
+CONFIGURE_ARGS+=	--enable-curses-graphics
+CONFIGURE_ARGS+=	--enable-tty-graphics
 # Don't do the user/permission setting during build time.
-CONFIGURE_ENV+=	CHOWN=true
-CONFIGURE_ENV+=	CHGRP=true
+CONFIGURE_ENV+=		CHOWN=true
+CONFIGURE_ENV+=		CHGRP=true
 
 # For executable
 BUILD_TARGET=	unnethack
-INSTALL_TARGET=binfiles
+INSTALL_TARGET=	binfiles
 
 # For data files.
 # (BUG: building the datafiles first causes a double compile
 # of the game executable somehow)
-BUILD_TARGET+=	datastuff
-INSTALL_TARGET+=manpages install-dat
-INSTALLATION_DIRS=${PKGMANDIR}/man6 ${GAMEDIR}
+BUILD_TARGET+=		datastuff
+INSTALL_TARGET+=	manpages install-dat
+INSTALLATION_DIRS=	${PKGMANDIR}/man6 ${GAMEDIR}
 
 PLIST_SUBST+=	VER=$(VER)
 PLIST_VARS=	x11
diff --git a/unnethack/options.mk b/unnethack/options.mk
index cc21dd1646..b4cd778c3e 100644
--- a/unnethack/options.mk
+++ b/unnethack/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.3 2014/04/20 14:53:48 rhialto Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.unnethack
-PKG_SUPPORTED_OPTIONS=  x11
+PKG_OPTIONS_VAR=	PKG_OPTIONS.unnethack
+PKG_SUPPORTED_OPTIONS=	x11
 PKG_SUGGESTED_OPTIONS=
 
 # Support for the x11 option seems unreliable.
@@ -25,7 +25,7 @@ BUILD_TARGET+=		rip.xpm
 FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 INSTALLATION_DIRS+=	lib/X11/app-defaults lib/X11/fonts/misc
 
-MESSAGE_SRC+=           ${.CURDIR}/MESSAGE.x11
+MESSAGE_SRC+=		${.CURDIR}/MESSAGE.x11
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dat/x11tiles \
diff --git a/unpaper/Makefile b/unpaper/Makefile
index 9d7386620a..56a1efac37 100644
--- a/unpaper/Makefile
+++ b/unpaper/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS=	bin
 
 .include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/upower/Makefile b/upower/Makefile
index 9b17156dcb..535f1339ef 100644
--- a/upower/Makefile
+++ b/upower/Makefile
@@ -25,10 +25,10 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=	${PREFIX}/share/examples/${PKGBASE}/UPower/UPower.conf \
-		${PKG_SYSCONFDIR}/UPower/UPower.conf
-CONF_FILES+=	${PREFIX}/share/examples/${PKGBASE}/dbus-1/system.d/org.freedesktop.UPower.conf \
-		${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.UPower.conf
+CONF_FILES+=		${PREFIX}/share/examples/${PKGBASE}/UPower/UPower.conf \
+			${PKG_SYSCONFDIR}/UPower/UPower.conf
+CONF_FILES+=		${PREFIX}/share/examples/${PKGBASE}/dbus-1/system.d/org.freedesktop.UPower.conf \
+			${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.UPower.conf
 
 OWN_DIRS+=	${VARBASE}/lib/upower
 OWN_DIRS+=	${PKG_SYSCONFDIR}/UPower
diff --git a/ups-monitor/Makefile b/ups-monitor/Makefile
index 5d59915d9a..a6e4df494f 100644
--- a/ups-monitor/Makefile
+++ b/ups-monitor/Makefile
@@ -16,14 +16,14 @@ REPLACE_PYTHON=		ups-monitor
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2
 
 SUBST_CLASSES+=		py
-SUBST_STAGE.py= 	post-patch
-SUBST_FILES.py= 	eggtray/Makefile.in
+SUBST_STAGE.py=		post-patch
+SUBST_FILES.py=		eggtray/Makefile.in
 SUBST_SED.py=		-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|"
 SUBST_MESSAGE.py=	Fixing Python version.
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix= 	post-patch
-SUBST_FILES.prefix= 	eggtray/Makefile.in
+SUBST_STAGE.prefix=	post-patch
+SUBST_FILES.prefix=	eggtray/Makefile.in
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|"
 SUBST_MESSAGE.prefix=	Fixing prefix.
 
diff --git a/uptimed/Makefile b/uptimed/Makefile
index f03ddc2445..09d803e56f 100644
--- a/uptimed/Makefile
+++ b/uptimed/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.6 2013/05/10 08:20:04 ahp-nils Exp $
 #
 
-DISTNAME=		uptimed-0.3.17
-CATEGORIES=		sysutils
-MASTER_SITES=		http://podgorny.cz/uptimed/releases/
+DISTNAME=	uptimed-0.3.17
+CATEGORIES=	sysutils
+MASTER_SITES=	http://podgorny.cz/uptimed/releases/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=		joe%joe.cz@localhost
diff --git a/using-mpi/Makefile b/using-mpi/Makefile
index 327e512f5b..b0ef4ee0e9 100644
--- a/using-mpi/Makefile
+++ b/using-mpi/Makefile
@@ -9,8 +9,8 @@ MAINTAINER=	asau%inbox.ru@localhost
 HOMEPAGE=	http://www-unix.mcs.anl.gov/mpi/learning.html
 COMMENT=	Sample programs from "Using MPI" (2nd ed.) book
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c fortran77 c++
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c fortran77 c++
 CONFIGURE_ARGS+=	--with-mpich=${PREFIX}/bin
 BUILD_MAKE_FLAGS+=	CXX=${PREFIX}/bin/mpicxx
 BUILD_MAKE_FLAGS+=	LIBS=-lm
diff --git a/utf8proc/buildlink3.mk b/utf8proc/buildlink3.mk
index 429359ec71..b72a15797c 100644
--- a/utf8proc/buildlink3.mk
+++ b/utf8proc/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	utf8proc
 UTF8PROC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.utf8proc+=	utf8proc>=2.1.0
-BUILDLINK_PKGSRCDIR.utf8proc?=	../../converters/utf8proc
-BUILDLINK_DEPMETHOD.utf8proc?=	build
+BUILDLINK_PKGSRCDIR.utf8proc?=		../../converters/utf8proc
+BUILDLINK_DEPMETHOD.utf8proc?=		build
 .endif	# UTF8PROC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-utf8proc
diff --git a/uthash/PLIST b/uthash/PLIST
index 8d4c5e526d..6e7d92a018 100644
--- a/uthash/PLIST
+++ b/uthash/PLIST
@@ -25,4 +25,3 @@ share/doc/uthash/uthash.png
 share/doc/uthash/utlist.txt
 share/doc/uthash/utringbuffer.txt
 share/doc/uthash/utstring.txt
-
Home | Main Index | Thread Index | Old Index