How about an innodb plugin options thats new !
Alex Dupre wrote:
ale 2009-09-04 13:37:14 UTC
FreeBSD ports repository
Modified files:
databases/mysql51-server Makefile distinfo pkg-plist
Log:
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
Revision Changes Path
1.253 +12 -5 ports/databases/mysql51-server/Makefile
1.115 +3 -3 ports/databases/mysql51-server/distinfo
1.86 +9 -5 ports/databases/mysql51-server/pkg-plist
http://cvsweb.FreeBSD.org/ports/databases/mysql51-server/Makefile.diff?r1=1.252&r2=1.253&f=h
| --- ports/databases/mysql51-server/Makefile 2009/08/28 08:23:35 1.252
| +++ ports/databases/mysql51-server/Makefile 2009/09/04 13:37:14 1.253
| @@ -2,11 +2,11 @@
| # Date created: 28 Jan 2006
| # Whom: Alex Dupre <[email protected]>
| #
| -# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/databases/mysql51-server/Makefile,v 1.252
2009/08/28 08:23:35 ale Exp $
| +# $FreeBSD:
/usr/local/www/cvsroot/FreeBSD/ports/databases/mysql51-server/Makefile,v 1.253
2009/09/04 13:37:14 ale Exp $
| #
|
| 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_CH
| 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}
http://cvsweb.FreeBSD.org/ports/databases/mysql51-server/distinfo.diff?r1=1.114&r2=1.115&f=h
| --- ports/databases/mysql51-server/distinfo 2009/08/28 08:23:35 1.114
| +++ ports/databases/mysql51-server/distinfo 2009/09/04 13:37:14 1.115
| @@ -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
http://cvsweb.FreeBSD.org/ports/databases/mysql51-server/pkg-plist.diff?r1=1.85&r2=1.86&f=h
| --- ports/databases/mysql51-server/pkg-plist 2009/03/03 16:35:52 1.85
| +++ ports/databases/mysql51-server/pkg-plist 2009/09/04 13:37:14 1.86
| @@ -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
| %%nd...@dirrm include/mysql/storage/ndb
| %%nd...@dirrm include/mysql/storage
| @dirrmtry include/mysql
| -...@dirrm lib/mysql/plugin
| +%%plugin...@dirrm lib/mysql/plugin
| @dirrmtry lib/mysql
| @dirrm %%DATADIR%%/charsets
| @dirrm %%DATADIR%%/czech
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci ([email protected]) c: 703.336.9354
Consultant - P6M7G8 Inc. http://p6m7g8.net
Senior Sys Admin - RideCharge, Inc. http://ridecharge.com
ASF Member - Apache Software Foundation http://apache.org
FreeBSD Committer - FreeBSD Foundation http://freebsd.org
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "[email protected]"
