diff options
| -rw-r--r-- | databases/mysql40-server/Makefile | 52 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-man::Makefile.in | 13 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-scripts::Makefile.in | 37 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist | 19 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist.client | 3 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist.scripts | 13 |
6 files changed, 107 insertions, 30 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index b1266d9f05a7..3be1605dc20a 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mysql PORTVERSION= 4.0.18 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ @@ -100,10 +100,9 @@ CXXFLAGS+= -fno-exceptions .endif # MySQL-Server part -.if !defined(CLIENT_ONLY) -USE_PERL5_RUN= yes - -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40 +.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) +USE_MYSQL= yes +WANT_MYSQL_VER= 40 LATEST_LINK= mysql40-server @@ -112,6 +111,9 @@ CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* PLIST_SUB= DB_DIR=${DB_DIR} \ MYSQL_VERSION=${PORTVERSION} +MAN1= isamchk.1 isamlog.1 mysqlaccess.1 mysqld.1 \ + mysqld_safe.1 perror.1 replace.1 + DOCS= manual.html manual.txt manual_toc.html INFO= mysql @@ -138,7 +140,9 @@ pre-fetch: @${ECHO} "" post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|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 post-build: @@ -176,15 +180,14 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir -# MySQL-Client part .else +# MySQL-Client part +.if defined(CLIENT_ONLY) LATEST_LINK= mysql40-client CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* -MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ - mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 +MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -192,11 +195,38 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql CONFIGURE_ARGS+=--without-server post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 + +.else +# MySQL-Scripts part +USE_MYSQL= yes +WANT_MYSQL_VER= 40 +USE_PERL5= yes + +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40 + +LATEST_LINK= mysql40-scripts + +CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[1-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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.endif .endif .include <bsd.port.post.mk> diff --git a/databases/mysql40-server/files/patch-man::Makefile.in b/databases/mysql40-server/files/patch-man::Makefile.in new file mode 100644 index 000000000000..86d18cec61b2 --- /dev/null +++ b/databases/mysql40-server/files/patch-man::Makefile.in @@ -0,0 +1,13 @@ +--- man/Makefile.in.orig Mon Feb 23 14:54:10 2004 ++++ man/Makefile.in Mon Feb 23 14:54:34 2004 +@@ -272,9 +272,7 @@ + vio_dir = @vio_dir@ + vio_libs = @vio_libs@ + +-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ +- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ +- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 ++man_MANS = + + + EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \ diff --git a/databases/mysql40-server/files/patch-scripts::Makefile.in b/databases/mysql40-server/files/patch-scripts::Makefile.in new file mode 100644 index 000000000000..92cc61a9138c --- /dev/null +++ b/databases/mysql40-server/files/patch-scripts::Makefile.in @@ -0,0 +1,37 @@ +--- scripts/Makefile.in.orig Mon Feb 23 13:02:34 2004 ++++ scripts/Makefile.in Mon Feb 23 13:04:46 2004 +@@ -271,24 +271,7 @@ + vio_dir = @vio_dir@ + vio_libs = @vio_libs@ + +-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 ++bin_SCRIPTS = + + + EXTRA_SCRIPTS = make_binary_distribution.sh \ +@@ -463,7 +446,7 @@ + uninstall: uninstall-am + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + + installcheck: installcheck-am + install-strip: diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index d9ee9aaba144..d962edad5dce 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -1,32 +1,15 @@ bin/comp_err bin/isamchk bin/isamlog -bin/make_win_src_distribution -bin/msql2mysql bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_explain_log -bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_fix_privilege_tables bin/mysql_install bin/mysql_install_db -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_tableinfo bin/mysql_waitpid -bin/mysql_zap -bin/mysqlaccess -bin/mysqlbug -bin/mysqld_multi bin/mysqld_safe -bin/mysqldumpslow -bin/mysqlhotcopy bin/pack_isam bin/perror bin/replace @@ -100,7 +83,6 @@ share/mysql/Info.plist share/mysql/MySQL-shared-compat.spec share/mysql/StartupParameters.plist share/mysql/binary-configure -share/mysql/make_sharedlib_distribution share/mysql/postinstall share/mysql/preinstall share/mysql/charsets/Index @@ -151,7 +133,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client index 0a3d53fda709..23923af6512a 100644 --- a/databases/mysql40-server/pkg-plist.client +++ b/databases/mysql40-server/pkg-plist.client @@ -1,6 +1,9 @@ bin/mysql +bin/mysql_config +bin/mysql_fix_privilege_tables bin/mysqladmin bin/mysqlbinlog +bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqlimport diff --git a/databases/mysql40-server/pkg-plist.scripts b/databases/mysql40-server/pkg-plist.scripts new file mode 100644 index 000000000000..f77f27a1839c --- /dev/null +++ b/databases/mysql40-server/pkg-plist.scripts @@ -0,0 +1,13 @@ +bin/msql2mysql +bin/mysql_convert_table_format +bin/mysql_explain_log +bin/mysql_find_rows +bin/mysql_fix_extensions +bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_zap +bin/mysqlaccess +bin/mysqld_multi +bin/mysqldumpslow +bin/mysqlhotcopy |