summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/alsa-lib/Makefile9
-rw-r--r--audio/audacious/Makefile7
-rw-r--r--audio/csound5/Makefile8
-rw-r--r--audio/libaudiofile/hacks.mk6
-rw-r--r--audio/libfishsound/Makefile6
-rw-r--r--audio/libsndfile/Makefile10
-rw-r--r--audio/libxmp/Makefile8
-rw-r--r--audio/mad123/Makefile6
-rw-r--r--audio/musicpd/Makefile7
-rw-r--r--audio/portaudio-devel/Makefile8
-rw-r--r--audio/pulseaudio/Makefile10
-rw-r--r--audio/streamtuner/Makefile6
-rw-r--r--audio/tap-plugins/Makefile11
-rw-r--r--audio/timidity/Makefile6
14 files changed, 33 insertions, 75 deletions
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 6f6c597bb29..1f9310bbb86 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/02/18 15:15:57 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= alsa-lib-1.1.0
CATEGORIES= audio
@@ -29,11 +29,8 @@ CPPFLAGS.SunOS+= -Dbswap_64=BSWAP_64 -Dbswap_32=BSWAP_32 -Dbswap_16=BSWAP_16
CPPFLAGS.NetBSD+= -D__u32=uint32_t -D__u64=uint64_t
CPPFLAGS.FreeBSD+= -D__u32=uint32_t -D__u64=uint64_t
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --without-versioned
-BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=Versions
-.endif
+CONFIGURE_ARGS.SunOS+= --without-versioned
+BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=Versions
.include "../../mk/dlopen.buildlink3.mk"
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 39b9925bc09..f80d420b75e 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/02/20 11:28:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= audacious-3.5.2
PKGREVISION= 2
@@ -20,11 +20,8 @@ PKGCONFIG_OVERRIDE+= audacious.pc.in
BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-.include "../../mk/bsd.prefs.mk"
# XXX does not solve linking problem completely
-.if ${OPSYS} == "Darwin"
-LDFLAGS+= -flat_namespace -undefined suppress
-.endif
+LDFLAGS.Darwin+= -flat_namespace -undefined suppress
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index a3e6b6d0f17..9035f21f274 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/12/05 21:25:27 adam Exp $
+# $NetBSD: Makefile,v 1.37 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= Csound${CSOUND_VERSION}
PKGNAME= csound5-${CSOUND_VERSION}
@@ -33,14 +33,10 @@ INSTALLATION_DIRS= bin
CHECK_PORTABILITY_SKIP+= installer/misc/makedeb.sh
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+= strip
+SUBST_CLASSES.SunOS+= strip
SUBST_STAGE.strip= pre-build
SUBST_FILES.strip= install.py installer/misc/mkpackage.py
SUBST_SED.strip= -e 's/--strip-unneeded//g'
-.endif
do-build:
cd ${WRKSRC} && ${TOOLS_PATH.bison} -d -o frontends/beats/beats.tab.c frontends/beats/beats.y
diff --git a/audio/libaudiofile/hacks.mk b/audio/libaudiofile/hacks.mk
index 6833dbc005d..313f895828f 100644
--- a/audio/libaudiofile/hacks.mk
+++ b/audio/libaudiofile/hacks.mk
@@ -1,6 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2012/07/09 16:42:37 bsiegert Exp $
+# $NetBSD: hacks.mk,v 1.2 2016/02/25 10:15:45 jperkin Exp $
# gcc in MirBSD does not recognize these options
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden rm:-fvisibility-inlines-hidden
-.endif
+BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility=hidden rm:-fvisibility-inlines-hidden
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index e77a6aa0d63..f55dd7666a2 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/09/10 15:59:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 10:15:45 jperkin Exp $
#
DISTNAME= libfishsound-1.0.0
@@ -18,9 +18,7 @@ PKGCONFIG_OVERRIDE+= fishsound.pc.in
.include "options.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=Version_script
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=Version_script
.include "../../multimedia/liboggz/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index dbca88cefb3..47e75e1f34f 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2015/12/04 20:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= libsndfile-1.0.26
CATEGORIES= audio
@@ -20,13 +20,11 @@ CONFIGURE_ENV+= ac_cv_c_struct_hack=yes
TEST_TARGET= check
-.include "../../mk/bsd.prefs.mk"
-
.include "options.mk"
-.if ${OPSYS} == "Darwin"
-BUILDLINK_PASSTHRU_DIRS+= /Developer
-.endif
+OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS
+
+BUILDLINK_PASSTHRU_DIRS.Darwin+= /Developer
.if !empty(PKGSRC_COMPILER:Msunpro)
CXXFLAGS+= -features=extensions
diff --git a/audio/libxmp/Makefile b/audio/libxmp/Makefile
index 277d22869ba..77a120cf0db 100644
--- a/audio/libxmp/Makefile
+++ b/audio/libxmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/02/14 14:06:21 rxg Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= libxmp-4.3.11
CATEGORIES= audio
@@ -15,10 +15,6 @@ GNU_CONFIGURE= yes
INSTALLATION_DIRS= bin lib
INSTALL_MAKE_FLAGS+= INSTALL=${INSTALL:Q}
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= ac_cv_c_flag_f_visibility_hidden=no
-.endif
+CONFIGURE_ENV.SunOS+= ac_cv_c_flag_f_visibility_hidden=no
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile
index 38cefa44baa..5ca7bf2d331 100644
--- a/audio/mad123/Makefile
+++ b/audio/mad123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2014/02/12 23:17:34 tron Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 10:15:45 jperkin Exp $
#
DISTNAME= mad123-0.8.5
@@ -20,9 +20,7 @@ PKG_SUGGESTED_OPTIONS+= oss
.if ${OPSYS} != "DragonFly" && ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
PKG_SUGGESTED_OPTIONS+= sun
.endif
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+= arts
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+= arts
.include "../../mk/bsd.options.mk"
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 7e00f53a683..725442b431b 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2015/12/27 22:52:41 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2016/02/25 10:15:45 jperkin Exp $
DISTNAME= mpd-0.19.12
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@@ -23,10 +23,7 @@ USE_LANGUAGES= c c++
GCC_REQD= 4.6
# MacOS X audio output is no longer enabled by default.
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --enable-osx
-.endif
+CONFIGURE_ARGS.Darwin+= --enable-osx
CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile
index 188db153099..2d9a076171e 100644
--- a/audio/portaudio-devel/Makefile
+++ b/audio/portaudio-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:36 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/25 10:15:46 jperkin Exp $
DISTNAME= pa_stable_v19_20140130
PKGNAME= portaudio-devel-20140130
@@ -39,11 +39,7 @@ SUBST_MESSAGE.pc= Fixing pkgconfig directory
SUBST_FILES.pc= Makefile.in
SUBST_SED.pc= -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g'
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CFLAGS+= -Wno-deprecated-declarations
-.endif
+CFLAGS.Darwin+= -Wno-deprecated-declarations
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index de3b8991c28..3316c8862ab 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2016/01/22 19:29:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.106 2016/02/25 10:15:46 jperkin Exp $
DISTNAME= pulseaudio-8.0
CATEGORIES= audio
@@ -21,9 +21,7 @@ REPLACE_BASH= shell-completion/bash/pulseaudio git-version-gen
.include "../../mk/bsd.prefs.mk"
# Some tests are incompatible for NetBSD at least
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --disable-default-build-tests
-.endif
+CONFIGURE_ARGS.NetBSD+= --disable-default-build-tests
.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)
# broken test for TLS
CONFIGURE_ENV+= ac_cv_tls=none
@@ -33,9 +31,7 @@ CONFIGURE_ENV+= DATADIRNAME=${PKGLOCALEDIR}
USE_PKGLOCALEDIR= yes
# Wrong sys/capability.h assumptions, incompatible implementation:
-.if ${OPSYS} == "FreeBSD"
-CONFIGURE_ARGS+= --without-caps
-.endif
+CONFIGURE_ARGS.FreeBSD+= --without-caps
CONFIGURE_ENV+= EGDIR=${EGDIR}
MAKE_ENV+= EGDIR=${EGDIR}
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 6ee4058d4a5..248831a576e 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2015/04/25 14:20:24 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2016/02/25 10:15:46 jperkin Exp $
#
DISTNAME= streamtuner-0.99.99
@@ -24,9 +24,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "options.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-lutil
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-lutil
.include "../../mk/omf-scrollkeeper.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/audio/tap-plugins/Makefile b/audio/tap-plugins/Makefile
index 7ce01a7237d..327c9c07196 100644
--- a/audio/tap-plugins/Makefile
+++ b/audio/tap-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/04/11 17:55:22 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/25 10:15:46 jperkin Exp $
#
DISTNAME= tap-plugins-0.7.2
@@ -20,12 +20,7 @@ SUBST_SED.prefix= -e 's|/usr/local|${DESTDIR}${PREFIX}|'
INSTALLATION_DIRS+= lib/ladspa share/ladspa/rdf
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "OpenBSD"
-BUILDLINK_TRANSFORM+= rm:-lrt
-.elif ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+= rm:-Bsymbolic
-.endif
+BUILDLINK_TRANSFORM.OpenBSD+= rm:-lrt
+BUILDLINK_TRANSFORM.Darwin+= rm:-Bsymbolic
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 6a05f28899b..cafc1138832 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2015/10/14 20:17:24 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2016/02/25 10:15:46 jperkin Exp $
DISTNAME= TiMidity++-2.14.0
PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
@@ -27,9 +27,7 @@ CONFIGURE_ARGS+= --enable-network
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-alsaseq
-.endif
+CONFIGURE_ARGS.Linux+= --enable-alsaseq
SUBST_CLASSES+= confdir
SUBST_MESSAGE.confdir= Configuring to use PKG_SYSCONFDIR.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 13:44:10 +0000