Fixed some pkglint warnings.

5 files changed, 20 insertions, 19 deletions

diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index 89aa4c7de2a..5e9963c25d0 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2012/10/20 12:21:39 darcy Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/09 11:41:57 rillig Exp $
 
 DISTNAME=	freeswitch-music-1.0.8
 CATEGORIES=	audio
 MASTER_SITES=	http://files.freeswitch.org/
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	freeswitch
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	darcy@NetBSD.org
 COMMENT=	FreeSwitch Music - All Bitrates
 LICENSE=	mpl-1.1
 
 MUSICDIR=	share/freeswitch/sounds/music
-PLIST_SUBST += MUSICDIR="${MUSICDIR}"
+PLIST_SUBST+=	MUSICDIR="${MUSICDIR}"
 NO_BUILD=	yes
 
 pre-install:
diff --git a/audio/freeswitch-music/options.mk b/audio/freeswitch-music/options.mk
index 9fa2095bf53..66d3b9362f9 100644
--- a/audio/freeswitch-music/options.mk
+++ b/audio/freeswitch-music/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2015/12/29 04:54:36 dholland Exp $
+# $NetBSD: options.mk,v 1.5 2016/07/09 11:41:57 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freeswitch
 PKG_SUPPORTED_OPTIONS=	freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k
@@ -9,33 +9,33 @@ PKG_SUGGESTED_OPTIONS=	freeswitch-08k freeswitch-16k
 .if !empty(PKG_OPTIONS:Mfreeswitch-08k)
 DISTFILES+=	freeswitch-sounds-music-8000-1.0.8.tar.gz
 INSTALLATION_DIRS+= share/freeswitch/sounds/music/8000
-SOUND_DIRS+= 8000
+SOUND_DIRS+=	8000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-16k)
 DISTFILES+=	freeswitch-sounds-music-16000-1.0.8.tar.gz
-SOUND_DIRS+= 16000
+SOUND_DIRS+=	16000
 INSTALLATION_DIRS+= share/freeswitch/sounds/music/16000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-32k)
 DISTFILES+=	freeswitch-sounds-music-32000-1.0.8.tar.gz
-SOUND_DIRS+= 32000
+SOUND_DIRS+=	32000
 INSTALLATION_DIRS+= share/freeswitch/sounds/music/32000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-48k)
 DISTFILES+=	freeswitch-sounds-music-48000-1.0.8.tar.gz
-SOUND_DIRS+= 48000
+SOUND_DIRS+=	48000
 INSTALLATION_DIRS+= share/freeswitch/sounds/music/48000
 .endif
 
 .for opt in ${PKG_SUPPORTED_OPTIONS}
-.if !empty(PKG_OPTIONS:M${opt})
-PLIST_SUBST+= ${opt}=""
-.else
-PLIST_SUBST+= ${opt}="@comment "
-.endif
+.  if !empty(PKG_OPTIONS:M${opt})
+PLIST_SUBST+=	${opt}=""
+.  else
+PLIST_SUBST+=	${opt}="@comment "
+.  endif
 .endfor
 
 PLIST_VARS+=	${PKG_SUPPORTED_OPTIONS}
diff --git a/x11/xfce4-tumbler/Makefile b/x11/xfce4-tumbler/Makefile
index ce8a3518864..3df60ded04e 100644
--- a/x11/xfce4-tumbler/Makefile
+++ b/x11/xfce4-tumbler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/05/22 18:20:49 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/07/09 11:39:08 rillig Exp $
 #
 #
 
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
-CONFIGURE_ARGS =	--disable-raw-thumbnailer \
+CONFIGURE_ARGS=	--disable-raw-thumbnailer \
 			--disable-gstreamer-thumbnailer
 
 PKGCONFIG_OVERRIDE+=	tumbler/tumbler-1.pc.in
@@ -32,7 +32,7 @@ CONF_FILES=	${EGDIR}/tumbler.rc \
 	       ${PKG_SYSCONFDIR}/tumbler/tumbler.rc
 
 INSTALL_UNSTRIPPED=	yes
-CFLAGS+=	-g
+CFLAGS+=		-g
 
 .include "options.mk"
 
diff --git a/x11/xfce4-tumbler/distinfo b/x11/xfce4-tumbler/distinfo
index e45ae9591ca..a977640ae3a 100644
--- a/x11/xfce4-tumbler/distinfo
+++ b/x11/xfce4-tumbler/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:29:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/07/09 11:39:08 rillig Exp $
 
 SHA1 (tumbler-0.1.31.tar.bz2) = cba7b81f8269f30dd6412d133767b6044c470f2c
 RMD160 (tumbler-0.1.31.tar.bz2) = 35dc77a7e2834b57a93425e869549280d15ee4f8
 SHA512 (tumbler-0.1.31.tar.bz2) = 8c5fc914be28b899155a8c3b3fec21c5e74c26569ae1bf6a18ae87c930927828570027d77d3ec0435b8db9449a9ea933da9ae5e00f7fdf13a335c0a25bb14d04
 Size (tumbler-0.1.31.tar.bz2) = 550650 bytes
-SHA1 (patch-tumblerd_Makefile.in) = 0e8b939381a7bbd38603a7bd79c2ddedeb33f6a7
+SHA1 (patch-tumblerd_Makefile.in) = be057d51fa064610e31f9ae883f3d3ec992e0798
diff --git a/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in b/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in
index dd3e2e6961d..05b5a38c452 100644
--- a/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in
+++ b/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-tumblerd_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+$NetBSD: patch-tumblerd_Makefile.in,v 1.2 2016/07/09 11:39:08 rillig Exp $
 
 Adjust config path
+
 --- tumblerd/Makefile.in.orig	2013-01-12 11:14:34.000000000 +0000
 +++ tumblerd/Makefile.in
 @@ -471,7 +471,7 @@ service_in_files = \