From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 12 20:10:12 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCFE316A4CF for ; Wed, 12 Nov 2003 20:10:11 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 749E943FBF for ; Wed, 12 Nov 2003 20:10:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAD4A7FY080257 for ; Wed, 12 Nov 2003 20:10:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAD4A7LP080256; Wed, 12 Nov 2003 20:10:07 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 12 Nov 2003 20:10:07 -0800 (PST) Resent-Message-Id: <200311130410.hAD4A7LP080256@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergey Matveychuk Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D98E816A4CE for ; Wed, 12 Nov 2003 20:01:12 -0800 (PST) Received: from hueymiccailhuitl.mtu.ru (hueytecuilhuitl.mtu.ru [195.34.32.123]) by mx1.FreeBSD.org (Postfix) with ESMTP id 741AE43FEA for ; Wed, 12 Nov 2003 20:01:11 -0800 (PST) (envelope-from sem@Current.sem-home.ciam.ru) Received: from Current.sem-home.ciam.ru (ppp138-215.dialup.mtu-net.ru [62.118.138.215]) by hueymiccailhuitl.mtu.ru (Postfix) with ESMTP id 56774F9742 for ; Thu, 13 Nov 2003 07:01:09 +0300 (MSK) (envelope-from sem@Current.sem-home.ciam.ru) Received: from sem by Current.sem-home.ciam.ru with local (Exim 4.24; FreeBSD 5.1) id 1AJyS8-0002to-TD for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Nov 2003 20:06:48 +0300 Message-Id: Date: Wed, 12 Nov 2003 20:06:48 +0300 From: Sergey Matveychuk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/59242: bsd.port.mk: MYSQL_VER - beautify with "." X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sergey Matveychuk List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Nov 2003 04:10:12 -0000 X-List-Received-Date: Thu, 13 Nov 2003 04:10:12 -0000 >Number: 59242 >Category: ports >Synopsis: bsd.port.mk: MYSQL_VER - beautify with "." >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: Wed Nov 12 20:10:06 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergey Matveychuk >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD Current.sem-home.ciam.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Sun Oct 19 08:20:34 MSD 2003 root@current-test.sem-home.ciam.ru:/usr/obj/usr/src/sys/CURRENT i386 >Description: Now MySQL version looks like 323, 40, 41 It will looks better with ".": 3.23, 4.0, 4.1 A patch keeps backward compatibles >How-To-Repeat: >Fix: --- bsd.port.mk.diff begins here --- --- bsd.port.mk.1.473 Mon Nov 10 10:13:30 2003 +++ bsd.port.mk Wed Nov 12 19:57:40 2003 @@ -1622,9 +1622,9 @@ .endif .if defined(USE_MYSQL) -DEFAULT_MYSQL_VER?= 40 +DEFAULT_MYSQL_VER?= 4.0 # MySQL client version currently supported. -MYSQL323_LIBVER=10 +MYSQL323_LIBVER= 10 MYSQL40_LIBVER= 12 MYSQL41_LIBVER= 14 @@ -1634,25 +1634,25 @@ .elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} .elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL323_LIBVER}) -MYSQL_VER= 323 +MYSQL_VER= 3.23 .elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER}) -MYSQL_VER= 40 +MYSQL_VER= 4.0 .elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER}) -MYSQL_VER= 41 +MYSQL_VER= 4.1 .else MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif # WANT_MYSQL # And now we are checking if we can use it -.if exists(${PORTSDIR}/databases/mysql${MYSQL_VER}-client) +.if exists(${PORTSDIR}/databases/mysql${MYSQL_VER:S/.//g}-client) .if defined(BROKEN_WITH_MYSQL) . for VER in ${BROKEN_WITH_MYSQL} -. if (${MYSQL_VER} == "${VER}") +. if (${MYSQL_VER:S/.//g} == "${VER:S/.//g}") BROKEN= "Doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${BROKEN_WITH_MYSQL})" . endif . endfor .endif # BROKEN_WITH_MYSQL -LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client +LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER:S/.//g}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER:S/.//g}-client .else BROKEN= "unknown MySQL version: ${MYSQL_VER}" .endif # Check for correct libs --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: