pkgsrc-Changes archive

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

CVS commit: pkgsrc/multimedia



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov  3 17:12:05 UTC 2019

Modified Files:
        pkgsrc/multimedia/acidrip: Makefile
        pkgsrc/multimedia/adobe-flash-player: options.mk
        pkgsrc/multimedia/dvd-slideshow: Makefile
        pkgsrc/multimedia/dvdrip: Makefile
        pkgsrc/multimedia/ffmpeg010: Makefile options.mk
        pkgsrc/multimedia/ffmpeg1: options.mk
        pkgsrc/multimedia/ffmpeg2: Makefile.common
        pkgsrc/multimedia/ggrab: Makefile
        pkgsrc/multimedia/gmediaserver: Makefile
        pkgsrc/multimedia/gmplayer: Makefile
        pkgsrc/multimedia/gopchop: Makefile
        pkgsrc/multimedia/gst-plugins0.10-bad: Makefile Makefile.common
        pkgsrc/multimedia/gst-plugins0.10-base: Makefile plugins.mk
        pkgsrc/multimedia/gst-plugins0.10-ugly: Makefile.common
        pkgsrc/multimedia/gst-plugins0.10-v4l2: Makefile
        pkgsrc/multimedia/gst-plugins1-base: Makefile
        pkgsrc/multimedia/gst-plugins1-gtk: buildlink3.mk
        pkgsrc/multimedia/gst123: Makefile
        pkgsrc/multimedia/gstreamer0.10: buildlink3.mk
        pkgsrc/multimedia/handbrake: Makefile
        pkgsrc/multimedia/kodi: Makefile
        pkgsrc/multimedia/libdvdcss: Makefile
        pkgsrc/multimedia/libhdhomerun: Makefile
        pkgsrc/multimedia/libmpeg3: Makefile
        pkgsrc/multimedia/libva-driver-vdpau: Makefile
        pkgsrc/multimedia/libva-utils: Makefile
        pkgsrc/multimedia/minidlna: Makefile
        pkgsrc/multimedia/mjpegtools: hacks.mk options.mk
        pkgsrc/multimedia/mkvtoolnix-old: Makefile
        pkgsrc/multimedia/mplayer-share: options.mk
        pkgsrc/multimedia/ogle: Makefile
        pkgsrc/multimedia/omxplayer: Makefile
        pkgsrc/multimedia/phonon-backend-vlc: Makefile.common
        pkgsrc/multimedia/php-ming: Makefile
        pkgsrc/multimedia/py-gstreamer0.10: Makefile
        pkgsrc/multimedia/py-ming: Makefile
        pkgsrc/multimedia/replex: Makefile
        pkgsrc/multimedia/smpeg: Makefile
        pkgsrc/multimedia/totem: Makefile.common
        pkgsrc/multimedia/totem-browser-plugin: Makefile
        pkgsrc/multimedia/totem-nautilus: Makefile
        pkgsrc/multimedia/tstools: Makefile
        pkgsrc/multimedia/win32-codecs: Makefile
        pkgsrc/multimedia/xine-lib: Makefile Makefile.common
        pkgsrc/multimedia/xine-v4l: Makefile
        pkgsrc/multimedia/xine-v4l2: Makefile
        pkgsrc/multimedia/xvidcore: Makefile

Log Message:
multimedia: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/acidrip/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/adobe-flash-player/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/dvd-slideshow/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/dvdrip/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg010/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg010/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg1/options.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ggrab/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/gmediaserver/Makefile
cvs rdiff -u -r1.148 -r1.149 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/multimedia/gopchop/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/multimedia/gst-plugins0.10-bad/Makefile
cvs rdiff -u -r1.35 -r1.36 \
    pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/gst-plugins0.10-base/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk
cvs rdiff -u -r1.21 -r1.22 \
    pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/gst-plugins1-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/gst123/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/gstreamer0.10/buildlink3.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/multimedia/kodi/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/libdvdcss/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/libhdhomerun/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/multimedia/libmpeg3/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libva-driver-vdpau/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/libva-utils/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/minidlna/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/mjpegtools/hacks.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/mjpegtools/options.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/multimedia/mkvtoolnix-old/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/multimedia/mplayer-share/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/ogle/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/multimedia/omxplayer/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/phonon-backend-vlc/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/php-ming/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/multimedia/py-gstreamer0.10/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/py-ming/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/replex/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/smpeg/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/multimedia/totem/Makefile.common
cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/totem-browser-plugin/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/totem-nautilus/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/tstools/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/win32-codecs/Makefile
cvs rdiff -u -r1.156 -r1.157 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/multimedia/xine-lib/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/xine-v4l/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/multimedia/xine-v4l2/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/xvidcore/Makefile

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

Modified files:

Index: pkgsrc/multimedia/acidrip/Makefile
diff -u pkgsrc/multimedia/acidrip/Makefile:1.25 pkgsrc/multimedia/acidrip/Makefile:1.26
--- pkgsrc/multimedia/acidrip/Makefile:1.25     Sun Aug 11 13:22:01 2019
+++ pkgsrc/multimedia/acidrip/Makefile  Sun Nov  3 17:11:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 17:11:59 rillig Exp $
 #
 
 DISTNAME=      acidrip-0.14
@@ -15,7 +15,7 @@ DEPENDS+=     mencoder-[0-9]*:../../multimed
 DEPENDS+=      mplayer-[0-9]*:../../multimedia/mplayer
 DEPENDS+=      p5-gtk2>=1.040:../../x11/p5-gtk2
 
-PERL5_PACKLIST= auto/AcidRip/.packlist
+PERL5_PACKLIST=        auto/AcidRip/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/adobe-flash-player/options.mk
diff -u pkgsrc/multimedia/adobe-flash-player/options.mk:1.1 pkgsrc/multimedia/adobe-flash-player/options.mk:1.2
--- pkgsrc/multimedia/adobe-flash-player/options.mk:1.1 Fri Mar 17 21:56:29 2017
+++ pkgsrc/multimedia/adobe-flash-player/options.mk     Sun Nov  3 17:11:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/03/17 21:56:29 tsutsui Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 17:11:59 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.adobe-flash-plugin
@@ -15,12 +15,12 @@ PKG_SUGGESTED_OPTIONS=      nspluginwrapper
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mnspluginwrapper)
-DEPENDS+= nspluginwrapper>=1.4.4:../../www/nspluginwrapper
+DEPENDS+=              nspluginwrapper>=1.4.4:../../www/nspluginwrapper
 .  if !empty(PKG_OPTIONS:Mpulseaudio)
 EMUL_MODULES.linux+=   pulseaudio
 MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.pulseaudio
 .  else
-DEPENDS+= libflashsupport>=4.2.2011:../../multimedia/libflashsupport
+DEPENDS+=              libflashsupport>=4.2.2011:../../multimedia/libflashsupport
 .  endif
 INSTALL_TEMPLATES+=    ${PKGDIR}/INSTALL.nspluginwrapper
 DEINSTALL_TEMPLATES+=  ${PKGDIR}/INSTALL.nspluginwrapper

Index: pkgsrc/multimedia/dvd-slideshow/Makefile
diff -u pkgsrc/multimedia/dvd-slideshow/Makefile:1.18 pkgsrc/multimedia/dvd-slideshow/Makefile:1.19
--- pkgsrc/multimedia/dvd-slideshow/Makefile:1.18       Sat Jul  4 16:18:38 2015
+++ pkgsrc/multimedia/dvd-slideshow/Makefile    Sun Nov  3 17:11:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:38 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 17:11:59 rillig Exp $
 
 DISTNAME=      dvd-slideshow-0.7.5
 PKGREVISION=   12
@@ -34,16 +34,16 @@ REPLACE_BASH =      dir2slideshow dvd-burn dv
                                dvd-slideshow dvd-slideshow.orig gallery1-to-slideshow \
                                install.sh jigl2slideshow
 
-SUBST_CLASSES+=                        fonts
-SUBST_STAGE.fonts=             post-configure
-SUBST_FILES.fonts=             dvd-menu dvd-slideshow
-SUBST_SED.fonts=               -e 's,/usr/share/fonts/,${PREFIX}/share/fonts/,g'
+SUBST_CLASSES+=                fonts
+SUBST_STAGE.fonts=     post-configure
+SUBST_FILES.fonts=     dvd-menu dvd-slideshow
+SUBST_SED.fonts=       -e 's,/usr/share/fonts/,${PREFIX}/share/fonts/,g'
 SUBST_MESSAGE.fonts=   Fixing hardcoded fonts paths.
 
-SUBST_CLASSES+=                        pipeline
+SUBST_CLASSES+=                pipeline
 SUBST_STAGE.pipeline=  post-configure
 SUBST_FILES.pipeline=  dvd-slideshow
-SUBST_SED.pipeline=            -e 's/print0/printx/g;s/sort -z/sort/g;s/xargs -0/xargs/g'
+SUBST_SED.pipeline=    -e 's/print0/printx/g;s/sort -z/sort/g;s/xargs -0/xargs/g'
 SUBST_MESSAGE.pipeline=        Fixing Linux centric pipeline.
 
 SUBST_CLASSES+=                        lsof

Index: pkgsrc/multimedia/dvdrip/Makefile
diff -u pkgsrc/multimedia/dvdrip/Makefile:1.64 pkgsrc/multimedia/dvdrip/Makefile:1.65
--- pkgsrc/multimedia/dvdrip/Makefile:1.64      Sun Aug 11 13:22:01 2019
+++ pkgsrc/multimedia/dvdrip/Makefile   Sun Nov  3 17:11:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/08/11 13:22:01 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2019/11/03 17:11:59 rillig Exp $
 
 DISTNAME=      dvdrip-0.98.11
 PKGREVISION=   9
@@ -35,7 +35,7 @@ USE_TOOLS+=           perl
 MAKE_ENV+=             SKIP_UNPACK_REQUIRED_MODULES=1
 MAKE_JOBS_SAFE=                no
 
-PERL5_PACKLIST= auto/Video/DVDRip/.packlist
+PERL5_PACKLIST=        auto/Video/DVDRip/.packlist
 
 SUBST_CLASSES+=                fping
 SUBST_STAGE.fping=     pre-configure

Index: pkgsrc/multimedia/ffmpeg010/Makefile
diff -u pkgsrc/multimedia/ffmpeg010/Makefile:1.29 pkgsrc/multimedia/ffmpeg010/Makefile:1.30
--- pkgsrc/multimedia/ffmpeg010/Makefile:1.29   Fri Nov 23 08:06:31 2018
+++ pkgsrc/multimedia/ffmpeg010/Makefile        Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/11/23 08:06:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 17:12:00 rillig Exp $
 
 PKGNAME=       ffmpeg010-20150312.${DISTVERSION}
 PKGREVISION=   8
@@ -33,14 +33,14 @@ CONF_FILES+=        ${PREFIX}/share/examples/ff
 # disable asm on i386 for non-gcc and gcc < 4.2
 
 .if ${MACHINE_ARCH} == "i386"
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
+.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
    || !empty(CC_VERSION:Mgcc-[123]*) \
    || !empty(CC_VERSION:Mgcc-4.[01].*) \
    || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       --disable-asm
-.elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
-.endif
+.  elif !empty(CC_VERSION:Mgcc-[456].*)
+CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
+.  endif
 .endif
 
 TEST_TARGET=   check

Index: pkgsrc/multimedia/ffmpeg010/options.mk
diff -u pkgsrc/multimedia/ffmpeg010/options.mk:1.7 pkgsrc/multimedia/ffmpeg010/options.mk:1.8
--- pkgsrc/multimedia/ffmpeg010/options.mk:1.7  Fri Jun 15 10:55:12 2018
+++ pkgsrc/multimedia/ffmpeg010/options.mk      Sun Nov  3 17:12:00 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2018/06/15 10:55:12 jperkin Exp $
+# $NetBSD: options.mk,v 1.8 2019/11/03 17:12:00 rillig Exp $
 
 # Global and legacy options
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg010
-PKG_SUPPORTED_OPTIONS= faac lame libvpx opencore-amr theora vorbis xvid
-#PKG_SUPPORTED_OPTIONS+=x264
-PKG_SUGGESTED_OPTIONS= lame libvpx theora vorbis xvid
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ffmpeg010
+PKG_SUPPORTED_OPTIONS=         faac lame libvpx opencore-amr theora vorbis xvid
+#PKG_SUPPORTED_OPTIONS+=       x264
+PKG_SUGGESTED_OPTIONS=         lame libvpx theora vorbis xvid
 #PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=        faac
 

Index: pkgsrc/multimedia/ffmpeg1/options.mk
diff -u pkgsrc/multimedia/ffmpeg1/options.mk:1.4 pkgsrc/multimedia/ffmpeg1/options.mk:1.5
--- pkgsrc/multimedia/ffmpeg1/options.mk:1.4    Fri Jun 15 10:52:02 2018
+++ pkgsrc/multimedia/ffmpeg1/options.mk        Sun Nov  3 17:12:00 2019
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2018/06/15 10:52:02 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/03 17:12:00 rillig Exp $
 
 # Global and legacy options
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis xvid \
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS=         faac lame ass libvpx theora vorbis xvid \
                        opencore-amr rtmp
-#PKG_SUPPORTED_OPTIONS+=x264
-PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis xvid
+#PKG_SUPPORTED_OPTIONS+=       x264
+PKG_SUGGESTED_OPTIONS=         lame ass libvpx theora vorbis xvid
 #PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=        faac
 

Index: pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.57 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.58
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.57      Tue Sep 25 10:03:49 2018
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2018/09/25 10:03:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.58 2019/11/03 17:12:00 rillig Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -70,7 +70,7 @@ SUBST_SED.sunwspro+=  -e "s/-Wl,-rpath-li
 .endif
 
 #BUILD_DEPENDS+=       yasm>=0.7.2:../../devel/yasm
-BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
+BUILD_DEPENDS+=                nasm>=2.13:../../devel/nasm
 
 REPLACE_PERL+= doc/texi2pod.pl
 REPLACE_SH+=   configure version.sh

Index: pkgsrc/multimedia/ggrab/Makefile
diff -u pkgsrc/multimedia/ggrab/Makefile:1.7 pkgsrc/multimedia/ggrab/Makefile:1.8
--- pkgsrc/multimedia/ggrab/Makefile:1.7        Wed Aug 16 20:45:41 2017
+++ pkgsrc/multimedia/ggrab/Makefile    Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/16 20:45:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:12:00 rillig Exp $
 #
 
 DISTNAME=              ${PKGNAME}-linux
@@ -12,7 +12,7 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 COMMENT=               Server for recording video streams from dream dvb-receivers
 
 USE_LANGUAGES= c++
-WRKSRC=                        ${WRKDIR}/ggrab-0.22a
+WRKSRC=                ${WRKDIR}/ggrab-0.22a
 
 RCD_SCRIPTS=           sserver
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}

Index: pkgsrc/multimedia/gmediaserver/Makefile
diff -u pkgsrc/multimedia/gmediaserver/Makefile:1.17 pkgsrc/multimedia/gmediaserver/Makefile:1.18
--- pkgsrc/multimedia/gmediaserver/Makefile:1.17        Sun Aug 11 13:22:02 2019
+++ pkgsrc/multimedia/gmediaserver/Makefile     Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 17:12:00 rillig Exp $
 
 DISTNAME=              gmediaserver-0.13.0
 PKGREVISION=           13
@@ -24,7 +24,7 @@ CFGFILE=              ${PKG_SYSCONFDIR}/${CFGNAME}
 
 CONF_FILES=            ${PREFIX}/${EGDIR}/${CFGNAME} ${CFGFILE}
 INSTALLATION_DIRS+=    ${EGDIR}
-OWN_DIRS_PERMS+=       ${VARBASE}/gmediaserver ${GMEDIA_USER} \
+OWN_DIRS_PERMS+=       ${VARBASE}/gmediaserver ${GMEDIA_USER} \
                        ${GMEDIA_GROUP} 750
 RCD_SCRIPTS=           gmediaserver
 

Index: pkgsrc/multimedia/gmplayer/Makefile
diff -u pkgsrc/multimedia/gmplayer/Makefile:1.148 pkgsrc/multimedia/gmplayer/Makefile:1.149
--- pkgsrc/multimedia/gmplayer/Makefile:1.148   Sun Jul 21 22:25:25 2019
+++ pkgsrc/multimedia/gmplayer/Makefile Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2019/07/21 22:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.149 2019/11/03 17:12:00 rillig Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -95,7 +95,7 @@ SKINS+=               Abyss-1.7${SKIN_EXTRACT_SUFX}           
                xmmplayer-1.5${SKIN_EXTRACT_SUFX}
 
 .for skin in ${SKINS}
-SITES.${skin}= ${SKIN_SITES}
+SITES.${skin}= ${SKIN_SITES}
 .endfor
 
 DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}

Index: pkgsrc/multimedia/gopchop/Makefile
diff -u pkgsrc/multimedia/gopchop/Makefile:1.55 pkgsrc/multimedia/gopchop/Makefile:1.56
--- pkgsrc/multimedia/gopchop/Makefile:1.55     Sun Jul 21 22:25:26 2019
+++ pkgsrc/multimedia/gopchop/Makefile  Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/07/21 22:25:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2019/11/03 17:12:00 rillig Exp $
 #
 
 DISTNAME=              gopchop-1.1.8
