CVS commit: pkgsrc/databases/mysql56-client

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb  5 20:18:43 UTC 2019

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

Log Message:
mysql56-client: fix some pkglint issues


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/databases/mysql56-client/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mysql56-client/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mysql56-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/mysql56-client/Makefile.common
diff -u pkgsrc/databases/mysql56-client/Makefile.common:1.47 pkgsrc/databases/mysql56-client/Makefile.common:1.48
--- pkgsrc/databases/mysql56-client/Makefile.common:1.47        Tue Feb  5 20:06:06 2019
+++ pkgsrc/databases/mysql56-client/Makefile.common     Tue Feb  5 20:18:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2019/02/05 20:06:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.48 2019/02/05 20:18:43 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -66,7 +66,7 @@ CMAKE_ARGS+=          -DDEFAULT_COLLATION=${MYSQ
 CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
 
 # 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

Index: pkgsrc/databases/mysql56-client/buildlink3.mk
diff -u pkgsrc/databases/mysql56-client/buildlink3.mk:1.6 pkgsrc/databases/mysql56-client/buildlink3.mk:1.7
--- pkgsrc/databases/mysql56-client/buildlink3.mk:1.6   Tue Feb  5 20:14:56 2019
+++ pkgsrc/databases/mysql56-client/buildlink3.mk       Tue Feb  5 20:18:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2019/02/05 20:14:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2019/02/05 20:18:43 adam Exp $
 
 BUILDLINK_TREE+=       mysql-client
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.mysql-client?=    ../..
 BUILDLINK_INCDIRS.mysql-client?=       include/mysql
 BUILDLINK_LIBDIRS.mysql-client?=       lib
 
-pkgbase:=      mysql5
+pkgbase := mysql-client
 .include "../../mk/pkg-build-options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/databases/mysql56-client/options.mk
diff -u pkgsrc/databases/mysql56-client/options.mk:1.13 pkgsrc/databases/mysql56-client/options.mk:1.14
--- pkgsrc/databases/mysql56-client/options.mk:1.13     Tue Feb  5 20:06:06 2019
+++ pkgsrc/databases/mysql56-client/options.mk  Tue Feb  5 20:18:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2019/02/05 20:06:06 adam Exp $
+# $NetBSD: options.mk,v 1.14 2019/02/05 20:18:43 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5
 
@@ -42,7 +42,7 @@ 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/mysql56-server)
+.  if ${PKGPATH} == "databases/mysql56-server"
 MESSAGE_SRC=   ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .  endif
 PLIST.sphinx=  yes