CVS commit: pkgsrc/databases/mysql55-client

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Apr 25 18:23:23 UTC 2020

Modified Files:
        pkgsrc/databases/mysql55-client: Makefile.common options.mk

Log Message:
databases/mysql55-client: apply pkglint suggestions


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/databases/mysql55-client/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mysql55-client/options.mk

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

Modified files:

Index: pkgsrc/databases/mysql55-client/Makefile.common
diff -u pkgsrc/databases/mysql55-client/Makefile.common:1.67 pkgsrc/databases/mysql55-client/Makefile.common:1.68
--- pkgsrc/databases/mysql55-client/Makefile.common:1.67        Sat Apr 18 17:33:51 2020
+++ pkgsrc/databases/mysql55-client/Makefile.common     Sat Apr 25 18:23:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.67 2020/04/18 17:33:51 gdt Exp $
+# $NetBSD: Makefile.common,v 1.68 2020/04/25 18:23:23 rillig Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
@@ -73,7 +73,7 @@ CMAKE_ARGS+=          -DWITH_EXTRA_CHARSETS=${MY
 BROKEN_READLINE_DETECTION=     yes # At least on RHEL 5.6
 
 # MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
-.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == i386
 GNU_ARCH.i386=         i486
 CFLAGS+=               -march=i486
 .endif
@@ -131,7 +131,7 @@ SUBST_SED.fixpaths+=        -e "s,${WRAPPER_BIN
 
 .include "../../mk/readline.buildlink3.mk"
 
-.if !empty(READLINE_TYPE:Mreadline)
+.if ${READLINE_TYPE} == readline
 CMAKE_ARGS+=   -DREADLINE_FOUND=system
 .endif
 CMAKE_ARGS+=   -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline

Index: pkgsrc/databases/mysql55-client/options.mk
diff -u pkgsrc/databases/mysql55-client/options.mk:1.13 pkgsrc/databases/mysql55-client/options.mk:1.14
--- pkgsrc/databases/mysql55-client/options.mk:1.13     Wed May  3 12:37:01 2017
+++ pkgsrc/databases/mysql55-client/options.mk  Sat Apr 25 18:23:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2017/05/03 12:37:01 mef Exp $
+# $NetBSD: options.mk,v 1.14 2020/04/25 18:23:23 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5
 
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS+= embedded-server
 
 .include "../../mk/bsd.options.mk"
 
-.      include "../../security/openssl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 # Enable DTrace support
 .if !empty(PKG_OPTIONS:Mdtrace)
@@ -24,9 +24,9 @@ PLIST_VARS+=  sphinx
 SPHINX_VER=    2.2.11
 DISTFILES=     ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
 SITES.sphinx-2.2.11-release.tar.gz=    http://sphinxsearch.com/files/
-.if !empty(PKGPATH:Mdatabases/mysql55-server)
+.  if ${PKGPATH} == databases/mysql55-server
 MESSAGE_SRC=   ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
-.endif
+.  endif
 PLIST.sphinx=  yes
 
 post-extract: