Attachment #137627 for bug #183252

View | Details | Raw Unified | Return to bug 183252
Collapse All | Expand All





PORTNAME=	opengtl
PORTVERSION=	0.9.18
PORTREVISION=	1
CATEGORIES=	graphics devel
MASTER_SITES=	http://download.${PORTNAME}.org/
DISTNAME=	OpenGTL-${PORTVERSION}

LICENSE=	LGPL20

LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS=	llvm-config32:${PORTSDIR}/devel/llvm32
RUN_DEPENDS:=	${BUILD_DEPENDS}

USE_BZIP2=	yes
USES=		cmake perl5
USE_LDCONFIG=	yes
CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config32

OPTIONS_DEFINE=	SHIVA
OPTIONS_DEFAULT=SHIVA


PLIST_SUB+=	PORTVERSION=${PORTVERSION}

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSHIVA}





$FreeBSD$

--- cmake/modules/FindLLVM.cmake.orig
+++ cmake/modules/FindLLVM.cmake
@@ -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 )


Return to bug 183252

Lines 2-7 Link Here

(-)Makefile (-2 / +3 lines)
2		2
3	PORTNAME= opengtl	3	PORTNAME= opengtl
4	PORTVERSION= 0.9.18	4	PORTVERSION= 0.9.18
		5	PORTREVISION= 1
5	CATEGORIES= graphics devel	6	CATEGORIES= graphics devel
6	MASTER_SITES= http://download.${PORTNAME}.org/	7	MASTER_SITES= http://download.${PORTNAME}.org/
7	DISTNAME= OpenGTL-${PORTVERSION}	8	DISTNAME= OpenGTL-${PORTVERSION}
Lines 12-23 Link Here
12	LICENSE= LGPL20	13	LICENSE= LGPL20
13		14
14	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png	15	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
15	BUILD_DEPENDS= ${LOCALBASE}/lib/libLLVM-3.2.so:${PORTSDIR}/devel/llvm	16	BUILD_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32
16	RUN_DEPENDS:= ${BUILD_DEPENDS}	17	RUN_DEPENDS:= ${BUILD_DEPENDS}
17		18
18	USE_BZIP2= yes	19	USE_BZIP2= yes
19	USES= cmake perl5	20	USES= cmake perl5
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config32
21		23
22	OPTIONS_DEFINE= SHIVA	24	OPTIONS_DEFINE= SHIVA
23	OPTIONS_DEFAULT=SHIVA	25	OPTIONS_DEFAULT=SHIVA
Lines 26-32 Link Here
26		28
27	PLIST_SUB+= PORTVERSION=${PORTVERSION}	29	PLIST_SUB+= PORTVERSION=${PORTVERSION}
28		30
29	NO_STAGE= yes
30	.include <bsd.port.options.mk>	31	.include <bsd.port.options.mk>
31		32
32	.if ${PORT_OPTIONS:MSHIVA}	33	.if ${PORT_OPTIONS:MSHIVA}

Line 0 Link Here

(-)files/patch-cmake_modules_FindLLVM.cmake (+21 lines)
	1
	2	$FreeBSD$
	3
	4	--- cmake/modules/FindLLVM.cmake.orig
	5	+++ cmake/modules/FindLLVM.cmake
	6	@@ -27,11 +27,13 @@
	7	set(LLVM_FOUND TRUE)
	8	endif(LLVM_INCLUDE_DIR AND LLVM_LIBS_DIR)
	9	else (MSVC)
	10	- find_program(LLVM_CONFIG_EXECUTABLE
	11	+ if(NOT LLVM_CONFIG_EXECUTABLE)
	12	+ find_program(LLVM_CONFIG_EXECUTABLE
	13	NAMES llvm-config
	14	PATHS
	15	/opt/local/bin
	16	- )
	17	+ )
	18	+ endif()
	19
	20	exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LLVM_VERSION )
	21