Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
databases/mysql51-client/Makefile
View File

@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.12 2013/05/31 12:39:47 wiz Exp $
# $NetBSD: Makefile,v 1.16 2014/02/12 23:17:39 tron Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
PKGREVISION= 2
PKGREVISION= 1
SVR4_PKGNAME= mysqc
COMMENT= MySQL 5, a free SQL database (client)
CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
CONFLICTS= mysql3-client-[0-9]*
.include "Makefile.common"
@@ -35,5 +35,5 @@ post-install:
${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
.endfor
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

15
databases/mysql51-client/Makefile.common
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.28 2013/04/08 11:17:10 rodent Exp $
# $NetBSD: Makefile.common,v 1.30 2013/10/01 11:00:39 adam Exp $
#
# used by databases/mysql51-client/Makefile
# used by databases/mysql51-server/Makefile
DISTNAME= mysql-5.1.67
DISTNAME= mysql-5.1.72
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
@@ -32,12 +32,11 @@ PKG_GROUPS_VARS+= MYSQL_GROUP
# MYSQL_CHARSET default character set
# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
#
MYSQL_CHARSET?= latin1
MYSQL_EXTRA_CHARSET?= all
CONFIGURE_ARGS+= --enable-thread-safe-client
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --without-libwrap
CONFIG_SHELL= ${TOOLS_PATH.bash}
@@ -52,7 +51,6 @@ BUILD_DEFS+= VARBASE
# We always use our own readline. Note that these --without-* settings
# are confusing, but they just mean "don't use the included readline
# or libedit".
#
CONFIGURE_ARGS+= --without-readline
CONFIGURE_ARGS+= --without-libedit
@@ -62,8 +60,7 @@ CONFIGURE_ARGS+= --disable-dependency-tracking
CONFIGURE_ARGS+= --without-debug
CONFIGURE_ARGS+= --with-low-memory
CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib}
CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
@@ -72,10 +69,8 @@ CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
CONFIGURE_ARGS+= --enable-assembler
.endif
#
# MySQL 5.1 depends on builtin functions which enabled with i486 and
# later with GCC.
#
.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
GNU_ARCH.i386= i486
CFLAGS+= -march=i486
@@ -117,7 +112,7 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
TOOLS_PLATFORM.diff= # empty
.endif
SUBST_CLASSES= mk
SUBST_CLASSES+= mk
SUBST_STAGE.mk= pre-configure
SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
mysys/Makefile.in strings/Makefile.in

4
databases/mysql51-client/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.4 2013/02/06 23:20:56 jperkin Exp $
# $NetBSD: buildlink3.mk,v 1.5 2014/02/12 23:17:39 tron Exp $
BUILDLINK_TREE+= mysql-client
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= mysql-client
MYSQL_CLIENT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.1.44<5.5
BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=5.1.67nb1
BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=5.1.72nb1
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql51-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
BUILDLINK_INCDIRS.mysql-client?= include/mysql

9
databases/mysql51-client/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.24 2013/01/21 08:58:43 adam Exp $
$NetBSD: distinfo,v 1.26 2013/10/01 11:00:39 adam Exp $
SHA1 (mysql-5.1.67.tar.gz) = f1a7854701a1146b109c30d61236802523969b8d
RMD160 (mysql-5.1.67.tar.gz) = 5d4412988f50b1f44b4d7a83b943f0804626894e
Size (mysql-5.1.67.tar.gz) = 24781885 bytes
SHA1 (mysql-5.1.72.tar.gz) = af1f46e56402b38a085ac592cd7df3aa25e9cea2
RMD160 (mysql-5.1.72.tar.gz) = a5ba8bedf4027af90a4612a1a7f3a848999cfbf5
Size (mysql-5.1.72.tar.gz) = 24044338 bytes
SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
@@ -27,3 +27,4 @@ SHA1 (patch-av) = b8fb1065d7e71522374a16d759d2f3ab5227f590
SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909

15
databases/mysql51-client/patches/patch-vio_viossl.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-vio_viossl.c,v 1.1 2013/08/04 10:20:24 adam Exp $
Compatibility fix.
--- vio/viossl.c.orig 2013-07-11 13:39:36.000000000 +0000
+++ vio/viossl.c
@@ -198,7 +198,7 @@ static int ssl_do(struct st_VioSSLFd *pt
SSL_clear(ssl);
SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
SSL_set_fd(ssl, vio->sd);
-#ifndef HAVE_YASSL
+#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
#endif