aboutsummaryrefslogtreecommitdiffstats
path: root/databases/mysql41-server
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2006-02-14 03:44:19 +0800
committerale <ale@FreeBSD.org>2006-02-14 03:44:19 +0800
commit1e77b65250f2f4f99aaffaf08f8998375a53c4d1 (patch)
tree68249775e9f5df9454b3b3d0fdf83bc8867f150e /databases/mysql41-server
parentb20260b0a4a21aaf7b495f447daa62216e6c64eb (diff)
downloadfreebsd-ports-gnome-1e77b65250f2f4f99aaffaf08f8998375a53c4d1.tar.gz
freebsd-ports-gnome-1e77b65250f2f4f99aaffaf08f8998375a53c4d1.tar.zst
freebsd-ports-gnome-1e77b65250f2f4f99aaffaf08f8998375a53c4d1.zip
MySQL 4.1 doesn't need newer zlib.
Reported by: mnag
Diffstat (limited to 'databases/mysql41-server')
-rw-r--r--databases/mysql41-server/Makefile10
-rw-r--r--databases/mysql41-server/pkg-plist.client3
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