diff options
| author | tijl <tijl@FreeBSD.org> | 2014-08-31 02:52:30 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-08-31 02:52:30 +0800 |
| commit | 55d408a71bbddd4421f07d3d9a52f45cdd020914 (patch) | |
| tree | 12bd33797ab8c77cb44a8de1974f55999783f64b | |
| parent | 4c6233b50f10ccf6fd62415e8d26adb3078c8480 (diff) | |
| download | freebsd-ports-gnome-55d408a71bbddd4421f07d3d9a52f45cdd020914.tar.gz freebsd-ports-gnome-55d408a71bbddd4421f07d3d9a52f45cdd020914.tar.zst freebsd-ports-gnome-55d408a71bbddd4421f07d3d9a52f45cdd020914.zip | |
- Add USES=libtool
- Stop using PTHREAD_CFLAGS and PTHREAD_LIBS
| -rw-r--r-- | databases/mysql51-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/mysql51-server/pkg-plist | 10 | ||||
| -rw-r--r-- | databases/mysql51-server/pkg-plist.client | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 6cbb9b029df0..8aac649a46de 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -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 (server) 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/mysql \ --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 diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 0b2082190068..99d5ba8467d2 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -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 diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index 502cfa0ceb15..d11160394a6c 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -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 |