summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2016-02-25 12:50:49 +0000
committerjperkin <jperkin@pkgsrc.org>2016-02-25 12:50:49 +0000
commite0bc7a47f0f045fbf16c20ab408d2f3f2d11685a (patch)
tree2ea6f039d1b51f1e1aaf40f0a6962eba4f1221f8
parent1b40dcd9f36f779d46476e13ee9358b88db18f05 (diff)
downloadpkgsrc-e0bc7a47f0f045fbf16c20ab408d2f3f2d11685a.tar.gz
Use OPSYSVARS.
-rw-r--r--converters/hztty/Makefile14
-rw-r--r--devel/lua-lpeg/Makefile11
-rw-r--r--editors/ne/Makefile11
-rw-r--r--emulators/aranym/Makefile6
-rw-r--r--emulators/bochs/Makefile34
-rw-r--r--emulators/free42/Makefile11
-rw-r--r--emulators/libretro-mupen64plus/Makefile8
-rw-r--r--emulators/tuxnes/Makefile7
-rw-r--r--emulators/vice/Makefile15
-rw-r--r--filesystems/fuse-encfs/Makefile8
-rw-r--r--fonts/harfbuzz/Makefile6
11 files changed, 40 insertions, 91 deletions
diff --git a/converters/hztty/Makefile b/converters/hztty/Makefile
index 17df99b0426..d5865a42fcf 100644
--- a/converters/hztty/Makefile
+++ b/converters/hztty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/10/09 14:06:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 12:56:10 jperkin Exp $
DISTNAME= hztty-2.0
CATEGORIES= converters
@@ -8,15 +8,9 @@ MAINTAINER= rxg@NetBSD.org
#HOMEPAGE=
COMMENT= Turns a tty session between Big5/GB/HZ/Unicode
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-BUILD_TARGET= svr4
-.elif ${OPSYS} == "Linux"
-BUILD_TARGET= linux
-.else
-BUILD_TARGET= bsd
-.endif
+BUILD_TARGET.Interix= svr4
+BUILD_TARGET.Linux= linux
+BUILD_TARGET.*= bsd
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile
index e84bb118366..8733665740f 100644
--- a/devel/lua-lpeg/Makefile
+++ b/devel/lua-lpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/09/29 19:18:00 alnsn Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/25 12:56:10 jperkin Exp $
#
DISTNAME= lpeg-1.0.0
@@ -11,18 +11,13 @@ HOMEPAGE= http://www.inf.puc-rio.br/~roberto/lpeg/
COMMENT= Parsing Expression Grammars (PEGs) library for Lua
LICENSE= mit
-.include "../../mk/bsd.prefs.mk"
-
NO_CONFIGURE= yes
USE_TOOLS+= gmake
MAKE_FILE= makefile
TEST_TARGET= test
-.if ${OPSYS} == "Darwin"
-BUILD_TARGET= macosx
-.else
-BUILD_TARGET= linux
-.endif
+BUILD_TARGET.Darwin= macosx
+BUILD_TARGET.*= linux
REPLACE_LUA+= test.lua
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 3674bf9ffbc..a5a31b8da5d 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/09/23 22:30:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/25 12:56:10 jperkin Exp $
DISTNAME= ne-1.31
CATEGORIES= editors
@@ -15,13 +15,8 @@ WRKSRC= ${WRKDIR}/src
EXTRACT_ONLY= ${DISTNAME}.tar.gz
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILD_TARGET= SunOS5_gcc ne
-.else
-BUILD_TARGET= NetBSD ne
-.endif
+BUILD_TARGET.SunOS= SunOS5_gcc ne
+BUILD_TARGET.*= NetBSD ne
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index 739e9fa4d24..a7b6250ecef 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:20:44 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/25 12:50:49 jperkin Exp $
#
ETVER= 0.9.4
@@ -44,9 +44,7 @@ SUBST_MESSAGE.paths= Fixing hardcoded paths.
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-nfpci
-.endif
+CONFIGURE_ARGS.Linux+= --enable-nfpci
.if !empty(MACHINE_PLATFORM:MLinux-*-i386)
CONFIGURE_ARGS+= --enable-jit-compiler
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 57fc0f943af..d5f85f44417 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2015/08/18 07:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2016/02/25 12:50:49 jperkin Exp $
DISTNAME= bochs-2.6.8
PKGREVISION= 1
@@ -80,16 +80,11 @@ CONFIGURE_ARGS+= --enable-plugins
CONFIGURE_ARGS+= --enable-fast-function-calls
. endif
-. if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --enable-sb16=osx
-. elif ${OPSYS} == "FreeBSD"
-CONFIGURE_ARGS+= --enable-sb16=freebsd
-. elif ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-sb16=linux
-CONFIGURE_ARGS+= --enable-pcidev
-. else
-CONFIGURE_ARGS+= --enable-sb16=dummy
-. endif
+CONFIGURE_ARGS.Darwin+= --enable-sb16=osx
+CONFIGURE_ARGS.FreeBSD+= --enable-sb16=freebsd
+CONFIGURE_ARGS.Linux+= --enable-sb16=linux
+CONFIGURE_ARGS.Linux+= --enable-pcidev
+CONFIGURE_ARGS.*+= --enable-sb16=dummy
.endif
.if empty(PKG_OPTIONS:Mx11)
@@ -101,16 +96,13 @@ CONFIGURE_ARGS+= --with-term
PLIST.x11= yes
.endif
-.if ${OPSYS} == "Linux"
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,'
-.elif ${OPSYS} == "Darwin"
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
-.else
-BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,,'
-BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
-.endif
+OPSYSVARS+= BOCHSRC_SUBST
+BOCHSRC_SUBST.Linux+= -e 's,@FLOPPY_BSD@,\#,'
+BOCHSRC_SUBST.Linux+= -e 's,@FLOPPY_LINUX@,,'
+BOCHSRC_SUBST.Darwin+= -e 's,@FLOPPY_BSD@,\#,'
+BOCHSRC_SUBST.Darwin+= -e 's,@FLOPPY_LINUX@,\#,'
+BOCHSRC_SUBST.*+= -e 's,@FLOPPY_BSD@,,'
+BOCHSRC_SUBST.*+= -e 's,@FLOPPY_LINUX@,\#,'
.if ${OPSYS} == "Darwin"
MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin
diff --git a/emulators/free42/Makefile b/emulators/free42/Makefile
index c7f63e28e7c..b4664e81172 100644
--- a/emulators/free42/Makefile
+++ b/emulators/free42/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/25 14:20:45 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/25 12:50:49 jperkin Exp $
DISTNAME= free42
PKGNAME= ${DISTNAME}-1.4.78
@@ -22,13 +22,8 @@ BUILD_DIRS= gtk
BUILD_TARGET= free42${VARIANT}
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == NetBSD)
-CXXFLAGS+= -DNO_SINCOS
-.elif (${OPSYS} == Linux)
-MAKE_ENV+= AUDIO_ALSA=1
-.endif
+CXXFLAGS.NetBSD+= -DNO_SINCOS
+MAKE_ENV.Linux+= AUDIO_ALSA=1
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/doc/free42
diff --git a/emulators/libretro-mupen64plus/Makefile b/emulators/libretro-mupen64plus/Makefile
index 97bc5dec0e3..cb4939897df 100644
--- a/emulators/libretro-mupen64plus/Makefile
+++ b/emulators/libretro-mupen64plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 14:20:46 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/25 12:50:49 jperkin Exp $
DISTNAME= mupen64plus-libretro-20150204
PKGNAME= libretro-mupen64plus-20150204
@@ -24,11 +24,7 @@ SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g'
INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CFLAGS+= -DHAVE_POSIX_MEMALIGN=1
-.endif
+CFLAGS.NetBSD+= -DHAVE_POSIX_MEMALIGN=1
.include "options.mk"
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 458b1e95b10..7b718b76896 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/01/01 10:56:23 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/25 12:50:49 jperkin Exp $
#
DISTNAME= tuxnes-0.75
@@ -23,14 +23,11 @@ SUBST_MESSAGE.dsp= Adjusting sound device path.
SUBST_FILES.dsp= consts.h
SUBST_SED.dsp= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+= gld
+SUBST_CLASSES.SunOS+= gld
SUBST_STAGE.gld= post-patch
SUBST_MESSAGE.gld= Using GNU ld to create table.o
SUBST_FILES.gld= Makefile.in
SUBST_SED.gld= -e "/ld -r/s/ld/gld/"
-.endif
CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=500
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 169bfa9ac87..bccd80dcb69 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2015/11/18 14:19:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.119 2016/02/25 12:50:49 jperkin Exp $
DISTNAME= vice-2.4
PKGREVISION= 14
@@ -38,16 +38,9 @@ PLIST_SRC+= PLIST
.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == NetBSD)
-CONFIGURE_ARGS+= --without-oss
-CPPFLAGS+= -DHAVE_STDINT_H
-.endif
-
-.if (${OPSYS} == DragonFly)
-CPPFLAGS+= -DHAVE_STDINT_H
-.endif
+CONFIGURE_ARGS.NetBSD+= --without-oss
+CPPFLAGS.NetBSD+= -DHAVE_STDINT_H
+CPPFLAGS.DragonFly+= -DHAVE_STDINT_H
.include "../../mk/readline.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/filesystems/fuse-encfs/Makefile b/filesystems/fuse-encfs/Makefile
index 764d3a287cd..8f7ffe6328f 100644
--- a/filesystems/fuse-encfs/Makefile
+++ b/filesystems/fuse-encfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/02/12 23:17:53 tron Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/25 12:59:32 jperkin Exp $
#
DISTNAME= encfs-1.2.0-2
@@ -17,11 +17,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= autoconf gmake pkg-config
USE_LANGUAGES= c c++
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+= -D_NETBSD_SOURCE
-.endif
+CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE
.include "../../devel/librlog/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index e3334e7b8de..287d25cf6c1 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2016/02/21 10:29:12 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2016/02/25 13:08:40 jperkin Exp $
DISTNAME= harfbuzz-1.2.0
CATEGORIES= fonts
@@ -26,9 +26,7 @@ LDFLAGS.OpenBSD+= -lz
.include "../../mk/bsd.prefs.mk"
# gcc too old
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden
-.endif
+BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden
PLIST_VARS+= coretext