diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-02 21:09:12 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-02 21:09:12 +0000 |
| commit | 2a89443807b048ee84de6bb7bbcfb04b2a4dcdc2 (patch) | |
| tree | 06a7346d29f1c7f55735aea8cc0763c11f19a69e | |
| parent | 1ff5dfa2cce00c711a365227349b2e7e99f0259a (diff) | |
| download | pkgsrc-2a89443807b048ee84de6bb7bbcfb04b2a4dcdc2.tar.gz | |
audio: align variable assignments and directives
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
57 files changed, 194 insertions, 194 deletions
diff --git a/audio/alsa-lib/builtin.mk b/audio/alsa-lib/builtin.mk index 96d3196cdaa..0441d133cee 100644 --- a/audio/alsa-lib/builtin.mk +++ b/audio/alsa-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2011/02/25 20:17:41 markd Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/02 21:09:12 rillig Exp $ BUILTIN_PKG:= alsa-lib @@ -12,12 +12,12 @@ PKGCONFIG_BASE.alsa-lib= /usr ### solely to determine whether a built-in implementation exists. ### -CHECK_BUILTIN.alsa-lib?= no +CHECK_BUILTIN.alsa-lib?= no .if !empty(CHECK_BUILTIN.alsa-lib:M[nN][oO]) . if !empty(USE_BUILTIN.alsa-lib:M[yY][eE][sS]) -BUILDLINK_PREFIX.alsa-lib= /usr -BUILDLINK_FILES.alsa-lib+= lib/pkgconfig/alsa.pc +BUILDLINK_PREFIX.alsa-lib= /usr +BUILDLINK_FILES.alsa-lib+= lib/pkgconfig/alsa.pc . endif .endif # CHECK_BUILTIN.alsa-lib diff --git a/audio/alure/Makefile b/audio/alure/Makefile index d0a5d78b0b5..9ec3c5c31db 100644 --- a/audio/alure/Makefile +++ b/audio/alure/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/10/23 00:17:54 maya Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/02 21:09:12 rillig Exp $ DISTNAME= alure-1.2 CATEGORIES= audio @@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= alure.pc.in .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= alincldir openalincldir +PLIST_VARS+= alincldir openalincldir .if ${OPSYS} == "Darwin" PLIST.openalincldir= yes diff --git a/audio/amaroc/Makefile b/audio/amaroc/Makefile index b7846558699..8600cb8960e 100644 --- a/audio/amaroc/Makefile +++ b/audio/amaroc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/04/25 07:32:34 maya Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/02 21:09:12 rillig Exp $ # DISTNAME= amaroc-0.3 @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses INSTALLATION_DIRS= bin share/doc/amaroc -REPLACE_PYTHON= amaroc.py +REPLACE_PYTHON= amaroc.py NO_BUILD= yes diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index f176e73f322..6b4dba39b49 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/09/02 13:20:06 adam Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/02 21:09:12 rillig Exp $ DISTNAME= ardour-4.7 PKGREVISION= 23 @@ -140,12 +140,12 @@ CONF_FILES+= ${EGDIR}/trx.menus ${PKG_SYSCONFDIR}/trx.menus # As of NetBSD-7.99.21 pkgsrc's checks cannot open file with rare unicode characters CHECK_PORTABILITY_SKIP+= libs/pbd/test/i18n_test/*.tst -PYTHON_VERSIONS_ACCEPTED= 27 # as of 4.4 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 4.4 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "Linux" -BUILDLINK_TRANSFORM+= rm:-ldl +BUILDLINK_TRANSFORM+= rm:-ldl .endif LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ardour4/LV2/reasonablesynth.lv2 diff --git a/audio/ardour/options.mk b/audio/ardour/options.mk index 86fe6983a38..f8be9e4baf0 100644 --- a/audio/ardour/options.mk +++ b/audio/ardour/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2016/07/07 06:28:24 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/02 21:09:12 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ardour @@ -30,9 +30,9 @@ PLIST.jack= yes # Useful for developers .if !empty(PKG_OPTIONS:Mdummy) ARDOUR_BACKENDS_DUMMY= yes -PLIST.dummy= yes +PLIST.dummy= yes .endif ARDOUR_BACKENDS= ${ARDOUR_BACKENDS_ALSA:Dalsa},${ARDOUR_BACKENDS_JACK:Djack},${ARDOUR_BACKENDS_DUMMY:Ddummy} -WAF_ARGS+= --with-backends=${ARDOUR_BACKENDS:C/,+$//} +WAF_ARGS+= --with-backends=${ARDOUR_BACKENDS:C/,+$//} diff --git a/audio/aubio/options.mk b/audio/aubio/options.mk index 5cc04d02d94..5b579bb317b 100644 --- a/audio/aubio/options.mk +++ b/audio/aubio/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 21:09:12 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.aubio +PKG_OPTIONS_VAR= PKG_OPTIONS.aubio PKG_SUPPORTED_OPTIONS= jack alsa PKG_SUGGESTED_OPTIONS= jack alsa diff --git a/audio/bmp-crossfade/Makefile b/audio/bmp-crossfade/Makefile index 89000f96c71..82e273dccfb 100644 --- a/audio/bmp-crossfade/Makefile +++ b/audio/bmp-crossfade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/07/21 22:24:22 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 21:09:12 rillig Exp $ PKGNAME= bmp-crossfade-0.3.11 DISTNAME= xmms-crossfade-0.3.11 @@ -23,7 +23,7 @@ MAKE_ENV+= OSS_DEFS=${OSS_DEFS:Q} .include "../../audio/bmp/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" -CONFIGURE_ARGS+= --enable-player=bmp +CONFIGURE_ARGS+= --enable-player=bmp GNU_CONFIGURE_LIBSUBDIR= bmp/Output .if ${OSS_TYPE} == "none" diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile index a5b3a2508c9..13ad0532253 100644 --- a/audio/bmp-scrobbler/Makefile +++ b/audio/bmp-scrobbler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/08/22 12:22:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/02 21:09:12 rillig Exp $ DISTNAME= xmms-scrobbler-0.4.0 PKGNAME= ${DISTNAME:S/xmms/bmp/} @@ -13,9 +13,9 @@ COMMENT= BMP plugin for last.fm LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= YES +USE_LIBTOOL= YES +USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --disable-xmms-plugin .include "../../audio/musicbrainz/buildlink3.mk" diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile index aa54a7efaed..d694ea4bc4f 100644 --- a/audio/cddb-bundle/Makefile +++ b/audio/cddb-bundle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/04/03 00:32:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/02 21:09:12 rillig Exp $ # DISTNAME= cddb.bundle-0.2 @@ -21,7 +21,7 @@ MAKE_FILE= GNUmakefile INSTALL_MAKE_FLAGS= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ INSTALL_DATA=${INSTALL_DATA:Q} -FIX_GNUSTEP_INSTALLATION_DIR= yes +FIX_GNUSTEP_INSTALLATION_DIR= yes SUBST_FILES.gnustep_installation_dir+= Cddb/GNUmakefile .include "../../devel/gnustep-base/buildlink3.mk" diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile index f89afaadef9..f71cb6efb14 100644 --- a/audio/cdplayer/Makefile +++ b/audio/cdplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/04/03 00:32:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/02 21:09:13 rillig Exp $ # DISTNAME= cdplayer-0.5.1 @@ -21,7 +21,7 @@ MAKE_FILE= GNUmakefile MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import" MAKE_ENV+= GNUSTEP_LIB_DIR=${GNUSTEP_LIB_DIR:Q} -INSTALLATION_DIRS+=include/CDPlayer +INSTALLATION_DIRS+= include/CDPlayer .include "../../x11/gnustep-back/buildlink3.mk" .include "../../x11/gnustep-preferences/buildlink3.mk" diff --git a/audio/celt/hacks.mk b/audio/celt/hacks.mk index 61b061279a8..a6bea73ce8a 100644 --- a/audio/celt/hacks.mk +++ b/audio/celt/hacks.mk @@ -1,14 +1,14 @@ -# $NetBSD: hacks.mk,v 1.1.1.1 2008/12/03 00:44:49 bjs Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/02 21:09:13 rillig Exp $ # .if !defined(CELT_HACKS_MK) CELT_HACKS_MK= # empty -. include "../../mk/compiler.mk" +.include "../../mk/compiler.mk" ### ### XXX Remove this if unneeded in the future. ### -. if !empty(CC_VERSION:Mgcc-[34]*) +.if !empty(CC_VERSION:Mgcc-[34]*) CFLAGS+= -fno-strict-aliasing PKG_HACKS+= no-strict-aliasing -. endif +.endif .endif diff --git a/audio/cs4235/Makefile b/audio/cs4235/Makefile index 5cb7e6a1495..483fa2aebee 100644 --- a/audio/cs4235/Makefile +++ b/audio/cs4235/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/08/01 17:40:08 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 21:09:13 rillig Exp $ # DISTNAME= cs4235-20001009 @@ -13,7 +13,7 @@ LICENSE= public-domain INSTALLATION_DIRS= bin -ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 +ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 WRKSRC= ${WRKDIR}/cs4235 MAKE_ENV+= ${BSD_MAKE_ENV} diff --git a/audio/csound6-manual/Makefile b/audio/csound6-manual/Makefile index 6064c2eb629..b2d984c8279 100644 --- a/audio/csound6-manual/Makefile +++ b/audio/csound6-manual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:20:07 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 21:09:13 rillig Exp $ DISTNAME= manual_src PKGNAME= csound6-manual-${CSOUND_VERSION} @@ -32,7 +32,7 @@ SUBST_FILES.python= Makefile SUBST_STAGE.python= pre-build SUBST_MESSAGE.python= Fixing path to python. -PYTHON_VERSIONS_ACCEPTED= 27 # as of 6.02 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 6.02 do-install: cd ${WRKSRC}/html && pax -rw * ${DESTDIR}${PREFIX}/${DOCDIR} diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile index 5080e21e20f..3e6d1377bb8 100644 --- a/audio/eawpatches/Makefile +++ b/audio/eawpatches/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/09/11 23:59:30 asau Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 21:09:13 rillig Exp $ # DISTNAME= eawpats12_full @@ -11,7 +11,7 @@ MAINTAINER= adam@NetBSD.org COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity LICENSE= generic-nonlicense -RESTRICTED= Some patches are copyrighted, some marked no-commercial-use +RESTRICTED= Some patches are copyrighted, some marked no-commercial-use NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/audio/freeswitch-music/options.mk b/audio/freeswitch-music/options.mk index 66d3b9362f9..1a0d9ae75df 100644 --- a/audio/freeswitch-music/options.mk +++ b/audio/freeswitch-music/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2016/07/09 11:41:57 rillig Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/02 21:09:13 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k @@ -7,27 +7,27 @@ PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k .include "../../mk/bsd.options.mk" .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 +DISTFILES+= freeswitch-sounds-music-8000-1.0.8.tar.gz +INSTALLATION_DIRS+= share/freeswitch/sounds/music/8000 +SOUND_DIRS+= 8000 .endif .if !empty(PKG_OPTIONS:Mfreeswitch-16k) -DISTFILES+= freeswitch-sounds-music-16000-1.0.8.tar.gz -SOUND_DIRS+= 16000 -INSTALLATION_DIRS+= share/freeswitch/sounds/music/16000 +DISTFILES+= freeswitch-sounds-music-16000-1.0.8.tar.gz +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 -INSTALLATION_DIRS+= share/freeswitch/sounds/music/32000 +DISTFILES+= freeswitch-sounds-music-32000-1.0.8.tar.gz +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 -INSTALLATION_DIRS+= share/freeswitch/sounds/music/48000 +DISTFILES+= freeswitch-sounds-music-48000-1.0.8.tar.gz +SOUND_DIRS+= 48000 +INSTALLATION_DIRS+= share/freeswitch/sounds/music/48000 .endif .for opt in ${PKG_SUPPORTED_OPTIONS} diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile index 5e33a91770d..a97464b27f3 100644 --- a/audio/gbemol/Makefile +++ b/audio/gbemol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/22 12:22:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/02 21:09:13 rillig Exp $ # DISTNAME= gbemol-0.3.2 @@ -11,10 +11,10 @@ HOMEPAGE= http://gbemol.sourceforge.net/ COMMENT= Graphical frontend for the Music Player Daemon (MPD) LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config intltool msgfmt +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config intltool msgfmt .include "../../audio/id3lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile index b0e696c6bcb..6f8071a613a 100644 --- a/audio/gimmix/Makefile +++ b/audio/gimmix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2019/08/22 12:22:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.60 2019/11/02 21:09:13 rillig Exp $ # DISTNAME= gimmix-0.5.7.1 @@ -12,10 +12,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Graphical Music player daemon (MPD) client LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= intltool gmake msgfmt pkg-config +USE_TOOLS+= intltool gmake msgfmt pkg-config # fixes broken symbolic link to /usr/share/intltool/Makefile.in.in post-extract: diff --git a/audio/gnome-speech-espeak/Makefile b/audio/gnome-speech-espeak/Makefile index ed4b16e2a27..93a88099502 100644 --- a/audio/gnome-speech-espeak/Makefile +++ b/audio/gnome-speech-espeak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/09/15 10:03:36 obache Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 21:09:13 rillig Exp $ # .include "../../audio/gnome-speech/Makefile.common" @@ -8,8 +8,8 @@ PKGREVISION= 6 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= GNOME 2 text-to-speech API -BUILD_DIRS= drivers/espeak -INSTALL_DIRS= drivers/espeak +BUILD_DIRS= drivers/espeak +INSTALL_DIRS= drivers/espeak CONFIGURE_ARGS+= --with-espeak-dir=${LOCALBASE} .include "../../audio/espeak/buildlink3.mk" diff --git a/audio/gqmpeg-devel/options.mk b/audio/gqmpeg-devel/options.mk index f42b0fe1528..7fef165e95d 100644 --- a/audio/gqmpeg-devel/options.mk +++ b/audio/gqmpeg-devel/options.mk @@ -1,6 +1,6 @@ -# $NetBSD: options.mk,v 1.3 2009/01/12 21:12:40 shattered Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/02 21:09:14 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg +PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg PKG_OPTIONS_OPTIONAL_GROUPS= recode PKG_OPTIONS_GROUP.recode= gqmpeg-japanese gqmpeg-russian diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index d5689a0064f..779c74f4252 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2018/10/12 13:51:59 martin Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/02 21:09:14 rillig Exp $ # DISTNAME= id3lib-3.8.3 @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes USE_LIBTOOL= yes -CPPFLAGS+=-DID3_NEED_WCHAR_TEMPLATE +CPPFLAGS+= -DID3_NEED_WCHAR_TEMPLATE .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 1e95594c7a7..9fc407ded3f 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/09/09 03:11:23 dbj Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/02 21:09:14 rillig Exp $ DISTNAME= jack-audio-connection-kit-0.125.0 PKGREVISION= 1 @@ -114,7 +114,7 @@ CONFIGURE_ARGS+= --disable-dynsimd . endif .endif -BDB_ACCEPTED= db4 db5 +BDB_ACCEPTED= db4 db5 BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} post-extract: diff --git a/audio/kid3/hacks.mk b/audio/kid3/hacks.mk index f6ad7d8a4f3..39e1574e441 100644 --- a/audio/kid3/hacks.mk +++ b/audio/kid3/hacks.mk @@ -1,7 +1,7 @@ -# $NetBSD: hacks.mk,v 1.1 2018/01/21 04:10:44 markd Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/02 21:09:14 rillig Exp $ # linking -lQt5Widgets on NetBSD with gcc produces # ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail # /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694 # unless -lexecinfo preceeds -lQt5Widgets -BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets +BUILDLINK_TRANSFORM.NetBSD+= l:Qt5Widgets:execinfo:Qt5Widgets diff --git a/audio/libfishsound/options.mk b/audio/libfishsound/options.mk index e6efec7ca13..68757a429d0 100644 --- a/audio/libfishsound/options.mk +++ b/audio/libfishsound/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2015/12/29 04:54:36 dholland Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/02 21:09:14 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.libfishsound -PKG_SUPPORTED_OPTIONS= doc valgrind -PKG_SUGGESTED_OPTIONS+= flac speex vorbis +PKG_OPTIONS_VAR= PKG_OPTIONS.libfishsound +PKG_SUPPORTED_OPTIONS= doc valgrind +PKG_SUGGESTED_OPTIONS+= flac speex vorbis PKG_OPTIONS_NONEMPTY_SETS+= codec PKG_OPTIONS_SET.codec= flac speex vorbis @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-speex .endif .if !empty(PKG_OPTIONS:Mvalgrind) -BUILD_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind +BUILD_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind CONFIGURE_ARGS+= --enable-valgrind-testing .else CONFIGURE_ARGS+= --disable-valgrind-testing diff --git a/audio/libifp/Makefile b/audio/libifp/Makefile index 65c5e4dba1b..00729e2dc62 100644 --- a/audio/libifp/Makefile +++ b/audio/libifp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/02/27 23:56:07 khorben Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/02 21:09:14 rillig Exp $ # DISTNAME= libifp-1.0.0.2 @@ -11,11 +11,11 @@ HOMEPAGE= http://ifp-driver.sourceforge.net/ COMMENT= General-purpose library-driver for iRiver's iFP portable players LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libusb=${BUILDLINK_PREFIX.libusb} -USE_LIBTOOL= yes -USE_LANGUAGES= c c++ -USE_FEATURES+= fts_open +USE_LIBTOOL= yes +USE_LANGUAGES= c c++ +USE_FEATURES+= fts_open CFLAGS.SunOS+= -fPIC LIBS.SunOS+= -liconv diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile index f6ebad1eac3..db9fb7b557b 100644 --- a/audio/libopenmpt/Makefile +++ b/audio/libopenmpt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/09/18 14:17:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/02 21:09:14 rillig Exp $ DISTNAME= libopenmpt-0.4.3+release.autotools PKGNAME= ${DISTNAME:C/\+.*//} @@ -16,8 +16,8 @@ BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man USE_LANGUAGES= c c++ USE_TOOLS= gmake pkg-config -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libmodplug/libmodplug.pc.in libopenmpt/libopenmpt.pc.in CONFIGURE_ARGS+= --without-portaudio CONFIGURE_ARGS+= --without-portaudiocpp diff --git a/audio/libsndfile/options.mk b/audio/libsndfile/options.mk index 52a77a7e6b1..e2b6c455975 100644 --- a/audio/libsndfile/options.mk +++ b/audio/libsndfile/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.9 2010/10/16 08:23:04 adam Exp $ +# $NetBSD: options.mk,v 1.10 2019/11/02 21:09:14 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile -PKG_SUPPORTED_OPTIONS= octave +PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile +PKG_SUPPORTED_OPTIONS= octave PKG_OPTIONS_OPTIONAL_GROUPS= output PKG_OPTIONS_GROUP.output= oss sun diff --git a/audio/libxspf/Makefile b/audio/libxspf/Makefile index 78a139db5e7..4ad9bfddfab 100644 --- a/audio/libxspf/Makefile +++ b/audio/libxspf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/10/03 12:19:57 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/02 21:09:15 rillig Exp $ DISTNAME= libxspf-1.2.0 CATEGORIES= audio @@ -12,17 +12,17 @@ LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= pkg-config -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_LANGUAGES= c c++ -PKGCONFIG_OVERRIDE+= xspf.pc.in +USE_TOOLS+= pkg-config +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_LANGUAGES= c c++ +PKGCONFIG_OVERRIDE+= xspf.pc.in CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat:Q} #CONFIGURE_ARGS+= --with-uriparser=${BUILDLINK_PREFIX.uriparser:Q} -CONFIGURE_ARGS+= --disable-test -#TEST_TARGET= check +CONFIGURE_ARGS+= --disable-test +#TEST_TARGET= check BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1 BUILDLINK_API_DEPENDS.uriparser+= uriparser>=0.7.5 diff --git a/audio/lilv/Makefile b/audio/lilv/Makefile index 922b93ecbfe..b23dc914ad0 100644 --- a/audio/lilv/Makefile +++ b/audio/lilv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/07/21 22:23:57 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 21:09:15 rillig Exp $ DISTNAME= lilv-0.24.4 PKGREVISION= 2 @@ -25,7 +25,7 @@ INSTALLATION_DIRS= ${EGDIR} .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= lv2bench +PLIST_VARS+= lv2bench .if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" # Darwin doesn't have CLOCK_GETTIME so it doesn't compile this PLIST.lv2bench= yes diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile index 89f791fc411..234a0638cbe 100644 --- a/audio/maplay/Makefile +++ b/audio/maplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/02 23:47:57 asau Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 21:09:15 rillig Exp $ DISTNAME= maplay1_2 PKGNAME= maplay-1.2 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR} -USE_LANGUAGES= c++ +USE_LANGUAGES= c++ NOT_FOR_PLATFORM= Interix-*-* INSTALLATION_DIRS= bin diff --git a/audio/moss/Makefile b/audio/moss/Makefile index 0ce428b59d1..3a69fb3c0f7 100644 --- a/audio/moss/Makefile +++ b/audio/moss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:20:05 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/02 21:09:15 rillig Exp $ DISTNAME= moss-0.1.13 PKGREVISION= 7 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis -PYTHON_VERSIONS_ACCEPTED= 27 # py-ogg, py-vorbis +PYTHON_VERSIONS_ACCEPTED= 27 # py-ogg, py-vorbis REPLACE_PYTHON= ${WRKSRC}/*.py diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile index 603655f6e22..fe402ecbf34 100644 --- a/audio/mp3asm/Makefile +++ b/audio/mp3asm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/04/20 12:10:29 nros Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 21:09:15 rillig Exp $ # DISTNAME= mp3asm-0.1.3-1 @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/mp3asm-0.1 GNU_CONFIGURE= yes -INSTALLATION_DIRS+= share/doc/mp3asm +INSTALLATION_DIRS+= share/doc/mp3asm post-patch: ${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c \ diff --git a/audio/mserv-devel/Makefile b/audio/mserv-devel/Makefile index f34206269ff..416fc34db1e 100644 --- a/audio/mserv-devel/Makefile +++ b/audio/mserv-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:17:54 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 21:09:15 rillig Exp $ DISTNAME= mserv-0.39a PKGREVISION= 10 @@ -19,7 +19,7 @@ REPLACE_PERL= support/mservedit webclient/main.cgi \ webclient/margin.cgi webclient/mserv.cgi USE_TOOLS+= perl:run pkg-config -INSTALLATION_DIRS+= share/doc/mserv share/mserv/webclient +INSTALLATION_DIRS+= share/doc/mserv share/mserv/webclient post-configure: ${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h diff --git a/audio/nas/Makefile b/audio/nas/Makefile index ec10e4ae666..2000a502333 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2019/05/23 19:22:55 rillig Exp $ +# $NetBSD: Makefile,v 1.99 2019/11/02 21:09:15 rillig Exp $ DISTNAME= nas-1.9.4.src PKGNAME= ${DISTNAME:S/.src//} @@ -81,7 +81,7 @@ CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf . if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \ || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "UnixWare" -. include "../../mk/oss.buildlink3.mk" +. include "../../mk/oss.buildlink3.mk" . endif .endif diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index cb9d602b9b7..8b5524283d9 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/08/08 21:18:43 nia Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 21:09:15 rillig Exp $ DISTNAME= openal-soft-1.19.1 CATEGORIES= audio @@ -14,7 +14,7 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config -PKG_SYSCONFSUBDIR=openal +PKG_SYSCONFSUBDIR= openal .include "../../mk/bsd.prefs.mk" @@ -43,11 +43,11 @@ CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS:BOOL=OFF CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS:BOOL=ON .endif -CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\"" +CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\"" CFLAGS.NetBSD+= -D_NETBSD_SOURCE CFLAGS.SunOS+= -D__EXTENSIONS__ -CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf +CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf SUBST_CLASSES+= fix-oss SUBST_STAGE.fix-oss= pre-configure diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index a2c23689958..cc42af13d7c 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2019/10/27 12:44:27 kamil Exp $ +# $NetBSD: Makefile,v 1.141 2019/11/02 21:09:16 rillig Exp $ DISTNAME= pulseaudio-13.0 PKGREVISION= 1 @@ -110,13 +110,13 @@ PULSE_GROUP_ACCESS?= pulseacc BUILD_DEFS+= VARBASE PKG_SYSCONFBASE PKG_SYSCONFSUBDIR= pulse -EGDIR= ${PREFIX}/share/examples/pulseaudio -CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf -CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf -CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa -CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa -CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \ - ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf +EGDIR= ${PREFIX}/share/examples/pulseaudio +CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf +CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf +CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa +CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa +CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \ + ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf PKG_GROUPS= ${PULSE_GROUP} PKG_GROUPS+= ${PULSE_GROUP_REALTIME} diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile index baf103996a8..1e53a8d2601 100644 --- a/audio/py-audiotools/Makefile +++ b/audio/py-audiotools/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.20 2016/03/07 19:40:09 nros Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/02 21:09:16 rillig Exp $ -DISTNAME= audiotools-3.1.1 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 -CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audiotools/} -#MASTER_SITES= ${MASTER_SITE_GITHUB:=tuffy/} +DISTNAME= audiotools-3.1.1 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 2 +CATEGORIES= audio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audiotools/} +#MASTER_SITES= ${MASTER_SITE_GITHUB:=tuffy/} #GITHUB_PROJECT= python-audio-tools -#GITHUB_TAG= v${PKGVERSION_NOREV} +#GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://audiotools.sourceforge.net/ diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile index d72fcefb89b..e9374aa6ce4 100644 --- a/audio/py-id3/Makefile +++ b/audio/py-id3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:07 adam Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/02 21:09:16 rillig Exp $ DISTNAME= id3-py_1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py_//} @@ -16,7 +16,7 @@ USE_LANGUAGES= # empty WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} EGG_NAME= ${DISTNAME:S/py_//:tu} -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile index 5d244b381cf..cc001645c9a 100644 --- a/audio/py-karaoke/Makefile +++ b/audio/py-karaoke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/09/02 13:20:07 adam Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/02 21:09:16 rillig Exp $ DISTNAME= pykaraoke-0.7.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen DEPENDS+= ${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric -PYTHON_VERSIONS_ACCEPTED= 27 # py-Numeric, py-wxWidgets +PYTHON_VERSIONS_ACCEPTED= 27 # py-Numeric, py-wxWidgets REPLACE_PYTHON+= performer_prompt.py REPLACE_PYTHON+= pycdg.py diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile index 3daf2402370..747c84ccff7 100644 --- a/audio/py-musicbrainz/Makefile +++ b/audio/py-musicbrainz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/09/02 13:20:06 adam Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 21:09:16 rillig Exp $ DISTNAME= python-musicbrainz2-0.4.1 PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/} @@ -13,8 +13,8 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../audio/libdiscid/buildlink3.mk" .include "../../lang/python/distutils.mk" diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile index fe48f02486a..ef5ca2591b4 100644 --- a/audio/py-musique/Makefile +++ b/audio/py-musique/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/09/02 13:20:06 adam Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/02 21:09:16 rillig Exp $ DISTNAME= pymusique-0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.pyronecrophilia.com/content/pymusique/ COMMENT= Interface to the iTunes Music Store -RESTRICTED= Possible legal problems due to iTunes access +RESTRICTED= Possible legal problems due to iTunes access NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} @@ -22,8 +22,8 @@ DEPENDS+= ${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-mcrypt, py-gtk2 +PYDISTUTILSPKG= yes +PYTHON_VERSIONS_ACCEPTED= 27 # py-mcrypt, py-gtk2 .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile index bdbfdf9d06f..12c3cd25ba7 100644 --- a/audio/qjackctl/Makefile +++ b/audio/qjackctl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/10/27 15:00:03 kamil Exp $ +# $NetBSD: Makefile,v 1.57 2019/11/02 21:09:16 rillig Exp $ # DISTNAME= qjackctl-0.4.2 @@ -22,7 +22,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --without-alsa .endif -CONFIGURE_ARGS+= --with-qt5=${QTDIR} +CONFIGURE_ARGS+= --with-qt5=${QTDIR} .include "../../audio/jack/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile index fbb63a30763..8d5db97d2de 100644 --- a/audio/rsynth/Makefile +++ b/audio/rsynth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/01/28 20:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 21:09:16 rillig Exp $ DISTNAME= rsynth-2.0 PKGREVISION= 6 @@ -13,17 +13,17 @@ COMMENT= Public Domain Speech Synthesis System DICT_FILES+= README cmudict.0.4.Z cmulex.0.4.Z phoneset.0.4 EXTRACT_ONLY= rsynth-2.0.tar.gz -DIST_SUBDIR= rsynth -GNU_CONFIGURE= YES +DIST_SUBDIR= rsynth +GNU_CONFIGURE= YES CONFIGURE_HAS_MANDIR= NO USE_TOOLS+= gzcat -CONFIGURE_ARGS+=--with-aDict="${WRKDIR}/cmudict.0.4" -CONFIGURE_ARGS+=--without-bDict -CONFIGURE_ENV+= ac_cv_lib_audio=yes XLIBS=-lXt +CONFIGURE_ARGS+= --with-aDict="${WRKDIR}/cmudict.0.4" +CONFIGURE_ARGS+= --without-bDict +CONFIGURE_ENV+= ac_cv_lib_audio=yes XLIBS=-lXt -INSTALLATION_DIRS+= bin share/rsynth +INSTALLATION_DIRS+= bin share/rsynth pre-configure: ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/cmudict.0.4.Z > ${WRKDIR}/cmudict.0.4 diff --git a/audio/snd/options.mk b/audio/snd/options.mk index 0217e16313b..479a9d8fbc2 100644 --- a/audio/snd/options.mk +++ b/audio/snd/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2016/09/15 17:02:24 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/02 21:09:16 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.snd +PKG_OPTIONS_VAR= PKG_OPTIONS.snd PKG_SUPPORTED_OPTIONS= # ruby, forth, alsa, oss, jack, pulseaudio, gmp, ladspa PKG_OPTIONS_REQUIRED_GROUPS= frontend PKG_OPTIONS_GROUP.frontend= gtk motif -PKG_SUGGESTED_OPTIONS= gtk +PKG_SUGGESTED_OPTIONS= gtk .include "../../mk/bsd.options.mk" diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 92df2b62761..d060a973c9d 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2019/09/02 13:20:06 adam Exp $ +# $NetBSD: Makefile,v 1.72 2019/11/02 21:09:17 rillig Exp $ DISTNAME= solfege-3.22.2 PKGREVISION= 1 @@ -28,7 +28,7 @@ USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt bash:run REPLACE_BASH= lesson-files/bin/csound-play-harmonic-interval.sh REPLACE_PYTHON= *.py *.py.in */*.py */*.py.in -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 SUBST_CLASSES+= sound SUBST_STAGE.sound= do-configure diff --git a/audio/spectro-edit/Makefile b/audio/spectro-edit/Makefile index 41c0bdfe316..cbabc38b10a 100644 --- a/audio/spectro-edit/Makefile +++ b/audio/spectro-edit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/09/04 18:55:07 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/02 21:09:17 rillig Exp $ DISTNAME= spectro-edit_0.4 PKGNAME= ${DISTNAME:S/_/-/} @@ -11,8 +11,8 @@ HOMEPAGE= https://code.google.com/archive/p/spectro-edit/ COMMENT= Graphically view and edit WAV files LICENSE= gnu-gpl-v3 -WRKSRC= ${WRKDIR} -USE_LANGUAGES= # none +WRKSRC= ${WRKDIR} +USE_LANGUAGES= # none INSTALLATION_DIRS= bin share/spectro-edit USE_JAVA= run diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile index edbbc20ca3c..92a9d3d2586 100644 --- a/audio/squeezeboxserver/Makefile +++ b/audio/squeezeboxserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:17:57 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/02 21:09:17 rillig Exp $ # To the poor soul who wants to update this package: # @@ -57,12 +57,12 @@ PRODUCT= SqueezeboxServer_v7.5.1 PRODUCTREV= 30836 WRKSRC= ${WRKDIR}/${DISTNAME:S/-noCPAN//}-${PRODUCTREV}-noCPAN -RESTRICTED= Firmwares and some other components cannot be redistributed +RESTRICTED= Firmwares and some other components cannot be redistributed NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -LICENSE= squeezeboxserver-license +LICENSE= squeezeboxserver-license # Database server MYSQL_VERSIONS_ACCEPTED= 55 diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile index d1f3ba1abc6..b73765874eb 100644 --- a/audio/streamripper/Makefile +++ b/audio/streamripper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2016/04/20 12:10:32 nros Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 21:09:17 rillig Exp $ DISTNAME= streamripper-1.64.6 CATEGORIES= audio @@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-included-libmad -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config PTHREAD_OPTS+= require diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 853078ef132..633003506f4 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2019/07/21 22:24:29 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2019/11/02 21:09:17 rillig Exp $ DISTNAME= TiMidity++-2.14.0 PKGNAME= ${DISTNAME:S/TiMidity++/timidity/} @@ -49,8 +49,8 @@ TIMIDITY_NATIVE_AUDIO= alsa,oss TIMIDITY_NATIVE_AUDIO= darwin .endif -EGDIR=${PREFIX}/share/examples/timidity -CONF_FILES=${EGDIR}/timidity.cfg ${PKG_SYSCONFDIR}/timidity.cfg +EGDIR= ${PREFIX}/share/examples/timidity +CONF_FILES= ${EGDIR}/timidity.cfg ${PKG_SYSCONFDIR}/timidity.cfg pre-configure: ${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/timidity.cfg > \ diff --git a/audio/timidity/options.mk b/audio/timidity/options.mk index 96803a9d503..492c9bf969c 100644 --- a/audio/timidity/options.mk +++ b/audio/timidity/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/07/24 19:47:43 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/02 21:09:17 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.timidity PKG_SUPPORTED_OPTIONS= x11 gtk @@ -18,17 +18,17 @@ PLIST.x11= yes .include "../../mk/bsd.prefs.mk" -.if !defined(XAW_TYPE) -WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw -.elif ${XAW_TYPE} == "standard" -WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw -.elif ${XAW_TYPE} == "3d" -WITH_XAWLIB=--with-xawlib=xaw3d -.elif ${XAW_TYPE} == "xpm" -WITH_XAWLIB=--with-xawlib=xaw3d -.elif ${XAW_TYPE} == "neXtaw" -WITH_XAWLIB=--with-xawlib=neXtaw -.endif +. if !defined(XAW_TYPE) +WITH_XAWLIB= --with-xawlib=xaw,xaw3d,neXtaw +. elif ${XAW_TYPE} == "standard" +WITH_XAWLIB= --with-xawlib=xaw,xaw3d,neXtaw +. elif ${XAW_TYPE} == "3d" +WITH_XAWLIB= --with-xawlib=xaw3d +. elif ${XAW_TYPE} == "xpm" +WITH_XAWLIB= --with-xawlib=xaw3d +. elif ${XAW_TYPE} == "neXtaw" +WITH_XAWLIB= --with-xawlib=neXtaw +. endif CONFIGURE_ARGS+= --enable-xaw --enable-xdnd CONFIGURE_ARGS+= --with-xaw-resource-prefix="${PREFIX}/lib/X11/" @@ -41,10 +41,10 @@ CONFIGURE_ARGS+= ${WITH_XAWLIB} .include "../../mk/xaw.buildlink3.mk" #.include "../../x11/libXft/buildlink3.mk" -.if !empty(PKG_OPTIONS:Mgtk) +. if !empty(PKG_OPTIONS:Mgtk) CONFIGURE_ARGS+= --enable-gtk .include "../../x11/gtk2/buildlink3.mk" -.endif +. endif .else CONFIGURE_ARGS+= --without-x diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index 9aa49a97ecc..a4791ba3e07 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2014/10/09 14:05:58 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/02 21:09:17 rillig Exp $ DISTNAME= tracker-5.3 PKGREVISION= 1 @@ -18,8 +18,8 @@ MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/tracker MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \ - COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \ - COMPRESSION_FILE_EG=${EGDIR}/compression_methods + COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \ + COMPRESSION_FILE_EG=${EGDIR}/compression_methods EGDIR= ${PREFIX}/share/examples/tracker CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile index 48dfef25580..2e6f1b64d77 100644 --- a/audio/tunapie/Makefile +++ b/audio/tunapie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/09/02 13:20:06 adam Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 21:09:17 rillig Exp $ DISTNAME= tunapie-2.1.18 PKGREVISION= 2 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets -PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets USE_LANGUAGES= # none diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile index 1f9b1c01625..810d6a2f4af 100644 --- a/audio/wmmp3/Makefile +++ b/audio/wmmp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/04/20 12:10:33 nros Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 21:09:17 rillig Exp $ DISTNAME= wmmp3-0.12 PKGREVISION= 3 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile index d8f66ec0f1b..9b5dc9beb86 100644 --- a/audio/wmsmixer/Makefile +++ b/audio/wmsmixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/10/25 21:17:13 khorben Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 21:09:18 rillig Exp $ # DISTNAME= wmsmixer-0.5.1 @@ -13,15 +13,15 @@ LICENSE= gnu-gpl-v2 NOT_FOR_PLATFORM= Interix-*-* -USE_IMAKE= YES -USE_LANGUAGES= c++ -NO_INSTALL_MANPAGES= YES +USE_IMAKE= YES +USE_LANGUAGES= c++ +NO_INSTALL_MANPAGES= YES MAKE_FLAGS+= CCOPTIONS=${CFLAGS:Q} MAKE_FLAGS+= CXXOPTIONS=${CFLAGS:Q} MAKE_FLAGS+= LOCAL_LDFLAGS=${LDFLAGS:Q} -INSTALLATION_DIRS+= share/doc/wmsmixer share/examples/wmsmixer +INSTALLATION_DIRS+= share/doc/wmsmixer share/examples/wmsmixer pre-build: ${TOUCH} ${WRKSRC}/wmsmixer.man diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile index b07ef7941bb..e74079d4a19 100644 --- a/audio/wsoundprefs/Makefile +++ b/audio/wsoundprefs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2018/03/12 11:16:06 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2019/11/02 21:09:18 rillig Exp $ DISTNAME= WSoundPrefs-1.1.1 PKGNAME= wsoundprefs-1.1.1 @@ -12,7 +12,7 @@ COMMENT= WSoundServer configuration utility LICENSE= modified-bsd USE_TOOLS+= pkg-config -USE_IMAKE= yes +USE_IMAKE= yes BROKEN_GETTEXT_DETECTION= yes LDFLAGS.SunOS+= -lwraster diff --git a/audio/xine-alsa/Makefile b/audio/xine-alsa/Makefile index c37b20c1464..d23e4ef189f 100644 --- a/audio/xine-alsa/Makefile +++ b/audio/xine-alsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:17:57 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 21:09:18 rillig Exp $ PKGREVISION= 2 .include "../../multimedia/xine-lib/Makefile.common" @@ -9,7 +9,7 @@ COMMENT= The ALSA output plugin for xine-lib DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib -BUILD_DIRS= src/audio_out +BUILD_DIRS= src/audio_out CONFIGURE_ARGS+= --without-x --disable-xinerama CONFIGURE_ARGS+= --disable-vcd CONFIGURE_ARGS+= --with-alsa diff --git a/audio/xine-esound/Makefile b/audio/xine-esound/Makefile index 63eb6b39f2a..8c1fd5f133d 100644 --- a/audio/xine-esound/Makefile +++ b/audio/xine-esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/11 13:17:58 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/02 21:09:18 rillig Exp $ PKGREVISION= 2 .include "../../multimedia/xine-lib/Makefile.common" @@ -9,7 +9,7 @@ COMMENT= The esound audio output plugin for xine-lib DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib -BUILD_DIRS= src/audio_out +BUILD_DIRS= src/audio_out CONFIGURE_ARGS+= --without-x --disable-xinerama CONFIGURE_ARGS+= --disable-vcd diff --git a/audio/xine-pulse/Makefile b/audio/xine-pulse/Makefile index 41b6d5eab1d..9dbcdfa6761 100644 --- a/audio/xine-pulse/Makefile +++ b/audio/xine-pulse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/09/18 14:17:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/02 21:09:18 rillig Exp $ # PKGREVISION= 3 @@ -10,7 +10,7 @@ COMMENT= The PulseAudio output plugin for xine-lib DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib -BUILD_DIRS= src/audio_out +BUILD_DIRS= src/audio_out CONFIGURE_ARGS+= --without-x --disable-xinerama CONFIGURE_ARGS+= --disable-vcd CONFIGURE_ARGS+= --with-pulseaudio |