diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2006-02-13 19:44:19 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2006-02-13 19:44:19 +0000 |
| commit | 83015f7ae3128ba5c1568f4d7d4b107d46598102 (patch) | |
| tree | 64a4a04c010d262f08a3e92e4c881a9ca9fccdcf /databases | |
| parent | Update to 0.2.3c. (diff) | |
MySQL 4.1 doesn't need newer zlib.
Reported by: mnag
Notes
Notes:
svn path=/head/; revision=155959
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql41-server/Makefile | 10 | ||||
| -rw-r--r-- | databases/mysql41-server/pkg-plist.client | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 2c37df1eabe1..4b7d81743d1a 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -142,7 +142,7 @@ pre-fetch: @${ECHO} "" post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @@ -175,14 +175,8 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server -.if ${OSVERSION} < 500000 -PLIST_SUB+= ZLIB="" -.else -PLIST_SUB+= ZLIB="@comment " -.endif - post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @zlib_dir@ @sql_client_dirs@ scripts @man_dirs@|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in @${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 diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index 3efd4a847590..bbb139bceb37 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -47,9 +47,6 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -%%ZLIB%%lib/mysql/libz.a -%%ZLIB%%lib/mysql/libz.so -%%ZLIB%%lib/mysql/libz.so.3 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql |