pkgsrc-WIP-changes archive

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

wip/e*: fix pkglint indentation warnings



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 20:39:58 2018 +0000
Changeset:	31090b80f07d9e7765e8442f414dde39fbe68adc

Modified Files:
	eboard-extras/Makefile
	ecb/Makefile
	eclipse/Makefile
	edb/Makefile
	edelib/Makefile
	edelib/options.mk
	ekiga/options.mk
	electricsheep/PLIST
	electrum/Makefile
	elementary17/Makefile
	elinks-libmm/options.mk
	elinks-snapshot/Makefile
	elinks-snapshot/options.mk
	elixir/Makefile
	elk/Makefile
	elscreen-git/Makefile
	emacs-git/Makefile
	emacs-git/modules.mk
	emacs-git/options.mk
	emacs-nox11-git/Makefile
	emacs-session/Makefile
	emacs-w3m-cvs/Makefile
	emacs-w3m-cvs/buildlink3.mk
	emboss-base/Makefile.common
	emboss-domainatrix/PLIST
	emboss-mse/Makefile
	emboss/Makefile
	empathy/Makefile
	empathy/buildlink3.mk
	entrance/buildlink3.mk
	eot/Makefile
	epsilon/Makefile
	erlang-basho/Makefile.versions
	erlang15/Makefile.versions
	erlang15/options.mk
	espresso/Makefile
	espresso/PLIST
	etos/Makefile
	evas-software-x11/buildlink3.mk
	evas/Makefile.common
	eventd/Makefile
	ever-note-mode/Makefile
	evolution-rss/Makefile

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

pkglint -Wall -F -o aligned e*/

Several packages have been corrected manually for aesthetic reasons.
Only espresso revealed a bug in pkglint, in the case of a continuation
line that ends in a single totally empty line, followed by another
variable definition.

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

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

diffstat:
 eboard-extras/Makefile          |  2 +-
 ecb/Makefile                    |  4 ++--
 eclipse/Makefile                | 12 ++++++------
 edb/Makefile                    |  2 +-
 edelib/Makefile                 |  4 ++--
 edelib/options.mk               |  4 ++--
 ekiga/options.mk                |  4 ++--
 electricsheep/PLIST             |  6 +++---
 electrum/Makefile               |  2 +-
 elementary17/Makefile           | 10 +++++-----
 elinks-libmm/options.mk         | 24 ++++++++++++------------
 elinks-snapshot/Makefile        | 12 ++++++------
 elinks-snapshot/options.mk      | 18 +++++++++---------
 elixir/Makefile                 | 30 +++++++++++++++---------------
 elk/Makefile                    |  6 +++---
 elscreen-git/Makefile           |  4 ++--
 emacs-git/Makefile              |  2 +-
 emacs-git/modules.mk            |  4 ++--
 emacs-git/options.mk            |  8 ++++----
 emacs-nox11-git/Makefile        |  2 +-
 emacs-session/Makefile          | 16 ++++++++--------
 emacs-w3m-cvs/Makefile          | 10 +++++-----
 emacs-w3m-cvs/buildlink3.mk     |  2 +-
 emboss-base/Makefile.common     |  2 +-
 emboss-domainatrix/PLIST        |  4 ++--
 emboss-mse/Makefile             |  4 ++--
 emboss/Makefile                 |  2 +-
 empathy/Makefile                |  2 +-
 empathy/buildlink3.mk           |  4 ++--
 entrance/buildlink3.mk          |  2 +-
 eot/Makefile                    |  2 +-
 epsilon/Makefile                |  2 +-
 erlang-basho/Makefile.versions  |  2 +-
 erlang15/Makefile.versions      |  4 ++--
 erlang15/options.mk             |  4 ++--
 espresso/Makefile               | 21 ++++++++++-----------
 espresso/PLIST                  | 12 ++++++------
 etos/Makefile                   |  2 +-
 evas-software-x11/buildlink3.mk |  2 +-
 evas/Makefile.common            |  6 +++---
 eventd/Makefile                 | 14 +++++++-------
 ever-note-mode/Makefile         |  4 ++--
 evolution-rss/Makefile          |  2 +-
 43 files changed, 142 insertions(+), 143 deletions(-)

diffs:
diff --git a/eboard-extras/Makefile b/eboard-extras/Makefile
index 3092226c27..1321d182e6 100644
--- a/eboard-extras/Makefile
+++ b/eboard-extras/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.bergo.eng.br/eboard/
 COMMENT=		Extras sets, pieces and sound or eboard
 LICENSE=		gnu-gpl-v2
 
-NO_BUILD=YES
+NO_BUILD=	YES
 
 DISTFILES+=		${EXTRA2}${EXTRACT_SUFX}
 DISTFILES+=		${EXTRA1}${EXTRACT_SUFX}
diff --git a/ecb/Makefile b/ecb/Makefile
index 46b8da0347..d40379823e 100644
--- a/ecb/Makefile
+++ b/ecb/Makefile
@@ -4,14 +4,14 @@
 DISTNAME=		ecb-2.40
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ecb/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ecb/}
 
 MAINTAINER=		pho%cielonegro.org@localhost
 HOMEPAGE=		http://ecb.sourceforge.net/
 COMMENT=		Emacs Code Browser
 LICENSE=		gnu-gpl-v2
 
-USE_TOOLS=      find gmake makeinfo
+USE_TOOLS=		find gmake makeinfo
 INFO_FILES=		yes
 
 MAKE_FLAGS+=		EMACS=${EMACS_BIN}
diff --git a/eclipse/Makefile b/eclipse/Makefile
index 809552a50f..6f7d18f195 100644
--- a/eclipse/Makefile
+++ b/eclipse/Makefile
@@ -11,15 +11,15 @@ HOMEPAGE=	http://www.eclipse.org/
 COMMENT=	Java IDE
 LICENSE=	eclipse-license
 
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14 openjdk7-bin openjdk7
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14 openjdk7-bin openjdk7
 
 MAKE_ENV+=	JAVA_HOME=${PKG_JAVA_HOME}
 
-USE_TOOLS+= perl
-REPLACE_PERL+= plugins/org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl
-REPLACE_PERL+= plugins/org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl
-REPLACE_PERL+= plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl
-REPLACE_PYTHON+= plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
+USE_TOOLS+=		perl
+REPLACE_PERL+=		plugins/org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl
+REPLACE_PERL+=		plugins/org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl
+REPLACE_PERL+=		plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl
+REPLACE_PYTHON+=	plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
 
 # XXX: Others might work but might need significant tweaking
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64 Linux-*-*
diff --git a/edb/Makefile b/edb/Makefile
index e01e18368e..2620bc8dab 100644
--- a/edb/Makefile
+++ b/edb/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+=	pkg-config
 CONFIGURE_ARGS+=	--enable-ncurses
 CONFIGURE_ARGS+=	--enable-cxx
 
-PKG_CFLAGS= 	 	# defined
+PKG_CFLAGS=		# defined
 PKGCONFIG_OVERRIDE+=	edb.pc.in
 
 CHECK_BUILTIN.db1:=	yes
diff --git a/edelib/Makefile b/edelib/Makefile
index e764b5c176..04b46edc84 100644
--- a/edelib/Makefile
+++ b/edelib/Makefile
@@ -25,14 +25,14 @@ PKGCONFIG_OVERRIDE+=	edelib.pc.in
 PKG_OPTIONS_VAR=	PKG_OPTIONS.edelib
 PKG_SUPPORTED_OPTIONS=	largefile nls shared
 PKG_SUGGESTED_OPTIONS=	nls shared
-PLIST_VARS+=	shlibs statlibs
+PLIST_VARS+=		shlibs statlibs
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 # Solaris /bin/sh is really bad, so use TOOLS_PLATFORM.sh if it's been defined.
 .if ${OPSYS} == "SunOS"
-REPLACE_SH+=    autogen.sh configure \
+REPLACE_SH+=	autogen.sh configure \
                 src/tinyscheme/gen-c-string.sh \
                 test/abicheck.sh tools/geniconmap
 .else
diff --git a/edelib/options.mk b/edelib/options.mk
index cdb7f34e3c..1d9380362a 100644
--- a/edelib/options.mk
+++ b/edelib/options.mk
@@ -13,9 +13,9 @@ CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if !empty(PKG_OPTIONS:Mshared)
-PLIST.shlibs=yes
+PLIST.shlibs=		yes
 CONFIGURE_ARGS+=	--enable-shared
 .else
-PLIST.statlibs=yes
+PLIST.statlibs=		yes
 CONFIGURE_ARGS+=	--disable-shared
 .endif
diff --git a/ekiga/options.mk b/ekiga/options.mk
index c22da4e35a..d662205d1e 100644
--- a/ekiga/options.mk
+++ b/ekiga/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.5 2013/11/06 13:31:21 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ekiga
-PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
-PKG_SUGGESTED_OPTIONS+= avahi dbus gconf notify
+PKG_SUPPORTED_OPTIONS+=	avahi dbus evolution-data-server gconf gnome notify
+PKG_SUGGESTED_OPTIONS+=	avahi dbus gconf notify
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/electricsheep/PLIST b/electricsheep/PLIST
index 62675d2138..ab18f27b6d 100644
--- a/electricsheep/PLIST
+++ b/electricsheep/PLIST
@@ -1,12 +1,12 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:34 thomasklausner Exp $
 bin/electricsheep
 bin/electricsheep-voter
-bin/mpeg2dec_onroot
 bin/flam3-animate
 bin/flam3-convert
 bin/flam3-genome
 bin/flam3-render
-share/electricsheep/electricsheep-frown.png
-share/electricsheep/electricsheep-smile.png
+bin/mpeg2dec_onroot
 libexec/xscreensaver/config/electricsheep.xml
 man/man1/electricsheep.1
