Date: Sat, 31 Dec 2011 04:17:22 GMT From: Doug Barton <dougb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163728: Improve MySQL options for lang/newlisp Message-ID: <201112310417.pBV4HMYj045573@freefall.freebsd.org> Resent-Message-ID: <201112310420.pBV4KBZl045915@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163728 >Category: ports >Synopsis: Improve MySQL options for lang/newlisp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 31 04:20:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Doug Barton >Release: FreeBSD 8.2-STABLE i386 >Organization: AAAG >Environment: DNA >Description: Currently the port has 2 OPTIONS for specific versions of MySQL. It's better to allow the infrastructure to make the appropriate decision for which version to use. The attached patch removes the specific MySQL versions for the more generic option. This will allow the infrastructure to detect and use an already installed version, or to use the default (currently 55) if there is no version currently installed. I've tested this with 3 states, MYSQL OPTION off, with it on and no MySQL installed, and on with an existing version. It does the right thing for all 3 states. I've also tested the resulting binary with mariadb (MYSQL_VER= 52) and it seems fine. If there is a specific version that it does not work with, it can be eliminated with IGNORE_WITH_MYSQL. >How-To-Repeat: See above. >Fix: Apply the following patch. Index: Makefile =================================================================== RCS file: /home/pcvs/ports/lang/newlisp/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- Makefile 22 Dec 2011 14:38:03 -0000 1.27 +++ Makefile 31 Dec 2011 03:56:01 -0000 @@ -32,8 +32,7 @@ newlisp_index.html newlisp_manual.html \ OPTIONS= GMP "Enable GMP math library support" off \ - MYSQL5 "Build with mysql 5.0.x support" off \ - MYSQL51 "Build with mysql 5.1.x support" off \ + MYSQL "Build with mysql support" off \ PGSQL "Build with postgresql support" off \ SQLITE "Build with sqlite support" off \ GUISERV "Install GUI server (in JAVA)" off @@ -52,22 +51,12 @@ PLIST_SUB+= GMP="@comment " .endif -.if defined(WITH_MYSQL5) -USE_MYSQL=yes -WITH_MYSQL_VER= 50 +.if defined(WITH_MYSQL) +USE_MYSQL= yes MODULES+= mysql -PLIST_SUB+= MYSQL5="" +PLIST_SUB+= MYSQL="" .else -PLIST_SUB+= MYSQL5="@comment " -.endif - -.if defined(WITH_MYSQL51) -USE_MYSQL=yes -WITH_MYSQL_VER= 51 -MODULES+= mysql -PLIST_SUB+= MYSQL51="" -.else -PLIST_SUB+= MYSQL51="@comment " +PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/lang/newlisp/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- pkg-plist 22 Dec 2011 14:38:03 -0000 1.15 +++ pkg-plist 31 Dec 2011 03:56:01 -0000 @@ -75,8 +75,7 @@ %%DATADIR%%/modules/infix.lsp %%DATADIR%%/modules/json.lsp %%DATADIR%%/modules/macro.lsp -%%MYSQL51%%%%DATADIR%%/modules/mysql.lsp -%%MYSQL5%%%%DATADIR%%/modules/mysql.lsp +%%MYSQL%%%%DATADIR%%/modules/mysql.lsp %%DATADIR%%/modules/odbc.lsp %%DATADIR%%/modules/pop3.lsp %%PGSQL%%%%DATADIR%%/modules/postgres.lsp >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112310417.pBV4HMYj045573>