Update to 5.1.38 release:

- Add support for openssl instead of yassl (for backward compatability)
- Fix plist when built static (no plugins)
- Allow static build with yassl
This commit is contained in:
Alex Dupre 2009-09-04 13:37:14 +00:00
parent 626dd15527
commit 3256846cea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=240867
3 changed files with 24 additions and 13 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME?= mysql
PORTVERSION= 5.1.37
PORTVERSION= 5.1.38
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
@ -22,8 +22,6 @@ GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--infodir=${PREFIX}/info \
--mandir=${PREFIX}/man \
--without-debug \
--without-readline \
--without-libedit \
@ -43,13 +41,21 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
.endif
.if defined(WITH_OPENSSL)
.if !defined(WITHOUT_YASSL)
CONFIGURE_ARGS+=--with-ssl=bundled
.else
USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
.endif
.endif
.if defined(WITH_FAST_MUTEXES)
CONFIGURE_ARGS+=--with-fast-mutexes
.endif
.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
PLIST_SUB+= PLUGINS="@comment "
.else
PLIST_SUB+= PLUGINS=""
.endif
.if defined(WITH_NDB)
CONFIGURE_ARGS+=--with-plugins=max
@ -127,7 +133,8 @@ pre-fetch:
@${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)."
@${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')."
@${ECHO} " WITH_COLLATION=collate Define default collation (latin1_swedish_ci)."
@${ECHO} " WITH_OPENSSL=yes Enable secure connections."
@${ECHO} " WITH_OPENSSL=yes Enable secure connections"
@${ECHO} " (define WITHOUT_YASSL for backward compatibility)."
@${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library."
@${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads"
@${ECHO} " (try it if you use libpthread)."
@ -219,7 +226,7 @@ post-patch:
post-extract:
@${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h
.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
.if defined(WITH_OPENSSL) && defined(WITHOUT_YASSL) && defined(BUILD_STATIC)
pre-configure:
@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
@${FALSE}

View file

@ -1,3 +1,3 @@
MD5 (mysql-5.1.37.tar.gz) = cbdb8783b053019755ee9196f67ea04c
SHA256 (mysql-5.1.37.tar.gz) = 6a4596462d4447a79a0ad607ea1475ba0599651e2d82305a7f7dade038827f0c
SIZE (mysql-5.1.37.tar.gz) = 35796850
MD5 (mysql-5.1.38.tar.gz) = 8ee9bb80079bbd09499a28bc57d902e7
SHA256 (mysql-5.1.38.tar.gz) = c566263d4339f105c55b6a33db7f39ea76a6b928843d4efeecfa6b3111ef7d58
SIZE (mysql-5.1.38.tar.gz) = 37672923

View file

@ -75,10 +75,14 @@ lib/mysql/libmysys.a
%%NDB%%lib/mysql/libndbclient.so
%%NDB%%lib/mysql/libndbclient.so.3
lib/mysql/libvio.a
lib/mysql/plugin/ha_example.a
lib/mysql/plugin/ha_example.la
lib/mysql/plugin/ha_example.so
lib/mysql/plugin/ha_example.so.0
%%PLUGINS%%lib/mysql/plugin/ha_example.a
%%PLUGINS%%lib/mysql/plugin/ha_example.la
%%PLUGINS%%lib/mysql/plugin/ha_example.so
%%PLUGINS%%lib/mysql/plugin/ha_example.so.0
%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.a
%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.la
%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.so
%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.so.0
libexec/mysqld
%%NDB%%libexec/ndb_cpcd
%%NDB%%libexec/ndb_mgmd
@ -157,7 +161,7 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/storage/ndb
%%NDB%%@dirrm include/mysql/storage
@dirrmtry include/mysql
@dirrm lib/mysql/plugin
%%PLUGINS%%@dirrm lib/mysql/plugin
@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech