Index: head/databases/mysql41-server/Makefile =================================================================== --- head/databases/mysql41-server/Makefile (revision 151862) +++ head/databases/mysql41-server/Makefile (revision 151863) @@ -1,233 +1,237 @@ # New ports collection makefile for: MySQL-server # Date created: Fri Apr 11 10:06:26 CET 2003 # Whom: Alex Dupre # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.1.15 +PORTVERSION= 4.1.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-4.1 PKGNAMESUFFIX?= -server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql41-client USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes .if ${PKGNAMESUFFIX} == "-server" USE_RC_SUBR= mysql-server.sh .endif 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-vio \ --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_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= 41 LATEST_LINK= mysql41-server CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else PLIST_SUB+= NDB="@comment " .endif -MAN1= isamchk.1 isamlog.1 mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +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_NDB=yes Enable support for NDB Cluster." @${ECHO} "" post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @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_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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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}/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 + @${ECHO_CMD} "-- fill_help_tables.sql is broken in 4.1.16 release" \ + > ${WRKSRC}/scripts/fill_help_tables.sql post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .else # MySQL-Client part .if defined(CLIENT_ONLY) LATEST_LINK= mysql41-client CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.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 CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/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: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh .else # MySQL-Scripts part USE_MYSQL= yes WANT_MYSQL_VER= 41 USE_PERL5= yes RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 .if ${PERL_LEVEL} <= 500800 RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif LATEST_LINK= mysql41-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[02-9].* mysql-scripts-5.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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/mysql41-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/mysql41-server/distinfo =================================================================== --- head/databases/mysql41-server/distinfo (revision 151862) +++ head/databases/mysql41-server/distinfo (revision 151863) @@ -1,2 +1,3 @@ -MD5 (mysql-4.1.15.tar.gz) = 65a0841e592641b8816f9212aaa40176 -SIZE (mysql-4.1.15.tar.gz) = 17257765 +MD5 (mysql-4.1.16.tar.gz) = 13c5fdd05e28863db3a1261635890b5f +SHA256 (mysql-4.1.16.tar.gz) = e135f6089a0b49aeb2f3a1396820089c232505cfda010e77a680921750485557 +SIZE (mysql-4.1.16.tar.gz) = 17146702 Property changes on: head/databases/mysql41-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/mysql41-server/files/patch-Docs::Makefile.in =================================================================== --- head/databases/mysql41-server/files/patch-Docs::Makefile.in (revision 151862) +++ head/databases/mysql41-server/files/patch-Docs::Makefile.in (revision 151863) @@ -1,11 +1,20 @@ ---- Docs/Makefile.in.orig Fri May 13 13:33:27 2005 -+++ Docs/Makefile.in Fri Jun 3 16:54:40 2005 -@@ -481,7 +481,7 @@ - uninstall-info-am +--- Docs/Makefile.in.orig Wed Nov 30 21:37:04 2005 ++++ Docs/Makefile.in Thu Dec 22 16:03:51 2005 +@@ -324,7 +324,7 @@ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt - --all: txt_files + GT = $(srcdir)/Support/generate-text-files.pl +-all: all-am +all: - txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt + .SUFFIXES: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +@@ -410,7 +410,7 @@ + install-data: install-data-am + uninstall: uninstall-am + +-install-am: all-am ++install-am: + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am Property changes on: head/databases/mysql41-server/files/patch-Docs::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/mysql41-server/files/patch-Makefile.in =================================================================== --- head/databases/mysql41-server/files/patch-Makefile.in (revision 151862) +++ head/databases/mysql41-server/files/patch-Makefile.in (revision 151863) @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Dec 14 13:41:10 2004 -+++ Makefile.in Sun Dec 19 11:48:00 2004 -@@ -338,12 +338,7 @@ +--- Makefile.in.orig Thu Dec 22 16:04:09 2005 ++++ Makefile.in Thu Dec 22 16:04:29 2005 +@@ -348,12 +348,7 @@ + EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ + README COPYING EXCEPTIONS-CLIENT - # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ - @sql_union_dirs@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ Property changes on: head/databases/mysql41-server/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/databases/mysql41-server/files/patch-man::Makefile.in =================================================================== --- head/databases/mysql41-server/files/patch-man::Makefile.in (revision 151862) +++ head/databases/mysql41-server/files/patch-man::Makefile.in (revision 151863) @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Dec 14 13:41:14 2004 -+++ man/Makefile.in Sun Dec 19 11:53:40 2004 -@@ -313,9 +313,7 @@ +--- man/Makefile.in.orig Thu Dec 22 16:04:55 2005 ++++ man/Makefile.in Thu Dec 22 16:05:21 2005 +@@ -321,7 +321,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ Property changes on: head/databases/mysql41-server/files/patch-man::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property