summaryrefslogtreecommitdiff
path: root/databases/mysql40-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql40-server')
-rw-r--r--databases/mysql40-server/Makefile42
-rw-r--r--databases/mysql40-server/distinfo2
-rw-r--r--databases/mysql40-server/files/patch-Makefile.in17
-rw-r--r--databases/mysql40-server/files/patch-configure25
-rw-r--r--databases/mysql40-server/files/patch-include::Makefile.in14
-rw-r--r--databases/mysql40-server/pkg-plist8
-rw-r--r--databases/mysql40-server/pkg-plist.client1
7 files changed, 54 insertions, 55 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 153e9a67730c..7366666f55dd 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mysql
-PORTVERSION= 4.0.10
+PORTVERSION= 4.0.12
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
@@ -23,7 +23,6 @@ MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \
ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/
PKGNAMESUFFIX?= -server
-DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
COMMENT?= Multithreaded SQL database (server)
@@ -32,8 +31,10 @@ 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 +44,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \
--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>
@@ -99,12 +98,11 @@ CXX= ${CC}
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
-PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma
+PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
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 +113,20 @@ pre-fetch:
@${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 +149,14 @@ post-install:
.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 +169,13 @@ INSTALLS_SHLIB= yes
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 --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index f7751a770d6c..c4d84965c754 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.0.10-gamma.tar.gz) = fd66e12e7de57a6836283365107af427
+MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f
diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in
index 3e8211497edc..ba5973587226 100644
--- a/databases/mysql40-server/files/patch-Makefile.in
+++ b/databases/mysql40-server/files/patch-Makefile.in
@@ -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 --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index 7add28292e45..dd057cb485d0 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -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 --git a/databases/mysql40-server/files/patch-include::Makefile.in b/databases/mysql40-server/files/patch-include::Makefile.in
deleted file mode 100644
index 34b404c0a255..000000000000
--- a/databases/mysql40-server/files/patch-include::Makefile.in
+++ /dev/null
@@ -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 --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 692b3053f8c6..e77a5fa4d0f5 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -93,13 +93,15 @@ libexec/mysqld
%%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
diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client
index e7ad0a65b8a1..b41d52e39413 100644
--- a/databases/mysql40-server/pkg-plist.client
+++ b/databases/mysql40-server/pkg-plist.client
@@ -15,6 +15,7 @@ include/mysql/m_ctype.h
include/mysql/m_string.h
include/mysql/my_alloc.h
include/mysql/my_config.h
+include/mysql/my_dir.h
include/mysql/my_getopt.h
include/mysql/my_global.h
include/mysql/my_list.h