pkgsrc-WIP-changes archive

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

*: remove trailing whitespace



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sun Jun 30 15:45:26 2019 +0200
Changeset:	3b691bc332af39afa96460e85c0268f7cd718e65

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/options.mk
	MesaLib-dfbsd/Makefile
	MesaLib-dfbsd/options.mk
	arduino-builder/DESCR
	armadillo/Makefile
	asterisk11-vicidial/DESCR
	avrdude/options.mk
	boost-poly_collection/Makefile
	boost-yap/Makefile
	casady-fonts/DESCR
	collectd-web/Makefile
	concorde/Makefile
	dasht/Makefile
	dbus-dfbsd/options.mk
	dunelegacy/MESSAGE
	elegent/DESCR
	etoile-services/Makefile
	fastaunique/Makefile
	feathercoin/Makefile
	flite2/Makefile
	frida-libffi/Makefile
	gcalcli-git/Makefile
	gcc6snapshot/DESCR
	gfeedline/options.mk
	gmap/Makefile
	gnome-panel/Makefile
	go-junit-report/Makefile
	imgui/DESCR
	khelpcenter/DESCR
	khotkeys/Makefile
	kscreenlocker/Makefile
	ksysguard/DESCR
	libc++-abi/DESCR
	libdrm-dfbsd-meson/Makefile
	libguestfs-appliance/Makefile
	litecoin/Makefile
	microbiomeutil/Makefile
	modular-xorg-server-dfbsd-meson/options.mk
	modular-xorg-server-dfbsd/options.mk
	mothur/Makefile
	multiminer/Makefile
	netbsd-x11-i386/Makefile
	numactl/Makefile
	ocaml-gmetadom/DESCR
	openjazz/Makefile
	opera60-bin/Makefile
	p5-Data-DPath-Validator/Makefile
	p5-JSON-WebToken/Makefile
	paraview/Makefile
	pear-PHP_Depend/Makefile
	pear-PHP_Timer/Makefile
	pear-Version/Makefile
	phantomjs2/Makefile
	php-imagick-imagick6/DESCR
	pioneer/Makefile
	polarssl11/Makefile
	proj/Makefile
	py-achemkit/DESCR
	py-bitsets/Makefile
	py-chinup/Makefile
	py-corrfitter/DESCR
	py-django-picklefield/Makefile
	py-fwm-ensayo/Makefile
	py-graphs/Makefile
	py-kineticlib/DESCR
	py-libvirt490/Makefile
	py-peru/Makefile
	py-pyon/Makefile
	py-redbaron/DESCR
	py-solpy/DESCR
	py-strategies/DESCR
	py-txWS/Makefile
	qstat214/Makefile
	qt5-qscintilla/DESCR
	residualvm/options.mk
	rtcmix/Makefile
	ruby-diaspora/Makefile
	ruby-redmine/Makefile
	simutrans-data/Makefile
	tetrinet/Makefile
	trac-plugins-SensitiveTickets-svn/Makefile
	uhd-git/Makefile
	vis-editor/Makefile
	xf86-input-mouse-dfbsd/Makefile
	xf86-video-intel-dfbsd/Makefile

Log Message:
*: remove trailing whitespace

pkglint -Wall -r -F --only "Trailing whitespace"

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile               |  2 +-
 MesaLib-dfbsd-meson/options.mk             |  2 +-
 MesaLib-dfbsd/Makefile                     |  2 +-
 MesaLib-dfbsd/options.mk                   |  2 +-
 arduino-builder/DESCR                      |  2 +-
 armadillo/Makefile                         |  2 +-
 asterisk11-vicidial/DESCR                  |  6 +++---
 avrdude/options.mk                         |  2 +-
 boost-poly_collection/Makefile             |  4 ++--
 boost-yap/Makefile                         |  2 +-
 casady-fonts/DESCR                         |  6 +++---
 collectd-web/Makefile                      |  2 +-
 concorde/Makefile                          |  2 +-
 dasht/Makefile                             |  4 ++--
 dbus-dfbsd/options.mk                      |  2 +-
 dunelegacy/MESSAGE                         |  2 +-
 elegent/DESCR                              |  2 +-
 etoile-services/Makefile                   |  2 +-
 fastaunique/Makefile                       |  2 +-
 feathercoin/Makefile                       |  6 +++---
 flite2/Makefile                            | 12 ++++++------
 frida-libffi/Makefile                      |  2 +-
 gcalcli-git/Makefile                       |  2 +-
 gcc6snapshot/DESCR                         |  2 +-
 gfeedline/options.mk                       |  2 +-
 gmap/Makefile                              |  4 ++--
 gnome-panel/Makefile                       |  2 +-
 go-junit-report/Makefile                   |  2 +-
 imgui/DESCR                                |  2 +-
 khelpcenter/DESCR                          |  2 +-
 khotkeys/Makefile                          |  6 +++---
 kscreenlocker/Makefile                     |  2 +-
 ksysguard/DESCR                            |  2 +-
 libc++-abi/DESCR                           |  2 +-
 libdrm-dfbsd-meson/Makefile                |  4 ++--
 libguestfs-appliance/Makefile              |  2 +-
 litecoin/Makefile                          |  2 +-
 microbiomeutil/Makefile                    |  2 +-
 modular-xorg-server-dfbsd-meson/options.mk | 10 +++++-----
 modular-xorg-server-dfbsd/options.mk       | 10 +++++-----
 mothur/Makefile                            |  2 +-
 multiminer/Makefile                        |  2 +-
 netbsd-x11-i386/Makefile                   |  4 ++--
 numactl/Makefile                           |  2 +-
 ocaml-gmetadom/DESCR                       | 12 ++++++------
 openjazz/Makefile                          |  2 +-
 opera60-bin/Makefile                       |  2 +-
 p5-Data-DPath-Validator/Makefile           |  2 +-
 p5-JSON-WebToken/Makefile                  |  2 +-
 paraview/Makefile                          |  4 ++--
 pear-PHP_Depend/Makefile                   |  2 +-
 pear-PHP_Timer/Makefile                    |  2 +-
 pear-Version/Makefile                      |  2 +-
 phantomjs2/Makefile                        |  2 +-
 php-imagick-imagick6/DESCR                 |  2 +-
 pioneer/Makefile                           |  2 +-
 polarssl11/Makefile                        |  2 +-
 proj/Makefile                              |  2 +-
 py-achemkit/DESCR                          |  2 +-
 py-bitsets/Makefile                        |  2 +-
 py-chinup/Makefile                         |  2 +-
 py-corrfitter/DESCR                        |  2 +-
 py-django-picklefield/Makefile             |  2 +-
 py-fwm-ensayo/Makefile                     |  2 +-
 py-graphs/Makefile                         |  2 +-
 py-kineticlib/DESCR                        |  2 +-
 py-libvirt490/Makefile                     |  2 +-
 py-peru/Makefile                           |  2 +-
 py-pyon/Makefile                           |  2 +-
 py-redbaron/DESCR                          |  2 +-
 py-solpy/DESCR                             |  2 +-
 py-strategies/DESCR                        |  4 ++--
 py-txWS/Makefile                           |  2 +-
 qstat214/Makefile                          |  2 +-
 qt5-qscintilla/DESCR                       |  6 +++---
 residualvm/options.mk                      |  2 +-
 rtcmix/Makefile                            |  4 ++--
 ruby-diaspora/Makefile                     |  2 +-
 ruby-redmine/Makefile                      | 22 +++++++++++-----------
 simutrans-data/Makefile                    |  4 ++--
 tetrinet/Makefile                          |  2 +-
 trac-plugins-SensitiveTickets-svn/Makefile |  2 +-
 uhd-git/Makefile                           |  2 +-
 vis-editor/Makefile                        |  2 +-
 xf86-input-mouse-dfbsd/Makefile            |  4 ++--
 xf86-video-intel-dfbsd/Makefile            |  6 +++---
 86 files changed, 136 insertions(+), 136 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 9e53d1fd54..7c83bffb52 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -57,7 +57,7 @@ COMMIT_ID=	f53ebfb4503a1ae054539df1c414b86c3b1966d9
 # 2019-05-01	gitlab-ci: build vulkan drivers in clang build
 # COMMIT_ID=	47f419d0b37721776785a54005783ef6fe836d66
 
