From owner-freebsd-ports@FreeBSD.ORG Thu Oct 7 02:46:46 2010 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D778610656A5 for ; Thu, 7 Oct 2010 02:46:46 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 88C868FC1E for ; Thu, 7 Oct 2010 02:46:46 +0000 (UTC) Received: by vws2 with SMTP id 2so177954vws.13 for ; Wed, 06 Oct 2010 19:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:user-agent:mime-version:content-type; bh=wHkEX4uFTGJ21u2RLbqXH1WArnpFkGLapxbS/G7yGHw=; b=rpg513vEoMpHUVyV7GwU+Z0R5iyQPY3zS+wHcpqEamx/sYfjP8WlsIZBM1/arvwpoZ Du5R/v5tqwqvWyV9RoE4QiwhqOR8O6HtA5/68EdltpBBNq8HTPc3XJzDr9mxQgPTfuMW W0zBAcf5DLRNk8iEsjZpuYV9a3Je1nd7g8eMI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:user-agent:mime-version :content-type; b=AEfDVeBWw2Lk5QA2acnrOfqncauIXJM7ZY+3S2ITx8bs/20XPyRzibwHfVaBjMwUOK M4P8VQRkO63WFnG64anr+l0PgLaD46jdeHTyfqyP6hJK5wPrvhKAZ5Fg9PfZA/nVreAi 6waTtvM6aRKOvU0fGYiz//xBHv6bLXAQOPBIo= Received: by 10.220.185.140 with SMTP id co12mr67600vcb.109.1286419602681; Wed, 06 Oct 2010 19:46:42 -0700 (PDT) Received: from localhost (tor-exit-proxy7-readme.formlessnetworking.net [208.53.142.43]) by mx.google.com with ESMTPS id f18sm898078vcm.11.2010.10.06.19.46.40 (version=SSLv3 cipher=RC4-MD5); Wed, 06 Oct 2010 19:46:41 -0700 (PDT) From: Anonymous To: miwi@FreeBSD.org, freebsd@beardz.net Date: Thu, 07 Oct 2010 06:45:37 +0400 Message-ID: <86y6aau3e6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: freebsd-ports@freebsd.org Subject: irc/weechat*: cmake/Find(Python|Ruby|etc).cmake don't respect version from bsd.(python|ruby|etc).mk X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Oct 2010 02:46:47 -0000 The port blindly assumes the first version of python|ruby|etc it finds as the one user wants weechat plugin built against. Example for python $ export PYTHON_DEFAULT_VERSION=python2.7 $ make install deinstall WITH_PYTHON= ... ===> Deinstalling weechat-0.3.3_1 pkg_delete: file '/usr/local/lib/weechat/plugins/python.so' doesn't exist And excerpt from CMakeCache.txt //Path to a program. PYTHON_EXECUTABLE:FILEPATH=/usr/local/bin/python //Path to a file. PYTHON_INCLUDE_PATH:PATH=/usr/local/include/python2.5 //Path to a library. PYTHON_LIBRARY:FILEPATH=/usr/local/lib/libpython2.6.so //Dependencies for the target python_LIB_DEPENDS:STATIC=general;/usr/local/lib/libpython2.6.so;general;weechat_scripts; I guess FindPython.cmake doesn't respect LOCALBASE, too. %% Index: irc/weechat/Makefile =================================================================== RCS file: /a/.cvsup/ports/irc/weechat/Makefile,v retrieving revision 1.49 diff -u -p -r1.49 Makefile --- irc/weechat/Makefile 30 Sep 2010 04:14:36 -0000 1.49 +++ irc/weechat/Makefile 7 Oct 2010 02:44:32 -0000 @@ -64,6 +64,8 @@ PLIST_SUB+= ASPELL="@comment " .if defined(WITH_PYTHON) USE_PYTHON= yes +CMAKE_ARGS+= -DPYTHON_VERSION=${PYTHON_VERSION} \ + -DPYTHON_CMD=${PYTHON_CMD} PLIST_SUB+= PYTHON="" .else CMAKE_ARGS+= -DDISABLE_PYTHON=yes Index: irc/weechat/files/patch-cmake-FindPython.cmake =================================================================== RCS file: irc/weechat/files/patch-cmake-FindPython.cmake diff -N irc/weechat/files/patch-cmake-FindPython.cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ irc/weechat/files/patch-cmake-FindPython.cmake 7 Oct 2010 01:59:44 -0000 @@ -0,0 +1,21 @@ +--- cmake/FindPython.cmake~ 2010-09-28 13:09:52.000000000 +0400 ++++ cmake/FindPython.cmake 2010-10-07 05:37:43.709648725 +0400 +@@ -34,8 +34,7 @@ IF(PYTHON_FOUND) + ENDIF(PYTHON_FOUND) + + FIND_PROGRAM(PYTHON_EXECUTABLE +- NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 +- PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ NAMES ${PYTHON_CMD} + ) + + IF(PYTHON_EXECUTABLE) +@@ -65,7 +64,7 @@ IF(PYTHON_EXECUTABLE) + ) + + FIND_LIBRARY(PYTHON_LIBRARY +- NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 ++ NAMES ${PYTHON_VERSION} + PATHS ${PYTHON_POSSIBLE_LIB_PATH} + ) + %%