+share/electricsheep/electricsheep-frown.png
+share/electricsheep/electricsheep-smile.png
diff --git a/electrum/Makefile b/electrum/Makefile
index c38cc8b9cf..694e72cdcb 100644
--- a/electrum/Makefile
+++ b/electrum/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 PYTHON_VERSIONS_ACCEPTED= 27
 NO_BUILD=	yes
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 DEPENDS+=	${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses
 DEPENDS+=	${PYPKGPREFIX}-slowaes-[0-9]*:../../security/py-slowaes
diff --git a/elementary17/Makefile b/elementary17/Makefile
index d8ab40d9f4..e4778aa336 100644
--- a/elementary17/Makefile
+++ b/elementary17/Makefile
@@ -17,12 +17,12 @@ USE_TOOLS+=	autoconf automake gettext gmake pkg-config
 
 PKGCONFIG_OVERRIDE=	elementary.pc.in
 
-pre-configure:
-		cd ${WRKSRC} && ./autogen.sh
+MODULE_ARCH=		${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}-${LOWER_ARCH}
+PLIST_SUBST=		MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=	{ gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
 
-MODULE_ARCH=	${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}-${LOWER_ARCH}
-PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
 
 .include "../../wip/ecore/buildlink3.mk"
 .include "../../wip/eet/buildlink3.mk"
diff --git a/elinks-libmm/options.mk b/elinks-libmm/options.mk
index d4e7813be9..7f0e666f1f 100644
--- a/elinks-libmm/options.mk
+++ b/elinks-libmm/options.mk
@@ -1,21 +1,21 @@
 # $NetBSD: options.mk,v 1.2 2012/06/12 15:46:34 thomasklausner Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.elinks
-PKG_SUPPORTED_OPTIONS+=	bittorrent nntp javascript finger gopher
-PKG_SUPPORTED_OPTIONS+=	inet6 x11 elinks-exmode expat
-PKG_SUPPORTED_OPTIONS+= elinks-html-highlight elinks-root-exec libmm
-PKG_OPTIONS_GROUP.tls=	gnutls ssl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.elinks
+PKG_SUPPORTED_OPTIONS+=		bittorrent nntp javascript finger gopher
+PKG_SUPPORTED_OPTIONS+=		inet6 x11 elinks-exmode expat
+PKG_SUPPORTED_OPTIONS+=		elinks-html-highlight elinks-root-exec libmm
+PKG_OPTIONS_GROUP.tls=		gnutls ssl
 PKG_OPTIONS_REQUIRED_GROUPS=	tls
-PKG_SUGGESTED_OPTIONS=	inet6 ssl libmm
+PKG_SUGGESTED_OPTIONS=		inet6 ssl libmm
 
-PKG_OPTIONS_LEGACY_OPTS= spidermonkey:javascript
+PKG_OPTIONS_LEGACY_OPTS=	spidermonkey:javascript
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
@@ -62,9 +62,9 @@ CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
 .include "../../security/gnutls/buildlink3.mk"
 
-CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
-CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
-CONFIGURE_ARGS+= --without-openssl
+CONFIGURE_ARGS+=	--with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
+CONFIGURE_ARGS+=	--with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
+CONFIGURE_ARGS+=	--without-openssl
 .endif
 
 # Requires fsplib, which is not currently in pkgsrc.
diff --git a/elinks-snapshot/Makefile b/elinks-snapshot/Makefile
index 9ae76c899c..590150bbbb 100644
--- a/elinks-snapshot/Makefile
+++ b/elinks-snapshot/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.11 2015/08/15 22:19:25 atomicules Exp $
 
 DISTNAME=	elinks-current-0.13
-PKGNAME=		elinks-0.13
+PKGNAME=	${DISTNAME:S/-current-/-/}
 
 CATEGORIES=	www
 MASTER_SITES=	http://elinks.or.cz/download/
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	base%atomicules.co.uk@localhost
 HOMEPAGE=	http://elinks.or.cz/download/
 COMMENT=	Extended/Enhanced Links 0.13
@@ -14,11 +14,11 @@ LICENSE=	gnu-gpl-v2
 #NO_CHECKSUM=	Yes
 # Note: the distname stays the same even though the actual dist (checksum) changes every so often
 #       so update the below every time changes occur to the distinfo
-DIST_SUBDIR= elinks-20170813
+DIST_SUBDIR=	elinks-20170813
 
-CONFLICTS+=	elinks-[0-9]*
-LUA_VERSIONS_ACCEPTED=	51
-LUA_VERSIONS_INCOMPATIBLE= 52
+CONFLICTS+=			elinks-[0-9]*
+LUA_VERSIONS_ACCEPTED=		51
+LUA_VERSIONS_INCOMPATIBLE=	52
 
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGBASE}
diff --git a/elinks-snapshot/options.mk b/elinks-snapshot/options.mk
index 01156ca280..b311aff62b 100644
--- a/elinks-snapshot/options.mk
+++ b/elinks-snapshot/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.6 2015/08/12 19:46:44 atomicules Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.elinks
-PKG_SUPPORTED_OPTIONS+=	bittorrent nntp finger gopher
-PKG_SUPPORTED_OPTIONS+=	inet6 x11 elinks-exmode expat
-PKG_SUPPORTED_OPTIONS+= elinks-html-highlight elinks-root-exec
-PKG_SUPPORTED_OPTIONS+=	kerberos
-PKG_SUPPORTED_OPTIONS+=	python
-PKG_OPTIONS_GROUP.tls=	gnutls ssl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.elinks
+PKG_SUPPORTED_OPTIONS+=		bittorrent nntp finger gopher
+PKG_SUPPORTED_OPTIONS+=		inet6 x11 elinks-exmode expat
+PKG_SUPPORTED_OPTIONS+=		elinks-html-highlight elinks-root-exec
+PKG_SUPPORTED_OPTIONS+=		kerberos
+PKG_SUPPORTED_OPTIONS+=		python
+PKG_OPTIONS_GROUP.tls=		gnutls ssl
 PKG_OPTIONS_GROUP.malloc=	boehm-gc elinks-fastmem
 PKG_OPTIONS_REQUIRED_GROUPS=	tls
 PKG_OPTIONS_OPTIONAL_GROUPS=	malloc
-PKG_SUGGESTED_OPTIONS=	ssl elinks-html-highlight elinks-exmode
-PKG_SUGGESTED_OPTIONS+=	expat boehm-gc inet6
+PKG_SUGGESTED_OPTIONS=		ssl elinks-html-highlight elinks-exmode
+PKG_SUGGESTED_OPTIONS+=		expat boehm-gc inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/elixir/Makefile b/elixir/Makefile
index 073796bdd8..5250dcbd24 100644
--- a/elixir/Makefile
+++ b/elixir/Makefile
@@ -1,30 +1,30 @@
 # $NetBSD$
 
-DISTNAME=		elixir-1.5.3
+DISTNAME=	elixir-1.5.3
 PKGREVISION=	1
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_GITHUB:=elixir-lang/}
-EXTRACT_SUFX=		.zip
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GITHUB:=elixir-lang/}
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://elixir-lang.org/
-COMMENT=		Functional, meta-programming aware language built on top of Erlang VM
-LICENSE=		apache-2.0
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://elixir-lang.org/
+COMMENT=	Functional, meta-programming aware language built on top of Erlang VM
+LICENSE=	apache-2.0
 
