pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/r*: 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:27:54 2018 +0000
Changeset:	eebed906c1dd84ee0fda8378669b4fb90c371f47

Modified Files:
	radare2-git/Makefile
	rapidxml/buildlink3.mk
	rar4/PLIST
	ratpoints/Makefile
	rc.subr/PLIST
	realvnc/PLIST
	recoll/Makefile
	redeclipse/PLIST
	redshift/Makefile
	redshift/PLIST
	reduze/Makefile
	refkeen/Makefile
	reinteract/Makefile
	renameutils/Makefile
	resid-builder/Makefile
	residualvm/options.mk
	retroarch/Makefile
	retroarch/options.mk
	revelation/Makefile
	riak/Makefile
	riak/Makefile.versions
	riak14/Makefile.versions
	ripe-rpsl-objectlibrary/Makefile
	ripit/Makefile
	rmilter/Makefile
	rmilter/PLIST
	rnc-mode/Makefile
	roadfighter/Makefile
	rocksdb/Makefile
	rosegarden/Makefile
	rpm5/Makefile
	rpm5/PLIST.Linux
	rpm5/buildlink3.mk
	rsem/PLIST
	rst-mode/Makefile
	rtcmix/Makefile
	rte/buildlink3.mk
	rthread/Makefile
	rubrica2/buildlink3.mk
	ruby-diaspora/Makefile
	ruby-ditz/Makefile
	ruby-neovim/Makefile
	ruby-redmine/options.mk
	ruby-therubyracer/Makefile
	runit/Makefile
	rust/Makefile
	rustc/Makefile

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

pkglint -Wall -F -o aligned r*/

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

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

diffstat:
 radare2-git/Makefile             |  10 ++--
 rapidxml/buildlink3.mk           |   2 +-
 rar4/PLIST                       |   2 +-
 ratpoints/Makefile               |   8 ++--
 rc.subr/PLIST                    |   6 +--
 realvnc/PLIST                    |  12 ++---
 recoll/Makefile                  |   6 +--
 redeclipse/PLIST                 |   4 +-
 redshift/Makefile                |   2 +-
 redshift/PLIST                   |   2 +-
 reduze/Makefile                  |   2 +-
 refkeen/Makefile                 |  10 ++--
 reinteract/Makefile              |   4 +-
 renameutils/Makefile             |   2 +-
 resid-builder/Makefile           |   2 +-
 residualvm/options.mk            |   6 +--
 retroarch/Makefile               |   6 +--
 retroarch/options.mk             |   6 +--
 revelation/Makefile              |  10 ++--
 riak/Makefile                    |   2 +-
 riak/Makefile.versions           | 100 +++++++++++++++++++--------------------
 riak14/Makefile.versions         |  74 ++++++++++++++---------------
 ripe-rpsl-objectlibrary/Makefile |   2 +-
 ripit/Makefile                   |   2 +-
 rmilter/Makefile                 |   8 ++--
 rmilter/PLIST                    |   2 +-
 rnc-mode/Makefile                |   4 +-
 roadfighter/Makefile             |   2 +-
 rocksdb/Makefile                 |   6 +--
 rosegarden/Makefile              |   2 +-
 rpm5/Makefile                    |   8 ++--
 rpm5/PLIST.Linux                 |  16 +++----
 rpm5/buildlink3.mk               |   2 +-
 rsem/PLIST                       |   2 +-
 rst-mode/Makefile                |   2 +-
 rtcmix/Makefile                  |   8 ++--
 rte/buildlink3.mk                |   2 +-
 rthread/Makefile                 |   2 +-
 rubrica2/buildlink3.mk           |   2 +-
 ruby-diaspora/Makefile           |  14 +++---
 ruby-ditz/Makefile               |   2 +-
 ruby-neovim/Makefile             |   4 +-
 ruby-redmine/options.mk          |  14 +++---
 ruby-therubyracer/Makefile       |   2 +-
 runit/Makefile                   |   4 +-
 rust/Makefile                    |  13 ++---
 rustc/Makefile                   |  18 +++----
 47 files changed, 211 insertions(+), 210 deletions(-)

diffs:
diff --git a/radare2-git/Makefile b/radare2-git/Makefile
index 657a1b1b4f..0c6b89be2e 100644
--- a/radare2-git/Makefile
+++ b/radare2-git/Makefile
@@ -1,23 +1,23 @@
 # $NetBSD: Makefile,v 1.3 2015/03/21 21:01:51 krytarowski Exp $
 
-DISTNAME=	radare2-1.3.0
-CATEGORIES=	devel
+DISTNAME=		radare2-1.3.0
+CATEGORIES=		devel
 GIT_REPOSITORIES=	radare2
 GIT_REPO.radare2=	https://github.com/radare/radare2.git
