Index: head/databases/mysql50-server/Makefile =================================================================== --- head/databases/mysql50-server/Makefile (revision 161206) +++ head/databases/mysql50-server/Makefile (revision 161207) @@ -1,249 +1,249 @@ # New ports collection makefile for: MySQL-server # Date created: Fri Apr 11 10:06:26 CET 2003 # Whom: Alex Dupre # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 5.0.20 +PORTVERSION= 5.0.21 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql50-client databases/mysql50-scripts USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ --with-mysqlfs \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .endif .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(WITHOUT_INNODB) CONFIGURE_ARGS+=--without-innodb .endif .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif .if defined(WITH_FEDERATED) CONFIGURE_ARGS+=--with-federated-storage-engine .endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif .if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION} .endif .include .if ${ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db .endif .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.[24]:${PORTSDIR}/devel/linuxthreads CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .else CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS} CFLAGS+= ${PTHREAD_CFLAGS} .endif .if ${OSVERSION} < 500000 LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXX= ${CC} .endif .if defined(BUILD_OPTIMIZED) CFLAGS+= -O3 -fno-omit-frame-pointer .if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3)) CFLAGS+= -fno-gcse .endif .endif CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif # MySQL-Server part .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 50 LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.1.* USE_RC_SUBR= mysql-server.sh .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else PLIST_SUB+= NDB="@comment " .endif MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${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_LINUXTHREADS=yes Use the linuxthreads pthread library." @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" @${ECHO} " (try it if you use libpthread)." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc .endif post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .endif .else # MySQL-Client part .if defined(CLIENT_ONLY) LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.1.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql USE_LDCONFIG= ${PREFIX}/lib/mysql .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" CONFIGURE_ARGS+=--without-server .if ${OSVERSION} < 500000 PLIST_SUB+= ZLIB="" .else PLIST_SUB+= ZLIB="@comment " .endif post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @zlib_dir@ strings mysys dbug extra regex libmysql_r libmysql client scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c .endif post-install: install-ldconfig-file .else # MySQL-Scripts part USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 .if ${PERL_LEVEL} <= 500800 RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.1.* MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part post-extract: @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." @${FALSE} .endif .include Property changes on: head/databases/mysql50-server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.212 \ No newline at end of property +1.213 \ No newline at end of property Index: head/databases/mysql50-server/distinfo =================================================================== --- head/databases/mysql50-server/distinfo (revision 161206) +++ head/databases/mysql50-server/distinfo (revision 161207) @@ -1,3 +1,3 @@ -MD5 (mysql-5.0.20.tar.gz) = 54507849c9888ff9abe2c8ae203becd9 -SHA256 (mysql-5.0.20.tar.gz) = b2e9e4dab4f115ab2a44e686f40e648aabf500d6df889090d1a5e06b05e41cd9 -SIZE (mysql-5.0.20.tar.gz) = 19445124 +MD5 (mysql-5.0.21.tar.gz) = c3165204c42e1db6fc3a95a4fd2cd22f +SHA256 (mysql-5.0.21.tar.gz) = 2ea4b3665438f6bfa8cbae91e32e2b6c2d5e92a9d6bc3a5ef2e4ebee1d0b5d2b +SIZE (mysql-5.0.21.tar.gz) = 19529703 Property changes on: head/databases/mysql50-server/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.87 \ No newline at end of property +1.88 \ No newline at end of property Index: head/databases/mysql50-server/pkg-plist =================================================================== --- head/databases/mysql50-server/pkg-plist (revision 161206) +++ head/databases/mysql50-server/pkg-plist (revision 161207) @@ -1,166 +1,169 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_waitpid bin/mysqld_safe %%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index %%NDB%%bin/ndb_drop_table +%%NDB%%bin/ndb_error_reporter %%NDB%%bin/ndb_mgm %%NDB%%bin/ndb_restore %%NDB%%bin/ndb_select_all %%NDB%%bin/ndb_select_count +%%NDB%%bin/ndb_size.pl %%NDB%%bin/ndb_show_tables %%NDB%%bin/ndb_test_platform %%NDB%%bin/ndb_waiter bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%NDB%%include/mysql/ndb/mgmapi/mgmapi.h %%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters.h %%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h %%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h %%NDB%%include/mysql/ndb/mgmapi/ndb_logevent.h %%NDB%%include/mysql/ndb/mgmapi/ndbd_exit_codes.h %%NDB%%include/mysql/ndb/ndb_constants.h %%NDB%%include/mysql/ndb/ndb_init.h %%NDB%%include/mysql/ndb/ndb_types.h %%NDB%%include/mysql/ndb/ndb_version.h %%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbApi.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbBlob.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbDictionary.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbError.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbEventOperation.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbIndexOperation.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbOperation.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbPool.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbRecAttr.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbReceiver.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbScanFilter.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbScanOperation.hpp %%NDB%%include/mysql/ndb/ndbapi/NdbTransaction.hpp %%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h %%NDB%%include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.a %%NDB%%lib/mysql/libndbclient.la %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.0 lib/mysql/libvio.a libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/mi_test_all %%DATADIR%%/mi_test_all.res %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini +%%NDB%%%%DATADIR%%/ndb_size.tmpl %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%NDB%%@dirrm include/mysql/ndb/mgmapi %%NDB%%@dirrm include/mysql/ndb/ndbapi %%NDB%%@dirrm include/mysql/ndb @dirrmtry include/mysql @dirrmtry lib/mysql @dirrm %%DATADIR%%/charsets @dirrm %%DATADIR%%/czech @dirrm %%DATADIR%%/danish @dirrm %%DATADIR%%/dutch @dirrm %%DATADIR%%/english @dirrm %%DATADIR%%/estonian @dirrm %%DATADIR%%/french @dirrm %%DATADIR%%/german @dirrm %%DATADIR%%/greek @dirrm %%DATADIR%%/hungarian @dirrm %%DATADIR%%/italian @dirrm %%DATADIR%%/japanese @dirrm %%DATADIR%%/korean @dirrm %%DATADIR%%/norwegian @dirrm %%DATADIR%%/norwegian-ny @dirrm %%DATADIR%%/polish @dirrm %%DATADIR%%/portuguese @dirrm %%DATADIR%%/romanian @dirrm %%DATADIR%%/russian @dirrm %%DATADIR%%/serbian @dirrm %%DATADIR%%/slovak @dirrm %%DATADIR%%/spanish @dirrm %%DATADIR%%/swedish @dirrm %%DATADIR%%/ukrainian @dirrmtry %%DATADIR%% Property changes on: head/databases/mysql50-server/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.71 \ No newline at end of property +1.72 \ No newline at end of property