@@ -11,11 +11,11 @@ MAINTAINER=         pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://outflux.net/unix/software/GOPchop/
 COMMENT=               MPEG2 GOP-accurate editor
 
-GNU_CONFIGURE=         yes
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            intltool msgfmt pkg-config
+GNU_CONFIGURE=                 yes
+USE_LANGUAGES=                 c c++
+USE_LIBTOOL=                   yes
+USE_PKGLOCALEDIR=              yes
+USE_TOOLS+=                    intltool msgfmt pkg-config
 BROKEN_GETTEXT_DETECTION=      yes
 
 # XXX make this an option?

Index: pkgsrc/multimedia/gst-plugins0.10-bad/Makefile
diff -u pkgsrc/multimedia/gst-plugins0.10-bad/Makefile:1.28 pkgsrc/multimedia/gst-plugins0.10-bad/Makefile:1.29
--- pkgsrc/multimedia/gst-plugins0.10-bad/Makefile:1.28 Sat Mar  5 11:29:00 2016
+++ pkgsrc/multimedia/gst-plugins0.10-bad/Makefile      Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/03/05 11:29:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 17:12:00 rillig Exp $
 #
 
 USE_LANGUAGES= c c++
@@ -9,7 +9,7 @@ PKGREVISION=    6
 COMMENT+=      Bad plugins
 
 # builds gsettings module
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.26.0
 
 .include "../../devel/glib2/schemas.mk"
 # bzip2 is likely present anyway, make it default

Index: pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common
diff -u pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common:1.35 pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common:1.36
--- pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common:1.35  Sun Oct  5 16:41:07 2014
+++ pkgsrc/multimedia/gst-plugins0.10-bad/Makefile.common       Sun Nov  3 17:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2014/10/05 16:41:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2019/11/03 17:12:00 rillig Exp $
 #
 # used by audio/gst-plugins0.10-dts/Makefile
 # used by audio/gst-plugins0.10-faac/Makefile
@@ -40,7 +40,7 @@ GST_PLUGINS0.10_VER=  0.10.23
 CONFIGURE_ARGS+=       --disable-${driver}
 .endfor
 
-BUILDLINK_API_DEPENDS.gstreamer0.10+=  gstreamer0.10>=0.10.22.1
+BUILDLINK_API_DEPENDS.gstreamer0.10+=          gstreamer0.10>=0.10.22.1
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=   gst-plugins0.10-base>=0.10.22.1
 
 .include "../../devel/orc/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins0.10-base/Makefile
diff -u pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.35 pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.36
--- pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.35        Sun Aug 11 13:22:02 2019
+++ pkgsrc/multimedia/gst-plugins0.10-base/Makefile     Sun Nov  3 17:12:01 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2019/08/11 13:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 17:12:01 rillig Exp $
 #
 
 .include "Makefile.common"
 PKGREVISION=           12
 
-#CONFIGURE_ARGS+= --disable-silent-rules
+#CONFIGURE_ARGS+=      --disable-silent-rules
 
 COMMENT+=              Base plugins
 

Index: pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk
diff -u pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk:1.16 pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk:1.17
--- pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk:1.16      Tue Oct 17 10:50:39 2017
+++ pkgsrc/multimedia/gst-plugins0.10-base/plugins.mk   Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.16 2017/10/17 10:50:39 wiz Exp $
+# $NetBSD: plugins.mk,v 1.17 2019/11/03 17:12:01 rillig Exp $
 #
 # This file is shared across the gst-plugins-{base,good} packages to
 # simplify their code.  It provides a framework to write simple packages
@@ -56,9 +56,9 @@ COMMENT+=             ${GST_PLUGINS0.10_NAME} plugi
 GST_PLUGINS0.10_FLAGS?=        ${GST_PLUGINS0.10_NAME}
 GST_PLUGINS0.10_DIRS?= non-existent
 
-.for _f_ in ${GST_PLUGINS0.10_FLAGS}
+.  for _f_ in ${GST_PLUGINS0.10_FLAGS}
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/--disable-${_f_}/--enable-${_f_}/}
-.endfor
+.  endfor
 
 BUILD_DIRS=            ${GST_PLUGINS0.10_DIRS}
 INSTALL_DIRS=          ${GST_PLUGINS0.10_DIRS}
@@ -68,9 +68,9 @@ SUBST_CLASSES+=               libs
 SUBST_MESSAGE.libs=    Fixing path to dependent libraries.
 SUBST_STAGE.libs=      pre-configure
 SUBST_FILES.libs=
-.for _d_ in ${GST_PLUGINS0.10_DIRS}
+.  for _d_ in ${GST_PLUGINS0.10_DIRS}
 SUBST_FILES.libs+=     ${_d_}/Makefile.in
-.endfor
+.  endfor
 SUBST_SED.libs=                -e 's|$$(top_builddir)/gst-libs/gst/.*/libgst|${BUILDLINK_PREFIX.gst-plugins0.10-${GST_PLUGINS0.10_TYPE}}/lib/libgst|g'
 
 .include "../../multimedia/gst-plugins0.10-${GST_PLUGINS0.10_TYPE}/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common
diff -u pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common:1.21 pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common:1.22
--- pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common:1.21 Tue Feb 28 18:36:28 2012
+++ pkgsrc/multimedia/gst-plugins0.10-ugly/Makefile.common      Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2012/02/28 18:36:28 drochner Exp $
+# $NetBSD: Makefile.common,v 1.22 2019/11/03 17:12:01 rillig Exp $
 #
 # used by audio/gst-plugins0.10-a52/Makefile
 # used by audio/gst-plugins0.10-lame/Makefile
@@ -25,7 +25,7 @@ GST_PLUGINS0.10_VER=  0.10.19
 CONFIGURE_ARGS+=       --disable-${driver}
 .endfor
 
-BUILDLINK_API_DEPENDS.gstreamer0.10+=  gstreamer0.10>=0.10.20
+BUILDLINK_API_DEPENDS.gstreamer0.10+=          gstreamer0.10>=0.10.20
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=   gst-plugins0.10-base>=0.10.14
 
 .include "../../multimedia/gst-plugins0.10-base/plugins.mk"

Index: pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile
diff -u pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile:1.12 pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile:1.13
--- pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile:1.12        Mon Oct  8 09:21:03 2012
+++ pkgsrc/multimedia/gst-plugins0.10-v4l2/Makefile     Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 09:21:03 asau Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 17:12:01 rillig Exp $
 #
 
 GST_PLUGINS0.10_NAME=  v4l2
@@ -10,7 +10,7 @@ ONLY_FOR_PLATFORM=    NetBSD-[5-9]* Linux-*
 
 .include "../../multimedia/gst-plugins0.10-good/Makefile.common"
 
-CONFIGURE_ARGS+= --with-libv4l2
+CONFIGURE_ARGS+=       --with-libv4l2
 
 .include "../../graphics/libv4l/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/gst-plugins1-base/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-base/Makefile:1.18 pkgsrc/multimedia/gst-plugins1-base/Makefile:1.19
--- pkgsrc/multimedia/gst-plugins1-base/Makefile:1.18   Sun Aug 11 13:22:02 2019
+++ pkgsrc/multimedia/gst-plugins1-base/Makefile        Sun Nov  3 17:12:01 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 17:12:01 rillig Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT+=      Base plugins
 