-PORTNAME=	mesa		
+PORTNAME=	mesa
 
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
 PKGNAME=	MesaLib-19.1.0
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index c066023c71..ca54985420 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -277,7 +277,7 @@ PLIST.iris=		yes
 .  if !empty(PKG_OPTIONS:Mvulkan)
 # VULKAN_DRIVERS+=	intel
 # VULKAN_DRIVERS+=	radeon
-VULKAN_DRIVERS+=	auto	
+VULKAN_DRIVERS+=	auto
 PLIST.vulkan=		yes
 .  endif
 
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 90e0e4cfb7..70df10a91a 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -54,7 +54,7 @@
 # 2019-05-01	gitlab-ci: build vulkan drivers in clang build
 # COMMIT_ID=	47f419d0b37721776785a54005783ef6fe836d66
 
-PORTNAME=	mesa		
+PORTNAME=	mesa
 
 # DISTNAME=	${PORTNAME}-${COMMIT_ID}
 # PKGNAME=	MesaLib-19.1.0
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index 80c71bb4b7..29a514f926 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -277,7 +277,7 @@ PLIST.iris=		yes
 .if !empty(PKG_OPTIONS:Mvulkan)
 # VULKAN_DRIVERS+=	intel
 # VULKAN_DRIVERS+=	radeon
-VULKAN_DRIVERS+=	auto	
+VULKAN_DRIVERS+=	auto
 PLIST.vulkan=		yes
 .endif
 
diff --git a/arduino-builder/DESCR b/arduino-builder/DESCR
index 8508ddd048..36d1808158 100644
--- a/arduino-builder/DESCR
+++ b/arduino-builder/DESCR
@@ -1 +1 @@
-ArduinoBuilder is a tool able to compile and upload Arduino sketches. 
+ArduinoBuilder is a tool able to compile and upload Arduino sketches.
diff --git a/armadillo/Makefile b/armadillo/Makefile
index ff9292a2c2..0f4c959af8 100644
--- a/armadillo/Makefile
+++ b/armadillo/Makefile
@@ -27,7 +27,7 @@ SUBST_STAGE.minor=	post-patch
 SUBST_FILES.minor=	CMakeLists.txt
 SUBST_SED.minor=	-e "s|ARMA_MINOR ${DIST_MINOR}|ARMA_MINOR ${PKG_MINOR}|g"
 
-# Upstream requires both lapack and openblas, so we cannot use 
+# Upstream requires both lapack and openblas, so we cannot use
 # mk/blas.buildlink.mk without extensive hacking
 .include "../../wip/openblas/buildlink3.mk"
 .include "../../wip/lapack/buildlink3.mk"
diff --git a/asterisk11-vicidial/DESCR b/asterisk11-vicidial/DESCR
index a0d01cbfd0..2b4ee43755 100644
--- a/asterisk11-vicidial/DESCR
+++ b/asterisk11-vicidial/DESCR
@@ -4,9 +4,9 @@ over IP in three protocols, and can interoperate with almost all
 standards-based telephony equipment using relatively inexpensive
 hardware.
 
-VICIDIAL is a software suite that is designed to interact with 
-the Asterisk Open-Source PBX Phone system to act as a complete 
-inbound/outbound contact center suite with inbound email support 
+VICIDIAL is a software suite that is designed to interact with
+the Asterisk Open-Source PBX Phone system to act as a complete
+inbound/outbound contact center suite with inbound email support
 as well.
 
 This is a modified version of Asterisk 11 for Vicidial.
diff --git a/avrdude/options.mk b/avrdude/options.mk
index ab4a330d02..76b72e0099 100644
--- a/avrdude/options.mk
+++ b/avrdude/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.avrdude
 PKG_SUPPORTED_OPTIONS+=		doc
-PKG_SUGGESTED_OPTIONS=		
+PKG_SUGGESTED_OPTIONS=
 PLIST_VARS+=			doc
 
 .include "../../mk/bsd.options.mk"
diff --git a/boost-poly_collection/Makefile b/boost-poly_collection/Makefile
index 715375a1f7..dab639637a 100644
--- a/boost-poly_collection/Makefile
+++ b/boost-poly_collection/Makefile
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	brook%NetBSD.org@localhost
 HOMEPAGE=	http://rawgit.com/joaquintides/poly_collection/website/doc/html/index.html
-COMMENT=	Containers supporting dynamic polymorphism in C++ 
+COMMENT=	Containers supporting dynamic polymorphism in C++
 LICENSE=	boost-license
 
 WRKSRC=		${WRKDIR}/poly_collection-develop
@@ -18,7 +18,7 @@ USE_TOOLS+=	pax
 # XXX - remove this or add more to do-install and PLIST
 .if !empty(XXX_BUILD_BOOST_POLY_COLLECTION)
 USE_LANGUAGES+=	c c++
-USE_CMAKE=	
+USE_CMAKE=
 CMAKE_INSTALL_PREFIX=	${PREFIX}/include/boost/poly_collection
 .include "../../devel/boost-headers/buildlink3.mk"
 .else
diff --git a/boost-yap/Makefile b/boost-yap/Makefile
index 82f949d6d5..c3da9e77ce 100644
--- a/boost-yap/Makefile
+++ b/boost-yap/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=	pax
 # XXX - remove this or add more to do-install and PLIST
 .if !empty(XXX_BUILD_BOOST_YAP)
 USE_LANGUAGES+=	c c++
-USE_CMAKE=	
+USE_CMAKE=
 CMAKE_INSTALL_PREFIX=	${PREFIX}/include/boost/yap
 .include "../../devel/boost-headers/buildlink3.mk"
 .else
diff --git a/casady-fonts/DESCR b/casady-fonts/DESCR
index 0ce5948136..53a867f62c 100644
--- a/casady-fonts/DESCR
+++ b/casady-fonts/DESCR
@@ -1,8 +1,8 @@
 A diverse collection of eight TrueType fonts.
 
-The FLF were created by various authors including myself and Mike 
-Wright. When Casady & Greene, Inc. closed the rights went back to 
-the authors. I created ChicagoFLF and CheckboxFLF. You are free to 
+The FLF were created by various authors including myself and Mike
+Wright. When Casady & Greene, Inc. closed the rights went back to
+the authors. I created ChicagoFLF and CheckboxFLF. You are free to
 use them as you wish. I consider those two in the public domain.
 
 Regards,
diff --git a/collectd-web/Makefile b/collectd-web/Makefile
index fd6994f922..7eaa81afdb 100644
--- a/collectd-web/Makefile
+++ b/collectd-web/Makefile
@@ -8,7 +8,7 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/httpdss/
-COMMENT=	Web interface for Collectd	
+COMMENT=	Web interface for Collectd
 LICENSE=	gnu-gpl-v2
 
 NO_CONFIGURE=		yes
diff --git a/concorde/Makefile b/concorde/Makefile
index e06e773569..4ba2c39473 100644
--- a/concorde/Makefile
+++ b/concorde/Makefile
@@ -27,7 +27,7 @@ BINFILES=	CUT/mincut FMATCH/fmatch LINKERN/linkern \
 		TOOLS/killgrun TOOLS/prob2tsp TOOLS/showres TOOLS/tourchk \
 		TOOLS/tourlen TSP/bosstell TSP/concorde TSP/cutserv \
 		TSP/poolcat TSP/probserv TSP/test_tsp VERIFY/verify
-		
+
 INCFILES=	bigguy.h combs.h config.h consec1.h cut.h cuttree.h \
 		delaunay.h edgegen.h fmatch.h heldkarp.h kdtree.h \
 		linkern.h localcut.h lp.h machdefs.h macrorus.h mlinkern.h \
diff --git a/dasht/Makefile b/dasht/Makefile
index 9eb0b35ba4..9816d1c6fe 100644
--- a/dasht/Makefile
+++ b/dasht/Makefile
@@ -33,7 +33,7 @@ DASHT_MANPAGES= \
 	dasht-query-line.1 \
 	dasht-server-http.1 \
 	dasht-server.1 \
-	dasht.1 
+	dasht.1
 
 DASHT_SCRIPTS= \
 	dasht \
@@ -46,7 +46,7 @@ DASHT_SCRIPTS= \
 	dasht-query-html \
 	dasht-query-line \
 	dasht-server \
-	dasht-server-http 
+	dasht-server-http
 
 do-install:
 .for _m_ in ${DASHT_MANPAGES}
diff --git a/dbus-dfbsd/options.mk b/dbus-dfbsd/options.mk
index 42fb0621b8..f53a040b6c 100644
--- a/dbus-dfbsd/options.mk
+++ b/dbus-dfbsd/options.mk
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS+=	nonroot
 PKG_SUPPORTED_OPTIONS+=	strict-dfbsd
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+=	enable-in-rcvar	
+PKG_SUGGESTED_OPTIONS+=	enable-in-rcvar
 PKG_SUGGESTED_OPTIONS+=	strict-dfbsd
 .endif
 
diff --git a/dunelegacy/MESSAGE b/dunelegacy/MESSAGE
index 0d2611970c..398aa468f2 100644
--- a/dunelegacy/MESSAGE
+++ b/dunelegacy/MESSAGE
@@ -20,7 +20,7 @@ Dune Legacy:
 	GERMAN.PAK (for playing in German)
 	FRENCH.PAK (for playing in French)
 
-You should place these files in ${PREFIX}/share/dunelegacy 
+You should place these files in ${PREFIX}/share/dunelegacy
 or ~/.config/dunelegacy/data
 
 ===========================================================================
diff --git a/elegent/DESCR b/elegent/DESCR
index 5294f3172c..7b99b50ec6 100644
--- a/elegent/DESCR
+++ b/elegent/DESCR
@@ -1,3 +1,3 @@
 Elegent (Elastic Event GENeraTor) is a Monte-Carlo generator of (anti-)
-proton-proton elastic collisions, based on a number of 
+proton-proton elastic collisions, based on a number of
 theoretical/phenomenological models.
diff --git a/etoile-services/Makefile b/etoile-services/Makefile
index 5e339d93e3..5a7b5b4e41 100644
--- a/etoile-services/Makefile
+++ b/etoile-services/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	etoile-${VERSN}
 PKGNAME=	${DISTNAME:S/-/-services-/}
-CATEGORIES=	gnustep 
+CATEGORIES=	gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 VERSN=		0.4.1
 
diff --git a/fastaunique/Makefile b/fastaunique/Makefile
index f6241d85cb..bc784b94dd 100644
--- a/fastaunique/Makefile
+++ b/fastaunique/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	http://example.com
 COMMENT=	Sort and uniq fasta files
-# LICENSE=	
+# LICENSE=
 
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
diff --git a/feathercoin/Makefile b/feathercoin/Makefile
index 0afdebe991..1e17d0216b 100644
--- a/feathercoin/Makefile
+++ b/feathercoin/Makefile
@@ -18,9 +18,9 @@ USE_LANGUAGES=	c c++
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/f/F/1}
 AUTO_MKDIRS=	yes
 
-#CXXFLAGS+=	-std=c++0x -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
-CXXFLAGS+=	-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
-CXXFLAGS+=	-DBOOST_SYSTEM_NO_DEPRECATED 
+#CXXFLAGS+=	-std=c++0x -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+CXXFLAGS+=	-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+CXXFLAGS+=	-DBOOST_SYSTEM_NO_DEPRECATED
 CXXFLAGS+=	-Wall -g -I${PREFIX}/include/boost
 #CXXFLAGS+=	-std=c++0x -Wall -g -I${PREFIX}/include/boost
 
diff --git a/flite2/Makefile b/flite2/Makefile
index 57e5c9058e..a03458dc16 100644
--- a/flite2/Makefile
+++ b/flite2/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	flite-2.0.0-release
 PKGNAME=	${DISTNAME:S/-release//}
 CATEGORIES=	audio
 #MASTER_SITES=	http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
-MASTER_SITES=	http://festvox.org/flite/packed/flite-2.0/	
+MASTER_SITES=	http://festvox.org/flite/packed/flite-2.0/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -25,11 +25,11 @@ GNU_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-sockets
-CONFIGURE_ARGS+=	--with-audio=pulseaudio 
-CONFIGURE_ARGS+=	--with-lang 
-CONFIGURE_ARGS+=	--with-pic 
-CONFIGURE_ARGS+=	--with-vox 
-CONFIGURE_ARGS+=	--with-lex 
+CONFIGURE_ARGS+=	--with-audio=pulseaudio
+CONFIGURE_ARGS+=	--with-lang
+CONFIGURE_ARGS+=	--with-pic
+CONFIGURE_ARGS+=	--with-vox
+CONFIGURE_ARGS+=	--with-lex
 CONFIGURE_ARGS+=	--with-langvox=default
 
 .include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/frida-libffi/Makefile b/frida-libffi/Makefile
index 1be1c92159..31865efa7c 100644
--- a/frida-libffi/Makefile
+++ b/frida-libffi/Makefile
@@ -36,7 +36,7 @@ pre-build:
 
 .if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 TEST_TARGET=	check
-TEST_ENV=	
+TEST_ENV=
 BUILD_DEPENDS+=	dejagnu-[0-9]*:../../devel/dejagnu
 .endif
 
diff --git a/gcalcli-git/Makefile b/gcalcli-git/Makefile
index d2d2b000ea..ed7265f246 100644
--- a/gcalcli-git/Makefile
+++ b/gcalcli-git/Makefile
@@ -7,7 +7,7 @@ LICENSE=	mit
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/insanum/gcalcli/
-COMMENT=	Command line interface to Google Calendar 
+COMMENT=	Command line interface to Google Calendar
 
 GIT_REPOSITORIES=	gcalcli
 GIT_REPO.gcalcli=	git://github.com/insanum/gcalcli.git
diff --git a/gcc6snapshot/DESCR b/gcc6snapshot/DESCR
index 8ebaa3e51b..746d1793a9 100644
--- a/gcc6snapshot/DESCR
+++ b/gcc6snapshot/DESCR
@@ -2,5 +2,5 @@ The GNU Compiler Collection (GCC) includes front ends for C, C++, Objective-C,
 Fortran, Java, and Go, as well as libraries for these languages (libstdc++,
 libgcj,...). This package provides the development version of veersion 6.x.
 
-On NetBSD a working cabsl function must be present in libm to build gfortran. 
+On NetBSD a working cabsl function must be present in libm to build gfortran.
 This has been added to NetBSD7 on 2014/10/13.
diff --git a/gfeedline/options.mk b/gfeedline/options.mk
index debe0a696b..aacfe4211c 100644
--- a/gfeedline/options.mk
+++ b/gfeedline/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gfeedline
 PKG_SUPPORTED_OPTIONS=	proxy spellcheck
-PKG_SUGGESTED_OPTIONS=	
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/gmap/Makefile b/gmap/Makefile
index 881a2115c6..b5d51a84aa 100644
--- a/gmap/Makefile
+++ b/gmap/Makefile
@@ -12,12 +12,12 @@ DISTFILES=	gmap-gsnap-${PORTVERSION:C|\.|-|g}${EXTRACT_SUFX}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 COMMENT=	Genomic Mapping and Alignment Program for mRNA and EST Sequences
-#LICENSE=	
+#LICENSE=
 
 # Pessimistic assumption.  Test and change if possible.
 # MAKE_JOBS_SAFE=	no
 
-ONLY_FOR_PLATFORM=	
+ONLY_FOR_PLATFORM=
 
 # FIXME: Add shebang fixes for perl scripts
 
diff --git a/gnome-panel/Makefile b/gnome-panel/Makefile
index 1305abfcaa..d19afc0153 100644
--- a/gnome-panel/Makefile
+++ b/gnome-panel/Makefile
@@ -26,7 +26,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # py-ORBit via py-gnome2
 
 
 # Horrible hack because the package uses libgweather wrong
-# error "gweather-timezone.h must not be included individually, 
+# error "gweather-timezone.h must not be included individually,
 # include gweather.h instead"
 CFLAGS+=	-DGWEATHER_COMPILATION
 
diff --git a/go-junit-report/Makefile b/go-junit-report/Makefile
index bf8e43d8a6..7cac065d93 100644
--- a/go-junit-report/Makefile
+++ b/go-junit-report/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	go-junit-report
 GITHUB_TAG=	af01ea7f8024089b458d804d5cdf190f962a9a0c
-#DISTNAME=	go-junit-report	
+#DISTNAME=	go-junit-report
 DISTNAME=	${GITHUB_PROJECT}-${GITHUB_TAG}
 
 PKGREVISION=	2
diff --git a/imgui/DESCR b/imgui/DESCR
index f4c91cdd06..4d0e27debd 100644
--- a/imgui/DESCR
+++ b/imgui/DESCR
@@ -10,4 +10,4 @@ thus lacks certain features normally found in more high-level libraries.
 
 ImGui is particularly suited to integration in realtime 3D applications,
 fullscreen applications, embedded applications, games, or any applications on
-consoles platforms where operating system features are non-standard. 
+consoles platforms where operating system features are non-standard.
diff --git a/khelpcenter/DESCR b/khelpcenter/DESCR
index ae40652430..b1f90eae6b 100644
--- a/khelpcenter/DESCR
+++ b/khelpcenter/DESCR
@@ -1,4 +1,4 @@
 The Plasma help system is designed to make accessing the common
 UNIX help systems (man and info) simple, as well as the native
-Plasma and applications documentation (XML). 
+Plasma and applications documentation (XML).
 
diff --git a/khotkeys/Makefile b/khotkeys/Makefile
index 85bffc0158..86c7ee506e 100644
--- a/khotkeys/Makefile
+++ b/khotkeys/Makefile
@@ -17,9 +17,9 @@ USE_TOOLS+=	msgmerge pkg-config
 SUBST_CLASSES+=		fix-moc
 SUBST_STAGE.fix-moc=	post-configure
 SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
-SUBST_FILES.fix-moc=	_KDE_build/app/CMakeFiles/kded_khotkeys_autogen.dir/AutogenInfo.cmake 
-SUBST_FILES.fix-moc+=	_KDE_build/test/CMakeFiles/khotkeys_standalone_autogen.dir/AutogenInfo.cmake 
-SUBST_FILES.fix-moc+=	_KDE_build/kcm_hotkeys/CMakeFiles/kcm_hotkeys_autogen.dir/AutogenInfo.cmake 
+SUBST_FILES.fix-moc=	_KDE_build/app/CMakeFiles/kded_khotkeys_autogen.dir/AutogenInfo.cmake
+SUBST_FILES.fix-moc+=	_KDE_build/test/CMakeFiles/khotkeys_standalone_autogen.dir/AutogenInfo.cmake
+SUBST_FILES.fix-moc+=	_KDE_build/kcm_hotkeys/CMakeFiles/kcm_hotkeys_autogen.dir/AutogenInfo.cmake
 SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 
 .include "../../devel/kcmutils/buildlink3.mk"
diff --git a/kscreenlocker/Makefile b/kscreenlocker/Makefile
index 6f77de1828..fe3ef4588c 100644
--- a/kscreenlocker/Makefile
+++ b/kscreenlocker/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config perl:run
 
-REPLACE_PERL+=	updaters/ksreenlocker_5_3_separate_autologin.pl 
+REPLACE_PERL+=	updaters/ksreenlocker_5_3_separate_autologin.pl
 
 SPECIAL_PERMS+=	${PREFIX}/libexec/kcheckpass \
 		${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555
diff --git a/ksysguard/DESCR b/ksysguard/DESCR
index 1e01c9acd7..0f719d8910 100644
--- a/ksysguard/DESCR
+++ b/ksysguard/DESCR
@@ -1,4 +1,4 @@
 KSysGuard is a program to monitor various elements of your system, or any
-other remote system with the KSysGuard daemon (ksysgardd) installed. 
+other remote system with the KSysGuard daemon (ksysgardd) installed.
 Currently the daemon has been ported to Linux, FreeBSD, Irix, NetBSD,
 OpenBSD, Solaris and Tru64 with varying degrees of completion.
diff --git a/libc++-abi/DESCR b/libc++-abi/DESCR
index 0452e99bab..6d14940f3d 100644
--- a/libc++-abi/DESCR
+++ b/libc++-abi/DESCR
@@ -8,6 +8,6 @@ Features and Goals includes:
 Correctness as defined by the C++11 standard.
 Provide a portable sublayer to wase the porting of libc++.
 On Mac OS X, be ABI compatible with the existing low-level support.
-libc++abi is know to work on Darwin platform using clang. 
+libc++abi is know to work on Darwin platform using clang.
 Find the list of functionality here:
 http://libcxxabi.llvm.org/spec.html
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 4b9bc28419..cae909798f 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -118,7 +118,7 @@ PKG_SUGGESTED_OPTIONS=
 
 PKG_SUPPORTED_OPTIONS+=	invert_atomic_add_unless
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+=	invert_atomic_add_unless 
+PKG_SUGGESTED_OPTIONS+=	invert_atomic_add_unless
 .endif
 
 # .if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
@@ -132,7 +132,7 @@ PKG_SUGGESTED_OPTIONS+=	strict_xsrc_netbsd
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		libkms	
+PLIST_VARS+=		libkms
 .if !empty(PKG_OPTIONS:Mlibkms)
 PKGCONFIG_OVERRIDE+=	libkms.pc.in
 PLIST.libkms=		yes
diff --git a/libguestfs-appliance/Makefile b/libguestfs-appliance/Makefile
index 604939b16a..27ca1aa43c 100644
--- a/libguestfs-appliance/Makefile
+++ b/libguestfs-appliance/Makefile
@@ -25,7 +25,7 @@ do-build:
 	${PREFIX}/bin/qemu-img convert -f raw -O qcow2 -c \
 	  ${WRKSRC}/root ${WRKSRC}/root.qcow2
 	rm ${WRKSRC}/root
-	ln -s root.qcow2 ${WRKSRC}/root 
+	ln -s root.qcow2 ${WRKSRC}/root
 
 do-install:
 	cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/lib/guestfs/.
diff --git a/litecoin/Makefile b/litecoin/Makefile
index 5c2175d841..b8122513f6 100644
--- a/litecoin/Makefile
+++ b/litecoin/Makefile
@@ -30,7 +30,7 @@ BOOST_LDFLAGS=		-Wl,-R${BUILDLINK_TRANSFORM.boost-libs}/lib -Wl,-L${BUILDLINK_PR
 
 CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=	--enable-hardening
-CONFIGURE_ARGS+=	${PREFIX}/include/db4 
+CONFIGURE_ARGS+=	${PREFIX}/include/db4
 #CONFIGURE_ARGS+=	--without-gui
 
 LIBTOOLIZE=	${PREFIX}/bin/libtoolize
diff --git a/microbiomeutil/Makefile b/microbiomeutil/Makefile
index f2a3c6e4c2..6348e4a73c 100644
--- a/microbiomeutil/Makefile
+++ b/microbiomeutil/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Utilities for processing and analyzing 16S rRNA genes
 # Pessimistic assumption.  Test and change if possible.
 MAKE_JOBS_SAFE=	no
 
-#ONLY_FOR_PLATFORM=	
+#ONLY_FOR_PLATFORM=
 
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
diff --git a/modular-xorg-server-dfbsd-meson/options.mk b/modular-xorg-server-dfbsd-meson/options.mk
index c713c959ad..c7753fc8ba 100644
--- a/modular-xorg-server-dfbsd-meson/options.mk
+++ b/modular-xorg-server-dfbsd-meson/options.mk
@@ -156,7 +156,7 @@ MESON_ARGS+=		-Dipv6=false
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 MESON_ARGS+=		--buildtype=debug
-# Debug flags -O0 -g3 recommended by: 
+# Debug flags -O0 -g3 recommended by:
 # https://www.x.org/wiki/Development/Documentation/ServerDebugging/
 # CFLAGS+=		-ggdb
 CFLAGS+=		-O0 -g3
@@ -171,15 +171,15 @@ CONFIGURE_ARGS+=	--without-dtrace
 
 .if !empty(PKG_OPTIONS:Mdevd)
 # SUBST_CLASSES+=			devd_config
-# SUBST_STAGE.devd_config=	post-configure	
+# SUBST_STAGE.devd_config=	post-configure
 # SUBST_MESSAGE.devd_config=	Patching config/Makefile for devd
 # SUBST_FILES.devd_config+=	config/Makefile
 # SUBST_SED.devd_config+=		-e 's|config\.c|config.c devd.c|g'
 # SUBST_SED.devd_config+=		-e 's|config\.lo|config.lo devd.lo|g'
 # SUBST_CLASSES+=			devd_dix
 # SUBST_STAGE.devd_dix=		post-configure
-# SUBST_MESSAGE.devd_dix=		Patching include/dix-config.h for devd 
-# SUBST_FILES.devd_dix+=		include/dix-config.h	
+# SUBST_MESSAGE.devd_dix=		Patching include/dix-config.h for devd
+# SUBST_FILES.devd_dix+=		include/dix-config.h
 # SUBST_SED.devd_dix+=		-e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
 CPPFLAGS+=	-DCONFIG_DEVD=1
 MESON_ARGS+=	-Ddevd=true
@@ -200,7 +200,7 @@ CPPFLAGS+=	-DREVERT_RANDR_LEASE
 
 SUBST_CLASSES+=		lease
 SUBST_STAGE.lease=	post-configure
-SUBST_MESSAGE.lease=	Removing definition of XF86_LEASE_VERSION	
+SUBST_MESSAGE.lease=	Removing definition of XF86_LEASE_VERSION
 SUBST_FILES.lease+=	hw/xfree86/modes/xf86Crtc.h
 SUBST_SED.lease+=	-e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
 .endif
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 3b814121ab..633a0be575 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
-# Debug flags -O0 -g3 recommended by: 
+# Debug flags -O0 -g3 recommended by:
 # https://www.x.org/wiki/Development/Documentation/ServerDebugging/
 # CFLAGS+=		-ggdb
 CFLAGS+=		-O0 -g3
@@ -96,15 +96,15 @@ CONFIGURE_ARGS+=	--without-dtrace
 
 .if !empty(PKG_OPTIONS:Mdevd)
 SUBST_CLASSES+=			devd_config
-SUBST_STAGE.devd_config=	post-configure	
+SUBST_STAGE.devd_config=	post-configure
 SUBST_MESSAGE.devd_config=	Patching config/Makefile for devd
 SUBST_FILES.devd_config+=	config/Makefile
 SUBST_SED.devd_config+=		-e 's|config\.c|config.c devd.c|g'
 SUBST_SED.devd_config+=		-e 's|config\.lo|config.lo devd.lo|g'
 SUBST_CLASSES+=			devd_dix
 SUBST_STAGE.devd_dix=		post-configure
-SUBST_MESSAGE.devd_dix=		Patching include/dix-config.h for devd 
-SUBST_FILES.devd_dix+=		include/dix-config.h	
+SUBST_MESSAGE.devd_dix=		Patching include/dix-config.h for devd
+SUBST_FILES.devd_dix+=		include/dix-config.h
 SUBST_SED.devd_dix+=		-e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
 .endif
 
@@ -117,7 +117,7 @@ CPPFLAGS+=	-DREVERT_RANDR_LEASE
 
 SUBST_CLASSES+=		lease
 SUBST_STAGE.lease=	post-configure
-SUBST_MESSAGE.lease=	Removing definition of XF86_LEASE_VERSION	
+SUBST_MESSAGE.lease=	Removing definition of XF86_LEASE_VERSION
 SUBST_FILES.lease+=	hw/xfree86/modes/xf86Crtc.h
 SUBST_SED.lease+=	-e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
 .endif
diff --git a/mothur/Makefile b/mothur/Makefile
index 091fec7afe..0652942442 100644
--- a/mothur/Makefile
+++ b/mothur/Makefile
@@ -35,7 +35,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 BUILD_TARGET=	mothur
 
-PORTVERSION=	1.40.5	
+PORTVERSION=	1.40.5
 DATADIR=	${PREFIX}/share/mothur
 DOCSDIR=	${PREFIX}/share/doc/mothur
 EXAMPLESDIR=	${PREFIX}/share/examples/mothur
diff --git a/multiminer/Makefile b/multiminer/Makefile
index 4ef81a641e..023212a192 100644
--- a/multiminer/Makefile
+++ b/multiminer/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	bfgminer>=3.9.0:../../wip/bfgminer
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	multiminer	
+SUBST_FILES.path=	multiminer
 SUBST_VARS.path=	PREFIX
 SUBST_MESSAGE.path=	"Fixing path."
 
diff --git a/netbsd-x11-i386/Makefile b/netbsd-x11-i386/Makefile
index b5f41cefcb..7ff11df596 100644
--- a/netbsd-x11-i386/Makefile
+++ b/netbsd-x11-i386/Makefile
@@ -16,7 +16,7 @@ WRKSRC=			${WRKDIR}/usr/X11R7
 # XXX crimes
 NO_BUILD=		yes
 
-do-install:                                                
+do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}
 	cd ${WRKSRC} && for dir in lib libexec usr; do		\
 	if ${TEST} -d "$$dir"; then				\
@@ -25,6 +25,6 @@ do-install:
 	fi;							\
 	done
 
-		 	
+
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/numactl/Makefile b/numactl/Makefile
index 491e57d96e..69e421def0 100644
--- a/numactl/Makefile
+++ b/numactl/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Non Uniform Memory Access tools
 #LICENSE=	# TODO: (see mk/license.mk)
 
 # numactl and the demo programs are under the GNU General Public License, v.2
-# libnuma is under the GNU Lesser General Public License, v2.1. 
+# libnuma is under the GNU Lesser General Public License, v2.1.
 
 ONLY_FOR_PLATFORM=	Linux-*-*
 
diff --git a/ocaml-gmetadom/DESCR b/ocaml-gmetadom/DESCR
index 1f9a0fcbb3..216137b9b9 100644
--- a/ocaml-gmetadom/DESCR
+++ b/ocaml-gmetadom/DESCR
@@ -1,9 +1,9 @@
-GMetaDOM is a collection of librares, each library providing a DOM 
+GMetaDOM is a collection of librares, each library providing a DOM
 implementation. This is the binding for OCAML.
 
-The basic idea is that, given the availability of DOM implementations 
-for the C programming language (like Gdome2), and given the uniformity 
-of the DOM interfaces, bindings for various programming languages based 
-on the C implementation can be built automatically, providing a small 
-number of hand-coded classes and a set of scripts for the automatic 
+The basic idea is that, given the availability of DOM implementations
+for the C programming language (like Gdome2), and given the uniformity
+of the DOM interfaces, bindings for various programming languages based
+on the C implementation can be built automatically, providing a small
+number of hand-coded classes and a set of scripts for the automatic
 generation of the remaining ones.
diff --git a/openjazz/Makefile b/openjazz/Makefile
index 8115386bf4..e70ef80540 100644
--- a/openjazz/Makefile
+++ b/openjazz/Makefile
@@ -17,7 +17,7 @@ USE_TOOLS+=	automake autoconf autoreconf pkg-config
 
 pre-configure:
 	${RUN} cd ${WRKSRC} && autoreconf -fiv
-	
+
 .include "../../audio/libmodplug/buildlink3.mk"
 .include "../../audio/libxmp/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/opera60-bin/Makefile b/opera60-bin/Makefile
index a29989b757..1304a5ba4a 100644
--- a/opera60-bin/Makefile
+++ b/opera60-bin/Makefile
@@ -43,7 +43,7 @@ PLIST_VARS+=		ia32w linux
 # 	librt.so.1 libgobject-2.0.so.0
 # 	libsmime3.so libpangocairo-1.0.so.0
 # 	libpango-1.0.so.0 libcairo.so.2 libgio-2.0.so.0
-# 	libgdk_pixbuf-2.0.so.0 
+# 	libgdk_pixbuf-2.0.so.0
 # 	libuuid.so.1
 # 	libatk-1.0.so.0 libatk-bridge-2.0.so.0
 # 	libatspi.so.0 libm.so.6 libgtk-3.so.0 libgdk-3.so.0
diff --git a/p5-Data-DPath-Validator/Makefile b/p5-Data-DPath-Validator/Makefile
index d0e4c41ae3..33f04ccc75 100644
--- a/p5-Data-DPath-Validator/Makefile
+++ b/p5-Data-DPath-Validator/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://search.cpan.org/~nperez/Data-DPath-Validator/
 COMMENT=	Validate data based on template data
 
-DEPENDS+=	p5-MooseX-Role-BuildInstanceOf>0:../../wip/p5-MooseX-Role-BuildInstanceOf 	
+DEPENDS+=	p5-MooseX-Role-BuildInstanceOf>0:../../wip/p5-MooseX-Role-BuildInstanceOf
 DEPENDS+=	p5-Data-DPath>0:../../wip/p5-Data-DPath
 DEPENDS+=	p5-Data-Visitor>0:../../devel/p5-Data-Visitor
 
diff --git a/p5-JSON-WebToken/Makefile b/p5-JSON-WebToken/Makefile
index 692ad1bbaa..cdbe97fece 100644
--- a/p5-JSON-WebToken/Makefile
+++ b/p5-JSON-WebToken/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	JSON-WebToken-0.10
 PKGREVISION=	1
 PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	www perl5 
+CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=JSON/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/paraview/Makefile b/paraview/Makefile
index ea0cbbc1fc..46e4d6b727 100644
--- a/paraview/Makefile
+++ b/paraview/Makefile
@@ -51,13 +51,13 @@ PY_PATCHPLIST=			yes
 
 # to make protoc work during installation
 # http://paraview.org/Bug/view.php?id=12852
-# 
+#
 # For 3.98 it fails to run vtkkwProcessXML-pv3.98
 # with the following error message
 # _ParaView_build/bin/vtkkwProcessXML-pv3.98: error while loading
 # shared libraries: libvtkCommonCore-pv3.98.so.1: cannot open shared
 # object file: No such file or directory
-# 
+#
 # I add ${WRKSRC}/_ParaView_build/lib/ to LD_LIBRARY_PATH to solve it
 MAKE_ENV+=			LD_LIBRARY_PATH=${WRKSRC}/_ParaView_build/bin:${WRKSRC}/_ParaView_build/lib/
 
diff --git a/pear-PHP_Depend/Makefile b/pear-PHP_Depend/Makefile
index cb02e94a6a..d37a198ead 100644
--- a/pear-PHP_Depend/Makefile
+++ b/pear-PHP_Depend/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES+=	http://pear.pdepend.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://pdepend.org/
-COMMENT=	PHP_Depend design quality metrics for PHP packages	
+COMMENT=	PHP_Depend design quality metrics for PHP packages
 LICENSE=	original-bsd
 
 BUILD_DEPENDS+=	${PHP_PKG_PREFIX}-pear-channel-pdepend-[0-9]*:../../wip/pear-channel-pdepend
diff --git a/pear-PHP_Timer/Makefile b/pear-PHP_Timer/Makefile
index 58312fa278..131ddaa8ab 100644
--- a/pear-PHP_Timer/Makefile
+++ b/pear-PHP_Timer/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://pear.phpunit.de/
-COMMENT=	Utility class for timing	
+COMMENT=	Utility class for timing
 LICENSE=	modified-bsd
 
 BUILD_DEPENDS+=	${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
diff --git a/pear-Version/Makefile b/pear-Version/Makefile
index dc735080ca..57081403b5 100644
--- a/pear-Version/Makefile
+++ b/pear-Version/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://pear.phpunit.de/
-COMMENT=	Library that helps with managing the version number of Git-hosted PHP projects	
+COMMENT=	Library that helps with managing the version number of Git-hosted PHP projects
 LICENSE=	modified-bsd
 
 BUILD_DEPENDS+=	${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
diff --git a/phantomjs2/Makefile b/phantomjs2/Makefile
index a5773c5ca4..852d8e4a99 100644
--- a/phantomjs2/Makefile
+++ b/phantomjs2/Makefile
@@ -31,7 +31,7 @@ CHECK_PORTABILITY_SKIP+=	src/breakpad/src/third_party/protobuf/protobuf/post_pro
 
 NOT_FOR_PLATFORM+=	SunOS-*-x86_64
 
-CONFIGURE_ARGS+=	--qtdeps=system -no-rpath 
+CONFIGURE_ARGS+=	--qtdeps=system -no-rpath
 CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
diff --git a/php-imagick-imagick6/DESCR b/php-imagick-imagick6/DESCR
index d7e960e473..a36b47f406 100644
--- a/php-imagick-imagick6/DESCR
+++ b/php-imagick-imagick6/DESCR
@@ -1,2 +1,2 @@
 Imagick is a PHP extension to create and modify images using
-the ImageMagick library. 
+the ImageMagick library.
diff --git a/pioneer/Makefile b/pioneer/Makefile
index cc7f54018c..b36037579c 100644
--- a/pioneer/Makefile
+++ b/pioneer/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config automake autoconf gmake
 
 CONFIGURE_ENV+=	PIONEER_DATA_DIR=${PREFIX}/share/pioneer/data
-   
+
 BUILDLINK_PKGSRCDIR.assimp=	../../wip/assimp
 
 pre-configure:
diff --git a/polarssl11/Makefile b/polarssl11/Makefile
index 748878ed51..e1a937c45a 100644
--- a/polarssl11/Makefile
+++ b/polarssl11/Makefile
@@ -19,7 +19,7 @@ BINFILES=	ssl/ssl_client1 ssl/ssl_client2 ssl/ssl_server aes/aescrypt2 \
 		pkey/dh_client pkey/dh_genprime pkey/dh_server pkey/mpi_demo \
 		pkey/rsa_genkey pkey/rsa_sign pkey/rsa_verify hash/hello \
 		hash/md5sum hash/sha1sum hash/sha2sum test/ssl_cert_test \
-		test/benchmark test/selftest test/ssl_test 
+		test/benchmark test/selftest test/ssl_test
 
 INCLUDE_FILES=	aes.h arc4.h asn1.h base64.h bignum.h \
 		bn_mul.h camellia.h certs.h cipher.h cipher_wrap.h config.h \
diff --git a/proj/Makefile b/proj/Makefile
index 7f4a5715e1..e6ded77035 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -3,7 +3,7 @@
 # I have an update to 6 ready, but it is on hold pending an assessment
 # of projects.h removal fallout - gdt.
 VERSION_BASE=	6.0.0
-VERSION_RC=	
+VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
 # proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
diff --git a/py-achemkit/DESCR b/py-achemkit/DESCR
index 7e74ba227b..4a2e4267ec 100644
--- a/py-achemkit/DESCR
+++ b/py-achemkit/DESCR
@@ -1,2 +1,2 @@
-PyAChemKit is a collection of Artificial Chemistry software written in Python 
+PyAChemKit is a collection of Artificial Chemistry software written in Python
 a library and collection of tools
diff --git a/py-bitsets/Makefile b/py-bitsets/Makefile
index fade25488b..a8b20c9d9f 100644
--- a/py-bitsets/Makefile
+++ b/py-bitsets/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=b/bitsets/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kamel.derouiche%gmail.com@localhost
-HOMEPAGE=	https://github.com/xflr6/bitsets	
+HOMEPAGE=	https://github.com/xflr6/bitsets
 COMMENT=	Ordered subsets over a predefined domain
 LICENSE=	mit
 
diff --git a/py-chinup/Makefile b/py-chinup/Makefile
index 9ededa4781..5412bb6027 100644
--- a/py-chinup/Makefile
+++ b/py-chinup/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/chinup/}
 
-MAINTAINER=	kamelderouiche%yahoo.com@localhost	
+MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	https://github.com/pagepart/chinup
 COMMENT=	Python Facebook Graph API client
 LICENSE=	mit
diff --git a/py-corrfitter/DESCR b/py-corrfitter/DESCR
index 1baaf19afd..d60c940435 100644
--- a/py-corrfitter/DESCR
+++ b/py-corrfitter/DESCR
@@ -15,6 +15,6 @@ used to fit multiple models to data simultaneously. Any number of
 correlators may be described and fit by a single |CorrFitter| object.
 |CorrFitter| objects can also be used to to extract the appropriate fit
 data from |Dataset| objects.
-  
+
 This module has been used extensively for analyzing results from lattice
 QCD simulations
diff --git a/py-django-picklefield/Makefile b/py-django-picklefield/Makefile
index 5780b3d9b1..64052252dd 100644
--- a/py-django-picklefield/Makefile
+++ b/py-django-picklefield/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-picklefield/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
-HOMEPAGE=	https://github.com/gintas/django-picklefield	
+HOMEPAGE=	https://github.com/gintas/django-picklefield
 COMMENT=	Pickled object field for Django
 LICENSE=	mit
 
diff --git a/py-fwm-ensayo/Makefile b/py-fwm-ensayo/Makefile
index cbb85c0dd5..1c77a10005 100644
--- a/py-fwm-ensayo/Makefile
+++ b/py-fwm-ensayo/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://pypi.python.org/pypi/fwm_ensayo/
 COMMENT=	Fortran package to work with watersheds and do hydrologic
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy	
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
 
 USE_LANGUAGES=	c fortran
 
diff --git a/py-graphs/Makefile b/py-graphs/Makefile
index 609ac3e89b..f3fbf0738c 100644
--- a/py-graphs/Makefile
+++ b/py-graphs/Makefile
@@ -17,5 +17,5 @@ USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../math/py-numpy/buildlink3.mk"	
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-kineticlib/DESCR b/py-kineticlib/DESCR
index 7ea8585528..0d74552cd0 100644
--- a/py-kineticlib/DESCR
+++ b/py-kineticlib/DESCR
@@ -1,5 +1,5 @@
 Provides a library with various functions used in computational kinetic theory.
 The documentation is currently being written. Mostly aimed at
-the multi-temperature approximation, but many functions 
+the multi-temperature approximation, but many functions
 work with the state-to-state
 approximation as well.
diff --git a/py-libvirt490/Makefile b/py-libvirt490/Makefile
index a2f6664c2a..f0e9195963 100644
--- a/py-libvirt490/Makefile
+++ b/py-libvirt490/Makefile
@@ -23,7 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-simplegeneric>0.8:../../devel/py-simplegeneric
 #DEPENDS+=	${PYPKGPREFIX}-traitlets>=4.2:../../devel/py-traitlets
 
 USE_LANGUAGES=	# none
-#REPLACE_PYTHON=	
+#REPLACE_PYTHON=
 #PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
diff --git a/py-peru/Makefile b/py-peru/Makefile
index cdb321913e..fef9360bf0 100644
--- a/py-peru/Makefile
+++ b/py-peru/Makefile
@@ -27,7 +27,7 @@ REPLACE_PYTHON+=	peru/resources/plugins/curl/curl_plugin.py\
 			peru/resources/plugins/hg/hg_plugin.py   \
 			peru/resources/plugins/noop_cache/noop_cache_plugin.py \
 			peru/resources/plugins/print/print_plugin.py \
-			peru/resources/plugins/svn/svn_plugin.py		
+			peru/resources/plugins/svn/svn_plugin.py
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-pyon/Makefile b/py-pyon/Makefile
index c5aa9c0b89..da91655039 100644
--- a/py-pyon/Makefile
+++ b/py-pyon/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lattice QCD library including statistical, fitting, plotting functions
 #LICENSE=	# TODO: (see mk/license.mk)
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=3.3.2:../../converters/py-simplejson
-DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.7.2:../../textproc/py-jinja2 
+DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.7.2:../../textproc/py-jinja2
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
diff --git a/py-redbaron/DESCR b/py-redbaron/DESCR
index 4f87e6c7c2..19c7c5dcb5 100644
--- a/py-redbaron/DESCR
+++ b/py-redbaron/DESCR
@@ -1,4 +1,4 @@
-RedBaron is a python library and tool powerful enough to be used into IPython 
+RedBaron is a python library and tool powerful enough to be used into IPython
 solely that intent to make the process of writting code that modify source code
 as easy and as simple as possible. That include writing custom refactoring,
 generic refactoring, tools, IDE or directly modifying you source code into
diff --git a/py-solpy/DESCR b/py-solpy/DESCR
index 407089909c..a231b690bf 100644
--- a/py-solpy/DESCR
+++ b/py-solpy/DESCR
@@ -1,6 +1,6 @@
 Solpy is a python library to model solar system power performance similar to
 PVWatts or NREL's System Advisor Model (SAM).  I initially started writing this
-while working in Bangladesh as fairly crude calculator to go from a fisheye 
+while working in Bangladesh as fairly crude calculator to go from a fisheye
 panorama to a csv of vectors for shading calculations, however there were
 several pieces that were added to make it a bit more useful for both analyis
 and design. Daniel Thomas did work adding the Tang evacuated glass tube
diff --git a/py-strategies/DESCR b/py-strategies/DESCR
index 3dec037bfd..f5c605c8c9 100644
--- a/py-strategies/DESCR
+++ b/py-strategies/DESCR
@@ -1,7 +1,7 @@
 This project contains a set of complementary higher order functions that loosely
- resembles the Stratego language. 
+ resembles the Stratego language.
 
 This project was inspired by the Stratego language for programmatic control in
-the Stratego/XT project. It was first implemented as part of the 
+the Stratego/XT project. It was first implemented as part of the
 SymPy](http://sympy.org) Python library for symbolic algebra but was then
 spun off as a separate project.
diff --git a/py-txWS/Makefile b/py-txWS/Makefile
index 73af29e24c..cb22050984 100644
--- a/py-txWS/Makefile
+++ b/py-txWS/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+=	${PYPKGPREFIX}-vcversioner-[0-9]*:../../devel/py-vcversioner 
+DEPENDS+=	${PYPKGPREFIX}-vcversioner-[0-9]*:../../devel/py-vcversioner
 
 USE_LANGUAGES=	# none
 
diff --git a/qstat214/Makefile b/qstat214/Makefile
index 1eafa176ba..03bb9cf35e 100644
--- a/qstat214/Makefile
+++ b/qstat214/Makefile
@@ -26,6 +26,6 @@ WRKSRC=	${WRKDIR}/qstat-2.14
 
 pre-configure:
 	cd ${WRKSRC} && \
-	./autogen.sh       
+	./autogen.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt5-qscintilla/DESCR b/qt5-qscintilla/DESCR
index d1fcd4ff80..b331db8c7f 100644
--- a/qt5-qscintilla/DESCR
+++ b/qt5-qscintilla/DESCR
@@ -1,3 +1,3 @@
-Qscintilla is a Qt port of Neil Hodgson's scintilla(devel/scintilla)  
-C++ editor control. 
- 
+Qscintilla is a Qt port of Neil Hodgson's scintilla(devel/scintilla)
+C++ editor control.
+
diff --git a/residualvm/options.mk b/residualvm/options.mk
index c5117a4da3..94086a2bca 100644
--- a/residualvm/options.mk
+++ b/residualvm/options.mk
@@ -2,7 +2,7 @@
 
 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_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/rtcmix/Makefile b/rtcmix/Makefile
index 9563d4c58b..02d4283cf9 100644
--- a/rtcmix/Makefile
+++ b/rtcmix/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=RTcmix/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost	
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://rtcmix.org
 COMMENT=	Open-source digital signal processing and sound synthesis language
 LICENSE=	apache-2.0
@@ -20,5 +20,5 @@ USE_TOOLS=		gmake autoconf perl
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
-	
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/ruby-diaspora/Makefile b/ruby-diaspora/Makefile
index bd18e8972a..3974595f09 100644
--- a/ruby-diaspora/Makefile
+++ b/ruby-diaspora/Makefile
@@ -7,7 +7,7 @@ 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
-MASTER_SITES=	
+MASTER_SITES=
 
 # For now, obtain dependencies only.
 META_PACKAGE=	yes
diff --git a/ruby-redmine/Makefile b/ruby-redmine/Makefile
index 2b79584717..af4d4e9dfb 100644
--- a/ruby-redmine/Makefile
+++ b/ruby-redmine/Makefile
@@ -237,17 +237,17 @@ INSTALLATION_DIRS+=	share/${PKGBASE}/tmp/thumbnails share/${PKGBASE}/vendor
 .include "options.mk"
 
 #do-install:
-#	set -e; cd ${WRKSRC}; 
-		#for i in `find . -path ./doc -prune -o -type f ! -perm 775 -print`; 
-		#do 
-		#	${INSTALL_DATA} $$i 
-				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i; 
-		#done; 
-		#for i in `find . -type f -executable -not -name ttf2ufm\\* -print`; 
-		#do 
-		#	${INSTALL_SCRIPT} $$i 
-				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i; 
-		#done; 
+#	set -e; cd ${WRKSRC};
+		#for i in `find . -path ./doc -prune -o -type f ! -perm 775 -print`;
+		#do
+		#	${INSTALL_DATA} $$i
+				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
+		#done;
+		#for i in `find . -type f -executable -not -name ttf2ufm\\* -print`;
+		#do
+		#	${INSTALL_SCRIPT} $$i
+				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
+		#done;
 		#${INSTALL_DATA} doc/* ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/ruby/gem.mk"
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index 56a50309f5..8f236ad935 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=simutrans/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.simutrans.com/en/paksets/
-COMMENT=	Game data for Simutrans 
+COMMENT=	Game data for Simutrans
 #LICENSE=	# TODO: (see mk/license.mk)
 
 NO_BUILD=	yes
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 post-extract:
 		${FIND} ${WRKDIR} -type f -exec ${CHMOD} 0644 {} \;
 
-do-install:	
+do-install:
 		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simtrans
 		${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}/share/
 
diff --git a/tetrinet/Makefile b/tetrinet/Makefile
index 0efa4fd4eb..0350401189 100644
--- a/tetrinet/Makefile
+++ b/tetrinet/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	http://tetrinet.or.cz/download/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	david%netbsd-fr.org@localhost
-HOMEPAGE=	${MASTER_SITES}
+HOMEPAGE=	http://tetrinet.or.cz/download/
 COMMENT=	Console tetrinet client
 
 BUILDLINK_TRANSFORM+=	l:ncurses:curses
diff --git a/trac-plugins-SensitiveTickets-svn/Makefile b/trac-plugins-SensitiveTickets-svn/Makefile
index 2bb1ae688a..bf981754d9 100644
--- a/trac-plugins-SensitiveTickets-svn/Makefile
+++ b/trac-plugins-SensitiveTickets-svn/Makefile
@@ -7,7 +7,7 @@ SVN_VERSION=		12834
 DISTNAME=	TracSensitiveTickets-${VERSION}
 PKGNAME=	trac-plugins-SensitiveTickets-${VERSION}
 # Empty PKGREVISION because svn-package by default sets one.
-PKGREVISION=	
+PKGREVISION=
 CATEGORIES=	www
 MASTER_SITES=	# not defined
 
diff --git a/uhd-git/Makefile b/uhd-git/Makefile
index eae9c10491..6444054dc0 100644
--- a/uhd-git/Makefile
+++ b/uhd-git/Makefile
@@ -85,7 +85,7 @@ do-configure:
 post-install:
 	for i in firmware fpga images ; do \
 	  ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\
-	done	
+	done
 
 .include "../../lang/python/application.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/vis-editor/Makefile b/vis-editor/Makefile
index 4f531aa44a..64a10b4070 100644
--- a/vis-editor/Makefile
+++ b/vis-editor/Makefile
@@ -45,7 +45,7 @@ SUBST_STAGE.binary-names=	pre-build
 SUBST_MESSAGE.binary-names=	Fixing binary names.
 SUBST_FILES.binary-names+=	man/*.1
 SUBST_FILES.binary-names+=	lua/plugins/*.lua
-SUBST_FILES.binary-names+=	main.c vis-menu.c vis-registers.c vis.h 
+SUBST_FILES.binary-names+=	main.c vis-menu.c vis-registers.c vis.h
 SUBST_FILES.binary-names+=	vis-complete vis-open
 SUBST_SED.binary-names=		-e 's,'${DISTBASE}'-\(open\),'${PKGBASE}'-\1,g'
 SUBST_SED.binary-names+=	-e 's,'${DISTBASE}'-\(clipboard\),'${PKGBASE}'-\1,g'
diff --git a/xf86-input-mouse-dfbsd/Makefile b/xf86-input-mouse-dfbsd/Makefile
index 0f8a01a03a..611b7d7cd9 100644
--- a/xf86-input-mouse-dfbsd/Makefile
+++ b/xf86-input-mouse-dfbsd/Makefile
@@ -20,9 +20,9 @@ CFLAGS.DragonFly+=	-Wno-array-bounds
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-SUBST_CLASSES+=			freebsdusb 
+SUBST_CLASSES+=			freebsdusb
 SUBST_STAGE.freebsdusb=		post-extract
-SUBST_MESSAGE.freebsdusb=	Patching src/Makefile.in for DragonFly or FreeBSD compatible USB 
+SUBST_MESSAGE.freebsdusb=	Patching src/Makefile.in for DragonFly or FreeBSD compatible USB
 SUBST_FILES.freebsdusb+=	src/Makefile.in
 SUBST_SED.freebsdusb+=		-e 's|-module -avoid-version|-module -avoid-version -lusbhid|'
 .endif
diff --git a/xf86-video-intel-dfbsd/Makefile b/xf86-video-intel-dfbsd/Makefile
index 75323d5b13..9388142fa3 100644
--- a/xf86-video-intel-dfbsd/Makefile
+++ b/xf86-video-intel-dfbsd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.40 2018/03/07 11:57:43 wiz Exp $
 
-# Use the commit id to obtain a snapshot of the form: 
+# Use the commit id to obtain a snapshot of the form:
 # http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/xf86-video-intel-78d7a09b0343829c81257024b164b0b3764392ac.tar.xz
 
 # 2019-03-01 sna: Switch back to hwcursor on the next cursor update
@@ -13,7 +13,7 @@ COMMIT_ID=	6afed33b2d673d88674f0c76efe500ae414e8e1b
 # COMMIT_ID=	33ee0c3b21ea279e08d0863fcb2e874f0974b00e
 
 # 2019-01-10 sna: Switch off old outputs on topology changes
-# COMMIT_ID=	c37c7ee0748ba828ec5d2c7304cd2a17af2c8109	
+# COMMIT_ID=	c37c7ee0748ba828ec5d2c7304cd2a17af2c8109
 
 # 2018-05-12 configure: Set DRI1 to autodiscover
 # COMMIT_ID=	359477215092ac1b602ad1e2f17a28963d9224c2
@@ -53,7 +53,7 @@ CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 CONFIGURE_ENV.DragonFly+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
 
 # DragonFly version 4.6-RELEASE, maybe other versions prior to 4.7
-# need -D_WITH_GETLINE=1 according to: 
+# need -D_WITH_GETLINE=1 according to:
 # https://github.com/DragonFlyBSD/DPorts/issues/184
 # FreeBSD ports now patches files individually.
 # CFLAGS.FreeBSD+=		-D_WITH_GETLINE=1


Home | Main Index | Thread Index | Old Index