-GITHUB_TAG=		v${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-DEPENDS+=		erlang>=18.0:../../lang/erlang
+DEPENDS+=	erlang>=18.0:../../lang/erlang
 
-WRKSRC=			${WRKDIR}/${PKGBASE}-${PKGVERSION_NOREV}
+WRKSRC=				${WRKDIR}/${PKGBASE}-${PKGVERSION_NOREV}
 CHECK_INTERPRETER_SKIP+=	bin/mix
 CHECK_INTERPRETER_SKIP+=	lib/elixir/bin/mix
 
 USE_TOOLS+=	gmake gsed
-BUILD_TARGET= compile
+BUILD_TARGET=	compile
 
 .include "../../mk/bsd.pkg.mk"
 
 # These have to be included after bsd.pkg.mk otherwise elixir will warn the locale is set incorrectly as latin1
-MAKE_ENV += LC_CTYPE="en_US.UTF-8"
-MAKE_ENV += LC_LANG="en_US.UTF-8"
-MAKE_ENV += LC_ALL=""
+MAKE_ENV +=	LC_CTYPE="en_US.UTF-8"
+MAKE_ENV +=	LC_LANG="en_US.UTF-8"
+MAKE_ENV +=	LC_ALL=""
diff --git a/elk/Makefile b/elk/Makefile
index 4e4a8d8f5e..5fccaa790d 100644
--- a/elk/Makefile
+++ b/elk/Makefile
@@ -8,15 +8,15 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://elk.sourceforge.net/
-COMMENT= 	All-electron full-potential linearised augmented-planewave
+COMMENT=	All-electron full-potential linearised augmented-planewave
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	gnuplot>=4.2.6:../../graphics/gnuplot
 
 WRKSRC=		${WRKDIR}/elk
 
-MAKE_JOBS_SAFE=NO
-ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-*
+MAKE_JOBS_SAFE=		NO
+ONLY_FOR_PLATFORM=	NetBSD-*-* Linux-*-*
 
 MAKEFILE_FILE=	make.inc
 USE_TOOLS+=	gmake bash:run
diff --git a/elscreen-git/Makefile b/elscreen-git/Makefile
index 5e76fd79ae..340db6324d 100644
--- a/elscreen-git/Makefile
+++ b/elscreen-git/Makefile
@@ -22,8 +22,8 @@ do-build:
 	cd ${WRKSRC} && \
 	${EMACS_BIN} -batch -f batch-byte-compile *.el
 
-INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/elscreen
-INSTALLATION_DIRS+= share/doc/elscreen
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/elscreen
+INSTALLATION_DIRS+=	share/doc/elscreen
 
 do-install:
 .for files in *.el *.elc
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 937316dcdc..3316ab8518 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -50,7 +50,7 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
 CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION_NOREV}
 
