7 files changed, 45 insertions, 14 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 604851f8992d..41d8e5356e24 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -14,5 +14,4 @@ PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql51-scripts/Makefile b/databases/mysql51-scripts/Makefile
index 9dd789873e95..933b25fb4577 100644
--- a/databases/mysql51-scripts/Makefile
+++ b/databases/mysql51-scripts/Makefile
@@ -15,5 +15,4 @@ PLIST=		${PKGDIR}/pkg-plist.scripts
 SCRIPTS_ONLY=	yes
 USES=		perl5
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 5931823477aa..1c21a07d5f14 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.72
+PORTVERSION=	5.1.73
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -62,7 +62,6 @@ CONFIGURE_ARGS+=--with-plugins=max-no-ndb
 CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
@@ -153,11 +152,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
 .endif
 
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${CAT} ${PKGMESSAGE}
-.endif
-
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
@@ -180,7 +174,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
 
 .else
 # MySQL-Scripts part
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index e9e08f7c8f90..52c9929fb70b 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.1.72.tar.gz) = c414a64722ffa89d315152a030661d34764894e293e33792809cea61c8a5303e
-SIZE (mysql-5.1.72.tar.gz) = 24044338
+SHA256 (mysql-5.1.73.tar.gz) = 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5
+SIZE (mysql-5.1.73.tar.gz) = 24023347
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 21d072ef1dd4..0b2082190068 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,4 +1,3 @@
-@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -95,6 +94,23 @@ libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
 %%NDB%%libexec/ndbd
+man/man1/innochecksum.1.gz
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_client_test_embedded.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqltest_embedded.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
@@ -168,7 +184,7 @@ libexec/mysqld
 %%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
-@dirrmtry include/mysql
+%%NDB%%@dirrmtry include/mysql
 @dirrmtry lib/mysql/plugin
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index 1813c8a26bbb..502cfa0ceb15 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -52,6 +52,18 @@ lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.la
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.16
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlbug.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+man/man1/mysqltest.1.gz
 share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
diff --git a/databases/mysql51-server/pkg-plist.scripts b/databases/mysql51-server/pkg-plist.scripts
index b0a603760ef0..c4ab6d26c67f 100644
--- a/databases/mysql51-server/pkg-plist.scripts
+++ b/databases/mysql51-server/pkg-plist.scripts
@@ -9,3 +9,14 @@ bin/mysqlaccess
 bin/mysqld_multi
 bin/mysqldumpslow
 bin/mysqlhotcopy
+man/man1/msql2mysql.1.gz
+man/man1/mysql_convert_table_format.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_fix_extensions.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+man/man1/mysql_zap.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz