Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Aug 2014 18:52:31 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366665 - head/databases/mysql51-server
Message-ID:  <201408301852.s7UIqVXI094091@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Aug 30 18:52:30 2014
New Revision: 366665
URL: http://svnweb.freebsd.org/changeset/ports/366665
QAT: https://qat.redports.org/buildarchive/r366665/

Log:
  - Add USES=libtool
  - Stop using PTHREAD_CFLAGS and PTHREAD_LIBS

Modified:
  head/databases/mysql51-server/Makefile
  head/databases/mysql51-server/pkg-plist
  head/databases/mysql51-server/pkg-plist.client

Modified: head/databases/mysql51-server/Makefile
==============================================================================
--- head/databases/mysql51-server/Makefile	Sat Aug 30 18:47:50 2014	(r366664)
+++ head/databases/mysql51-server/Makefile	Sat Aug 30 18:52:30 2014	(r366665)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.73
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
@@ -15,7 +15,7 @@ COMMENT?=	Multithreaded SQL database (se
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 GNU_CONFIGURE=	yes
 
-USES+=		makeinfo
+USES+=		libtool makeinfo
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
@@ -23,6 +23,7 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/
 		--with-libwrap \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
+		--with-named-thread-libs=-pthread \
 		--enable-thread-safe-client
 
 CONFIGURE_ENV=	mysql_cv_btype_last_arg_accept=socklen_t
@@ -77,9 +78,6 @@ BROKEN=		Does not compile on arm
 CONFIGURE_ARGS+=--enable-assembler
 .endif
 
-CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-
 .if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CFLAGS+=	-fno-gcse

Modified: head/databases/mysql51-server/pkg-plist
==============================================================================
--- head/databases/mysql51-server/pkg-plist	Sat Aug 30 18:47:50 2014	(r366664)
+++ head/databases/mysql51-server/pkg-plist	Sat Aug 30 18:52:30 2014	(r366665)
@@ -70,26 +70,26 @@ lib/mysql/libmysqld.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
-%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
+%%NDB%%lib/mysql/libndbclient.so.3.0.0
 lib/mysql/libvio.a
 %%PLUGINS%%lib/mysql/plugin/ha_example.a
-%%PLUGINS%%lib/mysql/plugin/ha_example.la
 %%PLUGINS%%lib/mysql/plugin/ha_example.so
 %%PLUGINS%%lib/mysql/plugin/ha_example.so.0
+%%PLUGINS%%lib/mysql/plugin/ha_example.so.0.0.0
 %%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.a
-%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.la
 %%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.so
 %%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.so.0
+%%PLUGINS%%lib/mysql/plugin/ha_innodb_plugin.so.0.0.0
 %%PLUGINS%%lib/mysql/plugin/libdaemon_example.a
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
 %%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
 %%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0.0.0
 %%PLUGINS%%lib/mysql/plugin/mypluglib.a
-%%PLUGINS%%lib/mysql/plugin/mypluglib.la
 %%PLUGINS%%lib/mysql/plugin/mypluglib.so
 %%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0.0.0
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd

Modified: head/databases/mysql51-server/pkg-plist.client
==============================================================================
--- head/databases/mysql51-server/pkg-plist.client	Sat Aug 30 18:47:50 2014	(r366664)
+++ head/databases/mysql51-server/pkg-plist.client	Sat Aug 30 18:52:30 2014	(r366665)
@@ -45,13 +45,13 @@ include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
 lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.16
+lib/mysql/libmysqlclient.so.16.0.0
 lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.la
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.16
+lib/mysql/libmysqlclient_r.so.16.0.0
 man/man1/mysql.1.gz
 man/man1/mysql_config.1.gz
 man/man1/mysql_upgrade.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408301852.s7UIqVXI094091>