From owner-svn-ports-head@FreeBSD.ORG Sat Oct 26 13:50:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 880FD12C; Sat, 26 Oct 2013 13:50:37 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C13C2E77; Sat, 26 Oct 2013 13:50:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QDob97083704; Sat, 26 Oct 2013 13:50:37 GMT (envelope-from avilla@svn.freebsd.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QDoaDC083699; Sat, 26 Oct 2013 13:50:36 GMT (envelope-from avilla@svn.freebsd.org) Message-Id: <201310261350.r9QDoaDC083699@svn.freebsd.org> From: Alberto Villa Date: Sat, 26 Oct 2013 13:50:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331689 - in head/graphics/opengtl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 13:50:37 -0000 Author: avilla Date: Sat Oct 26 13:50:36 2013 New Revision: 331689 URL: http://svnweb.freebsd.org/changeset/ports/331689 Log: - Switch to devel/llvm32. - STAGEify. - Bump PORTREVISION. PR: 183252 Submitted by: brooks - Use "new" ${opt}_RUN_DEPENDS. Added: head/graphics/opengtl/files/ head/graphics/opengtl/files/patch-cmake__modules__FindLLVM.cmake (contents, props changed) Modified: head/graphics/opengtl/Makefile Modified: head/graphics/opengtl/Makefile ============================================================================== --- head/graphics/opengtl/Makefile Sat Oct 26 13:39:37 2013 (r331688) +++ head/graphics/opengtl/Makefile Sat Oct 26 13:50:36 2013 (r331689) @@ -2,6 +2,7 @@ PORTNAME= opengtl PORTVERSION= 0.9.18 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= http://download.${PORTNAME}.org/ DISTNAME= OpenGTL-${PORTVERSION} @@ -11,27 +12,21 @@ COMMENT= Graphics Transformation Languag LICENSE= LGPL20 -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -BUILD_DEPENDS= ${LOCALBASE}/lib/libLLVM-3.2.so:${PORTSDIR}/devel/llvm -RUN_DEPENDS:= ${BUILD_DEPENDS} +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libLLVM-3.2.so:${PORTSDIR}/devel/llvm32 -USE_BZIP2= yes USES= cmake perl5 +USE_BZIP2= yes USE_LDCONFIG= yes +CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config32 + +PLIST_SUB+= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= SHIVA OPTIONS_DEFAULT=SHIVA SHIVA_DESC= Install filters and generators - -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MSHIVA} -RUN_DEPENDS+= ${LOCALBASE}/share/OpenGTL/shiva/kernels/oilify.shiva:${PORTSDIR}/graphics/shiva-collections -.endif +SHIVA_RUN_DEPENDS=${LOCALBASE}/share/OpenGTL/shiva/kernels/oilify.shiva:${PORTSDIR}/graphics/shiva-collections post-patch: # Disable latex doc, it's not ready yet. Added: head/graphics/opengtl/files/patch-cmake__modules__FindLLVM.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opengtl/files/patch-cmake__modules__FindLLVM.cmake Sat Oct 26 13:50:36 2013 (r331689) @@ -0,0 +1,18 @@ +--- ./cmake/modules/FindLLVM.cmake.orig 2012-12-29 12:27:12.000000000 +0100 ++++ ./cmake/modules/FindLLVM.cmake 2013-10-26 15:46:16.168023085 +0200 +@@ -27,11 +27,13 @@ + set(LLVM_FOUND TRUE) + endif(LLVM_INCLUDE_DIR AND LLVM_LIBS_DIR) + else (MSVC) +- find_program(LLVM_CONFIG_EXECUTABLE ++ if(NOT LLVM_CONFIG_EXECUTABLE) ++ find_program(LLVM_CONFIG_EXECUTABLE + NAMES llvm-config + PATHS + /opt/local/bin +- ) ++ ) ++ endif() + + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LLVM_VERSION ) +