diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-07-24 08:08:59 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-07-24 08:08:59 +0000 |
| commit | a10e291fa5e8878715c44d68c9193740baca7dff (patch) | |
| tree | 6e8652185f111b21470a09678c85be516a5e3f37 /databases | |
| parent | Mark BROKEN: does not build. (diff) | |
Update to 5.0.84 release and use bundled libtool.
Notes
Notes:
svn path=/head/; revision=238317
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql50-server/Makefile | 11 | ||||
| -rw-r--r-- | databases/mysql50-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql50-server/files/patch-configure | 11 |
3 files changed, 7 insertions, 21 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 29e30d0d378b..ea1f92bee4ef 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.83 +PORTVERSION= 5.0.84 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql50-client databases/mysql50-scripts -USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -192,8 +192,6 @@ MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ mysqldump.1 mysqlimport.1 mysqlshow.1 mysqltest.1 -MAN8= mysqlmanager.8 - USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -204,12 +202,9 @@ post-patch: @${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;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/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 .else # MySQL-Scripts part diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index dd23208bcd43..65fba3fb5fb6 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.0.83.tar.gz) = 051392064a1e32cca5c23a593908b10e -SHA256 (mysql-5.0.83.tar.gz) = f7d3ac87693de8d0f4ddf457c268107b0d538a0b577f1c2596a8a28eb0bdd1c4 -SIZE (mysql-5.0.83.tar.gz) = 35937401 +MD5 (mysql-5.0.84.tar.gz) = 671348f1a5b078da9ca76f97e1fda325 +SHA256 (mysql-5.0.84.tar.gz) = 675c5875a7c836565b284088a00222a42bb5382f08842822d715771e7214be51 +SIZE (mysql-5.0.84.tar.gz) = 36177320 diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index b20e5d7226b7..6a5a8cacdeee 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -1,15 +1,6 @@ --- configure.orig Thu Jul 27 20:53:44 2006 +++ configure Thu Aug 10 10:16:48 2006 -@@ -20093,8 +20093,6 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Prevent multiple expansion - -@@ -25651,8 +25649,8 @@ +@@ -25651,8 +25651,8 @@ # Some system specific hacks # |