-USE_TOOLS+=    perl:run
+USE_TOOLS+=            perl:run
 PKGCONFIG_OVERRIDE+=   pkgconfig/*.pc.in
 
 # only useful if gstreamer was built with the "gstcheck" option

Index: pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk
diff -u pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk:1.1 pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk:1.2
--- pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk:1.1        Thu Oct  3 14:57:03 2019
+++ pkgsrc/multimedia/gst-plugins1-gtk/buildlink3.mk    Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/10/03 14:57:03 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 17:12:01 rillig Exp $
 
 BUILDLINK_TREE+=       gst-plugins1-gtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gst-plugins1-gtk
 GST_PLUGINS1_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gst-plugins1-gtk+=       gst-plugins1-gtk>=1.16.0
-BUILDLINK_PKGSRCDIR.gst-plugins1-gtk?= ../../multimedia/gst-plugins1-gtk
+BUILDLINK_PKGSRCDIR.gst-plugins1-gtk?=         ../../multimedia/gst-plugins1-gtk
 
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"

Index: pkgsrc/multimedia/gst123/Makefile
diff -u pkgsrc/multimedia/gst123/Makefile:1.41 pkgsrc/multimedia/gst123/Makefile:1.42
--- pkgsrc/multimedia/gst123/Makefile:1.41      Sun Jul 21 22:25:26 2019
+++ pkgsrc/multimedia/gst123/Makefile   Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/07/21 22:25:26 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/03 17:12:01 rillig Exp $
 
 DISTNAME=      gst123-0.3.5
 PKGREVISION=   3
@@ -16,7 +16,7 @@ USE_LANGUAGES=        c c++
 
 USE_TOOLS+=    pkg-config gmake
 
-USE_NCURSES=   yes
+USE_NCURSES=           yes
 CONFIGURE_ARGS+=       NCURSES_CFLAGS=-I${BUILDLINK_PREFIX.ncurses}/include
 CONFIGURE_ARGS+=       NCURSES_LIBS="-L${BUILDLINK_PREFIX.ncurses}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncurses}/lib -l${BUILDLINK_LIBNAME.ncurses}"
 

Index: pkgsrc/multimedia/gstreamer0.10/buildlink3.mk
diff -u pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.20 pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.21
--- pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.20  Sun Jan  7 13:04:24 2018
+++ pkgsrc/multimedia/gstreamer0.10/buildlink3.mk       Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2019/11/03 17:12:01 rillig Exp $
 
 BUILDLINK_TREE+=       gstreamer0.10
 
@@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.gstreamer0.10?=   ../.
 pkgbase := gstreamer0.10
 .include "../../mk/pkg-build-options.mk"
 
-.  if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck)
+.if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck)
 .include "../../devel/check/buildlink3.mk"
-.  endif
+.endif
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/multimedia/handbrake/Makefile
diff -u pkgsrc/multimedia/handbrake/Makefile:1.52 pkgsrc/multimedia/handbrake/Makefile:1.53
--- pkgsrc/multimedia/handbrake/Makefile:1.52   Sun Aug 11 13:22:03 2019
+++ pkgsrc/multimedia/handbrake/Makefile        Sun Nov  3 17:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/08/11 13:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 17:12:01 rillig Exp $
 #
 
 DISTNAME=      HandBrake-1.2.2-source
@@ -28,11 +28,11 @@ DISTFILES+= ${CDISTFILES}
 SITES.${f}=    https://download.handbrake.fr/contrib/
 .endfor
 
-RESTRICTED=    Unresolved patent issues
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+RESTRICTED=            Unresolved patent issues
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_SRC_ON_FTP=         ${RESTRICTED}
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-source//}
 
@@ -50,8 +50,8 @@ MAKE_FILE=            GNUmakefile
 BUILD_TARGET=          # empty
 BUILD_FLAGS+=          BUILDLINK_DIR=${BUILDLINK_DIR}
 
-BUILD_DEPENDS+=        cmake-[0-9]*:../../devel/cmake
-BUILD_DEPENDS+=        nasm>=2.05.01:../../devel/nasm
+BUILD_DEPENDS+=                cmake-[0-9]*:../../devel/cmake
+BUILD_DEPENDS+=                nasm>=2.05.01:../../devel/nasm
 #BUILD_DEPENDS+=       gettext-m4-[0-9]*:../../devel/gettext-m4
 
 # harfbuzz, which is now separate from pango, installs a header file

Index: pkgsrc/multimedia/kodi/Makefile
diff -u pkgsrc/multimedia/kodi/Makefile:1.54 pkgsrc/multimedia/kodi/Makefile:1.55
--- pkgsrc/multimedia/kodi/Makefile:1.54        Mon Sep  2 13:20:10 2019
+++ pkgsrc/multimedia/kodi/Makefile     Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/09/02 13:20:10 adam Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/03 17:12:02 rillig Exp $
 
 PKGNAME=       kodi-15.2
 PKGREVISION=   42
@@ -29,14 +29,14 @@ USE_JAVA2=          yes
 GNU_CONFIGURE=         yes
 
 CONFIG_SHELL=          ${TOOLS_PATH.bash}
-CONFIG_GUESS_OVERRIDE=  lib/libmpeg2/.auto/config.guess \
+CONFIG_GUESS_OVERRIDE= lib/libmpeg2/.auto/config.guess \
                        tools/depends/build-aux/config.guess
-CONFIG_SUB_OVERRIDE=    lib/libmpeg2/.auto/config.sub \
+CONFIG_SUB_OVERRIDE=   lib/libmpeg2/.auto/config.sub \
                        tools/depends/build-aux/config.sub
 
 CONFIGURE_ENV+=                ac_cv_path_SWIG_EXE=${PREFIX}/bin/swig2.0
 
-PYTHON_VERSIONS_ACCEPTED=       27 # insists on < 3.0 as of 15.2
+PYTHON_VERSIONS_ACCEPTED=      27 # insists on < 3.0 as of 15.2
 
 # These need to be ported
 CONFIGURE_ARGS+=       --disable-projectm

Index: pkgsrc/multimedia/libdvdcss/Makefile
diff -u pkgsrc/multimedia/libdvdcss/Makefile:1.36 pkgsrc/multimedia/libdvdcss/Makefile:1.37
--- pkgsrc/multimedia/libdvdcss/Makefile:1.36   Fri Jun 22 12:45:46 2018
+++ pkgsrc/multimedia/libdvdcss/Makefile        Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/06/22 12:45:46 jakllsch Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 17:12:02 rillig Exp $
 #
 # In order to ensure compliance with U.S. and international law, please
 # do not modify this file to provide pointers to the source or homepage
@@ -32,9 +32,9 @@ PKGCONFIG_OVERRIDE=   src/libdvdcss.pc.in
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(LIBDVDCSS_MASTER_SITES)
 INTERACTIVE_STAGE=     fetch
-FETCH_MESSAGE+=        "Please define LIBDVDCSS_MASTER_SITES in mk.conf."
-FETCH_MESSAGE+=        "Alternatively you may download '${DISTNAME}${EXTRACT_SUFX}' manually"
-FETCH_MESSAGE+=        "to ${DISTDIR}."
+FETCH_MESSAGE+=                "Please define LIBDVDCSS_MASTER_SITES in mk.conf."
+FETCH_MESSAGE+=                "Alternatively you may download '${DISTNAME}${EXTRACT_SUFX}' manually"
+FETCH_MESSAGE+=                "to ${DISTDIR}."
 .endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/libhdhomerun/Makefile
diff -u pkgsrc/multimedia/libhdhomerun/Makefile:1.6 pkgsrc/multimedia/libhdhomerun/Makefile:1.7
--- pkgsrc/multimedia/libhdhomerun/Makefile:1.6 Wed Aug 16 20:21:12 2017
+++ pkgsrc/multimedia/libhdhomerun/Makefile     Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/16 20:21:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 17:12:02 rillig Exp $
 
 DISTNAME=      libhdhomerun_20140121
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -27,21 +27,21 @@ SHLIBEXT=   so
 .endif
 PLIST_SUBST+=  SHLIBEXT=${SHLIBEXT}
 
-INSTALL_HEADERS=hdhomerun.h \
-               hdhomerun_channelscan.h \
-               hdhomerun_channels.h \
-               hdhomerun_control.h \
-               hdhomerun_debug.h \
-               hdhomerun_device.h \
-               hdhomerun_device_selector.h \
-               hdhomerun_discover.h \
-               hdhomerun_os.h \
-               hdhomerun_os_posix.h \
-               hdhomerun_os_windows.h \
-               hdhomerun_pkt.h \
-               hdhomerun_sock.h \
-               hdhomerun_types.h \
-               hdhomerun_video.h
+INSTALL_HEADERS=       hdhomerun.h \
+                       hdhomerun_channelscan.h \
+                       hdhomerun_channels.h \
+                       hdhomerun_control.h \
+                       hdhomerun_debug.h \
+                       hdhomerun_device.h \
+                       hdhomerun_device_selector.h \
+                       hdhomerun_discover.h \
+                       hdhomerun_os.h \
+                       hdhomerun_os_posix.h \
+                       hdhomerun_os_windows.h \
+                       hdhomerun_pkt.h \
+                       hdhomerun_sock.h \
+                       hdhomerun_types.h \
+                       hdhomerun_video.h
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/hdhomerun_config ${DESTDIR}${PREFIX}/bin/hdhomerun_config

Index: pkgsrc/multimedia/libmpeg3/Makefile
diff -u pkgsrc/multimedia/libmpeg3/Makefile:1.22 pkgsrc/multimedia/libmpeg3/Makefile:1.23
--- pkgsrc/multimedia/libmpeg3/Makefile:1.22    Sat Oct 12 20:26:43 2019
+++ pkgsrc/multimedia/libmpeg3/Makefile Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/10/12 20:26:43 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 17:12:02 rillig Exp $
 #
 
 DISTNAME=      libmpeg3-1.8-src
@@ -15,9 +15,9 @@ COMMENT=      MPEG decoding library and tools
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin")
-MAKE_ENV+=     USE_MMX=1
-MAKE_ENV+=     USE_CSS=1
-BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
+MAKE_ENV+=             USE_MMX=1
+MAKE_ENV+=             USE_CSS=1
+BUILD_DEPENDS+=                nasm-[0-9]*:../../devel/nasm
 .else
 MAKE_ENV.DragonFly+=   USE_MMX=0
 MAKE_ENV.DragonFly+=   USE_CSS=0
@@ -25,7 +25,7 @@ MAKE_ENV.DragonFly+=  USE_CSS=0
 
 NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake
-WRKSRC=        ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
 PTHREAD_AUTO_VARS=     yes
 PTHREAD_OPTS+=         require

Index: pkgsrc/multimedia/libva-driver-vdpau/Makefile
diff -u pkgsrc/multimedia/libva-driver-vdpau/Makefile:1.8 pkgsrc/multimedia/libva-driver-vdpau/Makefile:1.9
--- pkgsrc/multimedia/libva-driver-vdpau/Makefile:1.8   Sun Nov 25 20:39:29 2018
+++ pkgsrc/multimedia/libva-driver-vdpau/Makefile       Sun Nov  3 17:12:02 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2018/11/25 20:39:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 17:12:02 rillig Exp $
 
 DISTNAME=      vdpau-driver-${PKGNAME_NOREV:C/^.*-//}
 PKGNAME=       libva-driver-vdpau-0.7.4
 PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_BACKUP}
-               #https://cgit.freedesktop.org/vaapi/vdpau-driver/snapshot/
+       #https://cgit.freedesktop.org/vaapi/vdpau-driver/snapshot/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      https://cgit.freedesktop.org/vaapi/vdpau-driver

Index: pkgsrc/multimedia/libva-utils/Makefile
diff -u pkgsrc/multimedia/libva-utils/Makefile:1.2 pkgsrc/multimedia/libva-utils/Makefile:1.3
--- pkgsrc/multimedia/libva-utils/Makefile:1.2  Mon Jul 15 19:45:40 2019
+++ pkgsrc/multimedia/libva-utils/Makefile      Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/07/15 19:45:40 rjs Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 17:12:02 rillig Exp $
 
 DISTNAME=      libva-utils-2.3.0
 CATEGORIES=    multimedia
@@ -22,7 +22,7 @@ SUBST_MESSAGE.getopt= Fixing getopt_long
 SUBST_FILES.getopt+=   encode/*.c
 SUBST_SED.getopt+=     -e 's,getopt_long_only,getopt_long,'
 
-LIBS+=-lm
+LIBS+= -lm
 
 .include "../../multimedia/libva/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"

Index: pkgsrc/multimedia/minidlna/Makefile
diff -u pkgsrc/multimedia/minidlna/Makefile:1.36 pkgsrc/multimedia/minidlna/Makefile:1.37
--- pkgsrc/multimedia/minidlna/Makefile:1.36    Sun Sep 15 22:08:33 2019
+++ pkgsrc/multimedia/minidlna/Makefile Sun Nov  3 17:12:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/09/15 22:08:33 maya Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 17:12:02 rillig Exp $
 
 PKGNAME=       minidlna-1.2.1.20180601
 PKGREVISION=   5
@@ -13,9 +13,9 @@ HOMEPAGE=     http://minidlna.sourceforge.ne
 COMMENT=       DLNA server
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE=      yes
+GNU_CONFIGURE= yes
 EGDIR=         ${PREFIX}/share/examples/minidlna
-USE_TOOLS+=     msgfmt autoreconf autoconf automake
+USE_TOOLS+=    msgfmt autoreconf autoconf automake
 
 CONF_FILES=    ${EGDIR}/minidlna.conf \
                ${PKG_SYSCONFDIR}/minidlna.conf

Index: pkgsrc/multimedia/mjpegtools/hacks.mk
diff -u pkgsrc/multimedia/mjpegtools/hacks.mk:1.4 pkgsrc/multimedia/mjpegtools/hacks.mk:1.5
--- pkgsrc/multimedia/mjpegtools/hacks.mk:1.4   Thu Feb 22 19:26:51 2007
+++ pkgsrc/multimedia/mjpegtools/hacks.mk       Sun Nov  3 17:12:02 2019
@@ -1,7 +1,7 @@
-#      $NetBSD: hacks.mk,v 1.4 2007/02/22 19:26:51 wiz Exp $
+#      $NetBSD: hacks.mk,v 1.5 2019/11/03 17:12:02 rillig Exp $
 
 .if !defined(MJPEGTOOLS_HACKS_MK)
-MJPEGTOOLS_HACKS_MK= defined
+MJPEGTOOLS_HACKS_MK=   defined
 
 ### Hack to work around MacOS X 4.x (and probably other)'s gcc 4.x
 ### which does not understand -fmove-all-movables. Remove that option

Index: pkgsrc/multimedia/mjpegtools/options.mk
diff -u pkgsrc/multimedia/mjpegtools/options.mk:1.6 pkgsrc/multimedia/mjpegtools/options.mk:1.7
--- pkgsrc/multimedia/mjpegtools/options.mk:1.6 Sat Jul  7 15:49:00 2012
+++ pkgsrc/multimedia/mjpegtools/options.mk     Sun Nov  3 17:12:02 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2012/07/07 15:49:00 adam Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/03 17:12:02 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mjpegtools
-PKG_SUPPORTED_OPTIONS= dv simd
-PKG_SUGGESTED_OPTIONS= dv
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mjpegtools
+PKG_SUPPORTED_OPTIONS=         dv simd
+PKG_SUGGESTED_OPTIONS=         dv
 PKG_OPTIONS_LEGACY_OPTS+=      mjpegtools-simd:simd
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/multimedia/mkvtoolnix-old/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix-old/Makefile:1.58 pkgsrc/multimedia/mkvtoolnix-old/Makefile:1.59
--- pkgsrc/multimedia/mkvtoolnix-old/Makefile:1.58      Thu Aug 22 12:23:37 2019
+++ pkgsrc/multimedia/mkvtoolnix-old/Makefile   Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/08/22 12:23:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/03 17:12:03 rillig Exp $
 
 DISTNAME=      mkvtoolnix-2.9.8
 PKGREVISION=   55
@@ -11,10 +11,10 @@ HOMEPAGE=   http://www.bunkus.org/videotoo
 COMMENT=       Matroska tools, old version for build with g++-4.1
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake msgfmt
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake msgfmt
 USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES=         c c++
 
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=       --with-boost_regex=boost_regex
@@ -31,7 +31,7 @@ PLIST_VARS+=  gui
 PLIST.gui=     yes
 CONFIGURE_ARGS+=       --enable-gui
 CONFIGURE_ARGS+=       --enable-wxwidgets
-.   include "../../x11/wxGTK28/buildlink3.mk"
+.  include "../../x11/wxGTK28/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-gui
 CONFIGURE_ARGS+=       --disable-wxwidgets

Index: pkgsrc/multimedia/mplayer-share/options.mk
diff -u pkgsrc/multimedia/mplayer-share/options.mk:1.65 pkgsrc/multimedia/mplayer-share/options.mk:1.66
--- pkgsrc/multimedia/mplayer-share/options.mk:1.65     Tue Jun 25 20:50:22 2019
+++ pkgsrc/multimedia/mplayer-share/options.mk  Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.65 2019/06/25 20:50:22 markd Exp $
+# $NetBSD: options.mk,v 1.66 2019/11/03 17:12:03 rillig Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -24,73 +24,73 @@ PKG_OPTIONS_VAR=    PKG_OPTIONS.${PKGNAME:C
 # Options supported by both mplayer* or mencoder*.
 
 PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
-PKG_SUPPORTED_OPTIONS+= dvdread dvdnav libmpg123 opus
-.if ${OSS_TYPE} != "none"
+PKG_SUPPORTED_OPTIONS+=        dvdread dvdnav libmpg123 opus
+.  if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=        oss
-.endif
+.  endif
 
-PKG_SUPPORTED_OPTIONS+=        faad
+PKG_SUPPORTED_OPTIONS+=                faad
 
 # Set options based on the specific package being built.
-.if !empty(PKGNAME:M*mplayer*)
+.  if !empty(PKGNAME:M*mplayer*)
 PKG_SUPPORTED_OPTIONS+=        aalib alsa caca esound ggi mplayer-menu nas pulseaudio sdl
 
-.if ${VDPAU_AVAILABLE} == "yes"
+.    if ${VDPAU_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=        vdpau
-.endif
+.    endif
 
-.if ${LIRC_AVAILABLE} == "yes"
+.    if ${LIRC_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=        lirc
-.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"
-PKG_SUPPORTED_OPTIONS+=        cdparanoia
-.endif
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+PKG_SUPPORTED_OPTIONS+=                cdparanoia
+.  endif
 PKG_SUPPORTED_OPTIONS.SunOS+=  mlib
 PKG_SUPPORTED_OPTIONS.Linux+=  vidix
 
 # TODO: v4l2 option probably could be supported on Linux and OpenBSD too
-.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"
-PKG_SUPPORTED_OPTIONS+= mplayer-default-cflags mplayer-win32
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PKG_SUPPORTED_OPTIONS+=        mplayer-runtime-cpudetection
+.  endif
+.  if ${MACHINE_ARCH} == "i386"
+PKG_SUPPORTED_OPTIONS+=        mplayer-default-cflags mplayer-win32
+.  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
+PKG_SUPPORTED_OPTIONS+=        xvid
+.  endif
 
 # -------------------------------------------------------------------------
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for o in   dvdread dvdnav gif jpeg \
+.  for o in   dvdread dvdnav gif jpeg \
            mplayer-menu \
            mplayer-default-cflags mplayer-runtime-cpudetection \
            oss png pulseaudio sdl vdpau lirc
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${o})
-PKG_SUGGESTED_OPTIONS+=        ${o}
-.  endif
-.endfor
-.if !empty(PKGNAME:M*mplayer*)
+.    if !empty(PKG_SUPPORTED_OPTIONS:M${o})
+PKG_SUGGESTED_OPTIONS+=                ${o}
+.    endif
+.  endfor
+.  if !empty(PKGNAME:M*mplayer*)
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
-.endif
+.  endif
 PKG_SUGGESTED_OPTIONS.Linux+=  vidix
 
 # -------------------------------------------------------------------------
@@ -104,263 +104,263 @@ EXTRA_LIBS=
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Maalib)
+.  if !empty(PKG_OPTIONS:Maalib)
 CONFIGURE_ARGS+=       --enable-aa
-.  include "../../graphics/aalib/buildlink3.mk"
-.else
+.    include "../../graphics/aalib/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-aa
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Malsa)
+.  if !empty(PKG_OPTIONS:Malsa)
 CONFIGURE_ARGS+=       --enable-alsa
-.  include "../../audio/alsa-lib/buildlink3.mk"
-.else
+.    include "../../audio/alsa-lib/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-alsa
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mcaca)
+.  if !empty(PKG_OPTIONS:Mcaca)
 CONFIGURE_ARGS+=       --enable-caca
-.  include "../../graphics/libcaca/buildlink3.mk"
-.else
+.    include "../../graphics/libcaca/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-caca
-.endif
+.  endif
 
-.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 --disable-sighandler
 INSTALL_UNSTRIPPED=    yes
-.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
 
-.if !empty(PKG_OPTIONS:Mdvdread)
-.  include "../../multimedia/libdvdread/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mdvdread)
+.    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
-.  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)
+.  if !empty(PKG_OPTIONS:Mfaac)
 CONFIGURE_ARGS+=       --enable-faac
 EXTRA_LIBS+=           -lfaac
-.  include "../../audio/faac/buildlink3.mk"
-.else
+.    include "../../audio/faac/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-faac
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mfaad)
+.  if !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=       --enable-faad
-.  include "../../audio/faad2/buildlink3.mk"
-.else
+.    include "../../audio/faad2/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-faad
-.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:Mlibmpg123)
+.  if !empty(PKG_OPTIONS:Mlibmpg123)
 # no --enable-mpg123: configure forgets to add -lmpg123.
-.  include "../../audio/mpg123/buildlink3.mk"
-.else
+.    include "../../audio/mpg123/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-mpg123
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mlame)
+.  if !empty(PKG_OPTIONS:Mlame)
 CONFIGURE_ARGS+=       --enable-mp3lame
-.  include "../../audio/lame/buildlink3.mk"
-.else
+.    include "../../audio/lame/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-mp3lame
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mopus)
+.  if !empty(PKG_OPTIONS:Mopus)
 CONFIGURE_ARGS+=       --enable-libopus
-.  include "../../audio/libopus/buildlink3.mk"
-.else
+.    include "../../audio/libopus/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-libopus
-.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)
 CONFIGURE_ARGS+=       --enable-win32dll
 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+=       --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)
-.  include "../../audio/libvorbis/buildlink3.mk"
-.else
+.  if !empty(PKG_OPTIONS:Mvorbis)
+.    include "../../audio/libvorbis/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-libvorbis
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mx264)
+.  if !empty(PKG_OPTIONS:Mx264)
 CONFIGURE_ARGS+=       --enable-x264
 EXTRA_LIBS+=           -lx264
-.  include "../../multimedia/x264-devel/buildlink3.mk"
-.else
+.    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)
 CONFIGURE_ARGS+=       --disable-ssse3
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mvdpau)
+.  if !empty(PKG_OPTIONS:Mvdpau)
 CONFIGURE_ARGS+=       --enable-vdpau
-.  include "../../multimedia/libvdpau/buildlink3.mk"
-.else
+.    include "../../multimedia/libvdpau/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-vdpau
-.endif
+.  endif
 
-.if !empty(PKG_OPTIONS:Mlirc)
+.  if !empty(PKG_OPTIONS:Mlirc)
 CONFIGURE_ARGS+=       --enable-lirc
-.  include "../../comms/lirc/buildlink3.mk"
-.else
+.    include "../../comms/lirc/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-lirc
-.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*)

Index: pkgsrc/multimedia/ogle/Makefile
diff -u pkgsrc/multimedia/ogle/Makefile:1.34 pkgsrc/multimedia/ogle/Makefile:1.35
--- pkgsrc/multimedia/ogle/Makefile:1.34        Sun Sep  3 08:36:57 2017
+++ pkgsrc/multimedia/ogle/Makefile     Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/09/03 08:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 17:12:03 rillig Exp $
 
 DISTNAME=      ogle-0.9.2
 PKGREVISION=   8
@@ -41,7 +41,7 @@ WRAPPER_TRANSFORM_CMDS+=      opt:-mcpu=penti
 
 MESSAGE_SUBST+=                PKGBASE=${PKGBASE}
 
-BUILDLINK_API_DEPENDS.libdvdread+=      libdvdread>=4.1.3
+BUILDLINK_API_DEPENDS.libdvdread+=     libdvdread>=4.1.3
 
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"

Index: pkgsrc/multimedia/omxplayer/Makefile
diff -u pkgsrc/multimedia/omxplayer/Makefile:1.23 pkgsrc/multimedia/omxplayer/Makefile:1.24
--- pkgsrc/multimedia/omxplayer/Makefile:1.23   Thu Aug 22 12:23:38 2019
+++ pkgsrc/multimedia/omxplayer/Makefile        Sun Nov  3 17:12:03 2019
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.23 2019/08/22 12:23:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 17:12:03 rillig Exp $
 
 DISTNAME=      omxplayer-20170112
 PKGREVISION=   12
 CATEGORIES=    multimedia
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=popcornmix/}
-GITHUB_PROJECT= omxplayer
-GITHUB_TAG=     12b472eaa75bce25dc63ec61d9233aadb996f3a4
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=popcornmix/}
+GITHUB_PROJECT=        omxplayer
+GITHUB_TAG=    12b472eaa75bce25dc63ec61d9233aadb996f3a4
 
 MAINTAINER=    port-arm%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/popcornmix/omxplayer
 COMMENT=       Raspberry Pi video player
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c++
-USE_TOOLS+=    gmake bash:build
-BUILD_TARGET=  omxplayer.bin
-INSTALLATION_DIRS+= bin share/docs/omxplayer
-REPLACE_BASH=  omxplayer
+USE_LANGUAGES=         c++
+USE_TOOLS+=            gmake bash:build
+BUILD_TARGET=          omxplayer.bin
+INSTALLATION_DIRS+=    bin share/docs/omxplayer
+REPLACE_BASH=          omxplayer
 
 EXTRACT_USING= bsdtar
 

Index: pkgsrc/multimedia/phonon-backend-vlc/Makefile.common
diff -u pkgsrc/multimedia/phonon-backend-vlc/Makefile.common:1.6 pkgsrc/multimedia/phonon-backend-vlc/Makefile.common:1.7
--- pkgsrc/multimedia/phonon-backend-vlc/Makefile.common:1.6    Tue Aug 27 06:50:39 2019
+++ pkgsrc/multimedia/phonon-backend-vlc/Makefile.common        Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2019/08/27 06:50:39 markd Exp $
+# $NetBSD: Makefile.common,v 1.7 2019/11/03 17:12:03 rillig Exp $
 
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_KDE:=phonon/phonon-backend-vlc/0.10.3/}
@@ -8,8 +8,8 @@ MAINTAINER=     markd%NetBSD.org@localhost
 HOMEPAGE=      https://phonon.kde.org/
 LICENSE=       gnu-lgpl-v2.1
 
-PATCHDIR=       ${.CURDIR}/../../multimedia/phonon-backend-vlc/patches
-DISTINFO_FILE=  ${.CURDIR}/../../multimedia/phonon-backend-vlc/distinfo
+PATCHDIR=      ${.CURDIR}/../../multimedia/phonon-backend-vlc/patches
+DISTINFO_FILE= ${.CURDIR}/../../multimedia/phonon-backend-vlc/distinfo
 
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++

Index: pkgsrc/multimedia/php-ming/Makefile
diff -u pkgsrc/multimedia/php-ming/Makefile:1.30 pkgsrc/multimedia/php-ming/Makefile:1.31
--- pkgsrc/multimedia/php-ming/Makefile:1.30    Tue Nov 13 10:25:18 2018
+++ pkgsrc/multimedia/php-ming/Makefile Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/11/13 10:25:18 markd Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/03 17:12:03 rillig Exp $
 
 .include "../../multimedia/ming/Makefile.common"
 PECL_VERSION=          ${MING_VERSION}
@@ -22,7 +22,7 @@ USE_TOOLS+=           aclocal autoconf automake a
 
 # missing in 0.4.4 release tarball.
 post-extract:
-               ${CP} ${FILESDIR}/config.m4 ${WRKSRC}/${PHPSETUPSUBDIR}
+       ${CP} ${FILESDIR}/config.m4 ${WRKSRC}/${PHPSETUPSUBDIR}
 
 pre-configure:
        cd ${WRKSRC}; sh ./autogen.sh

Index: pkgsrc/multimedia/py-gstreamer0.10/Makefile
diff -u pkgsrc/multimedia/py-gstreamer0.10/Makefile:1.42 pkgsrc/multimedia/py-gstreamer0.10/Makefile:1.43
--- pkgsrc/multimedia/py-gstreamer0.10/Makefile:1.42    Mon Sep  2 13:20:10 2019
+++ pkgsrc/multimedia/py-gstreamer0.10/Makefile Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/09/02 13:20:10 adam Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/03 17:12:03 rillig Exp $
 
 DISTNAME=              gst-python-0.10.22
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer0.10/}
@@ -14,12 +14,12 @@ LICENSE=            gnu-lgpl-v2.1
 
 CONFLICTS=             gst-python-[0-9]*
 
-USE_PKGLOCALEDIR=      yes
-USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config gmake
-GNU_CONFIGURE=         yes
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN}
-PY_PATCHPLIST=         yes
+USE_PKGLOCALEDIR=              yes
+USE_LIBTOOL=                   yes
+USE_TOOLS+=                    pkg-config gmake
+GNU_CONFIGURE=                 yes
+CONFIGURE_ENV+=                        PYTHON=${PYTHONBIN}
+PY_PATCHPLIST=                 yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.10.22; use py-gobjects
 
 PKGCONFIG_OVERRIDE+=   pkgconfig/gst-python.pc.in

Index: pkgsrc/multimedia/py-ming/Makefile
diff -u pkgsrc/multimedia/py-ming/Makefile:1.32 pkgsrc/multimedia/py-ming/Makefile:1.33
--- pkgsrc/multimedia/py-ming/Makefile:1.32     Mon Sep  2 13:20:11 2019
+++ pkgsrc/multimedia/py-ming/Makefile  Sun Nov  3 17:12:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/09/02 13:20:11 adam Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 17:12:03 rillig Exp $
 
 .include "../../multimedia/ming/Makefile.common"
 
@@ -14,7 +14,7 @@ PY_PATCHPLIST=                yes
 PYSETUPSUBDIR=         py_ext
 EGG_NAME=              ${DISTNAME:S/ming/mingc/:S/_/./g}
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 pre-configure:
        cd ${WRKSRC}/py_ext; \

Index: pkgsrc/multimedia/replex/Makefile
diff -u pkgsrc/multimedia/replex/Makefile:1.6 pkgsrc/multimedia/replex/Makefile:1.7
--- pkgsrc/multimedia/replex/Makefile:1.6       Mon Sep  4 18:00:58 2017
+++ pkgsrc/multimedia/replex/Makefile   Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/09/04 18:00:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 17:12:04 rillig Exp $
 #
 
 DISTNAME=              replex-0.1.6.8
@@ -11,6 +11,6 @@ COMMENT=              Remultiplexes transport stream
 
 USE_TOOLS+=            gmake
 
-INSTALLATION_DIRS=      bin share/doc
+INSTALLATION_DIRS=     bin share/doc
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/smpeg/Makefile
diff -u pkgsrc/multimedia/smpeg/Makefile:1.32 pkgsrc/multimedia/smpeg/Makefile:1.33
--- pkgsrc/multimedia/smpeg/Makefile:1.32       Fri Jun 15 11:49:17 2018
+++ pkgsrc/multimedia/smpeg/Makefile    Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/06/15 11:49:17 tsutsui Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 17:12:04 rillig Exp $
 #
 
 DISTNAME=      smpeg-0.4.4
@@ -30,10 +30,10 @@ post-wrapper:
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
-. if ${OPSYS} != "Darwin" && \
+.  if ${OPSYS} != "Darwin" && \
      empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
 CONFIGURE_ARGS+=       --enable-mmx
-. endif
+.  endif
 .endif
 
 MAKE_ENV.SunOS+=       SunOS_LDFLAGS="-shared -mimpure-text"

Index: pkgsrc/multimedia/totem/Makefile.common
diff -u pkgsrc/multimedia/totem/Makefile.common:1.70 pkgsrc/multimedia/totem/Makefile.common:1.71
--- pkgsrc/multimedia/totem/Makefile.common:1.70        Mon Sep  2 13:20:10 2019
+++ pkgsrc/multimedia/totem/Makefile.common     Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.70 2019/09/02 13:20:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.71 2019/11/03 17:12:04 rillig Exp $
 #
 # used by multimedia/totem-browser-plugin/Makefile
 # used by multimedia/totem-nautilus/Makefile
@@ -28,7 +28,7 @@ GCONF_SCHEMAS+=       totem-video-thumbnail.sc
 
 CONFIGURE_ARGS+=       --enable-vala=no
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2, py-gdata
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2, py-gdata
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"

Index: pkgsrc/multimedia/totem-browser-plugin/Makefile
diff -u pkgsrc/multimedia/totem-browser-plugin/Makefile:1.64 pkgsrc/multimedia/totem-browser-plugin/Makefile:1.65
--- pkgsrc/multimedia/totem-browser-plugin/Makefile:1.64        Sun Jul 21 22:25:28 2019
+++ pkgsrc/multimedia/totem-browser-plugin/Makefile     Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/07/21 22:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2019/11/03 17:12:04 rillig Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
@@ -9,7 +9,7 @@ PKGNAME=        ${DISTNAME:S/totem/totem-browse
 PKGREVISION=   57
 
 # override Makefile.common
-PLIST_SRC=      ${.CURDIR}/PLIST
+PLIST_SRC=     ${.CURDIR}/PLIST
 GCONF_SCHEMAS= # none
 
 COMMENT+=      (gecko plugin)

Index: pkgsrc/multimedia/totem-nautilus/Makefile
diff -u pkgsrc/multimedia/totem-nautilus/Makefile:1.68 pkgsrc/multimedia/totem-nautilus/Makefile:1.69
--- pkgsrc/multimedia/totem-nautilus/Makefile:1.68      Sun Jul 21 22:25:28 2019
+++ pkgsrc/multimedia/totem-nautilus/Makefile   Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/07/21 22:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/03 17:12:04 rillig Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
@@ -7,9 +7,9 @@ PKGNAME=        ${DISTNAME:S/totem/totem-nautil
 PKGREVISION=   52
 
 # override Makefile.common
-PLIST_SRC=      ${.CURDIR}/PLIST
-GCONF_SCHEMAS= # none
-CONFIGURE_ARGS+= --with-plugins=properties
+PLIST_SRC=             ${.CURDIR}/PLIST
+GCONF_SCHEMAS=         # none
+CONFIGURE_ARGS+=       --with-plugins=properties
 
 COMMENT+=      (nautilus plugin)
 

Index: pkgsrc/multimedia/tstools/Makefile
diff -u pkgsrc/multimedia/tstools/Makefile:1.8 pkgsrc/multimedia/tstools/Makefile:1.9
--- pkgsrc/multimedia/tstools/Makefile:1.8      Wed Sep  6 11:30:41 2017
+++ pkgsrc/multimedia/tstools/Makefile  Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/09/06 11:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 17:12:04 rillig Exp $
 #
 
 DISTNAME=      tstools-1_11
@@ -20,24 +20,24 @@ USE_TOOLS+= gmake
 
 LDFLAGS.SunOS+=        -lsocket -lnsl -lresolv
 
-TSPROGS=es2ts \
-       esdots \
-       esfilter \
-       esmerge \
-       esreport \
-       esreverse \
-       m2ts2ts \
-       pcapreport \
-       ps2ts \
-       psdots \
-       psreport \
-       stream_type \
-       ts2es \
-       ts_packet_insert \
-       tsinfo \
-       tsplay \
-       tsreport \
-       tsserve
+TSPROGS=       es2ts \
+               esdots \
+               esfilter \
+               esmerge \
+               esreport \
+               esreverse \
+               m2ts2ts \
+               pcapreport \
+               ps2ts \
+               psdots \
+               psreport \
+               stream_type \
+               ts2es \
+               ts_packet_insert \
+               tsinfo \
+               tsplay \
+               tsreport \
+               tsserve
 
 do-install:
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/multimedia/win32-codecs/Makefile
diff -u pkgsrc/multimedia/win32-codecs/Makefile:1.35 pkgsrc/multimedia/win32-codecs/Makefile:1.36
--- pkgsrc/multimedia/win32-codecs/Makefile:1.35        Thu Jan 19 18:52:19 2017
+++ pkgsrc/multimedia/win32-codecs/Makefile     Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/01/19 18:52:19 agc Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 17:12:04 rillig Exp $
 
 DISTNAME=      windows-all-20071007
 PKGNAME=       win32-codecs-071007
@@ -16,11 +16,11 @@ HOMEPAGE=   http://www.mplayerhq.hu/MPlaye
 COMMENT=       Huge compilation of Win32 binary codecs
 LICENSE=       mplayer-codec-license
 
-RESTRICTED=    Unsure of codec's license
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+RESTRICTED=            Unsure of codec's license
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_SRC_ON_FTP=         ${RESTRICTED}
 
 USE_LANGUAGES=         # empty
 

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.156 pkgsrc/multimedia/xine-lib/Makefile:1.157
--- pkgsrc/multimedia/xine-lib/Makefile:1.156   Fri Aug 30 18:00:15 2019
+++ pkgsrc/multimedia/xine-lib/Makefile Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2019/08/30 18:00:15 nia Exp $
+# $NetBSD: Makefile,v 1.157 2019/11/03 17:12:04 rillig Exp $
 
 PKGREVISION= 4
 .include "Makefile.common"
@@ -34,9 +34,9 @@ BUILDLINK_API_DEPENDS.libcdio+=       libcdio>
 
 .if ${OPSYS} == "FreeBSD"
 PLIST_VARS+=   vidix
-.if ${MACHINE_ARCH} == "i386"
+.  if ${MACHINE_ARCH} == "i386"
 PLIST.vidix=   yes
-.endif
+.  endif
 .endif
 
 PLIST_VARS+=   qtw32
@@ -46,9 +46,9 @@ PLIST.qtw32=  yes
 
 .if ${OPSYS} == "SunOS"
 PLIST_VARS+=   oss
-.if ${OS_VERSION} == "5.11"
+.  if ${OS_VERSION} == "5.11"
 PLIST.oss=     yes
-.endif
+.  endif
 .endif
 
 CPPFLAGS.SunOS+=       -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE

Index: pkgsrc/multimedia/xine-lib/Makefile.common
diff -u pkgsrc/multimedia/xine-lib/Makefile.common:1.87 pkgsrc/multimedia/xine-lib/Makefile.common:1.88
--- pkgsrc/multimedia/xine-lib/Makefile.common:1.87     Wed Jul 31 09:39:56 2019
+++ pkgsrc/multimedia/xine-lib/Makefile.common  Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.87 2019/07/31 09:39:56 nia Exp $
+# $NetBSD: Makefile.common,v 1.88 2019/11/03 17:12:04 rillig Exp $
 #
 # used by audio/xine-alsa/Makefile
 # used by audio/xine-esound/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ENV+=               have_libpng="yes"
 CONFIGURE_ENV+=                PNG_CFLAGS="-I${PREFIX}/include"
 CONFIGURE_ENV+=                PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
 # XXX broken configure check in 1.2.1
-CONFIGURE_ENV+= cc_cv_cflags__Werror_implicit_function_declaration="no"
+CONFIGURE_ENV+=                cc_cv_cflags__Werror_implicit_function_declaration="no"
 PKGSRC_MAKE_ENV+=      "mkdir_p"="mkdir -p"
 
 .include "../../mk/bsd.prefs.mk"
@@ -50,15 +50,15 @@ PLIST_VARS+=                xv xvmc
 PLIST.xv=              yes
 PLIST.xvmc=            yes
 .else
-.if exists(${X11BASE}/lib/libXv.so)
+.  if exists(${X11BASE}/lib/libXv.so)
 CONFIGURE_ARGS+=       --with-xv-path='${X11BASE}/lib'
 PLIST.xv=              yes
-.endif
-.if exists(${X11BASE}/lib/libXvMC.so)
+.  endif
+.  if exists(${X11BASE}/lib/libXvMC.so)
 CONFIGURE_ARGS+=       --with-xvmc-path='${X11BASE}/lib'
 CONFIGURE_ARGS+=       --with-xxmc-path='${X11BASE}/lib'
 PLIST.xvmc=            yes
-.endif
+.  endif
 .endif # X11_TYPE
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/multimedia/xine-v4l/Makefile
diff -u pkgsrc/multimedia/xine-v4l/Makefile:1.25 pkgsrc/multimedia/xine-v4l/Makefile:1.26
--- pkgsrc/multimedia/xine-v4l/Makefile:1.25    Sun Aug 11 13:22:05 2019
+++ pkgsrc/multimedia/xine-v4l/Makefile Sun Nov  3 17:12:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:05 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 17:12:04 rillig Exp $
 
 PKGREVISION= 2
 .include "../../multimedia/xine-lib/Makefile.common"
@@ -12,7 +12,7 @@ NOT_FOR_PLATFORM=     NetBSD-*-*
 
 DEPENDS+=      xine-lib>=1rc3a:../../multimedia/xine-lib
 
-BUILD_DIRS=    src/input
+BUILD_DIRS=            src/input
 CONFIGURE_ARGS+=       --without-x --disable-xinerama
 CONFIGURE_ARGS+=       --disable-vcd
 

Index: pkgsrc/multimedia/xine-v4l2/Makefile
diff -u pkgsrc/multimedia/xine-v4l2/Makefile:1.23 pkgsrc/multimedia/xine-v4l2/Makefile:1.24
--- pkgsrc/multimedia/xine-v4l2/Makefile:1.23   Sun Aug 11 13:22:06 2019
+++ pkgsrc/multimedia/xine-v4l2/Makefile        Sun Nov  3 17:12:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:06 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 17:12:05 rillig Exp $
 
 PKGREVISION= 2
 .include "../../multimedia/xine-lib/Makefile.common"
@@ -9,7 +9,7 @@ COMMENT=        The v4l2 input plugin for xine-
 
 DEPENDS+=      xine-lib>=1rc3a:../../multimedia/xine-lib
 
-BUILD_DIRS=    src/input
+BUILD_DIRS=            src/input
 CONFIGURE_ARGS+=       --without-x --disable-xinerama
 CONFIGURE_ARGS+=       --disable-vcd
 

Index: pkgsrc/multimedia/xvidcore/Makefile
diff -u pkgsrc/multimedia/xvidcore/Makefile:1.47 pkgsrc/multimedia/xvidcore/Makefile:1.48
--- pkgsrc/multimedia/xvidcore/Makefile:1.47    Sun Dec  9 03:04:34 2018
+++ pkgsrc/multimedia/xvidcore/Makefile Sun Nov  3 17:12:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/12/09 03:04:34 sevan Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 17:12:05 rillig Exp $
 
 DISTNAME=      xvidcore-1.3.3
 PKGREVISION=   1
@@ -11,8 +11,8 @@ HOMEPAGE=     http://www.xvid.org/
 COMMENT=       ISO MPEG-4 compliant video codec
 LICENSE=       gnu-gpl-v2
 
-USE_GCC_RUNTIME=yes
-USE_TOOLS+=    gmake
+USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            gmake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=      --disable-assembly
 .elif ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=                nasm>=0.98.39nb3:../../devel/nasm
 #.elif ${MACHINE_ARCH} == "x86_64"
-#BUILD_DEPENDS+=               yasm>=0.4.0:../../devel/yasm
+#BUILD_DEPENDS+=       yasm>=0.4.0:../../devel/yasm
 .endif
 
 CFLAGS.SunOS+=         -D__inline=inline



Home | Main Index | Thread Index | Old Index