Index: head/databases/mysql41-server/Makefile =================================================================== --- head/databases/mysql41-server/Makefile (revision 137029) +++ head/databases/mysql41-server/Makefile (revision 137030) @@ -1,240 +1,233 @@ # 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.11 -PORTREVISION?= 1 +PORTVERSION= 4.1.12 +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_LIBTOOL_VER=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 +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib 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.* PLIST_SUB= VER=${PORTVERSION} .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 -.if !defined(NOPORTDOCS) -PORTDOCS= manual.html manual.txt manual_toc.html -.endif - 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 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|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 -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} -.endfor .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 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|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|%%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 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|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 .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.206 \ No newline at end of property +1.207 \ No newline at end of property Index: head/databases/mysql41-server/distinfo =================================================================== --- head/databases/mysql41-server/distinfo (revision 137029) +++ head/databases/mysql41-server/distinfo (revision 137030) @@ -1,2 +1,2 @@ -MD5 (mysql-4.1.11.tar.gz) = 0b99001b07cad53f161ec629a6bb24ea -SIZE (mysql-4.1.11.tar.gz) = 22880239 +MD5 (mysql-4.1.12.tar.gz) = 56a6f5cacd97ae290e07bbe19f279af1 +SIZE (mysql-4.1.12.tar.gz) = 17069350 Property changes on: head/databases/mysql41-server/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.83 \ No newline at end of property +1.84 \ 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 137029) +++ head/databases/mysql41-server/files/patch-Docs::Makefile.in (revision 137030) @@ -1,29 +1,11 @@ ---- Docs/Makefile.in.orig Sun Jan 9 12:51:43 2005 -+++ Docs/Makefile.in Sun Jan 9 12:58:11 2005 -@@ -316,7 +316,7 @@ +--- 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 - SUBDIRS = Images - GT = $(srcdir)/Support/generate-text-files.pl --all: $(BUILT_SOURCES) -+all: - $(MAKE) $(AM_MAKEFLAGS) all-recursive - .SUFFIXES: -@@ -626,7 +626,7 @@ - for dir in "$(DESTDIR)$(infodir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: $(BUILT_SOURCES) -+install: - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -750,7 +750,7 @@ - tags tags-recursive uninstall uninstall-am uninstall-info-am - - --all: $(targets) txt_files +-all: txt_files +all: - txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \ + txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt Property changes on: head/databases/mysql41-server/files/patch-Docs::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/databases/mysql41-server/files/patch-scripts::Makefile.in =================================================================== --- head/databases/mysql41-server/files/patch-scripts::Makefile.in (revision 137029) +++ head/databases/mysql41-server/files/patch-scripts::Makefile.in (revision 137030) @@ -1,48 +1,39 @@ ---- scripts/Makefile.in.orig Tue Dec 14 13:41:31 2004 -+++ scripts/Makefile.in Sun Dec 19 11:52:42 2004 -@@ -316,26 +316,7 @@ +--- scripts/Makefile.in.orig Fri May 13 13:33:57 2005 ++++ scripts/Makefile.in Fri Jun 3 16:58:01 2005 +@@ -320,26 +320,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ -bin_SCRIPTS = @server_scripts@ \ - msql2mysql \ - mysql_config \ - mysql_fix_privilege_tables \ - mysql_fix_extensions \ - mysql_setpermission \ - mysql_secure_installation \ - mysql_zap \ - mysqlaccess \ - mysqlbug \ - mysql_convert_table_format \ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ - mysql_explain_log \ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ - make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ -@@ -366,7 +347,7 @@ +@@ -369,7 +350,7 @@ mysqlaccess.conf \ mysqlbug -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -652,8 +633,6 @@ - - all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution - --fill_help_tables.sql: fill_help_tables ../Docs/manual.texi -- ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Property changes on: head/databases/mysql41-server/files/patch-scripts::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property