CVS commit: pkgsrc/multimedia/libvpx

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 29 09:43:37 UTC 2023

Modified Files:
        pkgsrc/multimedia/libvpx: Makefile hacks.mk

Log Message:
libvpx: fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/multimedia/libvpx/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/libvpx/hacks.mk

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

Modified files:

Index: pkgsrc/multimedia/libvpx/Makefile
diff -u pkgsrc/multimedia/libvpx/Makefile:1.99 pkgsrc/multimedia/libvpx/Makefile:1.100
--- pkgsrc/multimedia/libvpx/Makefile:1.99      Fri Sep 29 09:43:15 2023
+++ pkgsrc/multimedia/libvpx/Makefile   Fri Sep 29 09:43:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2023/09/29 09:43:15 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2023/09/29 09:43:37 wiz Exp $
 
 DISTNAME=      libvpx-1.13.0
 PKGREVISION=   1
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=      --target=mips32-linux-g
 CONFIGURE_ARGS+=       --target=generic-gnu
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) || !empty(MACHINE_PLATFORM:MNetBSD-*-*aarch64*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-*arm*} || ${MACHINE_PLATFORM:MNetBSD-*-*aarch64*}
 CONFIGURE_ARGS+=       --disable-runtime-cpu-detect
 .endif
 
@@ -102,7 +102,7 @@ CONFIGURE_ENV.MirBSD+=              RTCD_OPTIONS='--
 CONFIGURE_ARGS.MirBSD+=                --disable-runtime-cpu-detect
 
 # Under Solaris 10 its /usr/xpg4/bin/tr is not sufficient. PR pkg/48508
-.if !empty(MACHINE_PLATFORM:MSunOS-5.10-*)
+.if ${MACHINE_PLATFORM:MSunOS-5.10-*}
 TOOL_DEPENDS=          coreutils-[0-9]*:../../sysutils/coreutils
 TOOLS_PLATFORM.tr=     ${PREFIX}/bin/gtr
 .endif
@@ -116,9 +116,9 @@ PKGCONFIG_OVERRIDE+=                vpx.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-build
 
 # PR pkg/48508: newer gas from binutils is required to compile ssse3 code.
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) || \
-       !empty(MACHINE_PLATFORM:MSunOS-5.10-*) || \
-       !empty(MACHINE_PLATFORM:MOpenBSD-5.*)
+.if ${MACHINE_PLATFORM:MNetBSD-5.*} || \
+       ${MACHINE_PLATFORM:MSunOS-5.10-*} || \
+       ${MACHINE_PLATFORM:MOpenBSD-5.*}
 .include "../../devel/binutils/buildlink3.mk"
 .include "../../devel/binutils/override-as.mk"
 .endif

Index: pkgsrc/multimedia/libvpx/hacks.mk
diff -u pkgsrc/multimedia/libvpx/hacks.mk:1.4 pkgsrc/multimedia/libvpx/hacks.mk:1.5
--- pkgsrc/multimedia/libvpx/hacks.mk:1.4       Mon May 26 18:10:22 2014
+++ pkgsrc/multimedia/libvpx/hacks.mk   Fri Sep 29 09:43:37 2023
@@ -1,11 +1,11 @@
-# $NetBSD: hacks.mk,v 1.4 2014/05/26 18:10:22 tron Exp $
+# $NetBSD: hacks.mk,v 1.5 2023/09/29 09:43:37 wiz Exp $
 
 ### [Sun Jan  5 12:58:28 UTC 2014 : tron]
 ### GCC 4.5.3 gets stuck while compiline "vp9/vp9_cx_iface.c".
 ### See PR port-sparc64/48501 for more details.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-sparc*}
 .  include "../../mk/compiler.mk"
-.  if !empty(CC_VERSION:Mgcc-4.[0-5].*)
+.  if ${CC_VERSION:Mgcc-4.[0-5].*}
 PKG_HACKS+=            sparc-gcc-lock-up
 BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
 .  endif