-WRKSRC=		${WRKDIR}/radare2
+WRKSRC=			${WRKDIR}/radare2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.radare.org/
 COMMENT=	Reverse engineering framework
 LICENSE=	gnu-gpl-v3
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--with-sysmagic
 CONFIGURE_ARGS+=	--with-syscapstone
 CONFIGURE_ARGS+=	--with-syszip
 PKGCONFIG_OVERRIDE+=	pkgcfg/*.pc*
-USE_TOOLS+=	gmake
+USE_TOOLS+=		gmake
 
 CHECK_INTERPRETER_SKIP=	share/radare2/${PKGVERSION_NOREV}-git/www/m/vendors/fonts/iconjar-map.js
 
diff --git a/rapidxml/buildlink3.mk b/rapidxml/buildlink3.mk
index 93c0a57d37..b5325505b6 100644
--- a/rapidxml/buildlink3.mk
+++ b/rapidxml/buildlink3.mk
@@ -8,7 +8,7 @@ RAPIDXML_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.rapidxml?=	build
 
 BUILDLINK_API_DEPENDS.rapidxml+=	rapidxml>=1.13
-BUILDLINK_PKGSRCDIR.rapidxml?=	../../wip/rapidxml
+BUILDLINK_PKGSRCDIR.rapidxml?=		../../wip/rapidxml
 .endif	# RAPIDXML_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-rapidxml
diff --git a/rar4/PLIST b/rar4/PLIST
index 77b40f22df..edfd6d5fdd 100644
--- a/rar4/PLIST
+++ b/rar4/PLIST
@@ -4,9 +4,9 @@ bin/unrar4
 lib/default.sfx
 man/cat1/rar4.0
 share/examples/rar4/rarfiles.lst
+share/examples/rar4/rarfiles.lst
 share/rar4/license.txt
 share/rar4/order.htm
-share/examples/rar4/rarfiles.lst
 share/rar4/rar.txt
 share/rar4/readme.txt
 share/rar4/technote.txt
diff --git a/ratpoints/Makefile b/ratpoints/Makefile
index 561eb6de17..d895da7366 100644
--- a/ratpoints/Makefile
+++ b/ratpoints/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 14:53:43 asau Exp $
 #
 
-DISTNAME=		ratpoints-2.1.3
-CATEGORIES=		math
+DISTNAME=	ratpoints-2.1.3
+CATEGORIES=	math
 MASTER_SITES=	http://www.mathe2.uni-bayreuth.de/stoll/programs/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.mathe2.uni-bayreuth.de/stoll/programs/index.html
-COMMENT=		Optimized quadratic sieve algorithm
-LICENSE=		gnu-gpl-v2
+COMMENT=	Optimized quadratic sieve algorithm
+LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
diff --git a/rc.subr/PLIST b/rc.subr/PLIST
index 4435cc2cd7..cea71ce3e5 100644
--- a/rc.subr/PLIST
+++ b/rc.subr/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:45:13 thomasklausner Exp $
-share/examples/rc.d/SERVERS
-share/examples/rc.d/NETWORKING
-share/examples/rc.d/LOGIN
 share/examples/rc.d/DAEMON
+share/examples/rc.d/LOGIN
+share/examples/rc.d/NETWORKING
+share/examples/rc.d/SERVERS
 share/examples/rc.subr/rc.conf.example
 share/examples/rc.subr/rc.subr
diff --git a/realvnc/PLIST b/realvnc/PLIST
index c0e92595fe..73cbc232fd 100644
--- a/realvnc/PLIST
+++ b/realvnc/PLIST
@@ -1,16 +1,16 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:45:13 thomasklausner Exp $
-bin/vncserver
+bin/Xvnc
+bin/vncconfig
 bin/vncpasswd
+bin/vncserver
 bin/vncviewer
-bin/vncconfig
 bin/x0vncserver
-bin/Xvnc
 lib/modules/extensions/vnc.so
-man/man1/vncviewer.1
-man/man1/x0vncserver.1
-man/man1/vncpasswd.1
 man/man1/vncconfig.1
+man/man1/vncpasswd.1
 man/man1/vncserver.1
+man/man1/vncviewer.1
+man/man1/x0vncserver.1
 share/vnc/classes/index.vnc
 share/vnc/classes/logo150x150.gif
 share/vnc/classes/vncviewer.jar
diff --git a/recoll/Makefile b/recoll/Makefile
index 64ae70bc5f..cc5a209f6e 100644
--- a/recoll/Makefile
+++ b/recoll/Makefile
@@ -14,9 +14,9 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl:run
 
-CONFIGURE_ARGS+= --disable-python-module
-CONFIGURE_ARGS+= --with-aspell=${BUILDLINK_PREFIX.aspell}/bin/aspell
-CONFIGURE_ARGS+= --with-file-command=${BUILDLINK_PREFIX.file}/bin/file
+CONFIGURE_ARGS+=	--disable-python-module
+CONFIGURE_ARGS+=	--with-aspell=${BUILDLINK_PREFIX.aspell}/bin/aspell
+CONFIGURE_ARGS+=	--with-file-command=${BUILDLINK_PREFIX.file}/bin/file
 
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
diff --git a/redeclipse/PLIST b/redeclipse/PLIST
index e8c6da0330..01ed9be3b0 100644
--- a/redeclipse/PLIST
+++ b/redeclipse/PLIST
@@ -6,6 +6,8 @@ lib/redeclipse/data
 lib/redeclipse/doc
 lib/redeclipse/redeclipse
 lib/redeclipse/redeclipse-server
+man/man6/redeclipse-server.6
+man/man6/redeclipse.6
 share/appdata/redeclipse.appdata.xml
 share/applications/redeclipse.desktop
 share/doc/redeclipse/examples/servinit.cfg
@@ -15,8 +17,6 @@ share/icons/hicolor/16x16/apps/redeclipse.png
 share/icons/hicolor/32x32/apps/redeclipse.png
 share/icons/hicolor/48x48/apps/redeclipse.png
 share/icons/hicolor/64x64/apps/redeclipse.png
-man/man6/redeclipse-server.6
-man/man6/redeclipse.6
 share/pixmaps/redeclipse.xpm
 share/redeclipse/config/brush.cfg
 share/redeclipse/config/compass.cfg
diff --git a/redshift/Makefile b/redshift/Makefile
index 8c73ff7bcd..819e586d77 100644
--- a/redshift/Makefile
+++ b/redshift/Makefile
@@ -16,7 +16,7 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autopoint autoreconf intltoolize aclocal autoheader autoconf automake gmake intltool msgfmt pkg-config gettext
-USE_LIBTOOL=            yes
+USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=	--disable-gui
diff --git a/redshift/PLIST b/redshift/PLIST
index 3e9565e141..e853a5808c 100644
--- a/redshift/PLIST
+++ b/redshift/PLIST
@@ -25,8 +25,8 @@ share/locale/lt/LC_MESSAGES/redshift.mo
 share/locale/nb/LC_MESSAGES/redshift.mo
 share/locale/nl/LC_MESSAGES/redshift.mo
 share/locale/pl/LC_MESSAGES/redshift.mo
-share/locale/pt_BR/LC_MESSAGES/redshift.mo
 share/locale/pt/LC_MESSAGES/redshift.mo
+share/locale/pt_BR/LC_MESSAGES/redshift.mo
 share/locale/ru/LC_MESSAGES/redshift.mo
 share/locale/sv/LC_MESSAGES/redshift.mo
 share/locale/tr/LC_MESSAGES/redshift.mo
diff --git a/reduze/Makefile b/reduze/Makefile
index 84cd6e1f3d..8e781d292e 100644
--- a/reduze/Makefile
+++ b/reduze/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Program for reducing Feynman Integrals
 LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
 EDGDIR=	${PREFIX}/examples/reduze
diff --git a/refkeen/Makefile b/refkeen/Makefile
index 480bd48a10..40569d1ddc 100644
--- a/refkeen/Makefile
+++ b/refkeen/Makefile
@@ -14,11 +14,11 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
 
-REFKEEN_PROGS+= reflection-cat3d
-REFKEEN_PROGS+= reflection-catabyss
-REFKEEN_PROGS+= reflection-catapoc
-REFKEEN_PROGS+= reflection-catarm
-REFKEEN_PROGS+= reflection-kdreams
+REFKEEN_PROGS+=	reflection-cat3d
+REFKEEN_PROGS+=	reflection-catabyss
+REFKEEN_PROGS+=	reflection-catapoc
+REFKEEN_PROGS+=	reflection-catarm
+REFKEEN_PROGS+=	reflection-kdreams
 
 INSTALLATION_DIRS=	bin share/doc/${PKGNAME}
 
diff --git a/reinteract/Makefile b/reinteract/Makefile
index 81bca74eb3..8ae4e9aacc 100644
--- a/reinteract/Makefile
+++ b/reinteract/Makefile
@@ -15,8 +15,8 @@ DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 GNU_CONFIGURE=	yes
 
-REPLACE_PYTHON+=	bin/reinteract.in
-PY_PATCHPLIST=	yes
+REPLACE_PYTHON+=		bin/reinteract.in
+PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gobject
 
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/renameutils/Makefile b/renameutils/Makefile
index a104b99fe3..9f181bc827 100644
--- a/renameutils/Makefile
+++ b/renameutils/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Rename files faster and more easily
 LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
-DEPENDS+=               coreutils-[0-9]*:../../sysutils/coreutils
+DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
 
 .include "options.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/resid-builder/Makefile b/resid-builder/Makefile
index d684a1712a..a22477cacd 100644
--- a/resid-builder/Makefile
+++ b/resid-builder/Makefile
@@ -18,7 +18,7 @@ USE_LIBTOOL=	yes
 
 # I know it's dirty...
 #
-RESID=resid-0.16.2-ccr
+RESID=	resid-0.16.2-ccr
 CONFIGURE_ARGS+= --with-resid=${WRKDIR}/${RESID}
 
 pre-extract:
diff --git a/residualvm/options.mk b/residualvm/options.mk
index 655d75c2fa..c5117a4da3 100644
--- a/residualvm/options.mk
+++ b/residualvm/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.2 2015/04/19 21:12:18 nbrkv Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.residualvm
-PKG_SUPPORTED_OPTIONS=	faad flac fluidsynth mad freetype png theora timidity jpeg
-PKG_SUGGESTED_OPTIONS=	faad flac fluidsynth mad freetype png theora timidity jpeg vorbis 
+PKG_OPTIONS_VAR=		PKG_OPTIONS.residualvm
+PKG_SUPPORTED_OPTIONS=		faad flac fluidsynth mad freetype png theora timidity jpeg
+PKG_SUGGESTED_OPTIONS=		faad flac fluidsynth mad freetype png theora timidity jpeg vorbis 
 # only one of tremor or ogg/vorbis
 PKG_OPTIONS_OPTIONAL_GROUPS+=	vorbis
 PKG_OPTIONS_GROUP.vorbis=	vorbis tremor
diff --git a/retroarch/Makefile b/retroarch/Makefile
index 6cc6724ab7..ff1c8faac5 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -14,8 +14,8 @@ GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--disable-builtinminiupnpc
-CONFIGURE_ARGS+=--disable-builtinzlib
+CONFIGURE_ARGS+=	--disable-builtinminiupnpc
+CONFIGURE_ARGS+=	--disable-builtinzlib
 
 CONFIGURE_ENV+=	BIN_DIR=${PREFIX}/bin
 CONFIGURE_ENV+=	MAN_DIR=${PREFIX}/${PKGMANDIR}
@@ -37,7 +37,7 @@ CPPFLAGS+=	-DPREFIX=\"${PREFIX}\"
 # file "/usr/src/lib/libpthread/pthread_tsd.c", line 287, function "pthread_key_delete"
 # [1]   Abort trap (core dumped) retroarch
 .if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --disable-thread_storage
+CONFIGURE_ARGS+=	--disable-thread_storage
 .endif
 
 .include "options.mk"
diff --git a/retroarch/options.mk b/retroarch/options.mk
index cea0985d16..cda9961b66 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -2,9 +2,9 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.retroarch
-PKG_SUPPORTED_OPTIONS+=	sdl2 ffmpeg freetype x11 alsa caca pulseaudio udev
-PKG_SUGGESTED_OPTIONS+=	sdl2 ffmpeg freetype x11
+PKG_OPTIONS_VAR=		PKG_OPTIONS.retroarch
+PKG_SUPPORTED_OPTIONS+=		sdl2 ffmpeg freetype x11 alsa caca pulseaudio udev
+PKG_SUGGESTED_OPTIONS+=		sdl2 ffmpeg freetype x11
 PKG_SUGGESTED_OPTIONS.Linux+=	alsa udev
 PKG_OPTIONS_OPTIONAL_GROUPS+=	gl
 PKG_OPTIONS_GROUP.gl+=		opengl
diff --git a/revelation/Makefile b/revelation/Makefile
index 1891375bcf..22700f37b2 100644
--- a/revelation/Makefile
+++ b/revelation/Makefile
@@ -14,11 +14,11 @@ DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
 DEPENDS+=	${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
 DEPENDS+=	${PYPKGPREFIX}-cracklib-[0-9]*:../../wip/py-cracklib
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c
-USE_TOOLS+=	gmake intltool pkg-config
-CONFIGURE_ARGS+=	GCONFTOOL=${GCONFTOOL2}
-PY_PATCHPLIST=	yes
+GNU_CONFIGURE=			yes
+USE_LANGUAGES=			c
+USE_TOOLS+=			gmake intltool pkg-config
+CONFIGURE_ARGS+=		GCONFTOOL=${GCONFTOOL2}
+PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gtk2
 
 GCONF_SCHEMAS=	revelation.schemas
diff --git a/riak/Makefile b/riak/Makefile
index d244e93d81..d3de7d650a 100644
--- a/riak/Makefile
+++ b/riak/Makefile
@@ -76,7 +76,7 @@ REPLACE_BASH+=		deps/yokozuna/build/${SOLR:S/.tgz//}/example/etc/create-solrtest
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
 REPLACE.escript.new=	${PREFIX}/bin/escript
-REPLACE_FILES.escript=  deps/node_package/priv/base/nodetool
+REPLACE_FILES.escript=	deps/node_package/priv/base/nodetool
 
 CHECK_PORTABILITY_SKIP=	deps/riak_search/tests/riak_search/run_all.sh
 
diff --git a/riak/Makefile.versions b/riak/Makefile.versions
index e718b4fa86..aa52eff9b0 100644
--- a/riak/Makefile.versions
+++ b/riak/Makefile.versions
@@ -1,53 +1,53 @@
 # $NetBSD: Makefile,v 1.27 2015/07/14 19:44:09 fhajny Exp $
 # This file is generated by "/opt/local/bin/bmake update-deps", post-build
 
-RIAK_VERSIONS+=basho_stats 1.0.3
-RIAK_VERSIONS+=bear 0.1.3p1-0-gda820a1
-RIAK_VERSIONS+=bitcask 1.7.2
-RIAK_VERSIONS+=canola 2.0.0-0-g9bdfee8
-RIAK_VERSIONS+=clique 0.3.2-0-ge332c8f
-RIAK_VERSIONS+=cluster_info 2.0.3-0-g76c73fc
-RIAK_VERSIONS+=cuttlefish 2.0.5-0-g9ff5830
-RIAK_VERSIONS+=edown 0.5-0-gd62ec85
-RIAK_VERSIONS+=eleveldb 2.0.17-0-g973fc92
-RIAK_VERSIONS+=eper 0.78-0-g7222eca
-RIAK_VERSIONS+=erlang_js 1.3.0-0-g07467d8
-RIAK_VERSIONS+=erlydtl 0.7.0
-RIAK_VERSIONS+=eunit_formatters 0.1.2-0-g96b6ced
-RIAK_VERSIONS+=exometer_core 1.0.0-basho2-0-gb47a5d6
-RIAK_VERSIONS+=folsom 0.7.4p5-0-g7294452
-RIAK_VERSIONS+=getopt 0.8.2
-RIAK_VERSIONS+=goldrush 0.1.7
-RIAK_VERSIONS+=ibrowse 4.0.2
-RIAK_VERSIONS+=kvc 1.5.0
-RIAK_VERSIONS+=lager 2.1.1
-RIAK_VERSIONS+=lager_syslog 2.1.2
-RIAK_VERSIONS+=lucene_parser 1
-RIAK_VERSIONS+=meck 0.8.2
-RIAK_VERSIONS+=merge_index 2.0.1-0-g0c8f77c
-RIAK_VERSIONS+=mochiweb 2.9.0
-RIAK_VERSIONS+=neotoma 1.7.3-0-g6ac6007
-RIAK_VERSIONS+=node_package 2.0.3-0-gfb02805
-RIAK_VERSIONS+=parse_trans 2.9-0-g82cc002
-RIAK_VERSIONS+=pbkdf2 2.0.0-0-g7076584
-RIAK_VERSIONS+=poolboy 0.8.1p3-0-g8bb45fb
-RIAK_VERSIONS+=protobuffs 0.8.1p5-0-gf88fc3c
-RIAK_VERSIONS+=rebar_lock_deps_plugin 3.1.0
-RIAK_VERSIONS+=riak_api 2.1.2-0-gd8d510f
-RIAK_VERSIONS+=riak_auth_mods 2.1.0-0-g31b8b30
-RIAK_VERSIONS+=riak_control 2.1.2-0-gab3f924
-RIAK_VERSIONS+=riak_core 2.1.5-0-gb02ab53
-RIAK_VERSIONS+=riak_dt 2.1.1-0-ga2986bc
-RIAK_VERSIONS+=riak_ensemble 2.1.2-0-g1a79eed
-RIAK_VERSIONS+=riak_kv 2.1.2-0-gf969bba
-RIAK_VERSIONS+=riak_pb 2.1.0.2-0-g620bc70
-RIAK_VERSIONS+=riak_pipe 2.1.1-0-gb1ac2cf
-RIAK_VERSIONS+=riak_search 2.1.1-0-gffe2113
-RIAK_VERSIONS+=riak_sysmon 2.0.0
-RIAK_VERSIONS+=riaknostic 2.1.3-0-g84c0aa5
-RIAK_VERSIONS+=setup 1.4-0-g51ee7c9
-RIAK_VERSIONS+=sext 1.1p3-0-g846b9cc
-RIAK_VERSIONS+=sidejob 2.0.0-0-gc5aabba
-RIAK_VERSIONS+=syslog 1.0.3
-RIAK_VERSIONS+=webmachine 1.10.8-0-g7677c24
-RIAK_VERSIONS+=yokozuna 2.1.2-0-g3520d11
+RIAK_VERSIONS+=	basho_stats 1.0.3
+RIAK_VERSIONS+=	bear 0.1.3p1-0-gda820a1
+RIAK_VERSIONS+=	bitcask 1.7.2
+RIAK_VERSIONS+=	canola 2.0.0-0-g9bdfee8
+RIAK_VERSIONS+=	clique 0.3.2-0-ge332c8f
+RIAK_VERSIONS+=	cluster_info 2.0.3-0-g76c73fc
+RIAK_VERSIONS+=	cuttlefish 2.0.5-0-g9ff5830
+RIAK_VERSIONS+=	edown 0.5-0-gd62ec85
+RIAK_VERSIONS+=	eleveldb 2.0.17-0-g973fc92
+RIAK_VERSIONS+=	eper 0.78-0-g7222eca
+RIAK_VERSIONS+=	erlang_js 1.3.0-0-g07467d8
+RIAK_VERSIONS+=	erlydtl 0.7.0
+RIAK_VERSIONS+=	eunit_formatters 0.1.2-0-g96b6ced
+RIAK_VERSIONS+=	exometer_core 1.0.0-basho2-0-gb47a5d6
+RIAK_VERSIONS+=	folsom 0.7.4p5-0-g7294452
+RIAK_VERSIONS+=	getopt 0.8.2
+RIAK_VERSIONS+=	goldrush 0.1.7
+RIAK_VERSIONS+=	ibrowse 4.0.2
+RIAK_VERSIONS+=	kvc 1.5.0
+RIAK_VERSIONS+=	lager 2.1.1
+RIAK_VERSIONS+=	lager_syslog 2.1.2
+RIAK_VERSIONS+=	lucene_parser 1
+RIAK_VERSIONS+=	meck 0.8.2
+RIAK_VERSIONS+=	merge_index 2.0.1-0-g0c8f77c
+RIAK_VERSIONS+=	mochiweb 2.9.0
+RIAK_VERSIONS+=	neotoma 1.7.3-0-g6ac6007
+RIAK_VERSIONS+=	node_package 2.0.3-0-gfb02805
+RIAK_VERSIONS+=	parse_trans 2.9-0-g82cc002
+RIAK_VERSIONS+=	pbkdf2 2.0.0-0-g7076584
+RIAK_VERSIONS+=	poolboy 0.8.1p3-0-g8bb45fb
+RIAK_VERSIONS+=	protobuffs 0.8.1p5-0-gf88fc3c
+RIAK_VERSIONS+=	rebar_lock_deps_plugin 3.1.0
+RIAK_VERSIONS+=	riak_api 2.1.2-0-gd8d510f
+RIAK_VERSIONS+=	riak_auth_mods 2.1.0-0-g31b8b30
+RIAK_VERSIONS+=	riak_control 2.1.2-0-gab3f924
+RIAK_VERSIONS+=	riak_core 2.1.5-0-gb02ab53
+RIAK_VERSIONS+=	riak_dt 2.1.1-0-ga2986bc
+RIAK_VERSIONS+=	riak_ensemble 2.1.2-0-g1a79eed
+RIAK_VERSIONS+=	riak_kv 2.1.2-0-gf969bba
+RIAK_VERSIONS+=	riak_pb 2.1.0.2-0-g620bc70
+RIAK_VERSIONS+=	riak_pipe 2.1.1-0-gb1ac2cf
+RIAK_VERSIONS+=	riak_search 2.1.1-0-gffe2113
+RIAK_VERSIONS+=	riak_sysmon 2.0.0
+RIAK_VERSIONS+=	riaknostic 2.1.3-0-g84c0aa5
+RIAK_VERSIONS+=	setup 1.4-0-g51ee7c9
+RIAK_VERSIONS+=	sext 1.1p3-0-g846b9cc
+RIAK_VERSIONS+=	sidejob 2.0.0-0-gc5aabba
+RIAK_VERSIONS+=	syslog 1.0.3
+RIAK_VERSIONS+=	webmachine 1.10.8-0-g7677c24
+RIAK_VERSIONS+=	yokozuna 2.1.2-0-g3520d11
diff --git a/riak14/Makefile.versions b/riak14/Makefile.versions
index 991bae2a36..990f215baf 100644
--- a/riak14/Makefile.versions
+++ b/riak14/Makefile.versions
@@ -1,40 +1,40 @@
 # $NetBSD: Makefile.versions,v 1.1 2015/02/11 14:11:55 fhajny Exp $
 # This file is generated by "/opt/local/bin/bmake update-deps", post-build
 
-RIAK_VERSIONS+=basho_stats 1.0.3
-RIAK_VERSIONS+=bear 0.1.3p1-0-gda820a1
-RIAK_VERSIONS+=bitcask 1.6.6-0-g230b6d6
-RIAK_VERSIONS+=cluster_info 1.2.4
-RIAK_VERSIONS+=ebloom 1.1.2
-RIAK_VERSIONS+=edown 0.4-4-g4d18dc4
-RIAK_VERSIONS+=eleveldb 1.4.10-0-ga84b18c
-RIAK_VERSIONS+=eper 0.61
-RIAK_VERSIONS+=erlang_js 1.2.2
-RIAK_VERSIONS+=erlydtl 0.7.0
-RIAK_VERSIONS+=folsom 0.7.4p1-0-g4e485ce
-RIAK_VERSIONS+=getopt 0.4.3
-RIAK_VERSIONS+=goldrush 0.1.5
-RIAK_VERSIONS+=ibrowse 4.0.1
-RIAK_VERSIONS+=lager 2.0.1
-RIAK_VERSIONS+=lager_syslog 2.0.1
-RIAK_VERSIONS+=lucene_parser 1
-RIAK_VERSIONS+=meck 0.8.1-0-g2b25a30
-RIAK_VERSIONS+=merge_index 1.3.2-0-gcb38ee7
-RIAK_VERSIONS+=mochiweb 1.5.1p6
-RIAK_VERSIONS+=node_package 1.3.8-0-g7d60ed6
-RIAK_VERSIONS+=poolboy 0.8.1p1
-RIAK_VERSIONS+=protobuffs 0.8.1
-RIAK_VERSIONS+=ranch 0.4.0-p1
-RIAK_VERSIONS+=riak_api 1.4.10-0-gc407ac0
-RIAK_VERSIONS+=riak_control 1.4.10-0-g73c43c3
-RIAK_VERSIONS+=riak_core 1.4.10
-RIAK_VERSIONS+=riak_kv 1.4.10-0-g64b6ad8
-RIAK_VERSIONS+=riak_pb 1.4.4.0-0-g0353be3
-RIAK_VERSIONS+=riak_pipe 1.4.10-0-g9353526
-RIAK_VERSIONS+=riak_search 1.4.10-0-g6e548e7
-RIAK_VERSIONS+=riak_sysmon 1.1.3
-RIAK_VERSIONS+=riaknostic 1.2.1
-RIAK_VERSIONS+=sext 1.1p1-0-g0f7c45f
-RIAK_VERSIONS+=sidejob 0.2.0
-RIAK_VERSIONS+=syslog 1.0.2
-RIAK_VERSIONS+=webmachine 1.10.4-0-gfcff795
+RIAK_VERSIONS+=	basho_stats 1.0.3
+RIAK_VERSIONS+=	bear 0.1.3p1-0-gda820a1
+RIAK_VERSIONS+=	bitcask 1.6.6-0-g230b6d6
+RIAK_VERSIONS+=	cluster_info 1.2.4
+RIAK_VERSIONS+=	ebloom 1.1.2
+RIAK_VERSIONS+=	edown 0.4-4-g4d18dc4
+RIAK_VERSIONS+=	eleveldb 1.4.10-0-ga84b18c
+RIAK_VERSIONS+=	eper 0.61
+RIAK_VERSIONS+=	erlang_js 1.2.2
+RIAK_VERSIONS+=	erlydtl 0.7.0
+RIAK_VERSIONS+=	folsom 0.7.4p1-0-g4e485ce
+RIAK_VERSIONS+=	getopt 0.4.3
+RIAK_VERSIONS+=	goldrush 0.1.5
+RIAK_VERSIONS+=	ibrowse 4.0.1
+RIAK_VERSIONS+=	lager 2.0.1
+RIAK_VERSIONS+=	lager_syslog 2.0.1
+RIAK_VERSIONS+=	lucene_parser 1
+RIAK_VERSIONS+=	meck 0.8.1-0-g2b25a30
+RIAK_VERSIONS+=	merge_index 1.3.2-0-gcb38ee7
+RIAK_VERSIONS+=	mochiweb 1.5.1p6
+RIAK_VERSIONS+=	node_package 1.3.8-0-g7d60ed6
+RIAK_VERSIONS+=	poolboy 0.8.1p1
+RIAK_VERSIONS+=	protobuffs 0.8.1
+RIAK_VERSIONS+=	ranch 0.4.0-p1
+RIAK_VERSIONS+=	riak_api 1.4.10-0-gc407ac0
+RIAK_VERSIONS+=	riak_control 1.4.10-0-g73c43c3
+RIAK_VERSIONS+=	riak_core 1.4.10
+RIAK_VERSIONS+=	riak_kv 1.4.10-0-g64b6ad8
+RIAK_VERSIONS+=	riak_pb 1.4.4.0-0-g0353be3
+RIAK_VERSIONS+=	riak_pipe 1.4.10-0-g9353526
+RIAK_VERSIONS+=	riak_search 1.4.10-0-g6e548e7
+RIAK_VERSIONS+=	riak_sysmon 1.1.3
+RIAK_VERSIONS+=	riaknostic 1.2.1
+RIAK_VERSIONS+=	sext 1.1p1-0-g0f7c45f
+RIAK_VERSIONS+=	sidejob 0.2.0
+RIAK_VERSIONS+=	syslog 1.0.2
+RIAK_VERSIONS+=	webmachine 1.10.4-0-gfcff795
diff --git a/ripe-rpsl-objectlibrary/Makefile b/ripe-rpsl-objectlibrary/Makefile
index 7b7f46d05c..16322e3f9e 100644
--- a/ripe-rpsl-objectlibrary/Makefile
+++ b/ripe-rpsl-objectlibrary/Makefile
@@ -16,7 +16,7 @@ BUILD_DIRS=		${WRKSRC} ${WRKSRC}/perl
 
 USE_LIBTOOL=		YES
 
-BUILD_DEPENDS+=       p5-Net-Whois-RIPE-[0-9]*:../../wip/p5-Net-Whois-RIPE
+BUILD_DEPENDS+=	p5-Net-Whois-RIPE-[0-9]*:../../wip/p5-Net-Whois-RIPE
 
 post-configure: perl5-configure
 
diff --git a/ripit/Makefile b/ripit/Makefile
index 694084e36d..23d85d8f96 100644
--- a/ripit/Makefile
+++ b/ripit/Makefile
@@ -27,7 +27,7 @@ DEPENDS+=	vorbis-tools>=0:../../audio/vorbis-tools
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-RAWPART_cmd=	/sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
+RAWPART_cmd=		/sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
 SUBST_CLASSES+=		fix-dev
 SUBST_STAGE.fix-dev=	do-configure
 SUBST_FILES.fix-dev=	ripit.pl ripit.1
diff --git a/rmilter/Makefile b/rmilter/Makefile
index b9931569d7..aee668b102 100644
--- a/rmilter/Makefile
+++ b/rmilter/Makefile
@@ -44,10 +44,10 @@ OWN_DIRS_PERMS+=	${RUNDIR} ${RMILTER_USER} ${RMILTER_GROUP} 0755
 CONF_FILES=	${EGDIR}/rmilter.conf ${PKG_SYSCONFDIR}/rmilter.conf
 CONF_FILES+=	${EGDIR}/rmilter-grey.conf ${PKG_SYSCONFDIR}/rmilter-grey.conf
 
-SUBST_CLASSES+=         path
-SUBST_STAGE.path=       post-configure
-SUBST_FILES.path=       src/main.c
-SUBST_SED.path=         -e 's|/usr/local/etc/|${PKG_SYSCONFDIR}/|g'
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-configure
+SUBST_FILES.path=	src/main.c
+SUBST_SED.path=		-e 's|/usr/local/etc/|${PKG_SYSCONFDIR}/|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/rmilter.conf.sample \
diff --git a/rmilter/PLIST b/rmilter/PLIST
index 046183100a..028b9580a0 100644
--- a/rmilter/PLIST
+++ b/rmilter/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD$
 sbin/rmilter
-share/examples/rmilter/rmilter.conf
 share/examples/rmilter/rmilter-grey.conf
+share/examples/rmilter/rmilter.conf
diff --git a/rnc-mode/Makefile b/rnc-mode/Makefile
index f756a8127c..93ae8a06fa 100644
--- a/rnc-mode/Makefile
+++ b/rnc-mode/Makefile
@@ -6,7 +6,7 @@ PKGNAME=	rnc-mode-1.0b3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.pantor.com/
 EXTRACT_SUFX=	.tgz
-WRKSRC=			${WRKDIR}
+WRKSRC=		${WRKDIR}
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	http://www.pantor.com/download.html
@@ -14,7 +14,7 @@ COMMENT=	Emacs mode for editing compact RELAX NG schemas
 
 USE_LANGUAGES=	# none
 
-NO_CONFIGURE=YES
+NO_CONFIGURE=	YES
 
 do-build:
 	cd ${WRKSRC} \
diff --git a/roadfighter/Makefile b/roadfighter/Makefile
index 77d3c5f1d7..72e433b636 100644
--- a/roadfighter/Makefile
+++ b/roadfighter/Makefile
@@ -14,7 +14,7 @@ LICENSE=	unlicense
 WRKSRC=		${WRKDIR}/roadfighter-1.0.1269
 #USE_TOOLS=	gmake
 USE_LANGUAGES=	c++ c
-CFLAGS+=        -Wno-write-strings
+CFLAGS+=	-Wno-write-strings
 
 SHAREDIR=		${PREFIX}/share/roadfighter
 INSTALLATION_DIRS=	bin ${SHAREDIR}
diff --git a/rocksdb/Makefile b/rocksdb/Makefile
index 2aaaeeceac..ff14fd661b 100644
--- a/rocksdb/Makefile
+++ b/rocksdb/Makefile
@@ -12,9 +12,9 @@ HOMEPAGE=	http://www.rocksdb.org/
 COMMENT=	RocksDB is an embeddable persistent key-value store for fast storage.
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake perl
-BUILD_TARGET=	shared_lib static_lib tools tools_lib install-shared install-static install-headers
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl
+BUILD_TARGET=		shared_lib static_lib tools tools_lib install-shared install-static install-headers
 #INSTALL_TARGET=	install-shared install-static install-headers
 PKG_DESTDIR_SUPPORT=	destdir
 
diff --git a/rosegarden/Makefile b/rosegarden/Makefile
index 1e942cd569..2947884ad6 100644
--- a/rosegarden/Makefile
+++ b/rosegarden/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2014/12/30 22:51:59 makoto Exp $
 
-PKG_FAIL_REASON= "Not packaged yet (MASTER_SITES changed)"
+PKG_FAIL_REASON=	"Not packaged yet (MASTER_SITES changed)"
 
 DISTNAME=	rosegarden-14.12
 CATEGORIES=	audio
diff --git a/rpm5/Makefile b/rpm5/Makefile
index d8d717425f..ba5cdbf6fa 100644
--- a/rpm5/Makefile
+++ b/rpm5/Makefile
@@ -18,12 +18,12 @@ LICENSE=	gnu-lgpl-v2
 USE_TOOLS+=		autoconf213 bash:run gmake msgfmt perl:run pkg-config
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=        --with-db=${BDBBASE}
+CONFIGURE_ARGS+=	--with-db=${BDBBASE}
 
-BDB_ACCEPTED=           db4 db5
+BDB_ACCEPTED=		db4 db5
 
 # Needs help finding bdb.
-BUILDLINK_TRANSFORM+=   rename:-ldb:${BDB_LIBS}
+BUILDLINK_TRANSFORM+=	rename:-ldb:${BDB_LIBS}
 
 
 WRKSRC=		${WRKDIR}/${UPSTREAMNAME}-${VERSION}
@@ -39,7 +39,7 @@ pre-configure:
 	${RUN} ( cd ${WRKSRC} && autoreconf --force --verbose -i )
 
 
-RPM5_DBI_FILES= Basenames Conflictname Dirnames Group Installtid Name Packages \
+RPM5_DBI_FILES=	Basenames Conflictname Dirnames Group Installtid Name Packages \
 	        Providename Provideversion Requirename Requireversion Triggername \
 		Filemd5s Pubkeys Sha1header Sigmd5 \
 	        __db.001 __db.002 __db.003 __db.004 __db.005
diff --git a/rpm5/PLIST.Linux b/rpm5/PLIST.Linux
index 165562fe6e..22f64aa679 100644
--- a/rpm5/PLIST.Linux
+++ b/rpm5/PLIST.Linux
@@ -3,11 +3,11 @@ lib/rpm/debugedit
 lib/rpm/elfdeps
 lib/rpm/find-debuginfo.sh
 lib/rpm/platform/aarch64-linux/macros
-lib/rpm/platform/alphaev56-linux/macros
+lib/rpm/platform/alpha-linux/macros
 lib/rpm/platform/alphaev5-linux/macros
-lib/rpm/platform/alphaev67-linux/macros
+lib/rpm/platform/alphaev56-linux/macros
 lib/rpm/platform/alphaev6-linux/macros
-lib/rpm/platform/alpha-linux/macros
+lib/rpm/platform/alphaev67-linux/macros
 lib/rpm/platform/alphapca56-linux/macros
 lib/rpm/platform/amd64-linux/macros
 lib/rpm/platform/armv3l-linux/macros
@@ -28,25 +28,25 @@ lib/rpm/platform/ia64-linux/macros
 lib/rpm/platform/noarch-linux/macros
 lib/rpm/platform/pentium3-linux/macros
 lib/rpm/platform/pentium4-linux/macros
+lib/rpm/platform/ppc-linux/macros
 lib/rpm/platform/ppc32dy4-linux/macros
-lib/rpm/platform/ppc64iseries-linux/macros
 lib/rpm/platform/ppc64-linux/macros
+lib/rpm/platform/ppc64iseries-linux/macros
 lib/rpm/platform/ppc64p7-linux/macros
 lib/rpm/platform/ppc64pseries-linux/macros
 lib/rpm/platform/ppc8260-linux/macros
 lib/rpm/platform/ppc8560-linux/macros
 lib/rpm/platform/ppciseries-linux/macros
-lib/rpm/platform/ppc-linux/macros
 lib/rpm/platform/ppcpseries-linux/macros
 lib/rpm/platform/s390-linux/macros
 lib/rpm/platform/s390x-linux/macros
+lib/rpm/platform/sh-linux/macros
 lib/rpm/platform/sh3-linux/macros
-lib/rpm/platform/sh4a-linux/macros
 lib/rpm/platform/sh4-linux/macros
-lib/rpm/platform/sh-linux/macros
+lib/rpm/platform/sh4a-linux/macros
+lib/rpm/platform/sparc-linux/macros
 lib/rpm/platform/sparc64-linux/macros
 lib/rpm/platform/sparc64v-linux/macros
-lib/rpm/platform/sparc-linux/macros
 lib/rpm/platform/sparcv8-linux/macros
 lib/rpm/platform/sparcv9-linux/macros
 lib/rpm/platform/sparcv9v-linux/macros
diff --git a/rpm5/buildlink3.mk b/rpm5/buildlink3.mk
index 67e068885f..d609cd6081 100644
--- a/rpm5/buildlink3.mk
+++ b/rpm5/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.rpm+=	rpm>=2.5.4nb7
 BUILDLINK_PKGSRCDIR.rpm?=	../../misc/rpm
 BUILDLINK_DEPMETHOD.rpm?=	build
 
-BUILDLINK_CPPFLAGS.rpm= -I${BUILDLINK_PREFIX.rpm}/include/rpm
+BUILDLINK_CPPFLAGS.rpm=	-I${BUILDLINK_PREFIX.rpm}/include/rpm
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/rsem/PLIST b/rsem/PLIST
index 0b8f0b4faf..fac908c7fb 100644
--- a/rsem/PLIST
+++ b/rsem/PLIST
@@ -7,8 +7,8 @@ bin/rsem-build-read-index
 bin/rsem-calculate-credibility-intervals
 bin/rsem-calculate-expression
 bin/rsem-extract-reference-transcripts
-bin/rsem-generate-data-matrix
 bin/rsem-gen-transcript-plots
+bin/rsem-generate-data-matrix
 bin/rsem-get-unique
 bin/rsem-gff3-to-gtf
 bin/rsem-parse-alignments
diff --git a/rst-mode/Makefile b/rst-mode/Makefile
index 20d84ad3ea..74e3a4d979 100644
--- a/rst-mode/Makefile
+++ b/rst-mode/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Emacs mode for reStructuredText documents
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 
-NO_CONFIGURE=YES
+NO_CONFIGURE=	YES
 
 do-build:
 	cd ${WRKSRC} \
diff --git a/rtcmix/Makefile b/rtcmix/Makefile
index 2a5ff6b78b..ad6ce04ad0 100644
--- a/rtcmix/Makefile
+++ b/rtcmix/Makefile
@@ -10,13 +10,13 @@ HOMEPAGE=	http://rtcmix.org
 COMMENT=	Open-source digital signal processing and sound synthesis language
 LICENSE=	apache-2.0
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 # Html documentation and man pages are incomplete.
 # http://rtcmix.org/reference/
 #CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGBASE}/html
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
-USE_LANGUAGES=	c c++
-USE_TOOLS=	gmake autoconf perl
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/${PKGBASE}
+USE_LANGUAGES=		c c++
+USE_TOOLS=		gmake autoconf perl
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
diff --git a/rte/buildlink3.mk b/rte/buildlink3.mk
index 43c1b5b764..e5ba4c8f38 100644
--- a/rte/buildlink3.mk
+++ b/rte/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	rte
 .if !defined(RTE_BUILDLINK3_MK)
 RTE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.rte+=		rte>=0.5.6
+BUILDLINK_API_DEPENDS.rte+=	rte>=0.5.6
 BUILDLINK_PKGSRCDIR.rte?=	../../wip/rte
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/rthread/Makefile b/rthread/Makefile
index f38d1dbb8a..3d6b6c2d68 100644
--- a/rthread/Makefile
+++ b/rthread/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Distributed computing with remote threads in Python
 LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 
 .include "../../lang/python/extension.mk"
diff --git a/rubrica2/buildlink3.mk b/rubrica2/buildlink3.mk
index 38599f4d68..de155d008e 100644
--- a/rubrica2/buildlink3.mk
+++ b/rubrica2/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	rubrica2
 RUBRICA2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.rubrica2+=	rubrica2>=2.0.10
-BUILDLINK_PKGSRCDIR.rubrica2?=	../../wip/rubrica2
+BUILDLINK_PKGSRCDIR.rubrica2?=		../../wip/rubrica2
 
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/ruby-diaspora/Makefile b/ruby-diaspora/Makefile
index 1ec48ef98c..76a332a6e3 100644
--- a/ruby-diaspora/Makefile
+++ b/ruby-diaspora/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.9 2013/06/14 07:36:56 thomasklausner Exp $
 
-DISTNAME=       diaspora-0.0.3.0
-PKGNAME=        ${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=     www
+DISTNAME=	diaspora-0.0.3.0
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+CATEGORIES=	www
 # Diaspora is not a gem.  There is no release tarball.  Perhaps one
 # can get it from github via tags, but it is not clear if that is
 # stable
@@ -11,11 +11,11 @@ MASTER_SITES=
 # For now, obtain dependencies only.
 META_PACKAGE=	yes
 
-MAINTAINER=     gdt%NetBSD.org@localhost
-HOMEPAGE=       http://diasporaproject.org/
+MAINTAINER=	gdt%NetBSD.org@localhost
+HOMEPAGE=	http://diasporaproject.org/
 #HOMEPAGE=	http://diaspora.github.com/diaspora/
-COMMENT=        Federated privacy-aware social network
-LICENSE=        gnu-agpl-v3
+COMMENT=	Federated privacy-aware social network
+LICENSE=	gnu-agpl-v3
 
 # Packaging decisions:
 #   This package will only (for now) support pgsql.
diff --git a/ruby-ditz/Makefile b/ruby-ditz/Makefile
index fd1f80ca12..6907f7f0a7 100644
--- a/ruby-ditz/Makefile
+++ b/ruby-ditz/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 
 GIT_REPOSITORIES=	mainline
 GIT_REPO.mainline=	git://gitorious.org/ditz/mainline.git
-WRKSRC=		${WRKDIR}/${GIT_MODULE.mainline}
+WRKSRC=			${WRKDIR}/${GIT_MODULE.mainline}
 
 GEM_SPECFILE=	${WRKSRC}/ditz.gemspec
 
diff --git a/ruby-neovim/Makefile b/ruby-neovim/Makefile
index 2b4d996e8f..f7c4ff2221 100644
--- a/ruby-neovim/Makefile
+++ b/ruby-neovim/Makefile
@@ -7,9 +7,9 @@ HOMEPAGE=	https://github.com/alexgenco/neovim-ruby
 COMMENT=	Ruby client to Neovim
 LICENSE=	mit
 
-DEPENDS+=       ${RUBY_PKGPREFIX}-msgpack>=1.0.0:../../devel/ruby-msgpack
+DEPENDS+=	${RUBY_PKGPREFIX}-msgpack>=1.0.0:../../devel/ruby-msgpack
 
-RUBYGEM_OPTIONS+=       --format-executable
+RUBYGEM_OPTIONS+=	--format-executable
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ruby-redmine/options.mk b/ruby-redmine/options.mk
index b1d5329070..5e1d4c4123 100644
--- a/ruby-redmine/options.mk
+++ b/ruby-redmine/options.mk
@@ -52,7 +52,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-net-ldap>=0.3.1:../../databases/ruby-net-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mmarkdown)
-DEPENDS+=	${RUBY_PKGPREFIX}-redcarpet>=2.3.0:../../textproc/ruby-redcarpet
+DEPENDS+=		${RUBY_PKGPREFIX}-redcarpet>=2.3.0:../../textproc/ruby-redcarpet
 OVERRIDE_GEMSPEC+=	redcarpet>=2.3.0
 .endif
 
@@ -63,8 +63,8 @@ DEPENDS+=	${RUBY_PKGPREFIX}-mysql>=2.8.1:../../databases/ruby-mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mopenid)
-DEPENDS+=	${RUBY_PKGPREFIX}-ruby-openid>=2.3.0:../../security/ruby-ruby-openid
-DEPENDS+=	${RUBY_PKGPREFIX}-rack-openid-[0-9]*:../../security/ruby-rack-openid
+DEPENDS+=		${RUBY_PKGPREFIX}-ruby-openid>=2.3.0:../../security/ruby-ruby-openid
+DEPENDS+=		${RUBY_PKGPREFIX}-rack-openid-[0-9]*:../../security/ruby-rack-openid
 OVERRIDE_GEMSPEC+=	ruby-openid>=2.3.0
 .endif
 
@@ -83,10 +83,10 @@ DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-DEPENDS+=	${RUBY_PKGPREFIX}-shoulda>=3.3.2:../../devel/ruby-shoulda
-DEPENDS+=	${RUBY_PKGPREFIX}-mocha>=0.14:../../devel/ruby-mocha
+DEPENDS+=		${RUBY_PKGPREFIX}-shoulda>=3.3.2:../../devel/ruby-shoulda
+DEPENDS+=		${RUBY_PKGPREFIX}-mocha>=0.14:../../devel/ruby-mocha
 OVERRIDE_GEMSPEC+=	shoulda>=3.3.2
-DEPENDS+=	${RUBY_PKGPREFIX}-capybara>=2.1.0:../../www/ruby-capybara
-DEPENDS+=	${RUBY_PKGPREFIX}-selenium-webdriver-[0-9]*:../../www/ruby-selenium-webdriver
+DEPENDS+=		${RUBY_PKGPREFIX}-capybara>=2.1.0:../../www/ruby-capybara
+DEPENDS+=		${RUBY_PKGPREFIX}-selenium-webdriver-[0-9]*:../../www/ruby-selenium-webdriver
 OVERRIDE_GEMSPEC+=	capybara>=2.1.0
 .endif
diff --git a/ruby-therubyracer/Makefile b/ruby-therubyracer/Makefile
index b22be13ed2..eb892a7e29 100644
--- a/ruby-therubyracer/Makefile
+++ b/ruby-therubyracer/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	lang
 MAINTAINER=	filip%joyent.com@localhost
 HOMEPAGE=	https://github.com/cowboyd/libv8
 COMMENT=	Embedded V8 Javascript
-LICENSE=        mit
+LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-libv8>=3.16:../../wip/ruby-libv8
 DEPENDS+=	${RUBY_PKGPREFIX}-ref-[0-9]*:../../devel/ruby-ref
diff --git a/runit/Makefile b/runit/Makefile
index 919745bb32..b6513e3ce0 100644
--- a/runit/Makefile
+++ b/runit/Makefile
@@ -14,12 +14,12 @@ PKGDOCDIR=	${PREFIX}/share/doc/${PKGBASE}
 PKGEXAMPLEDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 USE_TOOLS+=		pax
-BUILD_DEFS+=            VARBASE
+BUILD_DEFS+=		VARBASE
 DJB_RESTRICTED=		NO
 DJB_SLASHPACKAGE=	YES
 
 SERVICEDIR?=	${VARBASE}/spool/service
-OWN_DIRS_PERMS= ${SERVICEDIR} ${ROOT_USER} ${ROOT_GROUP} 0755
+OWN_DIRS_PERMS=	${SERVICEDIR} ${ROOT_USER} ${ROOT_GROUP} 0755
 
 DOCS=		package/CHANGES package/COPYING package/README \
 		package/THANKS package/TODO doc/*.html
diff --git a/rust/Makefile b/rust/Makefile
index 3b1e9e7bb0..8e6e403b23 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -82,12 +82,13 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 .if defined(PLUS_BOOTSTRAPS)
 
 # When adding a target here, also add it to available.mk
-RUST_MACHINES=	i686-apple-darwin \
-		x86_64-apple-darwin \
-		i686-unknown-linux-gnu \
-		x86_64-unknown-linux-gnu \
-		x86_64-unknown-netbsd \
-#		x86_64-sun-solaris
+RUST_MACHINES= \
+	i686-apple-darwin \
+	x86_64-apple-darwin \
+	i686-unknown-linux-gnu \
+	x86_64-unknown-linux-gnu \
+	x86_64-unknown-netbsd
+#RUST_MACHINES+= x86_64-sun-solaris
 
 .for MACHINE in ${RUST_MACHINES}
 RUSTCS+=	rustc-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
diff --git a/rustc/Makefile b/rustc/Makefile
index 4e2531ff2e..4ef365b74e 100755
--- a/rustc/Makefile
+++ b/rustc/Makefile
@@ -18,9 +18,9 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.15.1
 PYTHON_FOR_BUILD_ONLY=		yes
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--mandir=${PREFIX}/${PKGMANDIR}
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS=		--prefix=${PREFIX} \
+			--mandir=${PREFIX}/${PKGMANDIR}
 #CONFIGURE_ARGS+=	--llvm-root=${BUILDLINK_PREFIX.libLLVM}
 #CONFIGURE_ARGS+=	--python=python
 CONFIGURE_ARGS+=	--disable-jemalloc  # XXX NetBSD only?
@@ -71,7 +71,7 @@ RUST_ARCH:=		i686-apple-darwin
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
@@ -82,7 +82,7 @@ RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
@@ -93,7 +93,7 @@ RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
@@ -104,7 +104,7 @@ RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
@@ -116,7 +116,7 @@ RUST_ARCH:=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
@@ -127,7 +127,7 @@ RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}= \
+SITES.${RUST_CARGO0}=	\
 	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif



Home | Main Index | Thread Index | Old Index