pkgsrc-WIP-changes archive

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

*: indent shell commands with a single tab



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Mon Jul 1 00:03:12 2019 +0200
Changeset:	d4cf40516f526a8b2406c695f7cc196ef0407649

Modified Files:
	ariamaestosa/Makefile
	audit-system/Makefile
	boringssl/Makefile
	chbg/Makefile
	cinnamon-settings-daemon/Makefile
	davical-git/Makefile
	dionysus/Makefile
	dmt-ux/Makefile
	dnrd/Makefile
	drumpiler/Makefile
	dwepcrack/Makefile
	easymesh/Makefile
	emerald-themes/Makefile
	emirror/Makefile
	filerunner/Makefile
	firehose/Makefile
	fnord/Makefile
	freedup16/Makefile
	geoloc/Makefile
	graphmonkey/Makefile
	iText/Makefile
	iTextXML/Makefile
	java-iText-RUPS/Makefile
	kyra2/Makefile
	lightdm-gtk-greeter/Makefile
	lightdm/Makefile
	lpdsrv/Makefile
	mplabs/Makefile
	mtop/Makefile
	mu-cite/Makefile
	nag/Makefile
	nbfc/Makefile
	nuttcp/Makefile
	openca/Makefile
	openttd-openmsx/Makefile
	ozymandns/Makefile
	pcsxr/Makefile
	piedock/Makefile
	pixz/Makefile
	profanity/Makefile
	ptunnel/Makefile
	qt5-qtbase-git/Makefile
	qtnotifydaemon/Makefile
	ranmacgen/Makefile
	ratproxy/Makefile
	ruby-redmine/Makefile
	semanticscuttle/Makefile
	shaarli/Makefile
	showmesh/Makefile
	simutrans-data/Makefile
	simutrans/Makefile
	stress-ng/Makefile
	tc-git/Makefile
	tc/Makefile
	tctool/Makefile
	udp-ping/Makefile
	unagi/Makefile
	vidalia-devel/Makefile
	vidalia/Makefile
	weplab/Makefile
	wla-dx-git/Makefile
	wla-dx/Makefile
	wmsupermon/Makefile
	wmswallow/Makefile
	xebece/Makefile
	xmail/Makefile
	xml-light/Makefile
	xmms2/Makefile
	yaupspe/Makefile

Log Message:
*: indent shell commands with a single tab

pkglint -Wall -r -F --only "single tab"

With manual editing afterwards.

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

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

diffstat:
 ariamaestosa/Makefile             | 17 ++++++-----------
 audit-system/Makefile             |  2 +-
 boringssl/Makefile                |  2 +-
 chbg/Makefile                     |  2 +-
 cinnamon-settings-daemon/Makefile |  2 +-
 davical-git/Makefile              |  8 ++++----
 dionysus/Makefile                 |  2 +-
 dmt-ux/Makefile                   |  4 ++--
 dnrd/Makefile                     |  4 ++--
 drumpiler/Makefile                |  4 ++--
 dwepcrack/Makefile                |  2 +-
 easymesh/Makefile                 |  7 ++++---
 emerald-themes/Makefile           |  2 +-
 emirror/Makefile                  |  8 ++++----
 filerunner/Makefile               |  6 +++---
 firehose/Makefile                 |  2 +-
 fnord/Makefile                    |  2 +-
 freedup16/Makefile                |  2 +-
 geoloc/Makefile                   | 19 ++++++++++++-------
 graphmonkey/Makefile              |  4 ++--
 iText/Makefile                    |  6 +++---
 iTextXML/Makefile                 |  2 +-
 java-iText-RUPS/Makefile          |  2 +-
 kyra2/Makefile                    |  2 +-
 lightdm-gtk-greeter/Makefile      |  4 ++--
 lightdm/Makefile                  | 30 +++++++++++++++---------------
 lpdsrv/Makefile                   |  2 +-
 mplabs/Makefile                   |  4 ++--
 mtop/Makefile                     |  2 +-
 mu-cite/Makefile                  |  6 +++---
 nag/Makefile                      |  2 +-
 nbfc/Makefile                     |  4 ++--
 nuttcp/Makefile                   | 20 ++++++++++----------
 openca/Makefile                   |  2 +-
 openttd-openmsx/Makefile          |  8 ++++----
 ozymandns/Makefile                |  4 ++--
 pcsxr/Makefile                    |  2 +-
 piedock/Makefile                  |  2 +-
 pixz/Makefile                     |  4 ++--
 profanity/Makefile                |  2 +-
 ptunnel/Makefile                  |  2 +-
 qt5-qtbase-git/Makefile           |  8 ++++----
 qtnotifydaemon/Makefile           |  4 ++--
 ranmacgen/Makefile                |  6 +++---
 ratproxy/Makefile                 |  2 +-
 ruby-redmine/Makefile             | 19 ++++++++-----------
 semanticscuttle/Makefile          |  4 ++--
 shaarli/Makefile                  |  4 ++--
 showmesh/Makefile                 |  7 ++++---
 simutrans-data/Makefile           |  6 +++---
 simutrans/Makefile                |  5 ++---
 stress-ng/Makefile                |  4 ++--
 tc-git/Makefile                   |  7 ++-----
 tc/Makefile                       |  7 ++-----
 tctool/Makefile                   |  2 +-
 udp-ping/Makefile                 | 10 +++++-----
 unagi/Makefile                    |  8 ++++----
 vidalia-devel/Makefile            |  2 +-
 vidalia/Makefile                  |  2 +-
 weplab/Makefile                   |  4 ++--
 wla-dx-git/Makefile               |  8 ++++----
 wla-dx/Makefile                   |  8 ++++----
 wmsupermon/Makefile               |  8 ++++----
 wmswallow/Makefile                |  2 +-
 xebece/Makefile                   | 24 ++++++++++++------------
 xmail/Makefile                    | 12 ++++++------
 xml-light/Makefile                |  6 +++---
 xmms2/Makefile                    |  2 +-
 yaupspe/Makefile                  |  6 +++---
 69 files changed, 196 insertions(+), 204 deletions(-)

diffs:
diff --git a/ariamaestosa/Makefile b/ariamaestosa/Makefile
index aac3497541..f5a0299f37 100644
--- a/ariamaestosa/Makefile
+++ b/ariamaestosa/Makefile
@@ -23,22 +23,17 @@ INSTALLATION_DIRS+=	share/applications
 
 .include "options.mk"
 
-
 do-build:
