Date: Thu, 27 Feb 2003 14:38:47 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48744: [Maintainer Update] Port: MySQL 4.0 (server) Message-ID: <200302271338.h1RDclEE086423@vaio.alexdupre.com>
next in thread | raw e-mail | index | archive | help
>Number: 48744 >Category: ports >Synopsis: [Maintainer Update] Port: MySQL 4.0 (server) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Feb 27 05:40:16 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD vaio.alexdupre.com 4.8-ALEXDUPRE FreeBSD 4.8-ALEXDUPRE #0: Sat Feb 22 15:23:34 CET 2003 root@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386 >Description: Update MySQL to 4.0.11a release. >How-To-Repeat: >Fix: --- mysql40-server.diff begins here --- diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile --- mysql40-server.orig/Makefile Tue Feb 25 12:48:20 2003 +++ mysql40-server/Makefile Thu Feb 27 14:15:59 2003 @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.0.10 +PORTVERSION= 4.0.11a PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ @@ -26,14 +26,16 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma MAINTAINER= sysadmin@alexdupre.com -COMMENT= Multithreaded SQL database (server) +COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql USE_PERL5_RUN= yes USE_LIBTOOL= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ @@ -43,9 +45,7 @@ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' \ - --with-server-suffix='' \ - --program-prefix='' + --with-comment='FreeBSD port: ${PKGNAME}' .include <bsd.port.pre.mk> @@ -103,8 +103,7 @@ ONLY_FOR_ARCHS= i386 alpha sparc64 -DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ - include.texi +DOCS= manual.html manual.txt manual_toc.html pre-fetch: @${ECHO} "" @@ -115,16 +114,20 @@ @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases" - @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" - @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database" + @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS" + @${ECHO} " reverse lookup before inserting local" + @${ECHO} " hostname into mysql database" @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +post-patch: + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." @@ -147,13 +150,14 @@ .endif @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh - .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/Flags + @${MKDIR} ${DOCSDIR}/Flags .for doc in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags + @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags + @${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif # MySQL-Client part @@ -166,12 +170,13 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql CONFIGURE_ARGS+=--without-server -MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-patch: + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in 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 - .endif .include <bsd.port.post.mk> diff -ruN mysql40-server.orig/distinfo mysql40-server/distinfo --- mysql40-server.orig/distinfo Tue Feb 4 15:13:33 2003 +++ mysql40-server/distinfo Thu Feb 27 07:27:09 2003 @@ -1 +1 @@ -MD5 (mysql-4.0.10-gamma.tar.gz) = fd66e12e7de57a6836283365107af427 +MD5 (mysql-4.0.11a-gamma.tar.gz) = dbe1426ed5ae1626b2b1a3ebca568200 diff -ruN mysql40-server.orig/files/patch-Makefile.in mysql40-server/files/patch-Makefile.in --- mysql40-server.orig/files/patch-Makefile.in Tue Feb 4 15:13:34 2003 +++ mysql40-server/files/patch-Makefile.in Thu Feb 27 12:27:44 2003 @@ -1,21 +1,16 @@ ---- Makefile.in.orig Tue Feb 4 13:55:10 2003 -+++ Makefile.in Tue Feb 4 13:58:31 2003 -@@ -210,13 +210,11 @@ +--- Makefile.in.orig Thu Feb 20 20:58:01 2003 ++++ Makefile.in Thu Feb 27 12:27:18 2003 +@@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB -SUBDIRS = . include @docs_dirs@ @readline_dir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ -- BUILD netware os2 @libmysqld_dirs@ \ -- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \ -- @platform_dir@ +- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - -+.if defined(CLIENT_ONLY) -+SUBDIRS = include @sql_client_dirs@ tests man -+.else -+SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files -+.endif ++SUBDIRS = # Relink after clean linked_sources = linked_client_sources linked_server_sources \ diff -ruN mysql40-server.orig/files/patch-configure mysql40-server/files/patch-configure --- mysql40-server.orig/files/patch-configure Tue Feb 4 15:13:34 2003 +++ mysql40-server/files/patch-configure Thu Feb 27 12:42:32 2003 @@ -1,14 +1,16 @@ ---- configure.orig Wed Jan 29 12:29:38 2003 -+++ configure Tue Feb 4 14:07:39 2003 -@@ -8104,6 +8104,7 @@ +--- configure.orig Tue Feb 25 21:30:07 2003 ++++ configure Thu Feb 27 12:42:12 2003 +@@ -8101,7 +8101,8 @@ + # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh" ++/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9046,7 +9047,7 @@ +@@ -9044,7 +9045,7 @@ ;; esac fi @@ -17,7 +19,7 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9238,43 +9239,8 @@ +@@ -9236,43 +9237,8 @@ echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 PS=$ac_cv_path_PS @@ -61,3 +63,12 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -22310,7 +22276,7 @@ + /* ) rel_srcdir="$srcdir" ;; + * ) rel_srcdir="../$srcdir" ;; + esac +- if test "x$enable_dependency_tracking" == xno ++ if test "x$enable_dependency_tracking" = xno + then + innodb_conf_flags=--disable-dependency-tracking + fi diff -ruN mysql40-server.orig/files/patch-include::Makefile.in mysql40-server/files/patch-include::Makefile.in --- mysql40-server.orig/files/patch-include::Makefile.in Fri Jan 31 17:02:39 2003 +++ mysql40-server/files/patch-include::Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 -+++ include/Makefile.in Tue Nov 19 17:14:10 2002 -@@ -335,7 +335,11 @@ - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -+.if defined(CLIENT_ONLY) - install: install-am -+.else -+install: -+.endif - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am diff -ruN mysql40-server.orig/pkg-comment.client mysql40-server/pkg-comment.client --- mysql40-server.orig/pkg-comment.client Tue Dec 28 17:29:25 1999 +++ mysql40-server/pkg-comment.client Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -Multithreaded SQL database (client) diff -ruN mysql40-server.orig/pkg-plist mysql40-server/pkg-plist --- mysql40-server.orig/pkg-plist Fri Jan 31 17:02:39 2003 +++ mysql40-server/pkg-plist Thu Feb 27 14:09:29 2003 @@ -93,13 +93,15 @@ %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif -%%PORTDOCS%%share/doc/mysql/include.texi %%PORTDOCS%%share/doc/mysql/manual.html -%%PORTDOCS%%share/doc/mysql/manual.ps -%%PORTDOCS%%share/doc/mysql/manual.texi %%PORTDOCS%%share/doc/mysql/manual.txt %%PORTDOCS%%share/doc/mysql/manual_toc.html +share/mysql/Description.plist +share/mysql/Info.plist +share/mysql/StartupParameters.plist share/mysql/binary-configure +share/mysql/postinstall +share/mysql/preinstall share/mysql/charsets/Index share/mysql/charsets/README share/mysql/charsets/cp1251.conf --- mysql40-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302271338.h1RDclEE086423>