diff options
Diffstat (limited to 'databases/mysql55-server/Makefile')
| -rw-r--r-- | databases/mysql55-server/Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index c0710426d050..7c92a2ffaced 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.4.1 +PORTVERSION= 5.4.2 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -23,8 +23,6 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ - --infodir=${PREFIX}/info \ - --mandir=${PREFIX}/man \ --without-debug \ --without-readline \ --without-libedit \ @@ -44,13 +42,21 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) +.if !defined(WITHOUT_YASSL) CONFIGURE_ARGS+=--with-ssl=bundled +.else +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} +.endif .endif .if defined(WITH_FAST_MUTEXES) CONFIGURE_ARGS+=--with-fast-mutexes .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static +PLIST_SUB+= PLUGINS="@comment " +.else +PLIST_SUB+= PLUGINS="" .endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-plugins=max @@ -128,7 +134,8 @@ pre-fetch: @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." @${ECHO} " WITH_COLLATION=collate Define default collation (latin1_swedish_ci)." - @${ECHO} " WITH_OPENSSL=yes Enable secure connections." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections" + @${ECHO} " (define WITHOUT_YASSL for backward compatibility)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" @${ECHO} " (try it if you use libpthread)." @@ -220,7 +227,7 @@ post-patch: post-extract: @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h -.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +.if defined(WITH_OPENSSL) && defined(WITHOUT_YASSL) && defined(BUILD_STATIC) pre-configure: @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." @${FALSE} |