pkgsrc-WIP-changes archive

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

wip/*: reindent Makefile conditionals and includes



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sun Jan 28 20:46:25 2018 +0000
Changeset:	cef9950b7035680e6481757c44735be5366c345a

Modified Files:
	MesaLib-dfbsd/buildlink3.mk
	MesaLib-dfbsd/dri.mk
	MesaLib-dfbsd/options.mk
	MesaLib/buildlink3.mk
	MesaLib/dri.mk
	MesaLib/options.mk
	audit-system/Makefile
	cardpeek/Makefile
	clementine/options.mk
	cygwin/Makefile.common
	davical-git/Makefile
	emacs-git/modules.mk
	emacs-git/options.mk
	evolution-rss/options.mk
	ffmpeg-git/buildlink3.mk
	firefox-dfbsd/mozilla-common.mk
	firefox-dfbsd/options.mk
	firefox-hg/options.mk
	firefox-webrtc/options.mk
	firefox/options.mk
	fricas-svn/Makefile
	fricas-svn/options.mk
	gcc42/buildlink3.mk
	gcc43/buildlink3.mk
	gcc44/Makefile
	gcc45/Makefile
	gcc46/Makefile
	gcc47/options.mk
	ghostscript-cidfonts-ryumin/Makefile
	gnokii/buildlink3.mk
	gnokii/options.mk
	grass/options.mk
	gretl/options.mk
	icecat/options.mk
	ices/Makefile
	jlibtool/Makefile
	libbsd/Makefile.common
	libbsd/buildlink3.mk
	libretro-glsl-shaders/Makefile
	libtermkey/options.mk
	linphone/Makefile
	llvm-all-in-one/buildlink3.mk
	llvm-git/buildlink3.mk
	llvm-netbsd/buildlink3.mk
	modular-xorg-server-dfbsd/options.mk
	mplayer-mt/options.mk
	mplayer-snapshot-share/options.mk
	mtr-graph/options.mk
	nag/Makefile
	neovim-git/options.mk
	nsp/options.mk
	openaxiom-svn/options.mk
	openca/Makefile
	openssh/Makefile
	openssh/options.mk
	openssl110/buildlink3.mk
	pulseaudio-git/buildlink3.mk
	qupzilla/options.mk
	ratproxy/hacks.mk
	retroarch-assets/Makefile
	retroarch/options.mk
	rust/Makefile
	scilab/Makefile
	sendmailX/options.mk
	varnish-modules/Makefile
	xf86-input-mouse-dfbsd/options.mk
	xmail/Makefile
	xmlformat-docs/Makefile

Log Message:
wip/*: reindent Makefile conditionals and includes

pkglint -Wall -F -o "indent" -r

The pkglint version used is b3814c4cee, which is somewhere between
version 5.5.2 and 5.5.3.

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

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

diffstat:
 MesaLib-dfbsd/buildlink3.mk          |   4 +-
 MesaLib-dfbsd/dri.mk                 |  46 +++---
 MesaLib-dfbsd/options.mk             |  84 +++++-----
 MesaLib/buildlink3.mk                |   4 +-
 MesaLib/dri.mk                       |  54 +++----
 MesaLib/options.mk                   |  50 +++---
 audit-system/Makefile                |   4 +-
 cardpeek/Makefile                    |   4 +-
 clementine/options.mk                |  14 +-
 cygwin/Makefile.common               |   4 +-
 davical-git/Makefile                 |   8 +-
 emacs-git/modules.mk                 |   4 +-
 emacs-git/options.mk                 |   6 +-
 evolution-rss/options.mk             |   4 +-
 ffmpeg-git/buildlink3.mk             |   2 +-
 firefox-dfbsd/mozilla-common.mk      |   4 +-
 firefox-dfbsd/options.mk             |  10 +-
 firefox-hg/options.mk                |  10 +-
 firefox-webrtc/options.mk            |  10 +-
 firefox/options.mk                   |  10 +-
 fricas-svn/Makefile                  |   4 +-
 fricas-svn/options.mk                |  12 +-
 gcc42/buildlink3.mk                  |  20 +--
 gcc43/buildlink3.mk                  |  20 +--
 gcc44/Makefile                       |  10 +-
 gcc45/Makefile                       |   6 +-
 gcc46/Makefile                       |   6 +-
 gcc47/options.mk                     |   4 +-
 ghostscript-cidfonts-ryumin/Makefile |  12 +-
 gnokii/buildlink3.mk                 |   4 +-
 gnokii/options.mk                    |   4 +-
 grass/options.mk                     |   4 +-
 gretl/options.mk                     |   6 +-
 icecat/options.mk                    |   4 +-
 ices/Makefile                        |   2 +-
 jlibtool/Makefile                    |   8 +-
 libbsd/Makefile.common               |   4 +-
 libbsd/buildlink3.mk                 |   4 +-
 libretro-glsl-shaders/Makefile       |   4 +-
 libtermkey/options.mk                |   8 +-
 linphone/Makefile                    |   4 +-
 llvm-all-in-one/buildlink3.mk        |   4 +-
 llvm-git/buildlink3.mk               |   4 +-
 llvm-netbsd/buildlink3.mk            |   4 +-
 modular-xorg-server-dfbsd/options.mk |   6 +-
 mplayer-mt/options.mk                | 274 ++++++++++++++++----------------
 mplayer-snapshot-share/options.mk    | 294 +++++++++++++++++------------------
 mtr-graph/options.mk                 |   4 +-
 nag/Makefile                         |   4 +-
 neovim-git/options.mk                |  14 +-
 nsp/options.mk                       |  10 +-
 openaxiom-svn/options.mk             |   8 +-
 openca/Makefile                      |   4 +-
 openssh/Makefile                     |   6 +-
 openssh/options.mk                   |   4 +-
 openssl110/buildlink3.mk             |   2 +-
 pulseaudio-git/buildlink3.mk         |   2 +-
 qupzilla/options.mk                  |   6 +-
 ratproxy/hacks.mk                    |   6 +-
 retroarch-assets/Makefile            |   4 +-
 retroarch/options.mk                 |   6 +-
 rust/Makefile                        |   4 +-
 scilab/Makefile                      |   2 +-
 sendmailX/options.mk                 |   4 +-
 varnish-modules/Makefile             |   2 +-
 xf86-input-mouse-dfbsd/options.mk    |   6 +-
 xmail/Makefile                       |  14 +-
 xmlformat-docs/Makefile              |   4 +-
 68 files changed, 594 insertions(+), 594 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd/buildlink3.mk b/MesaLib-dfbsd/buildlink3.mk
index 065162df3f..c02f39cd36 100644
--- a/MesaLib-dfbsd/buildlink3.mk
+++ b/MesaLib-dfbsd/buildlink3.mk
@@ -14,9 +14,9 @@ BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 .if ${X11_TYPE} == "modular"
 BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=13
 # This is needed to avoid linking conflicting libstdc++ versions
-.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
+.  if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
 GCC_REQD+=	4.2
-.endif
+.  endif
 .endif
 
 # See <http://developer.apple.com/qa/qa2007/qa1567.html>.
diff --git a/MesaLib-dfbsd/dri.mk b/MesaLib-dfbsd/dri.mk
index 55de43b06b..9027c88170 100644
--- a/MesaLib-dfbsd/dri.mk
+++ b/MesaLib-dfbsd/dri.mk
@@ -5,38 +5,38 @@
 .if !defined(DRI_MK)
 DRI_MK=		# defined
 
-.  if !defined(USE_BUILTIN.MesaLib)
+.if !defined(USE_BUILTIN.MesaLib)
 CHECK_BUILTIN.MesaLib:=	yes
-.    include "../../graphics/MesaLib/builtin.mk"
+.  include "../../graphics/MesaLib/builtin.mk"
 CHECK_BUILTIN.MesaLib:=	no
-.  endif
+.endif
 
-.  if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+.if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
 BUILDLINK_API_DEPENDS.dri2proto+=	dri2proto>=2.1
 BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.11
-.    if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.60
-.    endif
-.    if ${OPSYS} == "Linux"
+.  endif
+.  if ${OPSYS} == "Linux"
 BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
-.    endif
 .  endif
-.  include "../../textproc/expat/buildlink3.mk"
-.  include "../../x11/dri2proto/buildlink3.mk"
+.endif
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
 # XXX these do not have builtin.mk
-.  if ${X11_TYPE} == "modular"
+.if ${X11_TYPE} == "modular"
 # Change to option to include in options.mk
 # .    include "../../x11/dri3proto/buildlink3.mk"
-.    include "../../x11/libxshmfence/buildlink3.mk"
-.    include "../../x11/presentproto/buildlink3.mk"
-.  endif
-.  include "../../x11/glproto/buildlink3.mk"
-.  include "../../x11/libXdamage/buildlink3.mk"
-.  include "../../x11/libXfixes/buildlink3.mk"
-.  include "../../x11/libXxf86vm/buildlink3.mk"
-.  if ${OPSYS} != "Darwin"
-.    include "../../x11/libdrm/buildlink3.mk"
-.  endif
-.  include "../../x11/xf86driproto/buildlink3.mk"
-.  include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.  include "../../x11/libxshmfence/buildlink3.mk"
+.  include "../../x11/presentproto/buildlink3.mk"
+.endif
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/libdrm/buildlink3.mk"
+.endif
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .endif
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index cc516cccb0..8053660901 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -55,20 +55,20 @@ PLIST_VARS+=	osmesa xvmc
 CONFIGURE_ARGS+=	--enable-dri
 CONFIGURE_ARGS+=	--enable-egl
 
-.if !empty(PKG_OPTIONS:Mdri3)
+.  if !empty(PKG_OPTIONS:Mdri3)
 CFLAGS+=		-DHAVE_DRI3
 CONFIGURE_ARGS+=	--enable-dri3
-.if ${X11_TYPE} == "modular"
+.    if ${X11_TYPE} == "modular"
 .include "../../x11/dri3proto/buildlink3.mk"
-.endif
-.else
+.    endif
+.  else
 CONFIGURE_ARGS+=	--disable-dri3
-.endif
+.  endif
 
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=	--enable-gbm
 PLIST.gbm=		yes
-.endif
+.  endif
 
 CONFIGURE_ARGS+=	--enable-texture-float
 CONFIGURE_ARGS+=	--enable-osmesa
@@ -76,46 +76,46 @@ PLIST.osmesa=		yes
 CONFIGURE_ARGS+=	--enable-gles1
 CONFIGURE_ARGS+=	--enable-gles2
 
-.if !empty(PKG_OPTIONS:Mvdpau)
+.  if !empty(PKG_OPTIONS:Mvdpau)
 .include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
+.    if ${VDPAU_AVAILABLE} == "yes"
 PLIST.vdpau=   yes
 .include "../../multimedia/libvdpau/buildlink3.mk"
-.endif
-.endif
+.    endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mvaapi)
+.  if !empty(PKG_OPTIONS:Mvaapi)
 .include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
+.    if ${VAAPI_AVAILABLE} == "yes"
 PLIST.vaapi=   yes
 .include "../../multimedia/libva/buildlink3.mk"
-.endif
-.endif
+.    endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mglamor)
+.  if !empty(PKG_OPTIONS:Mglamor)
 
 # Recommended by
 # http://www.freedesktop.org/wiki/Software/Glamor/
 CONFIGURE_ARGS+=	--enable-glx-tls
 
-.else
+.  else
 
 # (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
 # /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model
 # initial-exec and dlopen is not supported
 CONFIGURE_ARGS+=	--disable-glx-tls
 
-.endif
+.  endif
 
 # DRI on Linux needs either sysfs or udev
 CONFIGURE_ARGS.Linux+=	--enable-sysfs
 
 PLIST.dri=	yes
 
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 BUILDLINK_DEPMETHOD.libpciaccess=	full
 .include "../../sysutils/libpciaccess/buildlink3.mk"
-.endif
+.  endif
 .include "../../graphics/MesaLib/dri.mk"
 
 DRI_DRIVERS=		#
@@ -124,13 +124,13 @@ GALLIUM_DRIVERS=	#
 # Software rasterizer
 PLIST.swrast_dri=	yes
 DRI_DRIVERS+=		swrast
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 PLIST.swrast=		yes
 GALLIUM_DRIVERS+=	swrast
-.endif
+.  endif
 
 # x86 only drivers
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+.  if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
 # svga / VMWare driver
 PLIST.svga=		yes
 GALLIUM_DRIVERS+=	svga
@@ -148,10 +148,10 @@ DRI_DRIVERS+=		i915
 
 PLIST.i965_dri=		yes
 DRI_DRIVERS+=		i965
-.endif
+.  endif
 
 # ARM drivers
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 # Qualcomm SnapDragon, libdrm_freedreno.pc
 GALLIUM_DRIVERS+=	freedreno
 PLIST.freedreno=	yes
@@ -159,17 +159,17 @@ PLIST.freedreno=	yes
 # Broadcom VideoCore 4
 GALLIUM_DRIVERS+=	vc4
 PLIST.vc4=		yes
-.endif
+.  endif
 
 # qemu Linux guest driver
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.  if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 # XXX test this
 #GALLIUM_DRIVERS+=	virgl
 #PLIST.virgl=		yes
-.endif
+.  endif
 
 # theoretically cross platform PCI drivers, but don't build on ARM
-.if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+.  if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 
 # AMD Radeon r600
 PLIST.r600=		yes
@@ -179,11 +179,11 @@ FULL_OS_VERSION_CMD=	${UNAME} -r
 FULL_OS_VERSION=	${FULL_OS_VERSION_CMD:sh}
 
 # Base llvm 3.9.x has problems building nouveau support
-.if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
+.    if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
 # nVidia
 PLIST.nouveau=		yes
 GALLIUM_DRIVERS+=	nouveau
-.endif
+.    endif
 
 # classic DRI radeon
 PLIST.radeon_dri=	yes
@@ -194,27 +194,27 @@ PLIST.r200_dri=		yes
 DRI_DRIVERS+=		r200
 
 # Base llvm 3.9.x has problems building nouveau support
-.if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
+.    if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
 # classic DRI nouveau
 PLIST.nouveau_dri=	yes
 DRI_DRIVERS+=		nouveau
-.endif
-.endif
+.    endif
+.  endif
 
-.if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-egl-platforms=x11
 #.elif ${OPSYS} == "Linux"
 #.include "../../wip/wayland/buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm,wayland
 #PLIST.wayland=		yes
-.else
+.  else
 CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm
-.endif
+.  endif
 
 CONFIGURE_ARGS+=	--with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
 CONFIGURE_ARGS+=	--with-dri-drivers=${DRI_DRIVERS:ts,}
 
-.if !empty(PKG_OPTIONS:Mllvm)
+.  if !empty(PKG_OPTIONS:Mllvm)
 # XA is useful for accelerating xf86-video-vmware
 CONFIGURE_ARGS+=	--enable-xa
 PLIST.xatracker=	yes
@@ -232,12 +232,12 @@ CPPFLAGS+=		-I${BUILDLINK_PREFIX.libelf}/include/libelf
 BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=4.0
 .include "../../lang/libLLVM/buildlink3.mk"
 CONFIGURE_ENV+=		ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else # !llvm
+.  else # !llvm
 CONFIGURE_ARGS+=	--disable-xa
 CONFIGURE_ARGS+=	--disable-gallium-llvm
 CONFIGURE_ARGS+=	--disable-llvm-shared-libs
 # CONFIGURE_ARGS+=	--disable-r600-llvm-compiler
-.endif # llvm
+.  endif # llvm
 .else # !dri
 CONFIGURE_ARGS+=	--with-gallium-drivers=
 CONFIGURE_ARGS+=	--with-dri-drivers=
@@ -248,9 +248,9 @@ CONFIGURE_ARGS+=	--disable-gbm
 CONFIGURE_ARGS+=	--disable-gles1
 CONFIGURE_ARGS+=	--disable-gles2
 CONFIGURE_ARGS+=	--enable-xlib-glx
-.if !empty(PKG_OPTIONS:Mllvm)
+.  if !empty(PKG_OPTIONS:Mllvm)
 PKG_FAIL_REASON+=	"The llvm PKG_OPTION must also be disabled when dri is disabled"
-.endif
+.  endif
 .endif # dri
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/MesaLib/buildlink3.mk b/MesaLib/buildlink3.mk
index 3fff25bfaf..d2636f568e 100644
--- a/MesaLib/buildlink3.mk
+++ b/MesaLib/buildlink3.mk
@@ -14,9 +14,9 @@ BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 .if ${X11_TYPE} == "modular"
 BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=13
 # This is needed to avoid linking conflicting libstdc++ versions
-.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
+.  if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
 GCC_REQD+=	4.2
-.endif
+.  endif
 .endif
 
 # See <http://developer.apple.com/qa/qa2007/qa1567.html>.
diff --git a/MesaLib/dri.mk b/MesaLib/dri.mk
index 68eb95d093..8e09a642cb 100644
--- a/MesaLib/dri.mk
+++ b/MesaLib/dri.mk
@@ -5,40 +5,40 @@
 .if !defined(DRI_MK)
 DRI_MK=		# defined
 
-.  if !defined(USE_BUILTIN.MesaLib)
+.if !defined(USE_BUILTIN.MesaLib)
 CHECK_BUILTIN.MesaLib:=	yes
-.    include "../../graphics/MesaLib/builtin.mk"
+.  include "../../graphics/MesaLib/builtin.mk"
 CHECK_BUILTIN.MesaLib:=	no
-.  endif
+.endif
 
-.  if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+.if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
 BUILDLINK_API_DEPENDS.dri2proto+=	dri2proto>=2.1
 BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.11
-.    if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.60
-.    endif
-.    if ${OPSYS} == "Linux"
+.  endif
+.  if ${OPSYS} == "Linux"
 BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
-.    endif
 .  endif
-.  include "../../textproc/expat/buildlink3.mk"
-.  include "../../x11/dri2proto/buildlink3.mk"
+.endif
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
 # XXX these do not have builtin.mk
-.  if ${X11_TYPE} == "modular"
-.    include "../../x11/dri3proto/buildlink3.mk"
-.    include "../../x11/libxshmfence/buildlink3.mk"
-.    include "../../x11/presentproto/buildlink3.mk"
-.  endif
-.  include "../../x11/glproto/buildlink3.mk"
-.  include "../../x11/libXdamage/buildlink3.mk"
-.  include "../../x11/libXfixes/buildlink3.mk"
-.  include "../../x11/libXxf86vm/buildlink3.mk"
-.  if ${OPSYS} != "Darwin"
-.    include "../../x11/libdrm/buildlink3.mk"
-.  endif
-.  include "../../x11/xf86driproto/buildlink3.mk"
-.  include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-.    include "../../devel/libdevq/buildlink3.mk"
-.  endif
+.if ${X11_TYPE} == "modular"
+.  include "../../x11/dri3proto/buildlink3.mk"
+.  include "../../x11/libxshmfence/buildlink3.mk"
+.  include "../../x11/presentproto/buildlink3.mk"
+.endif
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/libdrm/buildlink3.mk"
+.endif
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+.  include "../../devel/libdevq/buildlink3.mk"
+.endif
 .endif
diff --git a/MesaLib/options.mk b/MesaLib/options.mk
index 3b17174555..56b525f319 100644
--- a/MesaLib/options.mk
+++ b/MesaLib/options.mk
@@ -43,12 +43,12 @@ PLIST_VARS+=	gbm wayland xatracker
 
 CONFIGURE_ARGS+=	--enable-dri
 CONFIGURE_ARGS+=	--enable-egl
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 CFLAGS+=		-DHAVE_DRI3
 CONFIGURE_ARGS+=	--enable-dri3
 CONFIGURE_ARGS+=	--enable-gbm
 PLIST.gbm=		yes
-.endif
+.  endif
 CONFIGURE_ARGS+=	--enable-gles1
 CONFIGURE_ARGS+=	--enable-gles2
 
@@ -56,25 +56,25 @@ CONFIGURE_ARGS+=	--enable-gles2
 # XXX Fixme
 #	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||
 #	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) ||
-.if \
+.  if \
 	!empty(MACHINE_PLATFORM:MLinux-*-i386) ||		\
 	!empty(MACHINE_PLATFORM:MLinux-*-x86_64) ||		\
 	!empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) ||	\
 	!empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
 CONFIGURE_ARGS+=	--enable-glx-tls
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-glx-tls
-.endif
+.  endif
 
 # DRI on Linux needs either sysfs or udev
 CONFIGURE_ARGS.Linux+=	--enable-sysfs
 
 PLIST.dri=	yes
 
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 BUILDLINK_DEPMETHOD.libpciaccess=	full
 .include "../../sysutils/libpciaccess/buildlink3.mk"
-.endif
+.  endif
 .include "../../graphics/MesaLib/dri.mk"
 
 DRI_DRIVERS=		#
@@ -83,13 +83,13 @@ GALLIUM_DRIVERS=	#
 # Software rasterizer
 PLIST.swrast_dri=	yes
 DRI_DRIVERS+=		swrast
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 PLIST.swrast=		yes
 GALLIUM_DRIVERS+=	swrast
-.endif
+.  endif
 
 # x86 only drivers
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+.  if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
 # svga / VMWare driver
 PLIST.svga=		yes
 GALLIUM_DRIVERS+=	svga
@@ -106,10 +106,10 @@ GALLIUM_DRIVERS+=	ilo
 
 PLIST.i965_dri=		yes
 DRI_DRIVERS+=		i965
-.endif
+.  endif
 
 # ARM drivers
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 # Qualcomm SnapDragon, libdrm_freedreno.pc
 GALLIUM_DRIVERS+=	freedreno
 PLIST.freedreno=	yes
@@ -117,17 +117,17 @@ PLIST.freedreno=	yes
 # Broadcom VideoCore 4
 GALLIUM_DRIVERS+=	vc4
 PLIST.vc4=		yes
-.endif
+.  endif
 
 # qemu Linux guest driver
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.  if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 # XXX test this
 #GALLIUM_DRIVERS+=	virgl
 #PLIST.virgl=		yes
-.endif
+.  endif
 
 # theoretically cross platform PCI drivers, but don't build on ARM
-.if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+.  if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 
 # AMD Radeon r600
 PLIST.r600=		yes
@@ -148,22 +148,22 @@ DRI_DRIVERS+=		r200
 # classic DRI nouveau
 PLIST.nouveau_dri=	yes
 DRI_DRIVERS+=		nouveau
-.endif
+.  endif
 
-.if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-egl-platforms=x11
 #.elif ${OPSYS} == "Linux"
 #.include "../../wip/wayland/buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm,wayland
 #PLIST.wayland=		yes
-.else
+.  else
 CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm
-.endif
+.  endif
 
 CONFIGURE_ARGS+=	--with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
 CONFIGURE_ARGS+=	--with-dri-drivers=${DRI_DRIVERS:ts,}
 
-.if !empty(PKG_OPTIONS:Mllvm)
+.  if !empty(PKG_OPTIONS:Mllvm)
 # XA is useful for accelerating xf86-video-vmware
 CONFIGURE_ARGS+=	--enable-xa
 PLIST.xatracker=	yes
@@ -179,11 +179,11 @@ CONFIGURE_ARGS+=	--enable-r600-llvm-compiler
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libelf}/include/libelf
 .include "../../lang/libLLVM/buildlink3.mk"
 CONFIGURE_ENV+=		ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else # !llvm
+.  else # !llvm
 CONFIGURE_ARGS+=	--disable-xa
 CONFIGURE_ARGS+=	--disable-gallium-llvm
 CONFIGURE_ARGS+=	--disable-r600-llvm-compiler
-.endif # llvm
+.  endif # llvm
 .else # !dri
 CONFIGURE_ARGS+=	--with-gallium-drivers=
 CONFIGURE_ARGS+=	--with-dri-drivers=
@@ -194,7 +194,7 @@ CONFIGURE_ARGS+=	--disable-gbm
 CONFIGURE_ARGS+=	--disable-gles1
 CONFIGURE_ARGS+=	--disable-gles2
 CONFIGURE_ARGS+=	--enable-xlib-glx
-.if !empty(PKG_OPTIONS:Mllvm)
+.  if !empty(PKG_OPTIONS:Mllvm)
 PKG_FAIL_REASON+=	"The llvm PKG_OPTION must also be disabled when dri is disabled"
-.endif
+.  endif
 .endif
diff --git a/audit-system/Makefile b/audit-system/Makefile
index 9ca81470b8..041f44b007 100644
--- a/audit-system/Makefile
+++ b/audit-system/Makefile
@@ -59,9 +59,9 @@ SUBST_SED.tools+=	-e "s|@SCRIPT_DIR@|${SCRIPT_DIR}|g"
 SUBST_SED.tools+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 
 do-extract:
-.	for f in ${AS_FILES}
+.for f in ${AS_FILES}
 		${CP} ${FILESDIR}/${f} ${WRKSRC}
-.	endfor
+.endfor
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/audit-system.conf ${DESTDIR}${EGDIR}
diff --git a/cardpeek/Makefile b/cardpeek/Makefile
index 1a4cdc3a73..c808f29130 100644
--- a/cardpeek/Makefile
+++ b/cardpeek/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE=	YES
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-.if exists(/Developer/Applications/Xcode.app)
+.  if exists(/Developer/Applications/Xcode.app)
 SUBST_CLASSES+=			xcode
 SUBST_FILES.xcode=		configure
 SUBST_MESSAGE.xcode=		adapting Xcode install path
@@ -25,7 +25,7 @@ SUBST_SED.xcode+=		-e "s|head -1|tail -1|g"
 SUBST_SED.xcode+=		-e "s|/Applications/Xcode.app/|/Developer/Applications/Xcode.app/|g"
 SUBST_STAGE.xcode=		post-patch
 BUILDLINK_PASSTHRU_DIRS+=	/Developer
-.endif
+.  endif
 .else
 BUILDLINK_PASSTHRU_DIRS+=	/Applications/Xcode.app
 .endif
diff --git a/clementine/options.mk b/clementine/options.mk
index e1d9f0d4ed..a73824dff9 100644
--- a/clementine/options.mk
+++ b/clementine/options.mk
@@ -51,7 +51,7 @@ CMAKE_ARGS+=	-DENABLE_DEVICEKIT=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Mlibmtp)
-.	include "../../devel/libmtp/buildlink3.mk"
+.  include "../../devel/libmtp/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LIBMTP=ON
 .else
 CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
@@ -72,9 +72,9 @@ CMAKE_ARGS+=	-DENABLE_GIO=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Mlibgpod)
-.	include "../../audio/libgpod/buildlink3.mk"
-.	include "../libusbmuxd/buildlink3.mk" # Will be moved to comms/
-.	include "../../textproc/libplist/buildlink3.mk"
+.  include "../../audio/libgpod/buildlink3.mk"
+.  include "../libusbmuxd/buildlink3.mk" # Will be moved to comms/
+.  include "../../textproc/libplist/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LIBGPOD=ON
 .else
 CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
@@ -85,7 +85,7 @@ CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Maudiocd)
-.	include "../../misc/libcdio/buildlink3.mk"
+.  include "../../misc/libcdio/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_AUDIOCD=ON
 .else
 CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
@@ -117,7 +117,7 @@ CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Mlastfm)
-.	include "../../audio/liblastfm/buildlink3.mk"
+.  include "../../audio/liblastfm/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LIBLASTFM=ON
 .else
 CMAKE_ARGS+=	-DENABLE_LIBLASTFM=OFF
@@ -198,7 +198,7 @@ CMAKE_ARGS+=	-DENABLE_VK=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
-.	include "../../audio/pulseaudio/buildlink3.mk"
+.  include "../../audio/pulseaudio/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LIBPULSE=ON
 DEPENDS+=	gst-plugins1-pulse>=1.4.0:../../audio/gst-plugins1-pulse
 .else
diff --git a/cygwin/Makefile.common b/cygwin/Makefile.common
index 8fceb01f23..b2b30004af 100644
--- a/cygwin/Makefile.common
+++ b/cygwin/Makefile.common
@@ -16,7 +16,7 @@ PATH:=			${PREFIX}/cross/bin:${PATH}
 
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 
-.if defined(GNU_CONFIGURE)
+.  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS=		# reset
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
@@ -29,6 +29,6 @@ CONFIGURE_ARGS+=	--target=${CYGWIN_TARGET:Q}
 # following line to avoid getting
 #    make: exec(i386--netbsdelf-ar) failed (No such file or directory)
 USE_GNU_CONFIGURE_HOST=	NO
-.endif
+.  endif
 
 .endif
diff --git a/davical-git/Makefile b/davical-git/Makefile
index b646990dc6..f722793edf 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -124,16 +124,16 @@ do-install:
 		find . -name .gitignore -exec rm -f \{\} \; && \
 		pax -rwpam . ${DESTDIR}${DOCDIR}
 
-.	for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
+.for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
 		cd ${WRKSRC} && \
 		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
-.	endfor
+.endfor
 
-.	for d in ${PAXDIRS}
+.for d in ${PAXDIRS}
 		${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
 		cd ${WRKSRC}/${d} && find . -name .gitignore -exec rm -f \{\} \;
 		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
-.	endfor
+.endfor
 
 	cd ${WRKSRC}/config && for f in *; do				\
 		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$$f;	\
diff --git a/emacs-git/modules.mk b/emacs-git/modules.mk
index 6495fa8194..cb05a32a9e 100644
--- a/emacs-git/modules.mk
+++ b/emacs-git/modules.mk
@@ -285,9 +285,9 @@ CONFLICTS+=	${_EMACS_CONFLICTS.${_EMACS_FLAVOR}}
 
 EMACS_MODULES?=
 .for _mod_ in ${EMACS_MODULES}
-.if !empty(_EMACS_PKGDEP.${_mod_})
+.  if !empty(_EMACS_PKGDEP.${_mod_})
 DEPENDS+=	${_EMACS_PKGDEP.${_mod_}}
-.endif
+.  endif
 .endfor
 
 #
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index a1168067f6..fbfbc096d5 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -35,13 +35,13 @@ CONFIGURE_ARGS+=	--without-dbus
 ###
 ### Support XML2
 ###
-.  if !empty(PKG_OPTIONS:Mxml)
+.if !empty(PKG_OPTIONS:Mxml)
 USE_TOOLS+=             pkg-config
 BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
 .include "../../textproc/libxml2/buildlink3.mk"
-.  else
+.else
 CONFIGURE_ARGS+=        --without-xml2
-.  endif
+.endif
 
 ###
 ### Support gnutls
diff --git a/evolution-rss/options.mk b/evolution-rss/options.mk
index 305f796bc2..34bc2e361a 100644
--- a/evolution-rss/options.mk
+++ b/evolution-rss/options.mk
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=	dbus
 
 
 .if !empty(PKG_OPTIONS:Mdbus)
-.   include "../../sysutils/dbus/buildlink3.mk"
+.  include "../../sysutils/dbus/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-dbus
 .endif
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-dbus
 #.endif
 
 .if !empty(PKG_OPTIONS:Mwebkit )
-.   include "../../www/webkit24-gtk/buildlink3.mk"
+.  include "../../www/webkit24-gtk/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-webkit
 .else
 CONFIGURE_ARGS+=	--disable-webkit
diff --git a/ffmpeg-git/buildlink3.mk b/ffmpeg-git/buildlink3.mk
index bf00d01108..56cfc91915 100644
--- a/ffmpeg-git/buildlink3.mk
+++ b/ffmpeg-git/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ffmpeg+=	ffmpeg>=20130106.1.1
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 
 pkgbase := ffmpeg
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 
diff --git a/firefox-dfbsd/mozilla-common.mk b/firefox-dfbsd/mozilla-common.mk
index 0b137ed414..d025dd4a59 100644
--- a/firefox-dfbsd/mozilla-common.mk
+++ b/firefox-dfbsd/mozilla-common.mk
@@ -10,10 +10,10 @@
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=		yasm>=1.1:../../devel/yasm
 
-.if ${OPSYS} != "DragonFly" && ${OPSYS} != "FreeBSD"
+.  if ${OPSYS} != "DragonFly" && ${OPSYS} != "FreeBSD"
 # Enable Google widevine CDM. This requires external libwidevinecdm.so.
 CONFIGURE_ARGS+=	--enable-eme=widevine
-.endif
+.  endif
 .endif
 
 HAS_CONFIGURE=		yes
diff --git a/firefox-dfbsd/options.mk b/firefox-dfbsd/options.mk
index 333cdd9c1e..850677a7a8 100644
--- a/firefox-dfbsd/options.mk
+++ b/firefox-dfbsd/options.mk
@@ -47,12 +47,12 @@ CONFIGURE_ARGS+=	--disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -63,12 +63,12 @@ CONFIGURE_ARGS+=	--enable-debug-js-modules
 CONFIGURE_ARGS+=	--disable-install-strip
 PLIST.debug=		yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-symbols
 CONFIGURE_ARGS+=	--enable-optimize=-O0
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-optimize=-O2
 CONFIGURE_ARGS+=	--enable-install-strip
diff --git a/firefox-hg/options.mk b/firefox-hg/options.mk
index 26463a4d02..9d129c05fe 100644
--- a/firefox-hg/options.mk
+++ b/firefox-hg/options.mk
@@ -57,23 +57,23 @@ CONFIGURE_ARGS+=	--disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug="-g -O0 ${O0TRACKING}" --enable-debug-symbols --disable-optimize
 CONFIGURE_ARGS+=	--disable-install-strip
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-symbols
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-optimize=-O2
 CONFIGURE_ARGS+=	--enable-install-strip
diff --git a/firefox-webrtc/options.mk b/firefox-webrtc/options.mk
index 326d0f4f7b..8f94a0a155 100644
--- a/firefox-webrtc/options.mk
+++ b/firefox-webrtc/options.mk
@@ -44,12 +44,12 @@ CONFIGURE_ARGS+=	--disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -60,12 +60,12 @@ CONFIGURE_ARGS+=	--enable-debug-js-modules
 CONFIGURE_ARGS+=	--disable-install-strip
 PLIST.debug=		yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-symbols
 CONFIGURE_ARGS+=	--enable-optimize=-O0
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-optimize=-O2
 CONFIGURE_ARGS+=	--enable-install-strip
diff --git a/firefox/options.mk b/firefox/options.mk
index 756bc7abd3..2d9b77baa7 100644
--- a/firefox/options.mk
+++ b/firefox/options.mk
@@ -44,12 +44,12 @@ CONFIGURE_ARGS+=	--disable-jemalloc
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
 # Modern gcc does not run any "tracking" passes when compiling with -O0,
 # which makes the generated debug info mostly useless. So explicitly
 # request them.
 O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -59,12 +59,12 @@ CONFIGURE_ARGS+=	--enable-debug-js-modules
 CONFIGURE_ARGS+=	--disable-install-strip
 PLIST.debug=		yes
 .else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+.  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-symbols
 CONFIGURE_ARGS+=	--enable-optimize=-O0
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-debug-symbols
-.endif
+.  endif
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-optimize=-O2
 CONFIGURE_ARGS+=	--enable-install-strip
diff --git a/fricas-svn/Makefile b/fricas-svn/Makefile
index fca62ad835..44d5ecc7da 100644
--- a/fricas-svn/Makefile
+++ b/fricas-svn/Makefile
@@ -33,11 +33,11 @@ INSTALL_UNSTRIPPED=	yes	# don't strip AXIOMsys, it breaks FFI
 .endif
 
 .if 1 # extract from Subversion
-.if !empty(PKG_OPTIONS:Mx11)
+.  if !empty(PKG_OPTIONS:Mx11)
 post-build:
 # This should start Xvfb temporarily (1024x768x24 resolution recommended):
 	cd ${WRKSRC}/src/paste && ${MAKE_PROGRAM} gphts
-.endif
+.  endif
 
 # Get it from Subversion repository:
 SVN_REPOSITORIES=	fricas
diff --git a/fricas-svn/options.mk b/fricas-svn/options.mk
index fe9e246a4e..f2c2febd22 100644
--- a/fricas-svn/options.mk
+++ b/fricas-svn/options.mk
@@ -47,17 +47,17 @@ PRINT_PLIST_AWK+=	{if ($$0 ~ /\.o$$/) {$$0 = "$${ecl}" $$0;}}
 PRINT_PLIST_AWK+=	{if ($$0 !~ /^\$${x11}/ && $$0 ~ /\/share\/viewports\// || $$0 ~ /\.(bitmap|xbm|xbm.tiny|bm|bakmap|xpm|ht|pht|ps)$$/) {$$0 = "$${x11}" $$0;}}
 # ...where "util.ht" is false positive.
 # files in lib/.../bin
-.for _file_ in htadd hypertex viewAlone
+.  for _file_ in htadd hypertex viewAlone
 PRINT_PLIST_AWK+=	{if ($$0 !~ /^\$${x11}/ && $$0 ~ /\/bin\/${_file_}$$/) {$$0 = "$${x11}" $$0;}}
-.endfor
+.  endfor
 # files in lib/.../lib
-.for _file_ in ex2ht hthits htsearch presea spadbuf view2D view3D viewman
+.  for _file_ in ex2ht hthits htsearch presea spadbuf view2D view3D viewman
 PRINT_PLIST_AWK+=	{if ($$0 !~ /^\$${x11}/ && $$0 ~ /\/lib\/${_file_}$$/) {$$0 = "$${x11}" $$0;}}
-.endfor
+.  endfor
 # files in lib/.../bitmaps
-.for _file_ in door ht_icon
+.  for _file_ in door ht_icon
 PRINT_PLIST_AWK+=	{if ($$0 !~ /^\$${x11}/ && $$0 ~ /\/bitmaps\/${_file_}$$/) {$$0 = "$${x11}" $$0;}}
-.endfor
+.  endfor
 # Postscript files in lib/.../lib/graph:
 PRINT_PLIST_AWK+=	{if ($$0 !~ /^\$${x11}/ && $$0 ~ /\/lib\/graph\/.*\.ps$$/) {$$0 = "$${x11}" $$0;}}
 .endif
diff --git a/gcc42/buildlink3.mk b/gcc42/buildlink3.mk
index 9c24ddd9c9..b2b4f25a40 100644
--- a/gcc42/buildlink3.mk
+++ b/gcc42/buildlink3.mk
@@ -10,21 +10,21 @@ GCC42_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.gcc42+=	gcc42>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc42?=	gcc42>=4.2.0
 BUILDLINK_PKGSRCDIR.gcc42?=	../../wip/gcc42
-.  if exists(${BUILDLINK_PREFIX.gcc42}/bin/gcc)
+.if exists(${BUILDLINK_PREFIX.gcc42}/bin/gcc)
 _GNAT1!=			${BUILDLINK_PREFIX.gcc42}/bin/gcc -print-prog-name=gnat1
-.    if exists(${_GNAT1})
+.  if exists(${_GNAT1})
 BUILDLINK_ENV+=			ADAC=${BUILDLINK_PREFIX.gcc42}/bin/gcc
-.    endif
+.  endif
 BUILDLINK_LIBDIRS.gcc42+=	lib
 _GCC_ARCHDIR!=			${DIRNAME} `${BUILDLINK_PREFIX.gcc42}/bin/gcc --print-libgcc-file-name`
-.    if empty(_GCC_ARCHDIR:M*not_found*)
+.  if empty(_GCC_ARCHDIR:M*not_found*)
 BUILDLINK_LIBDIRS.gcc42+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\///}/
-.      if exists(${_GNAT1})
+.    if exists(${_GNAT1})
 BUILDLINK_LIBDIRS.gcc42+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\///}/adalib
-.      endif
-BUILDLINK_INCDIRS.gcc42+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\///}/include
 .    endif
+BUILDLINK_INCDIRS.gcc42+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\///}/include
 .  endif
+.endif
 
 BUILDLINK_FILES_CMD.gcc42=	\
 	(cd  ${BUILDLINK_PREFIX.gcc42} &&	\
@@ -32,11 +32,11 @@ BUILDLINK_FILES_CMD.gcc42=	\
 BUILDLINK_FNAME_TRANSFORM.gcc42=	-e s:\buildlink:buildlink/gcc42:
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc?=	build
-.  endif
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/gcc43/buildlink3.mk b/gcc43/buildlink3.mk
index 4f467e9127..c58e918e37 100644
--- a/gcc43/buildlink3.mk
+++ b/gcc43/buildlink3.mk
@@ -10,21 +10,21 @@ GCC43_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.gcc43+=	gcc43>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc43?=	gcc43>=4.3.0
 BUILDLINK_PKGSRCDIR.gcc43?=	../../wip/gcc43
-.  if exists(${BUILDLINK_PREFIX.gcc43}/bin/gcc)
+.if exists(${BUILDLINK_PREFIX.gcc43}/bin/gcc)
 _GNAT1!=			${BUILDLINK_PREFIX.gcc43}/bin/gcc -print-prog-name=gnat1
-.    if exists(${_GNAT1})
+.  if exists(${_GNAT1})
 BUILDLINK_ENV+=			ADAC=${BUILDLINK_PREFIX.gcc43}/bin/gcc
-.    endif
+.  endif
 BUILDLINK_LIBDIRS.gcc43+=	lib
 _GCC_ARCHDIR!=			${DIRNAME} `${BUILDLINK_PREFIX.gcc43}/bin/gcc --print-libgcc-file-name`
-.    if empty(_GCC_ARCHDIR:M*not_found*)
+.  if empty(_GCC_ARCHDIR:M*not_found*)
 BUILDLINK_LIBDIRS.gcc43+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\///}/
-.      if exists(${_GNAT1})
+.    if exists(${_GNAT1})
 BUILDLINK_LIBDIRS.gcc43+=	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\///}/adalib
-.      endif
-BUILDLINK_INCDIRS.gcc43+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\///}/include
 .    endif
+BUILDLINK_INCDIRS.gcc43+=	include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\///}/include
 .  endif
+.endif
 
 BUILDLINK_FILES_CMD.gcc43=	\
 	(cd  ${BUILDLINK_PREFIX.gcc43} &&	\
@@ -32,11 +32,11 @@ BUILDLINK_FILES_CMD.gcc43=	\
 BUILDLINK_FNAME_TRANSFORM.gcc43=	-e s:\buildlink:buildlink/gcc43:
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc?=	build
-.  endif
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/gcc44/Makefile b/gcc44/Makefile
index 02c16c2bf0..78e7aa7dc8 100644
--- a/gcc44/Makefile
+++ b/gcc44/Makefile
@@ -34,11 +34,11 @@ UNLIMIT_RESOURCES+=	stacksize
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
 CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. if !exists(/usr/sfw/bin/gas)
+.  if !exists(/usr/sfw/bin/gas)
 CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
-. else
+.  else
 CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
-.endif
+.  endif
 .endif
 
 
@@ -97,9 +97,9 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 #.endif # NetBSD
 
 .if ${OPSYS} == "NetBSD"
-.if !empty(OS_VERSION:M5.*)
+.  if !empty(OS_VERSION:M5.*)
 MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
-.endif
+.  endif
 .endif
 
 LIBS.SunOS+=		-lgmp
diff --git a/gcc45/Makefile b/gcc45/Makefile
index 4f900b6758..9a27a8f14b 100644
--- a/gcc45/Makefile
+++ b/gcc45/Makefile
@@ -37,11 +37,11 @@ UNLIMIT_RESOURCES+=	stacksize
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
 CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. if !exists(/usr/sfw/bin/gas)
+.  if !exists(/usr/sfw/bin/gas)
 CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
-. else
+.  else
 CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
-. endif
+.  endif
 .endif
 
 # REPLACE_AWK+=	gcc/testsuite/gcc.test-framework/test-framework.awk	\
diff --git a/gcc46/Makefile b/gcc46/Makefile
index fdb06a6e6a..6d320d3a9f 100644
--- a/gcc46/Makefile
+++ b/gcc46/Makefile
@@ -42,11 +42,11 @@ SUBST_VARS.vars=	GCC_TARGET_MACHINE
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
 CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. if !exists(/usr/sfw/bin/gas)
+.  if !exists(/usr/sfw/bin/gas)
 CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
-. else
+.  else
 CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
-. endif
+.  endif
 .endif
 
 
diff --git a/gcc47/options.mk b/gcc47/options.mk
index f5bad182e0..bceab87b19 100644
--- a/gcc47/options.mk
+++ b/gcc47/options.mk
@@ -158,9 +158,9 @@ LANGS+=			fortran
 .if !empty(PKG_OPTIONS:Mgcc-c++)
 LANGS+=			c++
 USE_TOOLS+=		perl
-.if ${OPSYS} != "SunOS"
+.  if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=	--enable-__cxa_atexit
-.endif
+.  endif
 CONFIGURE_ARGS+=	--with-gxx-include-dir=${GCC_PREFIX}/include/c++/
 .else
 CONFIGURE_ARGS+=	--disable-build-with-cxx
diff --git a/ghostscript-cidfonts-ryumin/Makefile b/ghostscript-cidfonts-ryumin/Makefile
index a5791339f6..e9f07cc7c8 100644
--- a/ghostscript-cidfonts-ryumin/Makefile
+++ b/ghostscript-cidfonts-ryumin/Makefile
@@ -69,15 +69,15 @@ NO_CONFIGURE=	yes
 
 # Following logic is flaky, for looking at PKG_OPTIONS.gs_type now NOT at build time
 .if   !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-agpl)
-. include	"../../print/ghostscript-agpl/Makefile.common"
-. if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
+.  include	"../../print/ghostscript-agpl/Makefile.common"
+.  if empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mdisable-compile-inits)
 PKG_FAIL_REASON+=	'(agpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
-. endif
+.  endif
 .else
-. include	"../../print/ghostscript-gpl/Makefile.common"
-. if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
+.  include	"../../print/ghostscript-gpl/Makefile.common"
+.  if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits)
 PKG_FAIL_REASON+=	'(gpl) You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.'
-. endif
+.  endif
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnokii/buildlink3.mk b/gnokii/buildlink3.mk
index aa005a989f..3ff0457ff1 100644
--- a/gnokii/buildlink3.mk
+++ b/gnokii/buildlink3.mk
@@ -44,9 +44,9 @@ pkgbase := gnokii
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.gnokii:Mxpm)
-.if empty(PKG_BUILD_OPTIONS.gnokii:Mx11)
+.  if empty(PKG_BUILD_OPTIONS.gnokii:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
-.endif
+.  endif
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/gnokii/options.mk b/gnokii/options.mk
index 181d21bd45..31eaf2422b 100644
--- a/gnokii/options.mk
+++ b/gnokii/options.mk
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=	--without-x
 .endif
 
 .if !empty(PKG_OPTIONS:Mxpm)
-.if empty(PKG_OPTIONS:Mx11)
+.  if empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
-.endif
+.  endif
 .endif
diff --git a/grass/options.mk b/grass/options.mk
index 4e725a496e..45b02b332c 100644
--- a/grass/options.mk
+++ b/grass/options.mk
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+=	--without-motif
 .if !empty(PKG_OPTIONS:Mmysql)
 CONFIGURE_ARGS+=	--with-mysql
 PLIST.mysql=		yes
-. include "../../mk/mysql.buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-mysql
 .endif
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=	--without-opengl
 .if !empty(PKG_OPTIONS:Mpgsql)
 CONFIGURE_ARGS+=	--with-postgres
 PLIST.pgsql=		yes
-. include "../../mk/pgsql.buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-postgres
 .endif
diff --git a/gretl/options.mk b/gretl/options.mk
index 94ee7712c5..851d587d8f 100644
--- a/gretl/options.mk
+++ b/gretl/options.mk
@@ -24,11 +24,11 @@ PKG_SUGGESTED_OPTIONS=		readline
 .include "../../mk/bsd.options.mk"
 
 .for option in ${PKG_SUPPORTED_OPTIONS}
-.if !empty(PKG_OPTIONS:M${option})
+.  if !empty(PKG_OPTIONS:M${option})
 PLIST_SUBST+=	${option}=""
-.else
+.  else
 PLIST_SUBST+=	${option}="@comment "
-.endif
+.  endif
 .endfor
 
 .if !empty(PKG_OPTIONS:Mreadline)
diff --git a/icecat/options.mk b/icecat/options.mk
index 04732cc67f..dff6402637 100644
--- a/icecat/options.mk
+++ b/icecat/options.mk
@@ -28,9 +28,9 @@ CONFIGURE_ARGS+=	--disable-gnomevfs --disable-dbus
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 CONFIGURE_ARGS+=	--enable-jemalloc
-. if ${OPSYS} == "SunOS"
+.  if ${OPSYS} == "SunOS"
 PLIST.jemalloc=		yes
-. endif
+.  endif
 .else
 CONFIGURE_ARGS+=	--disable-jemalloc
 .endif
diff --git a/ices/Makefile b/ices/Makefile
index dde3199c89..108a1baee6 100644
--- a/ices/Makefile
+++ b/ices/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--without-python
 #.endif
 
 .if defined(USE_VORBIS)
-.   include "../../audio/libvorbis/buildlink3.mk"
+.  include "../../audio/libvorbis/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-vorbis=${BUILDINK_PREFIX.libvorbis}
 .else
 CONFIGURE_ARGS+=	--without-vorbis
diff --git a/jlibtool/Makefile b/jlibtool/Makefile
index 1e8c884762..6710fa2f59 100644
--- a/jlibtool/Makefile
+++ b/jlibtool/Makefile
@@ -18,12 +18,12 @@ USE_FEATURES+=		snprintf
 AUTO_MKDIRS=		yes
 
 do-extract:
-.   if !exists(${WRKSRC})
+.if !exists(${WRKSRC})
 	${RUN} ${MKDIR} ${WRKSRC}
-.   endif
+.endif
 
-.   for fn in Makefile jlibtool.c
+.for fn in Makefile jlibtool.c
 	${RUN} cp ${FILESDIR}/${fn} ${WRKSRC}
-.   endfor
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libbsd/Makefile.common b/libbsd/Makefile.common
index 7e4a154f77..435e71bfd2 100644
--- a/libbsd/Makefile.common
+++ b/libbsd/Makefile.common
@@ -12,7 +12,7 @@ LIBBSD.only_for_platform=	Linux-*-*
 
 .include "../../mk/bsd.prefs.mk"
 .for p in ${LIBBSD.only_for_platform}
-.    if !empty(MACHINE_PLATFORM:M${p})
+.  if !empty(MACHINE_PLATFORM:M${p})
 USE_LIBBSD=		yes
-.    endif
+.  endif
 .endfor
diff --git a/libbsd/buildlink3.mk b/libbsd/buildlink3.mk
index c461d22b2d..3a5d98df5d 100644
--- a/libbsd/buildlink3.mk
+++ b/libbsd/buildlink3.mk
@@ -7,12 +7,12 @@
 
 BUILDLINK_TREE+=	libbsd
 
-.if !defined(LIBBSD_BUILDLINK3_MK)
+.  if !defined(LIBBSD_BUILDLINK3_MK)
 LIBBSD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbsd+=	libbsd>=0.4.2
 BUILDLINK_PKGSRCDIR.libbsd?=	../../wip/libbsd
-.endif	# LIBBSD_BUILDLINK3_MK
+.  endif	# LIBBSD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libbsd
 
diff --git a/libretro-glsl-shaders/Makefile b/libretro-glsl-shaders/Makefile
index 10fc5a236f..7d52fee3f4 100644
--- a/libretro-glsl-shaders/Makefile
+++ b/libretro-glsl-shaders/Makefile
@@ -143,12 +143,12 @@ do-install:
 	fi
 .endfor
 .for dir in ${SHADER_DIRS}
-.for type in glsl glslp md png
+.  for type in glsl glslp md png
 	if ${LS} -1 ${WRKSRC}/${dir} | ${GREP} -q .${type}$$ ; then \
 	    ${INSTALL_DATA} ${WRKSRC}/${dir}/*.${type} \
 	    ${DESTDIR}${PREFIX}/share/libretro/shaders/${dir} ; \
 	fi
-.endfor
+.  endfor
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libtermkey/options.mk b/libtermkey/options.mk
index 2c90d6cf58..43aacf0e54 100644
--- a/libtermkey/options.mk
+++ b/libtermkey/options.mk
@@ -10,13 +10,13 @@ PKG_SUGGESTED_OPTIONS=		unibilium
 ###
 ### Use ncurses
 ###
-.  if !empty(PKG_OPTIONS:Mncurses)
+.if !empty(PKG_OPTIONS:Mncurses)
 .include "../../mk/termcap.buildlink3.mk"
-.  endif
+.endif
 
 ###
 ### Use unibilium
 ###
-.  if !empty(PKG_OPTIONS:Munibilium)
+.if !empty(PKG_OPTIONS:Munibilium)
 .include "../../wip/libunibilium/buildlink3.mk"
-.  endif
+.endif
diff --git a/linphone/Makefile b/linphone/Makefile
index 825afd1096..66a08f204b 100644
--- a/linphone/Makefile
+++ b/linphone/Makefile
@@ -29,13 +29,13 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--enable-macsnd
-. if !empty(PKGSRC_COMPILER:Mgcc*)
+.  if !empty(PKGSRC_COMPILER:Mgcc*)
 SUBST_CLASSES+=			objective-c
 SUBST_STAGE.objective-c=	post-patch
 SUBST_MESSAGE.objective-c=	adding "-x objective-c" for mediastreamer2 code
 SUBST_FILES.objective-c=	mediastreamer2/src/Makefile.in
 SUBST_SED.objective-c=		-e 's/^CC = @CC@/CC = @CC@ -x objective-c/g'
-. endif
+.  endif
 SUBST_CLASSES+=			frameworks
 SUBST_STAGE.frameworks=		post-patch
 SUBST_MESSAGE.frameworks=	adding Carbon and AudioUnit frameworks
diff --git a/llvm-all-in-one/buildlink3.mk b/llvm-all-in-one/buildlink3.mk
index e9e7a94b3e..732f48cc11 100644
--- a/llvm-all-in-one/buildlink3.mk
+++ b/llvm-all-in-one/buildlink3.mk
@@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
 pkgbase := llvm
 .include "../../mk/pkg-build-options.mk"
-.  if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
+.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
 .include "../../mk/terminfo.buildlink3.mk"
-.  endif
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# LLVM_BUILDLINK3_MK
diff --git a/llvm-git/buildlink3.mk b/llvm-git/buildlink3.mk
index f690478fc3..cdaf914c3a 100644
--- a/llvm-git/buildlink3.mk
+++ b/llvm-git/buildlink3.mk
@@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
 pkgbase := llvm
 .include "../../mk/pkg-build-options.mk"
-.  if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
+.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
 .include "../../mk/terminfo.buildlink3.mk"
-.  endif
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# LLVM_BUILDLINK3_MK
diff --git a/llvm-netbsd/buildlink3.mk b/llvm-netbsd/buildlink3.mk
index e9e7a94b3e..732f48cc11 100644
--- a/llvm-netbsd/buildlink3.mk
+++ b/llvm-netbsd/buildlink3.mk
@@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
 pkgbase := llvm
 .include "../../mk/pkg-build-options.mk"
-.  if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
+.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
 .include "../../mk/terminfo.buildlink3.mk"
-.  endif
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# LLVM_BUILDLINK3_MK
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index ea10f0158e..8a037e8034 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -26,13 +26,13 @@ PLIST_VARS+=		dri3
 
 .if !empty(PKG_OPTIONS:Mdri)
 
-.if !empty(PKG_OPTIONS:Mdri3)
+.  if !empty(PKG_OPTIONS:Mdri3)
 CONFIGURE_ARGS+=	--enable-dri3
 PLIST.dri3=		yes
 .include "../../x11/dri3proto/buildlink3.mk"
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-dri3
-.endif
+.  endif
 
 .include "../../graphics/libepoxy/buildlink3.mk"
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=11
diff --git a/mplayer-mt/options.mk b/mplayer-mt/options.mk
index 5d7d24686b..406cbdfce1 100644
--- a/mplayer-mt/options.mk
+++ b/mplayer-mt/options.mk
@@ -15,68 +15,68 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 # Options supported by both mplayer* or mencoder*.
 
 PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv dvdread png theora vorbis x264 debug
-.if ${OSS_TYPE} != "none"
+.  if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=	oss
-.endif
+.  endif
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
 PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
 PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
 
 # Set options based on the specific package being built.
-.if !empty(PKGNAME:M*mplayer*)
+.  if !empty(PKGNAME:M*mplayer*)
 PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas pulseaudio sdl
 
-.elif !empty(PKGNAME:M*mencoder*)
+.  elif !empty(PKGNAME:M*mencoder*)
 PKG_SUPPORTED_OPTIONS+=	faac lame
-.endif
+.  endif
 
 # OS-specific options.
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.elif ${OPSYS} == "SunOS"
+.  elif ${OPSYS} == "SunOS"
 PKG_SUPPORTED_OPTIONS+=	mlib
-.endif
-.if ${OPSYS} == "Linux"
+.  endif
+.  if ${OPSYS} == "Linux"
 PKG_SUPPORTED_OPTIONS+=	vidix
-.endif
+.  endif
 
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
+.  if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
 PKG_SUPPORTED_OPTIONS+=		v4l2
 #PKG_SUGGESTED_OPTIONS+=	v4l2
-.endif
+.  endif
 
 # Platform-specific options.
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "powerpc"
 PKG_SUPPORTED_OPTIONS+=	mplayer-runtime-cpudetection
-.endif
-.if ${MACHINE_ARCH} == "i386"
+.  endif
+.  if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=	mplayer-default-cflags mplayer-win32
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.  endif
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_SUPPORTED_OPTIONS+=	mplayer-ssse3
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+.  endif
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
 PKG_SUPPORTED_OPTIONS+=	xvid
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for _o_ in aalib cdparanoia dv dvdread esound gif jpeg \
+.  for _o_ in aalib cdparanoia dv dvdread esound gif jpeg \
 	    lame mad mplayer-menu \
 	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss pulseaudio png sdl theora vorbis x264 xvid
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
+.    if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=	${_o_}
-.  endif
-.endfor
-.if ${OPSYS} == "Linux"
+.    endif
+.  endfor
+.  if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	vidix
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
@@ -89,216 +89,216 @@ EXTRA_LIBS=
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Maalib)
-.  include "../../graphics/aalib/buildlink3.mk"
-.endif
+.  if !empty(PKG_OPTIONS:Maalib)
+.    include "../../graphics/aalib/buildlink3.mk"
+.  endif
 
 CONFIGURE_ARGS+=	--disable-arts
 
-.if !empty(PKG_OPTIONS:Mcdparanoia)
+.  if !empty(PKG_OPTIONS:Mcdparanoia)
 CONFIGURE_ARGS+=	--enable-cdparanoia
-.  include "../../audio/cdparanoia/buildlink3.mk"
-.else
+.    include "../../audio/cdparanoia/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-cdparanoia
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdebug)
+.  if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdts)
+.  if !empty(PKG_OPTIONS:Mdts)
 CONFIGURE_ARGS+=	--enable-libdca
-.  include "../../audio/libdca/buildlink3.mk"
-.else
+.    include "../../audio/libdca/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-libdca
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdv)
+.  if !empty(PKG_OPTIONS:Mdv)
 CONFIGURE_ARGS+=	--enable-libdv
-.  include "../../multimedia/libdv/buildlink3.mk"
-.else
+.    include "../../multimedia/libdv/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-libdv
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdvdread)
+.  if !empty(PKG_OPTIONS:Mdvdread)
 CONFIGURE_ARGS+=	--enable-dvdread
-.  include "../../multimedia/libdvdread/buildlink3.mk"
-.else
+.    include "../../multimedia/libdvdread/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-dvdread
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mesound)
+.  if !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=	--enable-esd
-.  include "../../audio/esound/buildlink3.mk"
-.else
+.    include "../../audio/esound/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-esd
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mfaac)
-.  include "../../audio/faac/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mfaac)
+.    include "../../audio/faac/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-faac
-.endif
+.  endif
 
-.if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
+.  if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
 CONFIGURE_ARGS+=	--disable-faad-external
 CONFIGURE_ARGS+=	--disable-faad-internal
-.elif !empty(PKG_OPTIONS:Mfaad)
+.  elif !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=	--enable-faad-external
-.  include "../../audio/faad2/buildlink3.mk"
-.else
+.    include "../../audio/faad2/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--enable-faad-internal
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mggi)
+.  if !empty(PKG_OPTIONS:Mggi)
 CONFIGURE_ARGS+=	--enable-ggi
-.  include "../../graphics/libggi/buildlink3.mk"
-.else
+.    include "../../graphics/libggi/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-ggi
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mgif)
+.  if !empty(PKG_OPTIONS:Mgif)
 CONFIGURE_ARGS+=	--enable-gif
-.  include "../../graphics/giflib/buildlink3.mk"
-.else
+.    include "../../graphics/giflib/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-gif
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mjpeg)
+.  if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../mk/jpeg.buildlink3.mk"
-.else
+.    include "../../mk/jpeg.buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-jpeg
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mlame)
+.  if !empty(PKG_OPTIONS:Mlame)
 #CONFIGURE_ARGS+=	--enable-toolame
-.  include "../../audio/lame/buildlink3.mk"
-.else
+.    include "../../audio/lame/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-toolame
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmad)
+.  if !empty(PKG_OPTIONS:Mmad)
 CONFIGURE_ARGS+=	--enable-mad
-.  include "../../audio/libmad/buildlink3.mk"
-.else
+.    include "../../audio/libmad/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-mad
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmlib)
+.  if !empty(PKG_OPTIONS:Mmlib)
 CONFIGURE_ARGS+=	--enable-mlib
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-mlib
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-menu)
+.  if !empty(PKG_OPTIONS:Mmplayer-menu)
 CONFIGURE_ARGS+=	--enable-menu
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-menu
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
+.  if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
 CONFIGURE_ARGS+=	--enable-runtime-cpudetection
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-runtime-cpudetection
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-win32)
+.  if !empty(PKG_OPTIONS:Mmplayer-win32)
 EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
 PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=		--enable-win32dll
 CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
-.else
+.  else
 CONFIGURE_ARGS+=		--disable-win32dll
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mnas)
+.  if !empty(PKG_OPTIONS:Mnas)
 CONFIGURE_ARGS+=	--enable-nas
-.  include "../../audio/nas/buildlink3.mk"
-.else
+.    include "../../audio/nas/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-nas
-.endif
+.  endif
 
-.if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
+.  if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
 CONFIGURE_ARGS+=	--enable-ossaudio
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-ossaudio
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mpng)
+.  if !empty(PKG_OPTIONS:Mpng)
 CONFIGURE_ARGS+=	--enable-png
-.  include "../../graphics/png/buildlink3.mk"
-.else
+.    include "../../graphics/png/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-png
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mpulseaudio)
+.  if !empty(PKG_OPTIONS:Mpulseaudio)
 CONFIGURE_ARGS+=	--enable-pulse
-.  include "../../devel/glib2/buildlink3.mk"
-.  include "../../audio/pulseaudio/buildlink3.mk"
-.else
+.    include "../../devel/glib2/buildlink3.mk"
+.    include "../../audio/pulseaudio/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-pulse
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Msdl)
+.  if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=	--enable-sdl
-.  include "../../devel/SDL/buildlink3.mk"
-.else
+.    include "../../devel/SDL/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-sdl
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mtheora)
+.  if !empty(PKG_OPTIONS:Mtheora)
 CONFIGURE_ARGS+=	--enable-theora
-.  include "../../multimedia/libtheora/buildlink3.mk"
-.else
+.    include "../../multimedia/libtheora/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-theora
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mv4l2)
+.  if !empty(PKG_OPTIONS:Mv4l2)
 CONFIGURE_ARGS+=	--enable-tv-v4l2
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-tv-v4l2
-.endif
+.  endif
 
 # disable vidix if not in options
-.if empty(PKG_OPTIONS:Mvidix)
+.  if empty(PKG_OPTIONS:Mvidix)
 CONFIGURE_ARGS+=	--disable-vidix
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mvorbis)
+.  if !empty(PKG_OPTIONS:Mvorbis)
 CONFIGURE_ARGS+=	--enable-libvorbis
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-libvorbis
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mx264)
-.  include "../../multimedia/x264-devel/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mx264)
+.    include "../../multimedia/x264-devel/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-x264
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mxvid)
+.  if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=	--enable-xvid
 EXTRA_LIBS+=		-lxvidcore
-.  include "../../multimedia/xvidcore/buildlink3.mk"
-.else
+.    include "../../multimedia/xvidcore/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-xvid
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-ssse3)
+.  if !empty(PKG_OPTIONS:Mmplayer-ssse3)
 # needs a recent assembler
 .include "../../devel/binutils/buildlink3.mk"
 .include "../../devel/binutils/override-as.mk"
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-ssse3
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
 # -------------------------------------------------------------------------
-.if ${EXTRA_LIBS} != ""
+.  if ${EXTRA_LIBS} != ""
 CONFIGURE_ARGS+=	--extra-libs=${EXTRA_LIBS:C/^ //:Q}
-.endif
+.  endif
 
 .endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/mplayer-snapshot-share/options.mk b/mplayer-snapshot-share/options.mk
index 349933c770..4be2aa8449 100644
--- a/mplayer-snapshot-share/options.mk
+++ b/mplayer-snapshot-share/options.mk
@@ -17,73 +17,73 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 
 PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
 PKG_SUPPORTED_OPTIONS+=	dvdread dvdnav
-.if ${OSS_TYPE} != "none"
+.  if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=	oss
-.endif
+.  endif
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
 PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
 PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
 
 # Set options based on the specific package being built.
-.if !empty(PKGNAME:M*mplayer*)
+.  if !empty(PKGNAME:M*mplayer*)
 PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas pulseaudio sdl
 
-.if ${VDPAU_AVAILABLE} == "yes"
+.    if ${VDPAU_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=	vdpau
-.endif
+.    endif
 
-.elif !empty(PKGNAME:M*mencoder*)
+.  elif !empty(PKGNAME:M*mencoder*)
 PKG_SUPPORTED_OPTIONS+=	faac lame
-.endif
+.  endif
 
 # OS-specific options.
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.elif ${OPSYS} == "SunOS"
+.  elif ${OPSYS} == "SunOS"
 PKG_SUPPORTED_OPTIONS+=	mlib
-.endif
-.if ${OPSYS} == "Linux"
+.  endif
+.  if ${OPSYS} == "Linux"
 PKG_SUPPORTED_OPTIONS+=	vidix
-.endif
+.  endif
 
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
+.  if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
 PKG_SUPPORTED_OPTIONS+=	v4l2
 PKG_SUGGESTED_OPTIONS+=	v4l2
-.endif
+.  endif
 
 # Platform-specific options.
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "powerpc"
 PKG_SUPPORTED_OPTIONS+=	mplayer-runtime-cpudetection
-.endif
-.if ${MACHINE_ARCH} == "i386"
+.  endif
+.  if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=	mplayer-default-cflags mplayer-win32
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.  endif
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_SUPPORTED_OPTIONS+=	mplayer-ssse3
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+.  endif
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
 PKG_SUPPORTED_OPTIONS+=	xvid
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for _o_ in cdparanoia dv esound gif jpeg \
+.  for _o_ in cdparanoia dv esound gif jpeg \
 	    dvdread dvdnav \
 	    lame mad mplayer-menu \
 	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
+.    if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=	${_o_}
-.  endif
-.endfor
-.if ${OPSYS} == "Linux"
+.    endif
+.  endfor
+.  if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	vidix
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
@@ -96,236 +96,236 @@ EXTRA_LIBS=
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Maalib)
-.  include "../../graphics/aalib/buildlink3.mk"
-.endif
+.  if !empty(PKG_OPTIONS:Maalib)
+.    include "../../graphics/aalib/buildlink3.mk"
+.  endif
 
 CONFIGURE_ARGS+=	--disable-arts
 
-.if !empty(PKG_OPTIONS:Mcdparanoia)
+.  if !empty(PKG_OPTIONS:Mcdparanoia)
 CONFIGURE_ARGS+=	--enable-cdparanoia
-.  include "../../audio/cdparanoia/buildlink3.mk"
+.    include "../../audio/cdparanoia/buildlink3.mk"
 CFLAGS+=		-I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-cdparanoia
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdebug)
+.  if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdts)
+.  if !empty(PKG_OPTIONS:Mdts)
 # The configure handling for --enable-libdca is broken.
 # However, it works if you omit the argument and let
 # configure autodetect support.
 #CONFIGURE_ARGS+=       --enable-libdca
-.  include "../../audio/libdca/buildlink3.mk"
-.else
+.    include "../../audio/libdca/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-libdca
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdv)
+.  if !empty(PKG_OPTIONS:Mdv)
 CONFIGURE_ARGS+=	--enable-libdv
-.  include "../../multimedia/libdv/buildlink3.mk"
-.else
+.    include "../../multimedia/libdv/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-libdv
-.endif
+.  endif
 
 CONFIGURE_ARGS+=	--disable-dvdread-internal
-.if !empty(PKG_OPTIONS:Mdvdread)
+.  if !empty(PKG_OPTIONS:Mdvdread)
 CONFIGURE_ARGS+=	--enable-dvdread
 CONFIGURE_ARGS+=	--with-dvdread-config=${BUILDLINK_PREFIX.libdvdread}/bin/dvdread-config
-.  include "../../multimedia/libdvdread/buildlink3.mk"
-.else
+.    include "../../multimedia/libdvdread/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-dvdread
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mdvdnav)
+.  if !empty(PKG_OPTIONS:Mdvdnav)
 CONFIGURE_ARGS+=	--enable-dvdnav
 CONFIGURE_ARGS+=	--with-dvdnav-config=${BUILDLINK_PREFIX.libdvdnav}/bin/dvdnav-config
-.  include "../../multimedia/libdvdnav/buildlink3.mk"
+.    include "../../multimedia/libdvdnav/buildlink3.mk"
 #CFLAGS+=		-I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-dvdnav
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mesound)
+.  if !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=	--enable-esd
-.  include "../../audio/esound/buildlink3.mk"
-.else
+.    include "../../audio/esound/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-esd
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mfaac)
-.  include "../../audio/faac/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mfaac)
+.    include "../../audio/faac/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-faac
-.endif
+.  endif
 
-.if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
+.  if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
 CONFIGURE_ARGS+=	--disable-faad-internal
-.elif !empty(PKG_OPTIONS:Mfaad)
+.  elif !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=	--enable-faad
-.  include "../../audio/faad2/buildlink3.mk"
-.else
+.    include "../../audio/faad2/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--enable-faad-internal
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mggi)
+.  if !empty(PKG_OPTIONS:Mggi)
 CONFIGURE_ARGS+=	--enable-ggi
-.  include "../../graphics/libggi/buildlink3.mk"
-.else
+.    include "../../graphics/libggi/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-ggi
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mgif)
+.  if !empty(PKG_OPTIONS:Mgif)
 CONFIGURE_ARGS+=	--enable-gif
-.  include "../../graphics/giflib/buildlink3.mk"
-.else
+.    include "../../graphics/giflib/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-gif
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mjpeg)
+.  if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../mk/jpeg.buildlink3.mk"
-.else
+.    include "../../mk/jpeg.buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-jpeg
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mlame)
+.  if !empty(PKG_OPTIONS:Mlame)
 #CONFIGURE_ARGS+=	--enable-toolame
-.  include "../../audio/lame/buildlink3.mk"
-.else
+.    include "../../audio/lame/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-toolame
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmad)
+.  if !empty(PKG_OPTIONS:Mmad)
 CONFIGURE_ARGS+=	--enable-mad
-.  include "../../audio/libmad/buildlink3.mk"
-.else
+.    include "../../audio/libmad/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-mad
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmlib)
+.  if !empty(PKG_OPTIONS:Mmlib)
 CONFIGURE_ARGS+=	--enable-mlib
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-mlib
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-menu)
+.  if !empty(PKG_OPTIONS:Mmplayer-menu)
 CONFIGURE_ARGS+=	--enable-menu
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-menu
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
+.  if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
 CONFIGURE_ARGS+=	--enable-runtime-cpudetection
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-runtime-cpudetection
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-win32)
+.  if !empty(PKG_OPTIONS:Mmplayer-win32)
 EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
 PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=		--enable-win32dll
 #CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
-.else
+.  else
 CONFIGURE_ARGS+=		--disable-win32dll
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mnas)
+.  if !empty(PKG_OPTIONS:Mnas)
 CONFIGURE_ARGS+=	--enable-nas
-.  include "../../audio/nas/buildlink3.mk"
-.else
+.    include "../../audio/nas/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-nas
-.endif
+.  endif
 
-.if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
+.  if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
 CONFIGURE_ARGS+=	--enable-ossaudio
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-ossaudio
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mpng)
+.  if !empty(PKG_OPTIONS:Mpng)
 CONFIGURE_ARGS+=	--enable-png
-.  include "../../graphics/png/buildlink3.mk"
-.else
+.    include "../../graphics/png/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-png
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mpulseaudio)
+.  if !empty(PKG_OPTIONS:Mpulseaudio)
 CONFIGURE_ARGS+=	--enable-pulse
-.  include "../../devel/glib2/buildlink3.mk"
-.  include "../../audio/pulseaudio/buildlink3.mk"
-.else
+.    include "../../devel/glib2/buildlink3.mk"
+.    include "../../audio/pulseaudio/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-pulse
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Msdl)
+.  if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=	--enable-sdl
-.  include "../../devel/SDL/buildlink3.mk"
-.else
+.    include "../../devel/SDL/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-sdl
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mtheora)
+.  if !empty(PKG_OPTIONS:Mtheora)
 CONFIGURE_ARGS+=	--enable-theora
-.  include "../../multimedia/libtheora/buildlink3.mk"
-.else
+.    include "../../multimedia/libtheora/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-theora
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mv4l2)
+.  if !empty(PKG_OPTIONS:Mv4l2)
 CONFIGURE_ARGS+=	--enable-tv-v4l2
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-tv-v4l2
-.endif
+.  endif
 
 # disable vidix if not in options
-.if empty(PKG_OPTIONS:Mvidix)
+.  if empty(PKG_OPTIONS:Mvidix)
 CONFIGURE_ARGS+=	--disable-vidix
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mvorbis)
+.  if !empty(PKG_OPTIONS:Mvorbis)
 CONFIGURE_ARGS+=	--enable-libvorbis
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-libvorbis
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mx264)
-.  include "../../multimedia/x264-devel/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mx264)
+.    include "../../multimedia/x264-devel/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-x264
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mxvid)
+.  if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=	--enable-xvid
 EXTRA_LIBS+=		-lxvidcore
-.  include "../../multimedia/xvidcore/buildlink3.mk"
-.else
+.    include "../../multimedia/xvidcore/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-xvid
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mmplayer-ssse3)
+.  if !empty(PKG_OPTIONS:Mmplayer-ssse3)
 # needs a recent assembler
 .include "../../devel/binutils/buildlink3.mk"
 .include "../../devel/binutils/override-as.mk"
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-ssse3
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mvdpau)
-.  include "../../multimedia/libvdpau/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mvdpau)
+.    include "../../multimedia/libvdpau/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=	--disable-vdpau
-.endif
+.  endif
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
 # -------------------------------------------------------------------------
-.if ${EXTRA_LIBS} != ""
+.  if ${EXTRA_LIBS} != ""
 CONFIGURE_ARGS+=	--extra-libs=${EXTRA_LIBS:C/^ //:Q}
-.endif
+.  endif
 
 .endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/mtr-graph/options.mk b/mtr-graph/options.mk
index 2789685ea6..417a8a12b9 100644
--- a/mtr-graph/options.mk
+++ b/mtr-graph/options.mk
@@ -32,13 +32,13 @@ USE_TOOLS+=		pkg-config
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-graphcairo-xcb
 .else
-.if !empty(PKG_OPTIONS:Mgraphcairo-xlib)
+.  if !empty(PKG_OPTIONS:Mgraphcairo-xlib)
 USE_TOOLS+=		pkg-config
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-graphcairo-xlib
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Midn)
diff --git a/nag/Makefile b/nag/Makefile
index 2b4ce633db..64f84e5f09 100644
--- a/nag/Makefile
+++ b/nag/Makefile
@@ -80,9 +80,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/RELEASE_NOTES ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING ${DESTDIR}${DOCDIR}
 
-. for d in ${PAXDIRS}
+.for d in ${PAXDIRS}
 		cd ${WRKSRC}/${d} && pax -rwpma . ${DESTDIR}${NAGDIR}/${d}
-. endfor
+.endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${NAGDIR}/config
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${NAGDIR}
diff --git a/neovim-git/options.mk b/neovim-git/options.mk
index d7d6997ee5..7dd6b0d69a 100644
--- a/neovim-git/options.mk
+++ b/neovim-git/options.mk
@@ -9,26 +9,26 @@ PKG_SUGGESTED_OPTIONS=	python ruby
 ###
 ### Support Python (add dependency)
 ###
-.  if !empty(PKG_OPTIONS:Mpython)
+.if !empty(PKG_OPTIONS:Mpython)
 DEPENDS+=	${PYPKGPREFIX}-neovim-[0-9]*:../../wip/py-neovim
 
 .include "../../lang/python/pyversion.mk"
-.  endif
+.endif
 
 ###
 ### Support Ruby (add dependency)
 ###
-.  if !empty(PKG_OPTIONS:Mruby)
+.if !empty(PKG_OPTIONS:Mruby)
 DEPENDS+=	${RUBY_PKGPREFIX}-neovim-[0-9]*:../../wip/ruby-neovim
 
 .include "../../lang/ruby/rubyversion.mk"
-.  endif
+.endif
 
 ###
 ### Use jemalloc for memory allocation
 ###
-.  if !empty(PKG_OPTIONS:Mjemalloc)
+.if !empty(PKG_OPTIONS:Mjemalloc)
 .include "../../devel/jemalloc/buildlink3.mk"
-.  else
+.else
 CMAKE_ARGS+= -DENABLE_JEMALLOC=OFF
-.  endif
+.endif
diff --git a/nsp/options.mk b/nsp/options.mk
index 2b8b555e84..da9150a731 100644
--- a/nsp/options.mk
+++ b/nsp/options.mk
@@ -8,10 +8,10 @@ PKG_SUGGESTED_OPTIONS=	# blank
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgtk)
-. include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-. include "../../sysutils/libnotify/buildlink3.mk"
-. include "../../x11/gtk2/buildlink3.mk"
-. include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.  include "../../sysutils/libnotify/buildlink3.mk"
+.  include "../../x11/gtk2/buildlink3.mk"
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SRC+=		${PKGDIR}/PLIST.gtk
 .else
@@ -28,7 +28,7 @@ USE_LANGUAGES+=		c c++
 PLIST_SRC+=		${PKGDIR}/PLIST.qt
 MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}${PREFIX}
-. include "../../x11/qt4-tools/buildlink3.mk"
+.  include "../../x11/qt4-tools/buildlink3.mk"
 .PHONY:		build-qt-client
 post-build:	build-qt-client
 build-qt-client:
diff --git a/openaxiom-svn/options.mk b/openaxiom-svn/options.mk
index 1ee760c987..3b03a1bb31 100644
--- a/openaxiom-svn/options.mk
+++ b/openaxiom-svn/options.mk
@@ -56,12 +56,12 @@ CONFIGURE_ARGS+=	--with-x=no
 # Help PLIST generation
 .if !empty(PKG_OPTIONS:Mx11)
 # Handle X11-specific files
-.for _file_ in viewAlone
+.  for _file_ in viewAlone
 PRINT_PLIST_AWK+=	{if ($$0 ~ /\/bin\/${_file_}$$/) {$$0 = "$${x11}" $$0;}}
-.endfor
-.for _file_ in hypertex spadbuf view2D view3D viewman
+.  endfor
+.  for _file_ in hypertex spadbuf view2D view3D viewman
 PRINT_PLIST_AWK+=	{if ($$0 ~ /\/lib\/${_file_}$$/) {$$0 = "$${x11}" $$0;}}
-.endfor
+.  endfor
 PRINT_PLIST_AWK+=	{if ($$0 ~ /\/graph\/[^\/]*\.ps$$/) {$$0 = "$${x11}" $$0;}}
 .endif
 
diff --git a/openca/Makefile b/openca/Makefile
index 0242bca51a..dbc639eedf 100644
--- a/openca/Makefile
+++ b/openca/Makefile
@@ -129,9 +129,9 @@ post-install:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} install-doc
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} install-man
 
-. 	for f in ${MKDIRS}
+.for f in ${MKDIRS}
 		${MKDIR} ${PKG_SYSCONFDIR}/${f}
-.	endfor
+.endfor
 
 	${CHOWN} ${OPENCA_USER}:${OPENCA_GROUP} \
 		${PKG_SYSCONFDIR}/access_control
diff --git a/openssh/Makefile b/openssh/Makefile
index 1b279353b6..106574a851 100644
--- a/openssh/Makefile
+++ b/openssh/Makefile
@@ -41,13 +41,13 @@ BUILDLINK_PASSTHRU_DIRS+=	/usr/local/lib/bind
 CONFIGURE_ENV+=			ac_cv_func_openpty=no
 CONFIGURE_ENV+=			ac_cv_type_struct_timespec=yes
 CPPFLAGS+=			-DIOV_MAX=16 # default is INT_MAX, way too large
-.if exists(/usr/local/include/bind/resolv.h)
+.  if exists(/usr/local/include/bind/resolv.h)
 CPPFLAGS+=			-I/usr/local/include/bind
 BUILDLINK_PASSTHRU_DIRS+=	/usr/local/include/bind
-.elif exists(/usr/local/bind/include/resolv.h)
+.  elif exists(/usr/local/bind/include/resolv.h)
 CPPFLAGS+=			-I/usr/local/bind/include
 BUILDLINK_PASSTHRU_DIRS+=	/usr/local/bind/include
-.endif
+.  endif
 LDFLAGS+=			-L/usr/local/lib/bind
 LIBS+=				-lbind -ldb -lcrypt
 
diff --git a/openssh/options.mk b/openssh/options.mk
index 3c7c8c81c2..bc40cd1ac9 100644
--- a/openssh/options.mk
+++ b/openssh/options.mk
@@ -28,7 +28,7 @@ PLIST_VARS+=	pam
 CONFIGURE_ARGS+=	--with-pam
 MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
-.if ${OPSYS} == "Linux"
+.  if ${OPSYS} == "Linux"
 PLIST.pam=	yes
-.endif
+.  endif
 .endif
diff --git a/openssl110/buildlink3.mk b/openssl110/buildlink3.mk
index ce38f60aa4..70fa0cf23f 100644
--- a/openssl110/buildlink3.mk
+++ b/openssl110/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	openssl
 .if !defined(OPENSSL_BUILDLINK3_MK)
 OPENSSL_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.1.0f
 BUILDLINK_ABI_DEPENDS.openssl+=	openssl>=1.1.0f
diff --git a/pulseaudio-git/buildlink3.mk b/pulseaudio-git/buildlink3.mk
index 8af578d9d4..04be0b1923 100644
--- a/pulseaudio-git/buildlink3.mk
+++ b/pulseaudio-git/buildlink3.mk
@@ -21,7 +21,7 @@ BUILDLINK_RPATHDIRS.pulseaudio+=	lib/pulseaudio
 _WRAP_EXTRA_ARGS.LIBTOOL+=	-L${PREFIX}/lib/pulseaudio
 
 pkgbase:= pulseaudio
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 
diff --git a/qupzilla/options.mk b/qupzilla/options.mk
index f0154e8add..db826f0ac3 100644
--- a/qupzilla/options.mk
+++ b/qupzilla/options.mk
@@ -19,9 +19,9 @@ PKG_SUGGESTED_OPTIONS=	qt4 dbus
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 DEPENDS+=qt4-sqlite3>=4.7:../../x11/qt4-sqlite3
-.if !empty(PKG_OPTIONS:Mdbus)
+.  if !empty(PKG_OPTIONS:Mdbus)
 .include "../../x11/qt4-qdbus/buildlink3.mk"
-.else
+.  else
 MAKE_ENV+= DISABLE_DBUS=${TRUE}
-.endif
+.  endif
 .endif
diff --git a/ratproxy/hacks.mk b/ratproxy/hacks.mk
index ccc2ce8943..caab472625 100644
--- a/ratproxy/hacks.mk
+++ b/ratproxy/hacks.mk
@@ -3,9 +3,9 @@
 .if !defined(RATPROXY_HACKS_MK)
 RATPROXY_HACKS_MK=	# defined
 #
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 #
-.  if ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
 BUILDLINK_TRANSFORM+=	rm:-Wno-pointer-sign
-.  endif
+.endif
 .endif
diff --git a/retroarch-assets/Makefile b/retroarch-assets/Makefile
index 1286726a9a..709868de98 100644
--- a/retroarch-assets/Makefile
+++ b/retroarch-assets/Makefile
@@ -42,11 +42,11 @@ INSTALLATION_DIRS+=	share/retroarch/assets/${i}
 
 do-install:
 .for dir in ${RA_ASSET_DIRS}
-.for type in ttf png
+.  for type in ttf png
 	if ${LS} -1 ${WRKSRC}/assets/${dir} | ${GREP} -q .${type}$$; then \
 		${INSTALL_DATA} ${WRKSRC}/assets/${dir}/*.${type} \
 		    ${DESTDIR}${PREFIX}/share/retroarch/assets/${dir}; fi
-.endfor
+.  endfor
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/retroarch/options.mk b/retroarch/options.mk
index cda9961b66..7c7363fb01 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -34,11 +34,11 @@ PKG_SUGGESTED_OPTIONS+=		opengl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(MACHINE_ARCH:M*arm*)
-.if !empty(PKG_OPTIONS:Msimd)
+.  if !empty(PKG_OPTIONS:Msimd)
 CONFIGURE_ARGS+=	--enable-neon
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-neon
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
diff --git a/rust/Makefile b/rust/Makefile
index d6974257e9..2895920d18 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -90,11 +90,11 @@ RUST_MACHINES=		\
 	x86_64-unknown-netbsd
 #RUST_MACHINES+=	x86_64-sun-solaris
 
-.for MACHINE in ${RUST_MACHINES}
+.  for MACHINE in ${RUST_MACHINES}
 RUSTCS+=	rustc-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
 RUST_STDS+=	rust-std-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
 CARGOS+=	cargo-${CARGO_STAGE0_VER}-${MACHINE}.tar.gz
-.endfor
+.  endfor
 
 DISTFILES+=	${RUSTCS} ${RUST_STDS} ${CARGOS}
 
diff --git a/scilab/Makefile b/scilab/Makefile
index c8289f57ea..ca1fecdec6 100644
--- a/scilab/Makefile
+++ b/scilab/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 #   scilab-4.1/routines/os_specific/getarg.c
 #
 .include "../../mk/compiler.mk"
-.  if !empty(FC:Mgfortran) || (defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95))
+.if !empty(FC:Mgfortran) || (defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95))
 CFLAGS+=		-DG95_FORTRAN=1
 .endif
 
diff --git a/sendmailX/options.mk b/sendmailX/options.mk
index 6d695d4abe..f1ef665305 100644
--- a/sendmailX/options.mk
+++ b/sendmailX/options.mk
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	tls sasl pmilter
 ### Use OpenSSL libraries for SMTP STARTTLS support
 ###
 .if !empty(PKG_OPTIONS:Mtls)
-.	include "../../security/openssl/buildlink3.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	-enable-TLS
 CFLAGS+=		-DSM_USE_TLS
 .else
@@ -21,7 +21,7 @@ CONFIGURE_ENV+=		ac_cv_header_openssl_ssl_h=no
 ### Use SASLv2 for SMTP AUTH
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.	include "../../security/cyrus-sasl/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 CONFIGURE_ARGS+=	-enable-SASL
 CFLAGS+=		-DSM_USE_SASL
 .else
diff --git a/varnish-modules/Makefile b/varnish-modules/Makefile
index f22d9d3b22..d5bda698fc 100644
--- a/varnish-modules/Makefile
+++ b/varnish-modules/Makefile
@@ -34,6 +34,6 @@ pre-configure:
 .include "../../mk/bsd.pkg.mk"
 
 .include "../../mk/compiler.mk"
-. if !empty(PKGSRC_COMPILER:Mgcc)
+.if !empty(PKGSRC_COMPILER:Mgcc)
 DEPENDS+=       ${_GCC_DEPENDENCY}
 .endif
diff --git a/xf86-input-mouse-dfbsd/options.mk b/xf86-input-mouse-dfbsd/options.mk
index 2ef86455eb..49417d243c 100644
--- a/xf86-input-mouse-dfbsd/options.mk
+++ b/xf86-input-mouse-dfbsd/options.mk
@@ -11,13 +11,13 @@ PKG_SUGGESTED_OPTIONS=
 .include "../../mk/bsd.options.mk"
 
 .if ${OPSYS} == "DragonFly"
-.if !empty(OS_VERSION:M[0-2].*) || !empty(OS_VERSION:M3.0*)
+.  if !empty(OS_VERSION:M[0-2].*) || !empty(OS_VERSION:M3.0*)
 PKG_SUGGESTED_OPTIONS+=	dflyusb 
-.else
+.  else
 # Assume Dragonfly 3.1 - 3.6 users built U4B stack
 # 3.8 and after U4B is the default
 PKG_SUGGESTED_OPTIONS+=	dflyu4b 
-.endif
+.  endif
 .endif
 
 .if ${OPSYS} == "FreeBSD"
diff --git a/xmail/Makefile b/xmail/Makefile
index 9f28b5a033..b33d3ae8a4 100644
--- a/xmail/Makefile
+++ b/xmail/Makefile
@@ -19,19 +19,19 @@ MAKE_ENV+=	OSTYPE=${OPSYS}
 
 EXT=bsd # Default one :)
 .if ${OPSYS} == "Linux"
-.	if   ${MACHINE_ARCH} == "i86pc"
+.  if   ${MACHINE_ARCH} == "i86pc"
 		EXT="lnx"
-.	elif ${MACHINE_ARCH} == "sparc"
+.  elif ${MACHINE_ARCH} == "sparc"
 		EXT="slx"
-.	elif ${MACHINE_ARCH} == "ppc"
+.  elif ${MACHINE_ARCH} == "ppc"
 		EXT="plx"
-.	endif
+.  endif
 .elif ${OPSYS} == "SunOS"
-.	if   ${MACHINE_ARCH} == "sparc"
+.  if   ${MACHINE_ARCH} == "sparc"
 		EXT="sso"
-.	elif ${MACHINE_ARCH} == "i86pc"
+.  elif ${MACHINE_ARCH} == "i86pc"
 		EXT="ssx"
-.	endif
+.  endif
 .endif
 
 MAKE_FILE=	Makefile.${EXT}
diff --git a/xmlformat-docs/Makefile b/xmlformat-docs/Makefile
index a1be10782d..a1d7bf835b 100644
--- a/xmlformat-docs/Makefile
+++ b/xmlformat-docs/Makefile
@@ -17,12 +17,12 @@ DESCR_SRC=		${.CURDIR}/DESCR.common ${.CURDIR}/DESCR
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xmlformat
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xmlformat/examples
-.	for _dtype in xml html pdf
+.for _dtype in xml html pdf
 	${INSTALL_DATA} ${WRKSRC}/docs/tutorial.${_dtype} \
 		${DESTDIR}${PREFIX}/share/doc/xmlformat
 	${INSTALL_DATA} ${WRKSRC}/docs/xmlformat.${_dtype} \
 		${DESTDIR}${PREFIX}/share/doc/xmlformat
-.	endfor
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/API ${DESTDIR}${PREFIX}/share/doc/xmlformat
 	${INSTALL_DATA} ${WRKSRC}/docs/xmlformat.conf \
 		${DESTDIR}${PREFIX}/share/doc/xmlformat


Home | Main Index | Thread Index | Old Index