diff options
Diffstat (limited to 'databases/mysql60-server/Makefile')
| -rw-r--r-- | databases/mysql60-server/Makefile | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 6e2f0dcb4585..eaadc749b402 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,12 +6,10 @@ # PORTNAME?= mysql -PORTVERSION= 4.1.0 -PORTREVISION?= 1 +PORTVERSION= 4.1.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ - http://mysql.tzone.it/Downloads/MySQL-4.1/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -52,11 +50,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} == "i386" -CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db -.endif .if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .endif @@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif -.if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=i686 + +.include <bsd.port.pre.mk> + +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db .endif .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R @@ -79,23 +75,27 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 -LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif +.if ${OSVERSION} < 500000 +CXX= ${CC} +.endif +.if defined(BUILD_OPTIMIZED) CFLAGS+= -O3 -fno-omit-frame-pointer -CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti - +.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3)) +CFLAGS+= -fno-gcse +.endif +.endif +CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif -.if ${OSVERSION} < 500000 -CXX= ${CC} -.endif # MySQL-Server part .if !defined(CLIENT_ONLY) @@ -104,12 +104,12 @@ USE_PERL5_RUN= yes RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha - ONLY_FOR_ARCHS= i386 alpha sparc64 DOCS= manual.html manual.txt manual_toc.html +INFO= mysql + pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @@ -124,14 +124,17 @@ pre-fetch: @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS" @${ECHO} " reverse lookup before inserting local" @${ECHO} " hostname into mysql database" - @${ECHO} " (use if your machine has no official DNS entry)." + @${ECHO} " (use it if your machine has no official DNS entry)." + @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" + @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." + @${ECHO} " (use it if you need even more speed)." @${ECHO} "" post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g" .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: @@ -141,10 +144,10 @@ pre-configure: post-install: .if !defined(PACKAGE_BUILDING) -.if exists(${DB_DIR}) && defined(OVERWRITE_DB) +.if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no" @${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true .endif -.if !exists(${DB_DIR}) || defined(OVERWRITE_DB) +.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no") .if defined(SKIP_DNS_CHECK) ${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR} .else @@ -161,15 +164,15 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags +.endif @${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir -.endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ - mysqlshow.1 perror.1 replace.1 + mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -177,7 +180,8 @@ 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 man|g" ${WRKSRC}/Makefile.in + @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g" post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh |