diff options
Diffstat (limited to 'databases/mysql41-server/Makefile')
| -rw-r--r-- | databases/mysql41-server/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 0c22a3e2496a..2c37df1eabe1 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.1.16 +PORTVERSION= 4.1.18 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -18,7 +18,6 @@ COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql41-client USE_AUTOTOOLS= libtool:15 -USE_REINPLACE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -143,7 +142,7 @@ pre-fetch: @${ECHO} "" post-patch: - @${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|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @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 @@ -153,8 +152,6 @@ post-patch: .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc .endif - @${ECHO_CMD} "-- fill_help_tables.sql is broken in 4.1.16 release" \ - > ${WRKSRC}/scripts/fill_help_tables.sql post-install: .if !defined(PACKAGE_BUILDING) @@ -178,8 +175,14 @@ 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 @sql_client_dirs@ scripts @man_dirs@|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @zlib_dir@ @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 |