-PRINT_PLIST_AWK+=       { gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
+PRINT_PLIST_AWK+=	{ gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
 			gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
 			print; next; }
 
diff --git a/emacs-git/modules.mk b/emacs-git/modules.mk
index 666f6c9247..6495fa8194 100644
--- a/emacs-git/modules.mk
+++ b/emacs-git/modules.mk
@@ -268,8 +268,8 @@ _EMACS_TYPE=	${EMACS_TYPE}
 
 EMACS_VERSIONS_ACCEPTED?=	${_EMACS_VERSIONS_ALL}
 .if empty(EMACS_VERSIONS_ACCEPTED:M${_EMACS_TYPE})
-PKG_FAIL_REASON+=	"Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}"
-PKG_FAIL_REASON+=	"No valid Emacs version installed found"
+PKG_FAIL_REASON+=		"Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}"
+PKG_FAIL_REASON+=		"No valid Emacs version installed found"
 .endif
 
 _EMACS_PKGDIR=	${_EMACS_PKGDIR_MAP:M${_EMACS_TYPE}@*:C|${_EMACS_TYPE}@||}
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index 69dc28d6f0..a1168067f6 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -6,15 +6,15 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs_current
 PKG_SUPPORTED_OPTIONS=	dbus gconf gnutls imagemagick svg xaw3d xft2 xml
 # xaw3d is only valid with tookit = xaw
 
-PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
-PKG_OPTIONS_GROUP.window-system= x11 nextstep
+PKG_OPTIONS_OPTIONAL_GROUPS+=		window-system
+PKG_OPTIONS_GROUP.window-system=	x11 nextstep
 # tempted to have 'nox11' :-)
 
-PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
+PKG_OPTIONS_OPTIONAL_GROUPS+=	toolkit
 #  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk, gtk2,
 #                          gtk3, lucid or athena, motif, no)
 # gtk in next line implies gtk2, xaw = athena = lucid
-PKG_OPTIONS_GROUP.toolkit= gtk motif xaw lucid
+PKG_OPTIONS_GROUP.toolkit=	gtk motif xaw lucid
 # gtk is default in the logic below (even not included in SUGGESTED_=
 # gconf, gtk and xft2 will be ingnored for nextstep even shown as selected.
 
diff --git a/emacs-nox11-git/Makefile b/emacs-nox11-git/Makefile
index 788bb5664d..21b02d1f5e 100644
--- a/emacs-nox11-git/Makefile
+++ b/emacs-nox11-git/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	GNU editing macros (editor, no x11)
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	gmake makeinfo gzip autoconf automake
+USE_TOOLS+=		gmake makeinfo gzip autoconf automake
 # for example, Mac OS X 10.6.1 has 2.61 which fails
 AUTOCONF_REQUIRED=	2.65
 
diff --git a/emacs-session/Makefile b/emacs-session/Makefile
index 6273420b67..fd1f03be93 100644
--- a/emacs-session/Makefile
+++ b/emacs-session/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD: Makefile,v 1.3 2012/09/28 22:07:33 asau Exp $
 #
 
-DISTNAME=		session-2.3
-PKGNAME=		emacs-${DISTNAME}
-CATEGORIES=		misc
+DISTNAME=	session-2.3
+PKGNAME=	emacs-${DISTNAME}
+CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=${PKGBASE}/}
 
-MAINTAINER=		pho%cielonegro.org@localhost
-HOMEPAGE=		http://emacs-session.sourceforge.net/
-COMMENT=		Session Management for Emacs
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pho%cielonegro.org@localhost
+HOMEPAGE=	http://emacs-session.sourceforge.net/
+COMMENT=	Session Management for Emacs
+LICENSE=	gnu-gpl-v2
 
-WRKSRC=			${WRKDIR}/session
+WRKSRC=		${WRKDIR}/session
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS+=		${EMACS_LISPPREFIX}
diff --git a/emacs-w3m-cvs/Makefile b/emacs-w3m-cvs/Makefile
index 3aec4a279a..7a18420e6a 100644
--- a/emacs-w3m-cvs/Makefile
+++ b/emacs-w3m-cvs/Makefile
@@ -24,10 +24,10 @@ CVS_ROOT.emacs-w3m=	:pserver:anonymous:@cvs.namazu.org:/storage/cvsroot
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN}
-CONFIGURE_ARGS+=--with-icondir=${ICONDIR}
-CONFIGURE_ARGS+=--infodir=${PREFIX}/info
-BUILD_TARGET=	default
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_BIN}
+CONFIGURE_ARGS+=	--with-icondir=${ICONDIR}
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+BUILD_TARGET=		default
 INSTALL_TARGET=		install install-icons install-icons30
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
@@ -37,7 +37,7 @@ WRKSRC=			${WRKDIR}/emacs-w3m
 
 PLIST_SUBST+=		ETCDIR=${ETCDIR}
 
-SUBST_CLASSES+=	fix-icondir
+SUBST_CLASSES+=			fix-icondir
 SUBST_STAGE.fix-icondir=	pre-configure
 SUBST_FILES.fix-icondir=	Makefile.in w3m.el w3mhack.el
 SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g'
diff --git a/emacs-w3m-cvs/buildlink3.mk b/emacs-w3m-cvs/buildlink3.mk
index c02b34649a..33a1093dac 100644
--- a/emacs-w3m-cvs/buildlink3.mk
+++ b/emacs-w3m-cvs/buildlink3.mk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	emacs-w3m
 EMACS_W3M_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.emacs-w3m+=	${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4.50
-BUILDLINK_PKGSRCDIR.emacs-w3m?=	../../wip/emacs-w3m-current
+BUILDLINK_PKGSRCDIR.emacs-w3m?=		../../wip/emacs-w3m-current
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=	${EGREP} '.*\.el$$|.*\.elc$$'
 .endif # EMACS_W3M_BUILDLINK3_MK
diff --git a/emboss-base/Makefile.common b/emboss-base/Makefile.common
index 9aa48775c9..375d563f3d 100644
--- a/emboss-base/Makefile.common
+++ b/emboss-base/Makefile.common
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--infodir=${PREFIX}/doc
 CONFIGURE_ARGS+=	--with-pngdriver=${BUILDLINK_PREFIX.png}/lib
 
 PKG_DISTFILES_DIR=	emboss
-AUTO_MKDIRS=	yes
+AUTO_MKDIRS=		yes
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/emboss-domainatrix/PLIST b/emboss-domainatrix/PLIST
index 8c58a67390..5333c3740f 100644
--- a/emboss-domainatrix/PLIST
+++ b/emboss-domainatrix/PLIST
@@ -31,12 +31,12 @@ share/EMBOSS/acd/fraggle.acd
 share/EMBOSS/acd/hetparse.acd
 share/EMBOSS/acd/hmmgen.acd
 share/EMBOSS/acd/interface.acd
-share/EMBOSS/acd/pdbparse.acd
 share/EMBOSS/acd/libscan.acd
-share/EMBOSS/acd/rocplot.acd
+share/EMBOSS/acd/pdbparse.acd
 share/EMBOSS/acd/pdbplus.acd
 share/EMBOSS/acd/pdbtosp.acd
 share/EMBOSS/acd/profgen.acd
+share/EMBOSS/acd/rocplot.acd
 share/EMBOSS/acd/scopalign.acd
 share/EMBOSS/acd/scopnr.acd
 share/EMBOSS/acd/scopparse.acd
diff --git a/emboss-mse/Makefile b/emboss-mse/Makefile
index f507a0f65b..135dc2ca76 100644
--- a/emboss-mse/Makefile
+++ b/emboss-mse/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Multiple Sequence Editor for EMBOSS
 #mse.c 148  __Cols=Display->_maxx;
 #mse.c 149  __Rows=Display->_maxy;
 USE_NCURSES=	yes
-DIST_SUBDIR=		emboss/mse-1.0.0-20041107
-BUILD_TARGET=		#empty
+DIST_SUBDIR=	emboss/mse-1.0.0-20041107
+BUILD_TARGET=	#empty
 
 pre-configure:
 	${SED} -e 's|@EMBOSSLIB@|${PREFIX}/lib|' \
diff --git a/emboss/Makefile b/emboss/Makefile
index b703a89a2b..4b4ba63db6 100644
--- a/emboss/Makefile
+++ b/emboss/Makefile
@@ -10,7 +10,7 @@ DISTFILES=		#empty
 
 MAINTAINER=		dprice%cs.nmsu.edu@localhost
 HOMEPAGE=		http://emboss.sourceforge.net/
-COMMENT=	European Molecular Biology Open Software Suite
+COMMENT=		European Molecular Biology Open Software Suite
 
 DEPENDS+=		emboss-base>=2.9.0:../../wip/emboss-base
 DEPENDS+=		emboss-domainatrix>=1.0.0:../../wip/emboss-domainatrix
diff --git a/empathy/Makefile b/empathy/Makefile
index 43183c8100..44cbeb02fc 100644
--- a/empathy/Makefile
+++ b/empathy/Makefile
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ENV+=		YELL_CFLAGS=-I${WRKSRC}/telepathy-yell
 CONFIGURE_ENV+=	\
-  YELL_LIBS="-L${WRKSRC}/telepathy-yell/telepathy-yell -ltelepathy-yell"
+	YELL_LIBS="-L${WRKSRC}/telepathy-yell/telepathy-yell -ltelepathy-yell"
 
 # see pkgsrc/security/mozilla-rootcerts-openssl
 CONFIGURE_ARGS+=	--with-ca-file=/etc/ssl/certs/ca-certificates.crt
diff --git a/empathy/buildlink3.mk b/empathy/buildlink3.mk
index 309de61b50..ff3a6b0989 100644
--- a/empathy/buildlink3.mk
+++ b/empathy/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	empathy
 .if !defined(EMPATHY_BUILDLINK3_MK)
 EMPATHY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.empathy+= empathy>=3.12.10
-BUILDLINK_PKGSRCDIR.empathy?=   ../../wip/empathy
+BUILDLINK_API_DEPENDS.empathy+=	empathy>=3.12.10
+BUILDLINK_PKGSRCDIR.empathy?=	../../wip/empathy
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../wip/evolution-data-server/buildlink3.mk"
diff --git a/entrance/buildlink3.mk b/entrance/buildlink3.mk
index 09bdb490d4..d090eac3b9 100644
--- a/entrance/buildlink3.mk
+++ b/entrance/buildlink3.mk
@@ -7,7 +7,7 @@ ENTRANCE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.entrance+=	entrance>=0.9.9.042nb1
 BUILDLINK_ABI_DEPENDS.entrance?=	entrance>=0.9.9.050nb3
-BUILDLINK_PKGSRCDIR.entrance?=	../../wip/entrance
+BUILDLINK_PKGSRCDIR.entrance?=		../../wip/entrance
 
 .include	"../../wip/ecore/buildlink3.mk"
 .include	"../../graphics/evas/buildlink3.mk"
diff --git a/eot/Makefile b/eot/Makefile
index d0d05c8518..32b7190517 100644
--- a/eot/Makefile
+++ b/eot/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 
 REPLACE_PERL=	eot
 
-NO_BUILD=	yes
+NO_BUILD=		yes
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/epsilon/Makefile b/epsilon/Makefile
index f0810a083a..25c360d779 100644
--- a/epsilon/Makefile
+++ b/epsilon/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Small, display independent, and quick thumbnailing library
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS=	gmake pkg-config
-CONFIGURE_ARGS=		--enable-thumbnailer-xine
+CONFIGURE_ARGS=	--enable-thumbnailer-xine
 
 .include "../../wip/ecore/buildlink3.mk"
 .include "../../wip/edje/buildlink3.mk"
diff --git a/erlang-basho/Makefile.versions b/erlang-basho/Makefile.versions
index d5b5ffb2e9..bf1d42a37a 100644
--- a/erlang-basho/Makefile.versions
+++ b/erlang-basho/Makefile.versions
@@ -65,7 +65,7 @@ _VERSIONS=					\
 PLIST_SUBST+=		VERSION=${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D_basho${DIST_VERSION_MINOR}}
 
 .for name version in ${_VERSIONS}
-VERSION.${name}=${version}
+VERSION.${name}=	${version}
 PLIST_SUBST+=		VERSION.${name}=${version}
 .endfor
 
diff --git a/erlang15/Makefile.versions b/erlang15/Makefile.versions
index e9aae328c6..9d60aa0eec 100644
--- a/erlang15/Makefile.versions
+++ b/erlang15/Makefile.versions
@@ -66,8 +66,8 @@ _VERSIONS=					\
 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 
 .for name version in ${_VERSIONS}
-VERSION.${name}=${version}
-PLIST_SUBST+=	VERSION.${name}=${version}
+VERSION.${name}=	${version}
+PLIST_SUBST+=		VERSION.${name}=${version}
 .endfor
 
 # Generate PLIST
diff --git a/erlang15/options.mk b/erlang15/options.mk
index c5e437ac12..9fdac21906 100644
--- a/erlang15/options.mk
+++ b/erlang15/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.2 2015/02/24 08:54:28 fhajny Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.erlang
-PKG_SUPPORTED_OPTIONS=	java erlang-hipe
+PKG_OPTIONS_VAR=		PKG_OPTIONS.erlang
+PKG_SUPPORTED_OPTIONS=		java erlang-hipe
 PKG_OPTIONS_OPTIONAL_GROUPS=	odbc
 PKG_OPTIONS_GROUP.odbc=		iodbc unixodbc
 
diff --git a/espresso/Makefile b/espresso/Makefile
index 9a22e2f0f7..f795c1e9b6 100644
--- a/espresso/Makefile
+++ b/espresso/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	espresso-5.0.2
 CATEGORIES=	science
 MASTER_SITES=	http://qe-forge.org/gf/download/frsrelease/116/403/
 # FIXME: Fetch only what's being built
-DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
                 SaX-2.0.2.tar.gz \
                 ${PLUGINS_DISTFILES}
 
@@ -23,10 +23,10 @@ USE_LANGUAGES=	c fortran
 
 # Adding -traditional to CPPFLAGS causes conftests to fail for gcc
 # CPPFLAGS+=	-P
-SUBST_CLASSES+=	cpp
-SUBST_STAGE.cpp=post-configure
-SUBST_FILES.cpp=make.sys
-SUBST_SED.cpp=	-e 's|CPPFLAGS[ \t]*=|CPPFLAGS = -P -traditional|g'
+SUBST_CLASSES+=		cpp
+SUBST_STAGE.cpp=	post-configure
+SUBST_FILES.cpp=	make.sys
+SUBST_SED.cpp=		-e 's|CPPFLAGS[ \t]*=|CPPFLAGS = -P -traditional|g'
 
 # Slave packages for gui xspectra gipaw w90 want yambo?
 # Some could be independent packages?
@@ -43,12 +43,11 @@ BUILD_TARGET=	all links
 
 # install/plugins_list
 PLUGINS_DISTFILES= \
-                atomic-5.0.2.tar.gz \
-                pwcond-5.0.2.tar.gz \
-                neb-5.0.2.tar.gz \
-                PHonon-5.0.2.tar.gz \
-                tddfpt-5.0.2.tar.gz \
-
+	atomic-5.0.2.tar.gz \
+	pwcond-5.0.2.tar.gz \
+	neb-5.0.2.tar.gz \
+	PHonon-5.0.2.tar.gz \
+	tddfpt-5.0.2.tar.gz
 DIST_SUBDIR=	espresso
 
 MASTER_SITES_BASE=	http://www.qe-forge.org/gf/download/frsrelease
diff --git a/espresso/PLIST b/espresso/PLIST
index 6fcbfcd91f..aa3ca2eedf 100644
--- a/espresso/PLIST
+++ b/espresso/PLIST
@@ -1,11 +1,11 @@
 @comment $NetBSD: PLIST,v 1.1 2015/02/05 20:06:43 outpaddling Exp $
 bin/average.x
 bin/band_plot.x
-bin/bands_FS.x
 bin/bands.x
+bin/bands_FS.x
 bin/bgw2pw.x
-bin/cppp.x
 bin/cp.x
+bin/cppp.x
 bin/d3.x
 bin/dist.x
 bin/dos.x
@@ -16,8 +16,8 @@ bin/fqha.x
 bin/generate_vdW_kernel_table.x
 bin/initial_state.x
 bin/iotk
-bin/iotk_print_kinds.x
 bin/iotk.x
+bin/iotk_print_kinds.x
 bin/kpoints.x
 bin/kvecs_FS.x
 bin/lambda.x
@@ -26,8 +26,8 @@ bin/matdyn.x
 bin/neb.x
 bin/path_interpolation.x
 bin/pawplot.x
-bin/phcg.x
 bin/ph.x
+bin/phcg.x
 bin/plan_avg.x
 bin/plotband.x
 bin/plotproj.x
@@ -35,13 +35,13 @@ bin/plotrho.x
 bin/pmw.x
 bin/pp.x
 bin/projwfc.x
+bin/pw.x
 bin/pw2bgw.x
 bin/pw2gw.x
 bin/pw2wannier90.x
-bin/pwcond.x
 bin/pw_export.x
+bin/pwcond.x
 bin/pwi2xsf.x
-bin/pw.x
 bin/q2qstar.x
 bin/q2r.x
 bin/sumpdos.x
diff --git a/etos/Makefile b/etos/Makefile
index 8ad0ae9313..be3d1f9ec5 100644
--- a/etos/Makefile
+++ b/etos/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yesUSE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
-GCC_REQD+=          4.2
+GCC_REQD+=	4.2
 
 
 .include "../../graphics/glut/buildlink3.mk"
diff --git a/evas-software-x11/buildlink3.mk b/evas-software-x11/buildlink3.mk
index dac68d0aa9..2592dcfc3c 100644
--- a/evas-software-x11/buildlink3.mk
+++ b/evas-software-x11/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	evas-software-x11
 EVAS_SOFTWARE_X11_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-software-x11+=	evas-software-x11>=1.7.0
-BUILDLINK_PKGSRCDIR.evas-software-x11?=	../../wip/evas-software-x11
+BUILDLINK_PKGSRCDIR.evas-software-x11?=		../../wip/evas-software-x11
 
 .include "../../x11/libX11/buildlink3.mk"
 .endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK
diff --git a/evas/Makefile.common b/evas/Makefile.common
index 2f3cb8c632..f50a701195 100644
--- a/evas/Makefile.common
+++ b/evas/Makefile.common
@@ -46,8 +46,8 @@ CONFIGURE_ARGS+=	--disable-image-loader-${mod}
 CONFIGURE_ARGS+=	--enable-cpu-altivec
 .endif
 
-MODULE_ARCH=	${LOWER_OPSYS}${APPEND_ELF}-${LOWER_ARCH}-${EVAS_VERSION}
-PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+MODULE_ARCH=		${LOWER_OPSYS}${APPEND_ELF}-${LOWER_ARCH}-${EVAS_VERSION}
+PLIST_SUBST=		MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=	{ gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
 
 MAKE_FLAGS+=	MODULE_ARCH=${MODULE_ARCH}
diff --git a/eventd/Makefile b/eventd/Makefile
index ca2190551f..c1944480a8 100644
--- a/eventd/Makefile
+++ b/eventd/Makefile
@@ -20,13 +20,13 @@ PKGCONFIG_OVERRIDE+=	server/libeventd/pkgconfig/libeventd.pc.in
 PKGCONFIG_OVERRIDE+=	server/libeventd/pkgconfig/libeventd-protocol-json.pc.in
 PKGCONFIG_OVERRIDE+=	server/libeventd-plugin/pkgconfig/libeventd-plugin.pc.in
 
-CONFIGURE_ARGS+= --disable-introspection
-CONFIGURE_ARGS+= --disable-websocket
-CONFIGURE_ARGS+= --disable-dns-sd
-CONFIGURE_ARGS+= --disable-ssdp
-CONFIGURE_ARGS+= --disable-nd-wayland
-CONFIGURE_ARGS+= --disable-im
-CONFIGURE_ARGS+= --disable-sound
+CONFIGURE_ARGS+=	--disable-introspection
+CONFIGURE_ARGS+=	--disable-websocket
+CONFIGURE_ARGS+=	--disable-dns-sd
+CONFIGURE_ARGS+=	--disable-ssdp
+CONFIGURE_ARGS+=	--disable-nd-wayland
+CONFIGURE_ARGS+=	--disable-im
+CONFIGURE_ARGS+=	--disable-sound
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.12.0
diff --git a/ever-note-mode/Makefile b/ever-note-mode/Makefile
index b2eb1ed5ad..76a3a28a97 100644
--- a/ever-note-mode/Makefile
+++ b/ever-note-mode/Makefile
@@ -20,9 +20,9 @@ DOCSDIR=		${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS=	${DOCSDIR} \
 			${EMACS_LISPPREFIX}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/ruby
+WRKSRC=			${WRKDIR}/${DISTNAME}/ruby
 RUBY_VERSION_SUPPORTED=	21 # xxx untested
-USE_RUBY_SETUP=	YES
+USE_RUBY_SETUP=		YES
 
 DOCUMENTS=	readme_en.txt \
 		readme_en.html \
diff --git a/evolution-rss/Makefile b/evolution-rss/Makefile
index 39f42e61df..5e848ba3f5 100644
--- a/evolution-rss/Makefile
+++ b/evolution-rss/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://gnome.eu.org/
 MAINTAINER=	pkgsrc.gnome%gmail.com@localhost
 HOMEPAGE=	http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 COMMENT=	Evolution rss reader plugin
-LICENSE=		gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	gsed>=:../../textproc/gsed
 


Home | Main Index | Thread Index | Old Index