[Midnightbsd-cvs] mports [18049] trunk/databases/mysql51-server: fix some issues with the plist and depends after recent refactoring of mports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 6 20:04:46 EST 2015
Revision: 18049
http://svnweb.midnightbsd.org/mports/?rev=18049
Author: laffer1
Date: 2015-03-06 20:04:45 -0500 (Fri, 06 Mar 2015)
Log Message:
-----------
fix some issues with the plist and depends after recent refactoring of mports
Modified Paths:
--------------
trunk/databases/mysql51-server/Makefile
trunk/databases/mysql51-server/pkg-plist.client
Added Paths:
-----------
trunk/databases/mysql51-server/files/patch-Docs__Makefile.in
trunk/databases/mysql51-server/files/patch-man__Makefile.in
trunk/databases/mysql51-server/files/patch-scripts__Makefile.in
trunk/databases/mysql51-server/files/patch-sql__mysqld.cc
Removed Paths:
-------------
trunk/databases/mysql51-server/files/patch-Docs::Makefile.in
trunk/databases/mysql51-server/files/patch-man::Makefile.in
trunk/databases/mysql51-server/files/patch-scripts::Makefile.in
trunk/databases/mysql51-server/files/patch-sql::mysqld.cc
Modified: trunk/databases/mysql51-server/Makefile
===================================================================
--- trunk/databases/mysql51-server/Makefile 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/Makefile 2015-03-07 01:04:45 UTC (rev 18049)
@@ -2,7 +2,7 @@
PORTNAME?= mysql
PORTVERSION= 5.1.73
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
@@ -14,8 +14,9 @@
LICENSE= gpl2
SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts
-USES= libtool
-USE_GMAKE= yes
+
+GNU_CONFIGURE= yes
+USES+= libtool makeinfo
CONFIGURE_TARGET=${MACHINE_ARCH}-portbld-freebsd9.1
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
@@ -24,7 +25,9 @@
--with-libwrap \
--with-low-memory \
--with-comment='MidnightBSD port: ${PKGNAME}' \
+ --with-named-thread-libs=-pthread \
--enable-thread-safe-client
+CONFIGURE_ENV= mysql_cv_btype_last_arg_accept=socklen_t
.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
@@ -61,6 +64,9 @@
.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
.endif
+.if defined(CLIENT_ONLY)
+USES+= readline
+.endif
.include <bsd.port.pre.mk>
@@ -67,17 +73,6 @@
.if ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-assembler
.endif
-.if defined(WITH_LINUXTHREADS)
-CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-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
-LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads
-CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
-.else
-CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
-CFLAGS+= ${PTHREAD_CFLAGS}
-.endif
.if defined(BUILD_OPTIMIZED)
CFLAGS+= -O3 -fno-omit-frame-pointer
@@ -95,7 +90,7 @@
CONFLICTS= mysql-server-[34].* mysql-server-5.[02-9].*
-USE_RC_SUBR= mysql-server.sh
+USE_RC_SUBR= mysql-server
USERS= mysql
GROUPS= mysql
Deleted: trunk/databases/mysql51-server/files/patch-Docs::Makefile.in
===================================================================
--- trunk/databases/mysql51-server/files/patch-Docs::Makefile.in 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/files/patch-Docs::Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -1,20 +0,0 @@
---- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100
-+++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100
-@@ -368,7 +368,7 @@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
- EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
--all: all-am
-+all:
-
- .SUFFIXES:
- $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-@@ -453,7 +453,7 @@
- install-data: install-data-am
- uninstall: uninstall-am
-
--install-am: all-am
-+install-am:
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
Copied: trunk/databases/mysql51-server/files/patch-Docs__Makefile.in (from rev 18030, trunk/databases/mysql51-server/files/patch-Docs::Makefile.in)
===================================================================
--- trunk/databases/mysql51-server/files/patch-Docs__Makefile.in (rev 0)
+++ trunk/databases/mysql51-server/files/patch-Docs__Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -0,0 +1,20 @@
+--- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100
++++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100
+@@ -368,7 +368,7 @@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
+-all: all-am
++all:
+
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+@@ -453,7 +453,7 @@
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+-install-am: all-am
++install-am:
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+ installcheck: installcheck-am
Deleted: trunk/databases/mysql51-server/files/patch-man::Makefile.in
===================================================================
--- trunk/databases/mysql51-server/files/patch-man::Makefile.in 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/files/patch-man::Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig Thu Oct 26 14:03:04 2006
-+++ man/Makefile.in Tue Nov 7 08:19:50 2006
-@@ -363,8 +363,8 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
--man1_MANS = @man1_files@
--man8_MANS = @man8_files@
-+man1_MANS =
-+man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
- all: all-am
-
Copied: trunk/databases/mysql51-server/files/patch-man__Makefile.in (from rev 18030, trunk/databases/mysql51-server/files/patch-man::Makefile.in)
===================================================================
--- trunk/databases/mysql51-server/files/patch-man__Makefile.in (rev 0)
+++ trunk/databases/mysql51-server/files/patch-man__Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -0,0 +1,13 @@
+--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006
++++ man/Makefile.in Tue Nov 7 08:19:50 2006
+@@ -363,8 +363,8 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
++man1_MANS =
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
+
Deleted: trunk/databases/mysql51-server/files/patch-scripts::Makefile.in
===================================================================
--- trunk/databases/mysql51-server/files/patch-scripts::Makefile.in 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/files/patch-scripts::Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -1,38 +0,0 @@
---- scripts/Makefile.in.orig Tue May 8 11:42:25 2007
-+++ scripts/Makefile.in Thu May 17 09:30:48 2007
-@@ -399,21 +399,7 @@
- BUILT_SOURCES = mysql_fix_privilege_tables.sql \
- mysql_fix_privilege_tables_sql.c
-
--bin_SCRIPTS = @server_scripts@ \
-- msql2mysql \
-- mysql_config \
-- mysql_fix_privilege_tables \
-- mysql_fix_extensions \
-- mysql_setpermission \
-- mysql_secure_installation \
-- mysql_zap \
-- mysqlaccess \
-- mysqlbug \
-- mysql_convert_table_format \
-- mysql_find_rows \
-- mysqlhotcopy \
-- mysqldumpslow \
-- mysqld_multi
-+bin_SCRIPTS =
-
- noinst_SCRIPTS = make_binary_distribution \
- make_sharedlib_distribution
-@@ -445,11 +431,7 @@
- mysql_system_tables_fix.sql \
- CMakeLists.txt
-
--dist_pkgdata_DATA = fill_help_tables.sql \
-- mysql_fix_privilege_tables.sql \
-- mysql_system_tables.sql \
-- mysql_system_tables_data.sql \
-- mysql_test_data_timezone.sql
-+dist_pkgdata_DATA =
-
- CLEANFILES = @server_scripts@ \
- make_binary_distribution \
Copied: trunk/databases/mysql51-server/files/patch-scripts__Makefile.in (from rev 18030, trunk/databases/mysql51-server/files/patch-scripts::Makefile.in)
===================================================================
--- trunk/databases/mysql51-server/files/patch-scripts__Makefile.in (rev 0)
+++ trunk/databases/mysql51-server/files/patch-scripts__Makefile.in 2015-03-07 01:04:45 UTC (rev 18049)
@@ -0,0 +1,38 @@
+--- scripts/Makefile.in.orig Tue May 8 11:42:25 2007
++++ scripts/Makefile.in Thu May 17 09:30:48 2007
+@@ -399,21 +399,7 @@
+ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+ mysql_fix_privilege_tables_sql.c
+
+-bin_SCRIPTS = @server_scripts@ \
+- msql2mysql \
+- mysql_config \
+- mysql_fix_privilege_tables \
+- mysql_fix_extensions \
+- mysql_setpermission \
+- mysql_secure_installation \
+- mysql_zap \
+- mysqlaccess \
+- mysqlbug \
+- mysql_convert_table_format \
+- mysql_find_rows \
+- mysqlhotcopy \
+- mysqldumpslow \
+- mysqld_multi
++bin_SCRIPTS =
+
+ noinst_SCRIPTS = make_binary_distribution \
+ make_sharedlib_distribution
+@@ -445,11 +431,7 @@
+ mysql_system_tables_fix.sql \
+ CMakeLists.txt
+
+-dist_pkgdata_DATA = fill_help_tables.sql \
+- mysql_fix_privilege_tables.sql \
+- mysql_system_tables.sql \
+- mysql_system_tables_data.sql \
+- mysql_test_data_timezone.sql
++dist_pkgdata_DATA =
+
+ CLEANFILES = @server_scripts@ \
+ make_binary_distribution \
Deleted: trunk/databases/mysql51-server/files/patch-sql::mysqld.cc
===================================================================
--- trunk/databases/mysql51-server/files/patch-sql::mysqld.cc 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/files/patch-sql::mysqld.cc 2015-03-07 01:04:45 UTC (rev 18049)
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005
-+++ sql/mysqld.cc Sun Aug 28 20:41:38 2005
-@@ -3177,7 +3177,7 @@
- init_ssl();
-
- #ifdef HAVE_LIBWRAP
-- libwrapName= my_progname+dirname_length(my_progname);
-+ libwrapName= (char *) my_progname+dirname_length(my_progname);
- openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
-
Copied: trunk/databases/mysql51-server/files/patch-sql__mysqld.cc (from rev 18030, trunk/databases/mysql51-server/files/patch-sql::mysqld.cc)
===================================================================
--- trunk/databases/mysql51-server/files/patch-sql__mysqld.cc (rev 0)
+++ trunk/databases/mysql51-server/files/patch-sql__mysqld.cc 2015-03-07 01:04:45 UTC (rev 18049)
@@ -0,0 +1,11 @@
+--- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005
++++ sql/mysqld.cc Sun Aug 28 20:41:38 2005
+@@ -3177,7 +3177,7 @@
+ init_ssl();
+
+ #ifdef HAVE_LIBWRAP
+- libwrapName= my_progname+dirname_length(my_progname);
++ libwrapName= (char *) my_progname+dirname_length(my_progname);
+ openlog(libwrapName, LOG_PID, LOG_AUTH);
+ #endif
+
Modified: trunk/databases/mysql51-server/pkg-plist.client
===================================================================
--- trunk/databases/mysql51-server/pkg-plist.client 2015-03-06 01:46:33 UTC (rev 18048)
+++ trunk/databases/mysql51-server/pkg-plist.client 2015-03-07 01:04:45 UTC (rev 18049)
@@ -45,13 +45,13 @@
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
More information about the Midnightbsd-cvs
mailing list