pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/*: replace :M modifier with string comparison
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Wed May 22 21:35:55 2019 +0200
Changeset: be4ad839e886b516a1c2b0bdecf82a86bef703c8
Modified Files:
apel-git/Makefile
boost-libs-2017Q1/Makefile
cheese/Makefile
emacs-git/modules.mk
frida-libffi/Makefile
gdb-git/Makefile
heimdal/Makefile
icecat/options.mk
libdrm-dfbsd-meson/Makefile
libdrm-dfbsd/Makefile
libreoffice-git/options.mk
libretro-parallel-n64/options.mk
nodau/Makefile
nvidia-freebsd/Makefile
qemu-git/Makefile
qemu-git/options.mk
qt5-qtbase-git/Makefile
qt5-qtbase-git/Makefile.common
scilab/Makefile
tc-git/Makefile
tc/Makefile
wine-devel/Makefile
Log Message:
wip/*: replace :M modifier with string comparison
pkglint -r -Wall --only "matching against" -F
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=be4ad839e886b516a1c2b0bdecf82a86bef703c8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
apel-git/Makefile | 2 +-
boost-libs-2017Q1/Makefile | 6 +++---
cheese/Makefile | 2 +-
emacs-git/modules.mk | 2 +-
frida-libffi/Makefile | 2 +-
gdb-git/Makefile | 2 +-
heimdal/Makefile | 4 ++--
icecat/options.mk | 4 ++--
libdrm-dfbsd-meson/Makefile | 8 ++++----
libdrm-dfbsd/Makefile | 6 +++---
libreoffice-git/options.mk | 2 +-
libretro-parallel-n64/options.mk | 4 ++--
nodau/Makefile | 2 +-
nvidia-freebsd/Makefile | 2 +-
qemu-git/Makefile | 8 ++++----
qemu-git/options.mk | 2 +-
qt5-qtbase-git/Makefile | 2 +-
qt5-qtbase-git/Makefile.common | 6 +++---
scilab/Makefile | 2 +-
tc-git/Makefile | 4 ++--
tc/Makefile | 4 ++--
wine-devel/Makefile | 4 ++--
22 files changed, 40 insertions(+), 40 deletions(-)
diffs:
diff --git a/apel-git/Makefile b/apel-git/Makefile
index da1a7c842d..a9092f4dc2 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -45,7 +45,7 @@ MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
.include "../../wip/emacs-git/modules.mk"
PLIST_VARS+= emacs23 emacs19
-.if empty(EMACS_TYPE:Mxemacs)
+.if ${EMACS_TYPE} != xemacs
. if !empty(EMACS_TYPE:Memacs2[3-9]*)
PLIST.emacs23= yes
. else
diff --git a/boost-libs-2017Q1/Makefile b/boost-libs-2017Q1/Makefile
index 7df8771ee5..408d1591f5 100644
--- a/boost-libs-2017Q1/Makefile
+++ b/boost-libs-2017Q1/Makefile
@@ -16,7 +16,7 @@ PLIST_VARS+= context fiber log long_double_math
BJAM_ARGS+= pch=off
.endif
-.if !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || !empty(MACHINE_ARCH:Msparc64)
+.if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == m68k || ${MACHINE_ARCH} == sparc64
BJAM_ARGS+= --without-context
BJAM_ARGS+= --without-coroutine
BJAM_ARGS+= --without-coroutine2
@@ -40,8 +40,8 @@ PLIST.log= yes
# Additionally fiber checks std::timed_mutex.
.if ((${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14) || \
!empty(MACHINE_PLATFORM:MNetBSD-[0-7]*-*)) || \
- !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || \
- !empty(MACHINE_ARCH:Msparc64) || \
+ ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == m68k || \
+ ${MACHINE_ARCH} == sparc64 || \
(exists(/etc/redhat-release) && !empty(CC_VERSION:Mgcc-4.4.*)) || \
(${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang))
BJAM_ARGS+= --without-fiber
diff --git a/cheese/Makefile b/cheese/Makefile
index 5a25f20c0a..454a6b630d 100644
--- a/cheese/Makefile
+++ b/cheese/Makefile
@@ -17,7 +17,7 @@ DEPENDS+= gst-plugins1-vorbis-[0-9]*:../../audio/gst-plugins1-vorbis
.include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) || !empty(MACHINE_PLATFORM:MLinux)
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) || ${MACHINE_PLATFORM} == Linux
DEPENDS+= gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2
.endif
diff --git a/emacs-git/modules.mk b/emacs-git/modules.mk
index abb47abe1d..2ac1eafb4e 100644
--- a/emacs-git/modules.mk
+++ b/emacs-git/modules.mk
@@ -342,7 +342,7 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
.if defined(EMACS_BUILDLINK)
_EMACS_DIR= ${BUILDLINK_DIR}/share/emacs
-. if !empty(EMACS_TYPE:Memacs27)
+. if ${EMACS_TYPE} == emacs27
ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
. else
ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
diff --git a/frida-libffi/Makefile b/frida-libffi/Makefile
index fdd04ed19e..1be1c92159 100644
--- a/frida-libffi/Makefile
+++ b/frida-libffi/Makefile
@@ -51,7 +51,7 @@ CPPFLAGS += -D__PIC__
.endif
# irix fixes from PR 48587
-.if !empty(OPSYS:MIRIX)
+.if ${OPSYS} == IRIX
USE_TOOLS+= bash gmake
MAKE_FLAGS+= SHELL=${TOOLS_DIR}/bin/bash
.endif
diff --git a/gdb-git/Makefile b/gdb-git/Makefile
index 19e02be276..e5e76e193d 100644
--- a/gdb-git/Makefile
+++ b/gdb-git/Makefile
@@ -65,7 +65,7 @@ MAKE_ENV+= gdb_cv_var_elf=yes
CONFIGURE_ENV+= gdb_cv_struct_lwp=yes
MAKE_ENV+= gdb_cv_struct_lwp=yes
PLIST.gcore= YES
-.elif !empty(OPSYS:MLinux)
+.elif ${OPSYS} == Linux
PLIST.gcore= YES
PLIST.gdbserver= YES
.endif
diff --git a/heimdal/Makefile b/heimdal/Makefile
index a155429912..141d32a49a 100644
--- a/heimdal/Makefile
+++ b/heimdal/Makefile
@@ -111,13 +111,13 @@ CHECK_BUILTIN.openssl:= yes
.include "../../security/openssl/builtin.mk"
CHECK_BUILTIN.openssl:=no
.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
- (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) && \
+ (${OPSYS} == "SunOS" && ${USE_BUILTIN.openssl} == yes && \
!empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo]))
PLIST.hcrypto= yes
.endif
.if ${OPSYS} == "MirBSD"
-. if !empty(USE_BUILTIN.openssl:Myes)
+. if ${USE_BUILTIN.openssl} == yes
PLIST.hcrypto= yes
. endif
PLIST.vis= yes
diff --git a/icecat/options.mk b/icecat/options.mk
index dff6402637..95880fe003 100644
--- a/icecat/options.mk
+++ b/icecat/options.mk
@@ -9,8 +9,8 @@ PLIST_VARS+= gnome
PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
.endif
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
- !empty(MACHINE_ARCH:Marm)
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == sparc || \
+ ${MACHINE_ARCH} == arm
PKG_SUPPORTED_OPTIONS+= mozilla-jit
PKG_SUGGESTED_OPTIONS+= mozilla-jit
.endif
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 41c41b38af..f4072160fc 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -96,14 +96,14 @@ MESON_ARGS+= -Dvalgrind=false
LDFLAGS.NetBSD+= -lpci
PLIST_VARS+= intel arm
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
# libpciaccess is needed to build support for the intel KMS API,
# libdrm_intel.so.
.include "../../sysutils/libpciaccess/buildlink3.mk"
PLIST.intel= yes
.elif !empty(MACHINE_ARCH:Marm*) || \
!empty(MACHINE_ARCH:Mearm*) || \
- !empty(MACHINE_ARCH:Maarch64)
+ ${MACHINE_ARCH} == aarch64
PLIST.arm= yes
#.else
#CONFIGURE_ARGS+= --disable-intel
@@ -115,7 +115,7 @@ PKG_SUGGESTED_OPTIONS=
PKG_SUPPORTED_OPTIONS+= invert_atomic_add_unless
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= invert_atomic_add_unless
+PKG_SUGGESTED_OPTIONS+= invert_atomic_add_unless
.endif
# .if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
@@ -129,7 +129,7 @@ PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= libkms
+PLIST_VARS+= libkms
.if !empty(PKG_OPTIONS:Mlibkms)
PKGCONFIG_OVERRIDE+= libkms.pc.in
PLIST.libkms= yes
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index 6de4b68eae..a3022b5aa5 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -45,14 +45,14 @@ CONFIGURE_ARGS+= --disable-valgrind
LDFLAGS.NetBSD+= -lpci
PLIST_VARS+= intel arm
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
# libpciaccess is needed to build support for the intel KMS API,
# libdrm_intel.so.
.include "../../sysutils/libpciaccess/buildlink3.mk"
PLIST.intel= yes
.elif !empty(MACHINE_ARCH:Marm*) || \
!empty(MACHINE_ARCH:Mearm*) || \
- !empty(MACHINE_ARCH:Maarch64)
+ ${MACHINE_ARCH} == aarch64
PLIST.arm= yes
#.else
#CONFIGURE_ARGS+= --disable-intel
@@ -68,7 +68,7 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= libkms
+PLIST_VARS+= libkms
.if !empty(PKG_OPTIONS:Mlibkms)
PKGCONFIG_OVERRIDE+= libkms.pc.in
PLIST.libkms= yes
diff --git a/libreoffice-git/options.mk b/libreoffice-git/options.mk
index a15292fd30..3928eeb795 100644
--- a/libreoffice-git/options.mk
+++ b/libreoffice-git/options.mk
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
--with-system-hsqldb \
--without-system-jfreereport
PLIST_SRC+= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
-. if !empty(PKG_JVM:Mopenjdk7)
+. if ${PKG_JVM} == openjdk7
CONFIGURE_ARGS+= --disable-scripting-javascript
. else
PLIST_SRC+= ${PKGDIR}/PLIST.javascript
diff --git a/libretro-parallel-n64/options.mk b/libretro-parallel-n64/options.mk
index 2557648e46..57c1fb14cf 100644
--- a/libretro-parallel-n64/options.mk
+++ b/libretro-parallel-n64/options.mk
@@ -11,11 +11,11 @@ PKG_OPTIONS_GROUP.graphics+= rpi
PKG_SUPPORTED_OPTIONS+= dynarec
PKG_SUGGESTED_OPTIONS+= dynarec
N64_DYNAREC_ARCH= arm
-.elif !empty(MACHINE_ARCH:Mi386)
+.elif ${MACHINE_ARCH} == i386
PKG_SUPPORTED_OPTIONS+= dynarec
PKG_SUGGESTED_OPTIONS+= dynarec opengl
N64_DYNAREC_ARCH= x86
-.elif !empty(MACHINE_ARCH:Mx86_64)
+.elif ${MACHINE_ARCH} == x86_64
PKG_SUPPORTED_OPTIONS+= dynarec
PKG_SUGGESTED_OPTIONS+= dynarec opengl
N64_DYNAREC_ARCH= x86_64
diff --git a/nodau/Makefile b/nodau/Makefile
index 3323161fb4..f183e337bd 100644
--- a/nodau/Makefile
+++ b/nodau/Makefile
@@ -25,7 +25,7 @@ INSTALL_MAKE_FLAGS+= BIN_DIR=${DESTDIR}${PREFIX}/bin
INSTALL_MAKE_FLAGS+= MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.prefs.mk"
-.if !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == DragonFly
BUILDLINK_TRANSFORM+= rm:-ldl
.endif
diff --git a/nvidia-freebsd/Makefile b/nvidia-freebsd/Makefile
index f52f8da7f8..f788c27592 100644
--- a/nvidia-freebsd/Makefile
+++ b/nvidia-freebsd/Makefile
@@ -30,7 +30,7 @@ X11_TYPE?= XFree86 # If you use XFree86 from pkgsrc.
COMPAT_LINUX?= no # Linux compat libraries.
CHECK_SHLIBS= no
-.if !empty(X11_TYPE:MXFree86)
+.if ${X11_TYPE} == XFree86
SUBST_CLASSES+= fixme
SUBST_STAGE.fixme= post-patch
SUBST_FILES.fixme= doc/Makefile driver/Makefile \
diff --git a/qemu-git/Makefile b/qemu-git/Makefile
index 060fbb9b4c..c1f8fd0418 100644
--- a/qemu-git/Makefile
+++ b/qemu-git/Makefile
@@ -90,14 +90,14 @@ UE_ARCHS+= sparc64 x86_64 microblazeel s390x unicore32
.if ${OPSYS} == "NetBSD"
USER_EMUL= i386 x86_64 sparc sparc64
PLIST.nbd= YES
-.elif !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
+.elif !empty(OPSYS:M*BSD) || (${OPSYS} == DragonFly)
USER_EMUL= i386 x86_64 sparc sparc64
PLIST.nbd= YES
-.elif !empty(OPSYS:MDarwin)
+.elif ${OPSYS} == Darwin
USER_EMUL=
CONFIGURE_ARGS+= --disable-bsd-user
PLIST.nbd= YES
-.elif !empty(OPSYS:MLinux)
+.elif ${OPSYS} == Linux
USER_EMUL= ${UE_ARCHS}
PLIST.nbd= YES
PLIST.ivshmem= YES
@@ -120,7 +120,7 @@ post-install:
.include "../../wip/mk/git-package.mk"
# On Darwin, qemu uses Cocoa and CoreAudio
-.if empty(OPSYS:MDarwin)
+.if ${OPSYS} != Darwin
.include "../../mk/oss.buildlink3.mk"
.endif
.include "../../archivers/lzo/buildlink3.mk"
diff --git a/qemu-git/options.mk b/qemu-git/options.mk
index 82375b0ec3..c5254b22c8 100644
--- a/qemu-git/options.mk
+++ b/qemu-git/options.mk
@@ -5,7 +5,7 @@ PKG_SUPPORTED_OPTIONS= gtk3 sdl
.include "../../mk/bsd.fast.prefs.mk"
-.if empty(OPSYS:MDarwin)
+.if ${OPSYS} != Darwin
PKG_SUGGESTED_OPTIONS+= sdl
.endif
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index fd9d0a5fd0..923050003b 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+= -system-zlib
CONFIGURE_ARGS+= -iconv
QMAKE_CONF= qmake.conf
. if ${OPSYS} != "SunOS" && \
- (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
+ ((${MACHINE_ARCH} == i386) || (${MACHINE_ARCH} == x86_64))
CONFIGURE_ARGS+= -reduce-relocations
. endif
.else
diff --git a/qt5-qtbase-git/Makefile.common b/qt5-qtbase-git/Makefile.common
index ed1505238e..60da4c98ca 100644
--- a/qt5-qtbase-git/Makefile.common
+++ b/qt5-qtbase-git/Makefile.common
@@ -56,9 +56,9 @@ PLIST.unix= yes
# avoid creating a .qt directory in the users home directory
SCRIPTS_ENV+= HOME=${WRKDIR}
-.if empty(PKGPATH:Mwip/qt5-qtbase-git) \
- && empty(PKGPATH:Mwip/qt5-odbc-git) && empty(PKGPATH:Mwip/qt5-mysql-git) \
- && empty(PKGPATH:Mwip/qt5-psql-git) && empty(PKGPATH:Mwip/qt5-sqlite3-git)
+.if (${PKGPATH} != wip/qt5-qtbase-git) \
+ && (${PKGPATH} != wip/qt5-odbc-git) && (${PKGPATH} != wip/qt5-mysql-git) \
+ && (${PKGPATH} != wip/qt5-psql-git) && (${PKGPATH} != wip/qt5-sqlite3-git)
do-configure:
cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile
.endif
diff --git a/scilab/Makefile b/scilab/Makefile
index 3a4dc97d85..a1bb57aae9 100644
--- a/scilab/Makefile
+++ b/scilab/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ENV+= LOCALBASE=${PREFIX}
# scilab-4.1/routines/os_specific/getarg.c
#
.include "../../mk/compiler.mk"
-.if !empty(FC:Mgfortran) || (defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95))
+.if (${FC} == gfortran) || (defined(PKGSRC_FORTRAN) && (${PKGSRC_FORTRAN} == g95))
CFLAGS+= -DG95_FORTRAN=1
.endif
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 3876ea0a4b..8449485740 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -79,8 +79,8 @@ pre-configure:
)
# To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
# Just one file is to be converted now,
-.if !empty(EMACS_TYPE:Memacs25) || \
- !empty(EMACS_TYPE:Memacs26)
+.if (${EMACS_TYPE} == emacs25) || \
+ (${EMACS_TYPE} == emacs26)
post-patch:
(cd ${WRKSRC}/lisp; \
for i in tc-bushu.el; \
diff --git a/tc/Makefile b/tc/Makefile
index da800dec5d..491fc177b8 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -78,8 +78,8 @@ pre-configure:
)
# To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
# Just one file is to be converted now,
-.if !empty(EMACS_TYPE:Memacs25) || \
- !empty(EMACS_TYPE:Memacs26)
+.if (${EMACS_TYPE} == emacs25) || \
+ (${EMACS_TYPE} == emacs26)
post-patch:
(cd ${WRKSRC}/lisp; \
for i in tc-bushu.el; \
diff --git a/wine-devel/Makefile b/wine-devel/Makefile
index 4b1ade8fbf..31ab2a507b 100644
--- a/wine-devel/Makefile
+++ b/wine-devel/Makefile
@@ -45,12 +45,12 @@ PLIST_VARS+= oss wine16 wine32 wine64
PLIST_SRC= PLIST.wine32
NOT_PAX_MPROTECT_SAFE+= bin/wine
-.if !empty(MACHINE_ARCH:Mx86_64)
+.if ${MACHINE_ARCH} == x86_64
.include "../../wip/netbsd-x11-i386/buildlink3.mk"
.endif
# XXX nicer x11-32bit so config works for both
-.if !empty(MACHINE_ARCH:Mx86_64) && 0
+.if (${MACHINE_ARCH} == x86_64) && 0
NOT_PAX_MPROTECT_SAFE+= bin/wine64
PLIST_SRC= PLIST.wine64
Home |
Main Index |
Thread Index |
Old Index