From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 6 11:50:02 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 1B16816A41C for ; Mon, 6 Jun 2005 11:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C5C143D5D for ; Mon, 6 Jun 2005 11:50:01 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j56Bo1nZ074897 for ; Mon, 6 Jun 2005 11:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j56Bo1aa074896; Mon, 6 Jun 2005 11:50:01 GMT (envelope-from gnats) Resent-Date: Mon, 6 Jun 2005 11:50:01 GMT Resent-Message-Id: <200506061150.j56Bo1aa074896@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, Phil Pennock Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1613E16A41C for ; Mon, 6 Jun 2005 11:48:39 +0000 (GMT) (envelope-from pdp@nl.demon.net) Received: from hermes.mail.nl.demon.net (hermes.mail.nl.demon.net [194.159.72.197]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCA4B43D55 for ; Mon, 6 Jun 2005 11:48:38 +0000 (GMT) (envelope-from pdp@nl.demon.net) Received: from algemeen-01.server.nl.demon.net ([194.159.72.211]:50524) by hermes.mail.nl.demon.net with esmtp (Exim 4.43) id 1DfG5t-0003lv-E8 for FreeBSD-gnats-submit@freebsd.org; Mon, 06 Jun 2005 11:48:37 +0000 Received: from pdp by algemeen-01.server.nl.demon.net with local (Exim 4.51 (FreeBSD)) id 1DfG5t-000Gca-CT for FreeBSD-gnats-submit@freebsd.org; Mon, 06 Jun 2005 11:48:37 +0000 Message-Id: Date: Mon, 06 Jun 2005 11:48:37 +0000 From: Phil Pennock To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/81950: ruby-mysql Makefile broken for mysql dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Phil Pennock List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 11:50:02 -0000 >Number: 81950 >Category: ports >Synopsis: ruby-mysql Makefile broken for mysql dependency >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jun 06 11:50:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Phil Pennock >Release: FreeBSD 5.4-RELEASE-p1 i386 >Organization: Thus Plc, Demon Netherlands >Environment: System: FreeBSD algemeen-01.server.nl.demon.net 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Fri Jun 3 11:47:14 UTC 2005 root@xxxx.xxxx.xxx:/usr/src/sys/i386/compile/XXXXXXX i386 >Description: The Port databases/ruby-mysql has a Makefile which attempts to depend upon the correct version of mysqlclient, depending upon which version exists in the file-system. It doesn't work, because it uses ${LOCALBASE} but only has a .include for bsd.port.mk at the end, so ${LOCALBASE} isn't defined at the point in parsing where it's required. >How-To-Repeat: install mysql41-client attempt to install ruby-mysql watch as system attempts to install mysql-4.0.x. >Fix: Patch against: ports/databases/ruby-mysql/Makefile,v 1.22 This patch moves to using bsd.port.pre.mk and bsd.port.post.mk; it collapses a nested .else/.if into an .elif; it moves the USE_RUBY* variables up, so that they're defined before bsd.port.pre.mk inclusion so that the correct build methods are defined. --- Makefile.old Mon Jan 31 17:10:40 2005 +++ Makefile Mon Jun 6 11:40:31 2005 @@ -16,18 +16,18 @@ MAINTAINER= knu@FreeBSD.org COMMENT= Ruby module for accessing MySQL databases with a C API like interface +USE_RUBY= yes +USE_RUBY_EXTCONF= yes + +.include + .if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -.else -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) LIB_DEPENDS= mysqlclient.14:${PORTSDIR}/databases/mysql41-client .else LIB_DEPENDS= mysqlclient.12:${PORTSDIR}/databases/mysql40-client .endif -.endif - -USE_RUBY= yes -USE_RUBY_EXTCONF= yes CONFIGURE_ARGS= --with-mysql-dir="${LOCALBASE}" INSTALL_TARGET= site-install @@ -41,4 +41,4 @@ ${LN} -fs ../tommy.css ${RUBY_MODDOCDIR}/ja/ .endif -.include +.include >Release-Note: >Audit-Trail: >Unformatted: