pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/mysql56-client mysql56-client: fix some pkgl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/911618b6524b
branches:  trunk
changeset: 391353:911618b6524b
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Feb 05 20:18:43 2019 +0000

description:
mysql56-client: fix some pkglint issues

diffstat:

 databases/mysql56-client/Makefile.common |  4 ++--
 databases/mysql56-client/buildlink3.mk   |  4 ++--
 databases/mysql56-client/options.mk      |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 220ce4b0bae9 -r 911618b6524b databases/mysql56-client/Makefile.common
--- a/databases/mysql56-client/Makefile.common  Tue Feb 05 20:14:56 2019 +0000
+++ b/databases/mysql56-client/Makefile.common  Tue Feb 05 20:18:43 2019 +0000
@@ -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+=           -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
diff -r 220ce4b0bae9 -r 911618b6524b databases/mysql56-client/buildlink3.mk
--- a/databases/mysql56-client/buildlink3.mk    Tue Feb 05 20:14:56 2019 +0000
+++ b/databases/mysql56-client/buildlink3.mk    Tue Feb 05 20:18:43 2019 +0000
@@ -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_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"
diff -r 220ce4b0bae9 -r 911618b6524b databases/mysql56-client/options.mk
--- a/databases/mysql56-client/options.mk       Tue Feb 05 20:14:56 2019 +0000
+++ b/databases/mysql56-client/options.mk       Tue Feb 05 20:18:43 2019 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index