Re: git: 1c1e0975ade6 - main - databases/mysql-connector-odbc: remove expired port
Date: Sat, 18 Feb 2023 22:01:23 UTC
Unless you are confused or watching the logs of mysql exp-run for changing the default version this is not correct. Just for the sake of the conversation I have rebuilt the ports with now mysql 5.7 as default and here are the results: https://pdr.bofh.network/data/latest-per-pkg/mysql-connector-odbc-unixodbc-mysql57/5.3.14/123-default.log https://pdr.bofh.network/data/latest-per-pkg/mysql-connector-odbc-unixodbc-mysql57/5.3.14/123i386-default.log https://pdr.bofh.network/data/latest-per-pkg/mysql-connector-odbc-unixodbc-mysql57/5.3.14/131-default.log And neither do I see any PKGBASE conflicts: cd databases/mysql-connector-odbc && make -v PKGBASE cd databases/mysql-connector-odbc-80 && mysql-connector-odbc-unixodbc-mysql57 make -v PKGBASE mysql-connector-odbc-unixodbc-mysql80 Please revert. Kind regards, Moin > On Feb 18, 2023, at 9:40 PM, Antoine Brodin <antoine@FreeBSD.org> wrote: > > On Sat, Feb 18, 2023 at 8:16 PM Moin Rahman <bofh@freebsd.org> wrote: >> >> Why did you expire this port? This is marked to expire on 2012-12-31. > > It has not been built for months (ignored) and its PKGBASE now > collides with mysql-connector-odbc-80. > > Antoine > >> On Feb 18, 2023, at 9:07 PM, Antoine Brodin <antoine@FreeBSD.org> wrote: >> >> The branch main has been updated by antoine: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=1c1e0975ade679a1f13c10709cf443bc82dde3b9 >> >> commit 1c1e0975ade679a1f13c10709cf443bc82dde3b9 >> Author: Antoine Brodin <antoine@FreeBSD.org> >> AuthorDate: 2023-02-18 20:06:29 +0000 >> Commit: Antoine Brodin <antoine@FreeBSD.org> >> CommitDate: 2023-02-18 20:06:29 +0000 >> >> databases/mysql-connector-odbc: remove expired port >> --- >> MOVED | 1 + >> databases/Makefile | 1 - >> databases/mysql-connector-odbc/Makefile | 38 ---------------------- >> databases/mysql-connector-odbc/distinfo | 3 -- >> .../files/patch-CMakeLists.txt | 30 ----------------- >> .../mysql-connector-odbc/files/patch-driver_dll.cc | 11 ------- >> .../files/patch-driver_handle.cc | 11 ------- >> databases/mysql-connector-odbc/pkg-descr | 1 - >> 8 files changed, 1 insertion(+), 95 deletions(-) >> >> diff --git a/MOVED b/MOVED >> index bfe2d1dcb026..6823b3c2e314 100644 >> --- a/MOVED >> +++ b/MOVED >> @@ -17765,3 +17765,4 @@ x11/plasma5-kwayland-server|x11-wm/plasma5-kwin|2023-02-07|Reintegrated into x11 >> finance/py-TA-Lib|finance/py-ta-lib|2023-02-12|Remove duplicate port >> x11-toolkits/gnocl||2023-02-13|Fails to build, newer snapshot depends on a removed port >> games/opendungeons||2023-02-14|Has expired: Broken for more than 6 months >> +databases/mysql-connector-odbc|databases/mysql-connector-odbc-80|2023-02-18|Has expired: Requires EOLd mysql version >> diff --git a/databases/Makefile b/databases/Makefile >> index 3a6cbb867cc9..598e34d376ae 100644 >> --- a/databases/Makefile >> +++ b/databases/Makefile >> @@ -204,7 +204,6 @@ >> SUBDIR += mysql-connector-c++ >> SUBDIR += mysql-connector-java >> SUBDIR += mysql-connector-java51 >> - SUBDIR += mysql-connector-odbc >> SUBDIR += mysql-connector-odbc-80 >> SUBDIR += mysql-q4m >> SUBDIR += mysql-udf >> diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile >> deleted file mode 100644 >> index b61392aee08b..000000000000 >> --- a/databases/mysql-connector-odbc/Makefile >> +++ /dev/null >> @@ -1,38 +0,0 @@ >> -PORTNAME= mysql-connector-odbc >> -PORTVERSION= 5.3.14 >> -CATEGORIES= databases >> -MASTER_SITES= MYSQL/Connector-ODBC/5.3 >> -PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER} >> -DISTNAME= ${PORTNAME}-${PORTVERSION}-src >> - >> -MAINTAINER= bofh@FreeBSD.org >> -COMMENT= ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER} >> -WWW= https://www.mysql.com/ >> - >> -LICENSE= GPLv2 >> -LICENSE_FILE= ${WRKSRC}/LICENSE.txt >> - >> -DEPRECATED= Requires EOLd mysql version >> -EXPIRATION_DATE= 2023-12-31 >> - >> -LIB_DEPENDS= libodbc.so:databases/unixODBC >> - >> -USES= cmake compiler:c++11-lang localbase:ldflags mysql ssl >> -IGNORE_WITH_MYSQL= 101m 102m 103m 57p 57w 80 >> -USE_LDCONFIG= yes >> - >> -CMAKE_ARGS= -DDISABLE_GUI=1 \ >> - -DWITH_UNIXODBC=1 >> - >> -MAKE_JOBS_UNSAFE= yes >> - >> -DRIVER_MANAGER= unixodbc >> - >> -PLIST_FILES= bin/myodbc-installer \ >> - lib/libmyodbc5a.so \ >> - lib/libmyodbc5w.so >> -PORTDOCS= * >> - >> -OPTIONS_DEFINE= DOCS >> - >> -.include <bsd.port.mk> >> diff --git a/databases/mysql-connector-odbc/distinfo b/databases/mysql-connector-odbc/distinfo >> deleted file mode 100644 >> index 702e816bc4ff..000000000000 >> --- a/databases/mysql-connector-odbc/distinfo >> +++ /dev/null >> @@ -1,3 +0,0 @@ >> -TIMESTAMP = 1675364196 >> -SHA256 (mysql-connector-odbc-5.3.14-src.tar.gz) = 302d068ef0d8e1e9ada6e42e48c149151d4b722f9317efb106f801e483e74a7f >> -SIZE (mysql-connector-odbc-5.3.14-src.tar.gz) = 3010166 >> diff --git a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt >> deleted file mode 100644 >> index f184b2a0e6f4..000000000000 >> --- a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt >> +++ /dev/null >> @@ -1,30 +0,0 @@ >> ---- CMakeLists.txt.orig 2019-04-15 16:56:34 UTC >> -+++ CMakeLists.txt >> -@@ -431,7 +431,6 @@ ENDIF(NOT DISABLE_GUI) >> - >> - ADD_SUBDIRECTORY(dltest) >> - ADD_SUBDIRECTORY(installer) >> --ADD_SUBDIRECTORY(test) >> - >> - # For dynamic linking use the built-in sys and strings >> - IF(NOT MYSQLCLIENT_STATIC_LINKING) >> -@@ -501,8 +500,8 @@ cmake/sql.*\\\\.c$ >> - #------------ Installation --------------------------- >> - >> - >> --INSTALL(FILES LICENSE.txt DESTINATION .) >> --INSTALL(FILES README.txt DESTINATION .) >> -+INSTALL(FILES LICENSE.txt DESTINATION ./share/doc/mysql-connector-odbc/) >> -+INSTALL(FILES README.txt DESTINATION ./share/doc/mysql-connector-odbc/) >> - >> - IF(WIN32) >> - >> -@@ -542,7 +541,7 @@ IF(WIN32) >> - >> - ELSE(WIN32) >> - >> -- INSTALL(FILES ChangeLog DESTINATION .) >> -+ INSTALL(FILES ChangeLog DESTINATION ./share/doc/mysql-connector-odbc/) >> - >> - ENDIF(WIN32) >> - >> diff --git a/databases/mysql-connector-odbc/files/patch-driver_dll.cc b/databases/mysql-connector-odbc/files/patch-driver_dll.cc >> deleted file mode 100644 >> index b69ce6b9e812..000000000000 >> --- a/databases/mysql-connector-odbc/files/patch-driver_dll.cc >> +++ /dev/null >> @@ -1,11 +0,0 @@ >> ---- driver/dll.cc.orig 2019-04-15 16:56:34 UTC >> -+++ driver/dll.cc >> -@@ -125,7 +125,7 @@ void myodbc_end() >> - This eliminates the delay when mysys_end() is called and other threads >> - have been initialized but not ended. >> - */ >> -- my_thread_end_wait_time= 0; >> -+ static uint my_thread_end_wait_time= 0; >> - #endif >> - >> - /* >> diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.cc b/databases/mysql-connector-odbc/files/patch-driver_handle.cc >> deleted file mode 100644 >> index 3a12e522fa4e..000000000000 >> --- a/databases/mysql-connector-odbc/files/patch-driver_handle.cc >> +++ /dev/null >> @@ -1,11 +0,0 @@ >> ---- driver/handle.cc.orig 2019-04-15 16:56:34 UTC >> -+++ driver/handle.cc >> -@@ -646,7 +646,7 @@ SQLRETURN SQL_API my_SQLFreeStmtExtended(SQLHSTMT hstm >> - #if MYSQL_VERSION_ID >= 50722 && MYSQL_VERSION_ID < 80000 >> - if (stmt->result != NULL >> - #else >> -- if((stmt->result != NULL) && (stmt->result->field_alloc != NULL) >> -+ if((stmt->result != NULL) && (&stmt->result->field_alloc != NULL) >> - #if (!MYSQLCLIENT_STATIC_LINKING || !MYSQL8) >> - && (stmt->result->field_alloc.pre_alloc != NULL ) >> - #endif >> diff --git a/databases/mysql-connector-odbc/pkg-descr b/databases/mysql-connector-odbc/pkg-descr >> deleted file mode 100644 >> index 0441dd6a5d7f..000000000000 >> --- a/databases/mysql-connector-odbc/pkg-descr >> +++ /dev/null >> @@ -1 +0,0 @@ >> -MySQL Connector ODBC is an ODBC driver for interfacing to MySQL databases. >> >>