-			cd ${WRKSRC} && \
-			${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
-
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
 
 do-install:
-			cd ${WRKSRC} && \
-			${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/scons install prefix=${DESTDIR}${PREFIX}
-
+	cd ${WRKSRC} && \
+		${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/scons install prefix=${DESTDIR}${PREFIX}
 
 post-install:
-			${INSTALL_DATA} ${WRKSRC}/Freedesktop/Aria.desktop ${DESTDIR}${PREFIX}/share/applications/
-			${CHMOD} g-w ${DESTDIR}${PREFIX}/bin/Aria
-			${CHMOD} -R g-w ${DESTDIR}${PREFIX}/share/Aria
-
+	${INSTALL_DATA} ${WRKSRC}/Freedesktop/Aria.desktop ${DESTDIR}${PREFIX}/share/applications/
+	${CHMOD} g-w ${DESTDIR}${PREFIX}/bin/Aria
+	${CHMOD} -R g-w ${DESTDIR}${PREFIX}/share/Aria
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/audit-system/Makefile b/audit-system/Makefile
index 7c2a4d3533..223058985e 100644
--- a/audit-system/Makefile
+++ b/audit-system/Makefile
@@ -60,7 +60,7 @@ SUBST_VARS.tools+=	PKG_SYSCONFDIR
 
 do-extract:
 .for f in ${AS_FILES}
-		${CP} ${FILESDIR}/${f} ${WRKSRC}
+	${CP} ${FILESDIR}/${f} ${WRKSRC}
 .endfor
 
 do-install:
diff --git a/boringssl/Makefile b/boringssl/Makefile
index b733f5ebe6..444428391f 100644
--- a/boringssl/Makefile
+++ b/boringssl/Makefile
@@ -30,7 +30,7 @@ SUBST_FILES.go=		CMakeLists.txt
 SUBST_SED.go=		-e '/find_program.GO_EXECUTABLE/s,go,${GO},'
 
 post-extract:
-		${RUN} mkdir -p ${WRKDIR}/build
+	${RUN} mkdir -p ${WRKDIR}/build
 
 do-install:
 	for d in bssl/bin bssl/lib bssl/include/openssl; do		\
diff --git a/chbg/Makefile b/chbg/Makefile
index cec09a351d..2acdacdc67 100644
--- a/chbg/Makefile
+++ b/chbg/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-image-library=imlib2
 
 pre-configure:
-		${CP} ${FILESDIR}/es.* ${WRKSRC}/po
+	${CP} ${FILESDIR}/es.* ${WRKSRC}/po
 
 .include "../../devel/glib/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 8d09377238..167f2db59c 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -65,7 +65,7 @@ CONF_FILES+=		${EGDIR}/cinnamon-settings-daemon-a11y-keyboard.desktop		\
 			${PKG_SYSCONFDIR}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
 
 pre-configure:
-		cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
 BUILD_DEPENDS+=	autoconf-archive-[0-9]*:../../devel/autoconf-archive
 BUILD_DEPENDS+=	gettext-m4>=0.14.6:../../devel/gettext-m4
diff --git a/davical-git/Makefile b/davical-git/Makefile
index 369fe19584..0ecc3cb4b9 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -119,14 +119,14 @@ do-install:
 		pax -rwpam . ${DESTDIR}${DOCDIR}
 
 .for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
-		cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
 .endfor
 
 .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}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
+	cd ${WRKSRC}/${d} && find . -name .gitignore -exec rm -f \{\} \;
+	cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
 .endfor
 
 	cd ${WRKSRC}/config && for f in *; do				\
diff --git a/dionysus/Makefile b/dionysus/Makefile
index f8c2841c47..679c3380e1 100644
--- a/dionysus/Makefile
+++ b/dionysus/Makefile
@@ -20,6 +20,6 @@ CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 INSTALLATION_DIRS+=	bin ${PKGINFODIR} share/dionysus/databases
 
 post-install:
-		${INSTALL_DATA} ${WRKSRC}/databases/*.ddb ${DESTDIR}${PREFIX}/share/dionysus/databases/
+	${INSTALL_DATA} ${WRKSRC}/databases/*.ddb ${DESTDIR}${PREFIX}/share/dionysus/databases/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/dmt-ux/Makefile b/dmt-ux/Makefile
index ba6e07589b..66d25f68d1 100644
--- a/dmt-ux/Makefile
+++ b/dmt-ux/Makefile
@@ -16,10 +16,10 @@ MAKE_ENV+=	LIBS=${LIBS:Q}
 INSTALLATION_DIRS=	bin
 
 post-extract:
-		cd ${WRKSRC} && ${LN} -s modules/speedtouch.o speedtouch.o
+	cd ${WRKSRC} && ${LN} -s modules/speedtouch.o speedtouch.o
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/dmt-ux ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dmt-ux ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/dnrd/Makefile b/dnrd/Makefile
index cd2bf5ca11..be9c78ada7 100644
--- a/dnrd/Makefile
+++ b/dnrd/Makefile
@@ -21,8 +21,8 @@ LIBS.SunOS+=	-lrt -lsocket -lnsl -lresolv	# for sem_*(), inet_ntoa(), inet_aton(
 INSTALLATION_DIRS=	sbin share/doc/dnrd
 
 post-install:
-		${RM} -f ${DESTDIR}${PREFIX}/share/doc/dnrd/README-cygwin \
-			 ${DESTDIR}${PREFIX}/share/doc/dnrd/NEWS
+	${RM} -f ${DESTDIR}${PREFIX}/share/doc/dnrd/README-cygwin \
+		 ${DESTDIR}${PREFIX}/share/doc/dnrd/NEWS
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/drumpiler/Makefile b/drumpiler/Makefile
index db169d251a..739ca93b20 100644
--- a/drumpiler/Makefile
+++ b/drumpiler/Makefile
@@ -17,10 +17,10 @@ CFLAGS+=	`${SDL_CONFIG} --cflags`
 LIBS+=		`${SDL_CONFIG} --libs`
 
 do-build:
-		cd ${WRKSRC} && ${CC} ${CFLAGS} -DUSESDL -o drumpiler drumpiler.c ${LIBS}
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -DUSESDL -o drumpiler drumpiler.c ${LIBS}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/drumpiler ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/drumpiler ${PREFIX}/bin
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/dwepcrack/Makefile b/dwepcrack/Makefile
index 5863c7e27d..ef9e86fb51 100644
--- a/dwepcrack/Makefile
+++ b/dwepcrack/Makefile
@@ -17,7 +17,7 @@ INSTALLATION_DIRS=	bin
 CPPFLAGS.SunOS+=	-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/dwepcrack ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dwepcrack ${DESTDIR}${PREFIX}/bin
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/easymesh/Makefile b/easymesh/Makefile
index 4664899ae6..c23770ed98 100644
--- a/easymesh/Makefile
+++ b/easymesh/Makefile
@@ -15,11 +15,12 @@ NO_CONFIGURE=	YES
 INSTALLATION_DIRS=	bin
 
 do-extract:
-		cp ${DISTDIR}/easymesh_1_4.c ${WRKSRC}
+	cp ${DISTDIR}/easymesh_1_4.c ${WRKSRC}
+
 do-build:
-		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} easymesh_1_4.c -o easymesh ${LDFLAGS} -lm
+	cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} easymesh_1_4.c -o easymesh ${LDFLAGS} -lm
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/easymesh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/easymesh ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emerald-themes/Makefile b/emerald-themes/Makefile
index ff1be6a23b..0d91d4b16c 100644
--- a/emerald-themes/Makefile
+++ b/emerald-themes/Makefile
@@ -25,6 +25,6 @@ SUBST_FILES.gtar=	themes/import.sh
 SUBST_STAGE.gtar=	post-configure
 
 pre-configure:
-		cd ${WRKSRC} && ./autogen.sh
+	cd ${WRKSRC} && ./autogen.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emirror/Makefile b/emirror/Makefile
index 58d7f13b73..7c78fff31d 100644
--- a/emirror/Makefile
+++ b/emirror/Makefile
@@ -19,12 +19,12 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--with-python=${PYTHONBIN:Q}
 
 post-extract:
-		${MV} ${WRKSRC}/man/emirror.1 ${WRKSRC}/man/emirror.1.in
+	${MV} ${WRKSRC}/man/emirror.1 ${WRKSRC}/man/emirror.1.in
 
 post-configure:
-		${SED} -e "s|@PREFIX@|${PREFIX}|g" \
-			-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
-			< ${WRKSRC}/man/emirror.1.in > ${WRKSRC}/man/emirror.1
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" \
+		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
+		< ${WRKSRC}/man/emirror.1.in > ${WRKSRC}/man/emirror.1
 
 .include	"../../lang/python/application.mk"
 .include	"../../mk/bsd.pkg.mk"
diff --git a/filerunner/Makefile b/filerunner/Makefile
index 8c80bb28f1..c89c5cb653 100644
--- a/filerunner/Makefile
+++ b/filerunner/Makefile
@@ -22,13 +22,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fr ${DESTDIR}${PREFIX}/lib/FileRunner
 	${LN} -sf ${PREFIX}/lib/FileRunner/fr ${DESTDIR}${PREFIX}/bin
 .for file in FAQ HISTORY QuickStart.txt Tips.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
-		${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
 .endfor
 .for file in frcolor frftp
-		${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
+	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
 .endfor
 .for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit tree.bit up.bit update.bit xterm.bit
-		${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps
 .endfor
 
 .include "../../x11/tk/buildlink3.mk"
diff --git a/firehose/Makefile b/firehose/Makefile
index e4a5c9e67f..3509369904 100644
--- a/firehose/Makefile
+++ b/firehose/Makefile
@@ -28,7 +28,7 @@ INSTALLATION_DIRS=	bin
 CFLAGS+=		-Dfseeko64=fseeko -Dfopen64=fopen
 
 pre-configure:
-		cd ${WRKSRC} && ${MKDIR} i686 mips
+	cd ${WRKSRC} && ${MKDIR} i686 mips
 
 do-install:
 .for f in bottom date* extract fire???? swapon
diff --git a/fnord/Makefile b/fnord/Makefile
index e2f6aae15a..41aabc0993 100644
--- a/fnord/Makefile
+++ b/fnord/Makefile
@@ -27,6 +27,6 @@ LIBS.SunOS+=	-lsocket -lnsl
 INSTALLATION_DIRS=	sbin
 
 do-install:
-		cd ${WRKSRC} && ${INSTALL_PROGRAM} fnord fnord-cgi fnord-idx ${DESTDIR}${PREFIX}/sbin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} fnord fnord-cgi fnord-idx ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/freedup16/Makefile b/freedup16/Makefile
index b3e0e99357..aba7175815 100644
--- a/freedup16/Makefile
+++ b/freedup16/Makefile
@@ -31,6 +31,6 @@ ONLY_FOR_PLATFORM=	DragonFly-*-* \
 			NetBSD-[5-9]*-amd64
 
 post-extract:
-		cd ${WRKSRC} && rm symharden
+	cd ${WRKSRC} && rm symharden
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geoloc/Makefile b/geoloc/Makefile
index e66003c9cc..3130d344c4 100644
--- a/geoloc/Makefile
+++ b/geoloc/Makefile
@@ -25,15 +25,20 @@ YACC=		yacc
 USE_TOOLS=	yacc
 
 post-extract:
-		cd ${WRKSRC} && ${YACC} -o geolocd/y.tab.c geolocd/parse.y
+	cd ${WRKSRC} && ${YACC} -o geolocd/y.tab.c geolocd/parse.y
 
 pre-install:
-		${MKDIR} ${DESTDIR}/${PREFIX}/sbin && cp ${WRKSRC}/build/geolocd ${DESTDIR}/${PREFIX}/sbin \
-		&& cp ${WRKSRC}/build/geolocctl ${DESTDIR}/${PREFIX}/sbin && \
-		${MKDIR} ${DESTDIR}/${PREFIX}/etc && cp ${WRKSRC}/geolocd/geolocd.conf ${DESTDIR}/${PREFIX}/etc && \
-		${MKDIR} ${DESTDIR}/${PREFIX}/man8 && cp ${WRKSRC}/geolocd/geolocd.8 ${DESTDIR}/${PREFIX}/man8 && \
-		${MKDIR} ${DESTDIR}/${PREFIX}/man5 && cp ${WRKSRC}/geolocd/geolocd.conf.5 ${DESTDIR}/${PREFIX}/man5 && \
-		${MKDIR} ${DESTDIR}/${PREFIX}/man1 && cp ${WRKSRC}/geolocctl/geolocctl.1 ${DESTDIR}/${PREFIX}/man1
+	${MKDIR} ${DESTDIR}/${PREFIX}/sbin \
+	&& cp ${WRKSRC}/build/geolocd ${DESTDIR}/${PREFIX}/sbin \
+	&& cp ${WRKSRC}/build/geolocctl ${DESTDIR}/${PREFIX}/sbin \
+	&& ${MKDIR} ${DESTDIR}/${PREFIX}/etc \
+	&& cp ${WRKSRC}/geolocd/geolocd.conf ${DESTDIR}/${PREFIX}/etc \
+	&& ${MKDIR} ${DESTDIR}/${PREFIX}/man8 \
+	&& cp ${WRKSRC}/geolocd/geolocd.8 ${DESTDIR}/${PREFIX}/man8 \
+	&& ${MKDIR} ${DESTDIR}/${PREFIX}/man5 \
+	&& cp ${WRKSRC}/geolocd/geolocd.conf.5 ${DESTDIR}/${PREFIX}/man5 \
+	&& ${MKDIR} ${DESTDIR}/${PREFIX}/man1 \
+	&& cp ${WRKSRC}/geolocctl/geolocctl.1 ${DESTDIR}/${PREFIX}/man1
 
 .include "../../net/GeoIP/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphmonkey/Makefile b/graphmonkey/Makefile
index 8f01b1570a..87193871b6 100644
--- a/graphmonkey/Makefile
+++ b/graphmonkey/Makefile
@@ -25,8 +25,8 @@ SUBST_STAGE.prefix=	post-patch
 INSTALLATION_DIRS+=	bin share/pixmaps
 
 post-install:
-		${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png \
-			${DESTDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png \
+		${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
diff --git a/iText/Makefile b/iText/Makefile
index a2479f84d7..b8a7940586 100644
--- a/iText/Makefile
+++ b/iText/Makefile
@@ -21,9 +21,9 @@ MESSAGE_SUBST+=	PKGV_NR=${PKGVERSION_NOREV}
 INSTALLATION_DIRS+=	lib/java share/doc/${PKGBASE}
 
 do-install:
-		cd ${WRKSRC} && \
-			${INSTALL_DATA} *${PKGVERSION_NOREV}.jar ${DESTDIR}${PREFIX}/lib/java && \
-			${INSTALL_DATA} notice.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/README
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} *${PKGVERSION_NOREV}.jar ${DESTDIR}${PREFIX}/lib/java && \
+		${INSTALL_DATA} notice.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/README
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/iTextXML/Makefile b/iTextXML/Makefile
index 532f7e20c9..8bacbc281f 100644
--- a/iTextXML/Makefile
+++ b/iTextXML/Makefile
@@ -23,7 +23,7 @@ MESSAGE_SUBST+=	DN=${DISTNAME}
 INSTALLATION_DIRS=	lib/java
 
 do-install:
-		${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${DESTDIR}${PREFIX}/lib/java
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/java-iText-RUPS/Makefile b/java-iText-RUPS/Makefile
index d2218b99c0..90ebc0fa00 100644
--- a/java-iText-RUPS/Makefile
+++ b/java-iText-RUPS/Makefile
@@ -23,7 +23,7 @@ MESSAGE_SUBST+=	DN=itext-rups-${PKGVERSION_NOREV}
 INSTALLATION_DIRS=	lib/java
 
 do-install:
-		${INSTALL_DATA} ${WRKSRC}/itext-rups-${PKGVERSION_NOREV}.jar ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/itext-rups-${PKGVERSION_NOREV}.jar ${DESTDIR}${PREFIX}/lib/java
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kyra2/Makefile b/kyra2/Makefile
index bcf5f9c99a..8f066c2ebe 100644
--- a/kyra2/Makefile
+++ b/kyra2/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		autoconf automake gmake perl
 
 pre-configure:
-		cd ${WRKSRC} && ${SH} autogen
+	cd ${WRKSRC} && ${SH} autogen
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/lightdm-gtk-greeter/Makefile b/lightdm-gtk-greeter/Makefile
index c59a9cf4f0..31f2854ffb 100644
--- a/lightdm-gtk-greeter/Makefile
+++ b/lightdm-gtk-greeter/Makefile
@@ -22,10 +22,10 @@ CONF_FILES+=	${EGDIR}/lightdm-gtk-greeter.conf ${PKG_SYSCONFDIR}/lightdm/lightdm
 INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/lightdm ${EGDIR}
 
 pre-install:
-		${INSTALL_DATA} ${WRKSRC}/data/lightdm-gtk-greeter.conf ${DESTDIR}${EGDIR}/lightdm-gtk-greeter.conf
+	${INSTALL_DATA} ${WRKSRC}/data/lightdm-gtk-greeter.conf ${DESTDIR}${EGDIR}/lightdm-gtk-greeter.conf
 
 post-install:
-		${RM} ${DESTDIR}${PKG_SYSCONFDIR}/lightdm/lightdm-gtk-greeter.conf
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/lightdm/lightdm-gtk-greeter.conf
 
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/lightdm/Makefile b/lightdm/Makefile
index 87c7ac6c31..17883ba62a 100644
--- a/lightdm/Makefile
+++ b/lightdm/Makefile
@@ -40,23 +40,23 @@ CONF_FILES+=		${EGDIR}/pam.d/lightdm-autologin ${PKG_SYSCONFDIR}/pam.d/lightdm-a
 CONF_FILES+=		${EGDIR}/pam.d/lightdm-greeter ${PKG_SYSCONFDIR}/pam.d/lightdm-greeter
 
 pre-install:
-			cd ${WRKSRC}/data && \
-			${INSTALL_DATA} guest-session.apparmor ${DESTDIR}${EGDIR}/apparmor.d/lightdm-guest-session && \
-			${INSTALL_DATA} org.freedesktop.DisplayManager.conf ${DESTDIR}${EGDIR}/dbus/system.d/org.freedesktop.DisplayManager.conf && \
-			${INSTALL_DATA} lightdm.conf ${DESTDIR}${EGDIR}/lightdm/lightdm.conf && \
-			${INSTALL_DATA} keys.conf ${DESTDIR}${EGDIR}/lightdm/keys.conf && \
-			${INSTALL_DATA} users.conf ${DESTDIR}${EGDIR}/lightdm/users.conf;
-			cd ${WRKSRC}/data/pam && \
-			${INSTALL_DATA} lightdm ${DESTDIR}${EGDIR}/pam.d/lightdm && \
-			${INSTALL_DATA} lightdm-autologin ${DESTDIR}${EGDIR}/pam.d/lightdm-autologin && \
-			${INSTALL_DATA} lightdm-greeter ${DESTDIR}${EGDIR}/pam.d/lightdm-greeter
+	cd ${WRKSRC}/data && \
+		${INSTALL_DATA} guest-session.apparmor ${DESTDIR}${EGDIR}/apparmor.d/lightdm-guest-session && \
+		${INSTALL_DATA} org.freedesktop.DisplayManager.conf ${DESTDIR}${EGDIR}/dbus/system.d/org.freedesktop.DisplayManager.conf && \
+		${INSTALL_DATA} lightdm.conf ${DESTDIR}${EGDIR}/lightdm/lightdm.conf && \
+		${INSTALL_DATA} keys.conf ${DESTDIR}${EGDIR}/lightdm/keys.conf && \
+		${INSTALL_DATA} users.conf ${DESTDIR}${EGDIR}/lightdm/users.conf;
+	cd ${WRKSRC}/data/pam && \
+		${INSTALL_DATA} lightdm ${DESTDIR}${EGDIR}/pam.d/lightdm && \
+		${INSTALL_DATA} lightdm-autologin ${DESTDIR}${EGDIR}/pam.d/lightdm-autologin && \
+		${INSTALL_DATA} lightdm-greeter ${DESTDIR}${EGDIR}/pam.d/lightdm-greeter
 
 post-install:
-			${RM} ${DESTDIR}${PKG_SYSCONFDIR}/apparmor.d/lightdm-guest-session
-			${RM} ${DESTDIR}${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
-			${RM} ${DESTDIR}${PKG_SYSCONFDIR}/init/lightdm.conf
-			${RM} -rf ${DESTDIR}${PKG_SYSCONFDIR}/lightdm
-			${RM} ${DESTDIR}${PKG_SYSCONFDIR}/pam.d/lightdm*
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/apparmor.d/lightdm-guest-session
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/init/lightdm.conf
+	${RM} -rf ${DESTDIR}${PKG_SYSCONFDIR}/lightdm
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/pam.d/lightdm*
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/lpdsrv/Makefile b/lpdsrv/Makefile
index 48f90d210e..b22b3aad4c 100644
--- a/lpdsrv/Makefile
+++ b/lpdsrv/Makefile
@@ -19,6 +19,6 @@ MAKE_ENV+=	LDLIBS=${LIBS:Q}
 INSTALLATION_DIRS=	sbin
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/lpdsrv ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/lpdsrv ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mplabs/Makefile b/mplabs/Makefile
index e516ada3bf..b96002d8b7 100644
--- a/mplabs/Makefile
+++ b/mplabs/Makefile
@@ -23,8 +23,8 @@ do-install:
 .for i in LL-2D-DGR      LL-2D-STD      ZSC-2D-DGR     ZSC-2D-STD
 	${INSTALL_DATA} ${WRKSRC}/bin/${i} ${DESTDIR}${PREFIX}/bin
 .endfor
-		${INSTALL_DATA} ${WRKSRC}/docs/mp-labs.pdf \
-			${DESTDIR}${PREFIX}/share/doc/mplabs
+	${INSTALL_DATA} ${WRKSRC}/docs/mp-labs.pdf \
+		${DESTDIR}${PREFIX}/share/doc/mplabs
 
 .include "../../parallel/openmpi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mtop/Makefile b/mtop/Makefile
index ee2f6b547b..c08fddef36 100644
--- a/mtop/Makefile
+++ b/mtop/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES=	# none
 MAKE_PARAMS+=	--prefix=${PREFIX}
 
 post-extract:
-		rm ${WRKSRC}/cpan2spec.pl
+	rm ${WRKSRC}/cpan2spec.pl
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/mu-cite/Makefile b/mu-cite/Makefile
index 79bd57293e..7715d4fb4b 100644
--- a/mu-cite/Makefile
+++ b/mu-cite/Makefile
@@ -23,10 +23,10 @@ MAKE_DIRS+=		${PREFIX}/share/doc/mu-cite
 AUTO_MKDIRS=		yes
 
 do-build:
-		(cd ${WRKSRC} && ${MAKE})
+	cd ${WRKSRC} && ${MAKE}
 
 post-install:
-		${INSTALL_DATA} ${WRKSRC}/README.en ${DESTDIR}${PREFIX}/share/doc/mu-cite
-		${INSTALL_DATA} ${WRKSRC}/NEWS      ${DESTDIR}${PREFIX}/share/doc/mu-cite
+	${INSTALL_DATA} ${WRKSRC}/README.en ${DESTDIR}${PREFIX}/share/doc/mu-cite
+	${INSTALL_DATA} ${WRKSRC}/NEWS      ${DESTDIR}${PREFIX}/share/doc/mu-cite
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nag/Makefile b/nag/Makefile
index 5f245dd34d..4d3a2bc9ac 100644
--- a/nag/Makefile
+++ b/nag/Makefile
@@ -81,7 +81,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING ${DESTDIR}${DOCDIR}
 
 .for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && pax -rwpma . ${DESTDIR}${NAGDIR}/${d}
+	cd ${WRKSRC}/${d} && pax -rwpma . ${DESTDIR}${NAGDIR}/${d}
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${NAGDIR}/config
diff --git a/nbfc/Makefile b/nbfc/Makefile
index b36505c285..745dba4f7c 100644
--- a/nbfc/Makefile
+++ b/nbfc/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake yacc
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
-			${INSTALL_PROGRAM} ${WRKSRC}/nbfc ${DESTDIR}${PREFIX}/bin
-			${INSTALL_MAN} ${WRKSRC}/nbfc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/nbfc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nbfc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nuttcp/Makefile b/nuttcp/Makefile
index eb7d611679..a122937272 100644
--- a/nuttcp/Makefile
+++ b/nuttcp/Makefile
@@ -20,15 +20,15 @@ USE_TOOLS+=	gmake
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/doc/${PKGBASE}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/nuttcp-${NUTTCP_VERSION} \
-			${DESTDIR}${PREFIX}/bin/nuttcp
-		${INSTALL_MAN} ${WRKSRC}/nuttcp.8 \
-			${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-		${INSTALL_DATA} ${WRKSRC}/README \
-			${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-		${INSTALL_DATA} ${WRKSRC}/examples.txt \
-			${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-		${INSTALL_DATA} ${WRKSRC}/nuttcp.html \
-			${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_PROGRAM} ${WRKSRC}/nuttcp-${NUTTCP_VERSION} \
+		${DESTDIR}${PREFIX}/bin/nuttcp
+	${INSTALL_MAN} ${WRKSRC}/nuttcp.8 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/examples.txt \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/nuttcp.html \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/openca/Makefile b/openca/Makefile
index dbc639eedf..43e0f83b62 100644
--- a/openca/Makefile
+++ b/openca/Makefile
@@ -130,7 +130,7 @@ post-install:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} install-man
 
 .for f in ${MKDIRS}
-		${MKDIR} ${PKG_SYSCONFDIR}/${f}
+	${MKDIR} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 	${CHOWN} ${OPENCA_USER}:${OPENCA_GROUP} \
diff --git a/openttd-openmsx/Makefile b/openttd-openmsx/Makefile
index c3a25b0750..20b5620e8f 100644
--- a/openttd-openmsx/Makefile
+++ b/openttd-openmsx/Makefile
@@ -25,10 +25,10 @@ NO_CONFIGURE=	YES
 OPENTTD_GMDIR=	${DESTDIR}${PREFIX}/share/openttd/gm
 
 do-install:
-		${INSTALL_DATA} ${WRKSRC}/*.mid \
-			${OPENTTD_GMDIR}
-		${INSTALL_DATA} ${WRKSRC}/*.obm \
-			${OPENTTD_GMDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.mid \
+		${OPENTTD_GMDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.obm \
+		${OPENTTD_GMDIR}
 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/ozymandns/Makefile b/ozymandns/Makefile
index e536260294..9220477c3d 100644
--- a/ozymandns/Makefile
+++ b/ozymandns/Makefile
@@ -32,9 +32,9 @@ SUBST_SED.perlfix=	-e 's:^\#!/usr/bin/perl:\#!${PERL5}:g'
 LIBS.SunOS+=	-lnsl # for gethostbyname
 
 do-build:
-		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} glance.c -o glance ${LDFLAGS} ${LIBS}
+	cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} glance.c -o glance ${LDFLAGS} ${LIBS}
 
 do-install:
-		cd ${WRKSRC} && ${INSTALL_PROGRAM} glance ${DESTDIR}${PREFIX}/sbin && ${INSTALL_SCRIPT} ${OZYMAN_PERLSCRIPTS} ${DESTDIR}${PREFIX}/sbin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} glance ${DESTDIR}${PREFIX}/sbin && ${INSTALL_SCRIPT} ${OZYMAN_PERLSCRIPTS} ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pcsxr/Makefile b/pcsxr/Makefile
index 2e9c46e97e..52a0d20115 100644
--- a/pcsxr/Makefile
+++ b/pcsxr/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PKGBASE}
 .include "options.mk"
 
 pre-configure:
-			cd ${WRKSRC} && ./autogen.sh
+	cd ${WRKSRC} && ./autogen.sh
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_DEPMETHOD.libXcursor=	build
diff --git a/piedock/Makefile b/piedock/Makefile
index 82f2508ff3..1eb5c3a95c 100644
--- a/piedock/Makefile
+++ b/piedock/Makefile
@@ -27,7 +27,7 @@ SUBST_SED.share=	-e "s|/usr/share|${PREFIX}/share|g"
 .include "options.mk"
 
 post-install:
-			${INSTALL_DATA} ${WRKSRC}/res/piedockrc.sample ${DESTDIR}${PREFIX}/${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/res/piedockrc.sample ${DESTDIR}${PREFIX}/${EGDIR}/
 
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
diff --git a/pixz/Makefile b/pixz/Makefile
index cf6c1aeea1..99c7f789fd 100644
--- a/pixz/Makefile
+++ b/pixz/Makefile
@@ -19,8 +19,8 @@ BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=2.8
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/pixz ${DESTDIR}${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/pixz.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/pixz ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/pixz.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/profanity/Makefile b/profanity/Makefile
index afec656151..06e8c88bd0 100644
--- a/profanity/Makefile
+++ b/profanity/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
 pre-configure:
-		cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoconf
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
diff --git a/ptunnel/Makefile b/ptunnel/Makefile
index 5a6e624ef3..a5adfe0c61 100644
--- a/ptunnel/Makefile
+++ b/ptunnel/Makefile
@@ -12,8 +12,8 @@ HOMEPAGE=	http://www.cs.uit.no/~daniels/PingTunnel/
 COMMENT=	TCP tunnel over ICMP
 LICENSE=	modified-bsd
 
+# XXX Could be patched to use net/if_ether.h
 NOT_FOR_PLATFORM=	NetBSD-*-* # XXX needs net/ethernet.h
-			# XXX Could be patched to use net/if_ether.h
 
 WRKSRC=		${WRKDIR}/PingTunnel
 USE_TOOLS+=	gmake
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index 923050003b..0594954df8 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -165,10 +165,10 @@ pre-configure:
 		-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
 		-e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
 		${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
-		for dir in ${WRKSRC}/mkspecs/*; do \
-			cp ${WRKSRC}/qmake.conf $${dir}; \
-			rm -f $${dir}/*.orig; \
-		done
+	for dir in ${WRKSRC}/mkspecs/*; do \
+		cp ${WRKSRC}/qmake.conf $${dir}; \
+		rm -f $${dir}/*.orig; \
+	done
 	${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
 	${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
 
diff --git a/qtnotifydaemon/Makefile b/qtnotifydaemon/Makefile
index 94b0f05470..1e6d37cd79 100644
--- a/qtnotifydaemon/Makefile
+++ b/qtnotifydaemon/Makefile
@@ -23,8 +23,8 @@ SUBST_FILES.prefix=	org.freedesktop.Notifications.service
 SUBST_SED.prefix=	-e 's|/usr|${PREFIX}|'
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/qtnotifydaemon ${DESTDIR}${PREFIX}/bin/qtnotifydaemon
-		${INSTALL_DATA} ${WRKSRC}/org.freedesktop.Notifications.service ${DESTDIR}${PREFIX}/share/dbus-1/services/org.freedesktop.Notifications.service
+	${INSTALL_PROGRAM} ${WRKSRC}/qtnotifydaemon ${DESTDIR}${PREFIX}/bin/qtnotifydaemon
+	${INSTALL_DATA} ${WRKSRC}/org.freedesktop.Notifications.service ${DESTDIR}${PREFIX}/share/dbus-1/services/org.freedesktop.Notifications.service
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
diff --git a/ranmacgen/Makefile b/ranmacgen/Makefile
index 06d8ce330b..196e6ee9df 100644
--- a/ranmacgen/Makefile
+++ b/ranmacgen/Makefile
@@ -19,10 +19,10 @@ WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS+=	bin
 
 do-build:
-			cd ${WRKSRC} && ${CC} -o ranmacgen macgen.c
+	cd ${WRKSRC} && ${CC} -o ranmacgen macgen.c
 
 do-install:
-			${INSTALL_PROGRAM} ${WRKSRC}/ranmacgen \
-				${DESTDIR}${PREFIX}/bin/ranmacgen
+	${INSTALL_PROGRAM} ${WRKSRC}/ranmacgen \
+		${DESTDIR}${PREFIX}/bin/ranmacgen
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/ratproxy/Makefile b/ratproxy/Makefile
index bba1c95472..254a00f1a2 100644
--- a/ratproxy/Makefile
+++ b/ratproxy/Makefile
@@ -40,7 +40,7 @@ do-install:
 			${DESTDIR}${DATADIR} && \
 		${INSTALL_SCRIPT} ratproxy-report.sh \
 			${DESTDIR}${BINDIR}/ratproxy-report
-		${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${DOCDIR}
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ruby-redmine/Makefile b/ruby-redmine/Makefile
index af4d4e9dfb..b9e0e2b3b9 100644
--- a/ruby-redmine/Makefile
+++ b/ruby-redmine/Makefile
@@ -238,17 +238,14 @@ INSTALLATION_DIRS+=	share/${PKGBASE}/tmp/thumbnails share/${PKGBASE}/vendor
 
 #do-install:
 #	set -e; cd ${WRKSRC};
-		#for i in `find . -path ./doc -prune -o -type f ! -perm 775 -print`;
-		#do
-		#	${INSTALL_DATA} $$i
-				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
-		#done;
-		#for i in `find . -type f -executable -not -name ttf2ufm\\* -print`;
-		#do
-		#	${INSTALL_SCRIPT} $$i
-				#${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
-		#done;
-		#${INSTALL_DATA} doc/* ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+#	for i in `find . -path ./doc -prune -o -type f ! -perm 775 -print`; do
+#		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
+#	done;
+#	for i in `find . -type f -executable -not -name ttf2ufm\\* -print`; do
+#		${INSTALL_SCRIPT} $$i
+#		${DESTDIR}${PREFIX}/share/${PKGBASE}/$$i;
+#	done;
+#	${INSTALL_DATA} doc/* ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/semanticscuttle/Makefile b/semanticscuttle/Makefile
index 618d618dc4..9ecd774cb5 100644
--- a/semanticscuttle/Makefile
+++ b/semanticscuttle/Makefile
@@ -55,10 +55,10 @@ do-install:
 
 	# Data
 .for d in data/locales data/schema data/templates
-		${INSTALL_DATA_DIR} ${DESTDIR}${SSDIR}/${d}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SSDIR}/${d}
 .endfor
 .for d in data/locales data/schema data/templates
-		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${SSDIR}/${d}
+	cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${SSDIR}/${d}
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/data/config.default.php ${DESTDIR}${SSDIR}/data
diff --git a/shaarli/Makefile b/shaarli/Makefile
index 897ce1f864..7982b6b4f3 100644
--- a/shaarli/Makefile
+++ b/shaarli/Makefile
@@ -67,10 +67,10 @@ INSTALLATION_DIRS+=	${RCDIR} ${EGDIR}
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}
 .for d in ${PAXDIRS}
-		${INSTALL_DATA_DIR} ${DESTDIR}${RCDIR}/${d}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RCDIR}/${d}
 .endfor
 .for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${RCDIR}/${d}
+	cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${RCDIR}/${d}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/apache.conf.dist ${DESTDIR}${EGDIR}/apache.conf
 
diff --git a/showmesh/Makefile b/showmesh/Makefile
index 06e3ddad77..0ee0a6459b 100644
--- a/showmesh/Makefile
+++ b/showmesh/Makefile
@@ -16,12 +16,13 @@ NO_CONFIGURE=	YES
 INSTALLATION_DIRS=	bin
 
 do-extract:
-		${CP} ${DISTDIR}/showmesh_1_0.c ${WRKSRC}
+	${CP} ${DISTDIR}/showmesh_1_0.c ${WRKSRC}
+
 do-build:
-		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} showmesh_1_0.c -o showmesh ${LDFLAGS} -lX11
+	cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} showmesh_1_0.c -o showmesh ${LDFLAGS} -lX11
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/showmesh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/showmesh ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index 8f236ad935..6c14799030 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -16,11 +16,11 @@ NO_BUILD=	yes
 #DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 post-extract:
-		${FIND} ${WRKDIR} -type f -exec ${CHMOD} 0644 {} \;
+	${FIND} ${WRKDIR} -type f -exec ${CHMOD} 0644 {} \;
 
 do-install:
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simtrans
-		${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}/share/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simtrans
+	${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}/share/
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/simutrans/Makefile b/simutrans/Makefile
index 597354cd82..d7f9a9af38 100644
--- a/simutrans/Makefile
+++ b/simutrans/Makefile
@@ -44,10 +44,9 @@ SUBST_FILES.testeq+=	script/*.sh
 SUBST_FILES.testeq+=	Makefile
 SUBST_SED.testeq=	-e 's/==/=/g'
 
-
 do-extract:
-		unzip ${DISTDIR}/${DISTNAME}.zip -d ${WRKSRC} -o
-		unzip ${DISTDIR}/language_pack-Base+texts.zip -d ${WRKSRC}/simutrans/text -o
+	unzip ${DISTDIR}/${DISTNAME}.zip -d ${WRKSRC} -o
+	unzip ${DISTDIR}/language_pack-Base+texts.zip -d ${WRKSRC}/simutrans/text -o
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -rw -pp simutrans ${DESTDIR}${PREFIX}/share/
diff --git a/stress-ng/Makefile b/stress-ng/Makefile
index b1d6b261ed..98557e4c71 100644
--- a/stress-ng/Makefile
+++ b/stress-ng/Makefile
@@ -15,7 +15,7 @@ BUILD_TARGET=	install
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${DESTDIR}${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 8449485740..1f2b19f879 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -72,11 +72,8 @@ SUBST_SED.s2i=		-e s/string-to-int/string-to-number/g
 .include "options.mk"
 
 pre-configure:
-		( cd ${WRKSRC} && \
-		aclocal ;\
-		automake --add-missing; \
-		autoconf ; \
-		)
+	cd ${WRKSRC} && aclocal && automake --add-missing && autoconf
+
 # To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
 # Just one file is to be converted now,
 .if (${EMACS_TYPE} == emacs25) || \
diff --git a/tc/Makefile b/tc/Makefile
index 491fc177b8..b7742e7fd2 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -71,11 +71,8 @@ SUBST_SED.s2i=		-e s/string-to-int/string-to-number/g
 .include "options.mk"
 
 pre-configure:
-		( cd ${WRKSRC} && \
-		aclocal ;\
-		automake --add-missing; \
-		autoconf ; \
-		)
+	cd ${WRKSRC} && aclocal && automake --add-missing && autoconf
+
 # To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
 # Just one file is to be converted now,
 .if (${EMACS_TYPE} == emacs25) || \
diff --git a/tctool/Makefile b/tctool/Makefile
index 7a3194b7d7..b07e071ea4 100644
--- a/tctool/Makefile
+++ b/tctool/Makefile
@@ -24,6 +24,6 @@ CXXFLAGS.Linux+=	-DCSTDLIB
 BUILD_TARGET=	tctool
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/tctool ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tctool ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/udp-ping/Makefile b/udp-ping/Makefile
index 7ca8697c04..2d302f6215 100644
--- a/udp-ping/Makefile
+++ b/udp-ping/Makefile
@@ -17,13 +17,13 @@ NO_CONFIGURE=	YES
 INSTALLATION_DIRS+=	bin sbin
 
 do-build:
-		cd ${WRKSRC} &&  \
-		${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${PTHREAD_LDFLAGS} cUDPingLnx.cpp -o udp-ping ${LIBS} ${PTHREAD_LIBS} && \
-		${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} sUDPingLnx.cpp -o udp-ping-server ${LIBS}
+	cd ${WRKSRC} &&  \
+	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${PTHREAD_LDFLAGS} cUDPingLnx.cpp -o udp-ping ${LIBS} ${PTHREAD_LIBS} && \
+	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} sUDPingLnx.cpp -o udp-ping-server ${LIBS}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/udp-ping ${DESTDIR}${PREFIX}/bin && \
-		${INSTALL_PROGRAM} ${WRKSRC}/udp-ping-server ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/udp-ping ${DESTDIR}${PREFIX}/bin && \
+	${INSTALL_PROGRAM} ${WRKSRC}/udp-ping-server ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/unagi/Makefile b/unagi/Makefile
index d84094fc11..475c8b3803 100644
--- a/unagi/Makefile
+++ b/unagi/Makefile
@@ -26,10 +26,10 @@ BUILDLINK_TRANSFORM=	rm:-ldl
 .endif
 
 post-install:
-		cd ${WRKSRC} && \
-			${INSTALL_DATA} unagi.conf \
-				${DESTDIR}${PREFIX}/${EGDIR}/unagi.conf
-		${RM} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/unagi.conf
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} unagi.conf \
+			${DESTDIR}${PREFIX}/${EGDIR}/unagi.conf
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/unagi.conf
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/vidalia-devel/Makefile b/vidalia-devel/Makefile
index b01e239dcb..e4545c15c6 100644
--- a/vidalia-devel/Makefile
+++ b/vidalia-devel/Makefile
@@ -22,7 +22,7 @@ USE_TOOLS+=	gmake mkdir
 CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
 
 pre-configure:
-		cd ${WRKSRC} && ${MKDIR} build
+	cd ${WRKSRC} && ${MKDIR} build
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/vidalia/Makefile b/vidalia/Makefile
index 6e74b78373..6ed81b7555 100644
--- a/vidalia/Makefile
+++ b/vidalia/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
 DEPENDS+=	tor-[0-9]*:../../net/tor
 
 pre-configure:
-		cd ${WRKSRC} && ${MKDIR} build
+	cd ${WRKSRC} && ${MKDIR} build
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/weplab/Makefile b/weplab/Makefile
index 85132de291..246dcc28a4 100644
--- a/weplab/Makefile
+++ b/weplab/Makefile
@@ -17,8 +17,8 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 CPPFLAGS.SunOS+=	-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/weplab ${DESTDIR}${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/weplab.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/weplab ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/weplab.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/wla-dx-git/Makefile b/wla-dx-git/Makefile
index 11ace3a613..5ed9298a35 100644
--- a/wla-dx-git/Makefile
+++ b/wla-dx-git/Makefile
@@ -26,18 +26,18 @@ WLADX_BINARIES=		wla-6502 wla-6510 wla-65816 wla-65c02 wla-gb wla-huc6280 \
 
 do-install:
 .for f in ${WLADX_BINARIES}
-		${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
 .endfor
 
 .for f in binaries/doc/{wla-dx.txt,wla-dx.html} FILE_FORMATS CHANGELOG
-		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .endfor
 
 .for f in binaries/doc/*.1
-		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endfor
 .for f in binaries/doc/*.7
-		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
 .endfor
 
 
diff --git a/wla-dx/Makefile b/wla-dx/Makefile
index 79c0c2bfc6..b9a76c673f 100644
--- a/wla-dx/Makefile
+++ b/wla-dx/Makefile
@@ -25,17 +25,17 @@ WLADX_BINARIES=		wla-6502 wla-6510 wla-65816 wla-65c02 wla-gb wla-huc6280 \
 
 do-install:
 .for f in ${WLADX_BINARIES}
-		${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
 .endfor
 .if !empty(PKG_OPTIONS:Mdoc)
 .  for f in binaries/doc/wla-dx.txt binaries/doc/wla-dx.html FILE_FORMATS CHANGELOG
-			${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .  endfor
 .  for f in binaries/doc/*.1
-			${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .  endfor
 .  for f in binaries/doc/*.7
-			${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
 .  endfor
 .endif
 
diff --git a/wmsupermon/Makefile b/wmsupermon/Makefile
index 63f48dc041..0691aae15d 100644
--- a/wmsupermon/Makefile
+++ b/wmsupermon/Makefile
@@ -21,10 +21,10 @@ SUBST_MESSAGE.x11=	Fixing X11 LIBDIR.
 SUBST_SED.x11=		-e "s|/usr/X11R6/lib|${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib|"
 
 do-install:
-			${INSTALL_PROGRAM} ${WRKSRC}/wmsupermon ${DESTDIR}${PREFIX}/bin/wmsupermon
-			${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wmsupermon/README
-			${INSTALL_DATA} ${WRKSRC}/example-wmsupermonrc ${DESTDIR}${PREFIX}/share/examples/wmsupermon/wmsupermonrc
-			${INSTALL_DATA} ${WRKSRC}/wmsupermon-master.xpm ${DESTDIR}${PREFIX}/share/pixmaps/wmsupermon.xpm
+	${INSTALL_PROGRAM} ${WRKSRC}/wmsupermon ${DESTDIR}${PREFIX}/bin/wmsupermon
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wmsupermon/README
+	${INSTALL_DATA} ${WRKSRC}/example-wmsupermonrc ${DESTDIR}${PREFIX}/share/examples/wmsupermon/wmsupermonrc
+	${INSTALL_DATA} ${WRKSRC}/wmsupermon-master.xpm ${DESTDIR}${PREFIX}/share/pixmaps/wmsupermon.xpm
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/wmswallow/Makefile b/wmswallow/Makefile
index 22d229a730..f6a36b32a1 100644
--- a/wmswallow/Makefile
+++ b/wmswallow/Makefile
@@ -21,7 +21,7 @@ BUILD_TARGET=	xfree
 LDFLAGS+=	${X11_LDFLAGS}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/wmswallow ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/wmswallow ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/xebece/Makefile b/xebece/Makefile
index f719f83635..3fac01ec45 100644
--- a/xebece/Makefile
+++ b/xebece/Makefile
@@ -19,22 +19,22 @@ INSTALLATION_DIRS+=	bin share/doc/xebece share/examples/xebece xebece/dist
 INSTALLATION_DIRS+=	xebece/lib
 
 do-build:
-		# nothing
+	# nothing
 
 post-build:
-		${ECHO} '#!${SH}' > ${WRKSRC}/xebece
-		${ECHO} '${DESTDIR}${PREFIX}/bin/sun6-java -jar ${DESTDIR}${PREFIX}/xebece/dist/xebece.jar' >> ${WRKSRC}/xebece
+	${ECHO} '#!${SH}' > ${WRKSRC}/xebece
+	${ECHO} '${DESTDIR}${PREFIX}/bin/sun6-java -jar ${DESTDIR}${PREFIX}/xebece/dist/xebece.jar' >> ${WRKSRC}/xebece
 
 do-install:
-		${INSTALL_DATA} ${WRKSRC}/doc/Xebece-Manual.cal ${DESTDIR}${PREFIX}/share/doc/xebece/Xebece-Manual.cal
-		${INSTALL_DATA} ${WRKSRC}/doc/Xebece-Manual_de.cal ${DESTDIR}${PREFIX}/share/doc/xebece/Xebece-Manual_de.cal
-		${INSTALL_DATA} ${WRKSRC}/doc/examples/chi.cal ${DESTDIR}${PREFIX}/share/examples/xebece/chi.cal
-		${INSTALL_DATA} ${WRKSRC}/doc/examples/solar_system.cal ${DESTDIR}${PREFIX}/share/examples/xebece/solar_system.cal
-		${INSTALL_SCRIPT} ${WRKSRC}/dist/xebece.jar ${DESTDIR}${PREFIX}/xebece/dist/xebece.jar
-		${INSTALL_LIB} ${WRKSRC}/lib/icons.zip ${DESTDIR}${PREFIX}/xebece/lib/icons.zip
-		${INSTALL_LIB} ${WRKSRC}/lib/prefuse.jar ${DESTDIR}${PREFIX}/xebece/lib/prefuse.jar
-		${INSTALL_LIB} ${WRKSRC}/lib/prefusex.jar ${DESTDIR}${PREFIX}/xebece/lib/prefusex.jar
-		${INSTALL_SCRIPT} ${WRKSRC}/xebece ${DESTDIR}${PREFIX}/bin/xebece
+	${INSTALL_DATA} ${WRKSRC}/doc/Xebece-Manual.cal ${DESTDIR}${PREFIX}/share/doc/xebece/Xebece-Manual.cal
+	${INSTALL_DATA} ${WRKSRC}/doc/Xebece-Manual_de.cal ${DESTDIR}${PREFIX}/share/doc/xebece/Xebece-Manual_de.cal
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/chi.cal ${DESTDIR}${PREFIX}/share/examples/xebece/chi.cal
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/solar_system.cal ${DESTDIR}${PREFIX}/share/examples/xebece/solar_system.cal
+	${INSTALL_SCRIPT} ${WRKSRC}/dist/xebece.jar ${DESTDIR}${PREFIX}/xebece/dist/xebece.jar
+	${INSTALL_LIB} ${WRKSRC}/lib/icons.zip ${DESTDIR}${PREFIX}/xebece/lib/icons.zip
+	${INSTALL_LIB} ${WRKSRC}/lib/prefuse.jar ${DESTDIR}${PREFIX}/xebece/lib/prefuse.jar
+	${INSTALL_LIB} ${WRKSRC}/lib/prefusex.jar ${DESTDIR}${PREFIX}/xebece/lib/prefusex.jar
+	${INSTALL_SCRIPT} ${WRKSRC}/xebece ${DESTDIR}${PREFIX}/bin/xebece
 
 
 .include "../../mk/java-vm.mk"
diff --git a/xmail/Makefile b/xmail/Makefile
index b33d3ae8a4..b243e4015e 100644
--- a/xmail/Makefile
+++ b/xmail/Makefile
@@ -17,20 +17,20 @@ MAKE_ENV+=	OSTYPE=${OPSYS}
 
 .include "../../mk/bsd.prefs.mk"
 
-EXT=bsd # Default one :)
+EXT=	bsd # Default one :)
 .if ${OPSYS} == "Linux"
 .  if   ${MACHINE_ARCH} == "i86pc"
-		EXT="lnx"
+EXT=	lnx
 .  elif ${MACHINE_ARCH} == "sparc"
-		EXT="slx"
+EXT=	slx
 .  elif ${MACHINE_ARCH} == "ppc"
-		EXT="plx"
+EXT=	plx
 .  endif
 .elif ${OPSYS} == "SunOS"
 .  if   ${MACHINE_ARCH} == "sparc"
-		EXT="sso"
+EXT=	sso
 .  elif ${MACHINE_ARCH} == "i86pc"
-		EXT="ssx"
+EXT=	ssx
 .  endif
 .endif
 
diff --git a/xml-light/Makefile b/xml-light/Makefile
index d7ca1db8f0..79e8d8b1ff 100644
--- a/xml-light/Makefile
+++ b/xml-light/Makefile
@@ -25,9 +25,9 @@ SUBST_SED.destdir=	-e "s|INSTALLDIR=|INSTALLDIR=${DESTDIR}|1"
 INSTALLATION_DIRS+=	lib/ocaml
 
 post-install:
-		${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/dtd.mli
-		${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/xml.mli
-		${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/xmlParser.mli
+	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/dtd.mli
+	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/xml.mli
+	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/ocaml/xmlParser.mli
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xmms2/Makefile b/xmms2/Makefile
index 1c6ee8ed77..d6db5950d0 100644
--- a/xmms2/Makefile
+++ b/xmms2/Makefile
@@ -37,7 +37,7 @@ do-configure:
 			--with-default-output-plugin=oss \
 			--mandir=${PREFIX}/${PKGMANDIR} \
 			--boost-includes=${BOOST_INCLUDES}
-			# --without-plugins=${WITHOUT_PLUGINS} # space clobbered
+	# --without-plugins=${WITHOUT_PLUGINS} # space clobbered
 
 do-build:
 	cd ${WRKSRC} && \
diff --git a/yaupspe/Makefile b/yaupspe/Makefile
index d9b8471801..ca7224d8ad 100644
--- a/yaupspe/Makefile
+++ b/yaupspe/Makefile
@@ -15,11 +15,11 @@ USE_TOOLS+=		gmake pkg-config
 INSTALLATION_DIRS+=	bin
 
 do-build:
-		cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 do-install:
-		cd ${WRKSRC}/src && \
-			${INSTALL_PROGRAM} yaupspe ${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC}/src && \
+		${INSTALL_PROGRAM} yaupspe ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"


Home | Main Index | Thread Index | Old Index