From a067cf2edf663a9ad3770141f1114a6d946df61f Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Wed, 8 Jan 2014 08:32:42 +0000 Subject: [PATCH] Defines a variable LLVM_VERSION to ease updating to a newer LLVM version if desired. Other changes: - fix EMACS_CONFIGURE option helper - fix %%ETC%% rendering and name of clang port in pkg-message - bump PORTREVISION to force a rebuild for the dependency change. Tested with 'poudriere bulk pure*' on 10.0-amd64, 8.3-i386, and 9.1-i386 (partially). devel/llvm (expired) should not have any consumers anymore at this point. PR: ports/185190 Submitted by: rene Approved by: maintainer timeout (lichray@gmail.com , 14 days) --- lang/pure/Makefile | 17 +++++++++++++---- lang/pure/files/pkg-message.in | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lang/pure/Makefile b/lang/pure/Makefile index 90165917eabd..1315a11231ae 100644 --- a/lang/pure/Makefile +++ b/lang/pure/Makefile @@ -3,6 +3,7 @@ PORTNAME= pure PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://cdn.bitbucket.org/purelang/pure-lang/downloads/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz @@ -14,9 +15,11 @@ COMMENT= Modern-style functional programming language LICENSE= GPLv3 LGPL3 LICENSE_COMB= dual +LLVM_VERSION= 32 + LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libmpfr.so:${PORTSDIR}/math/mpfr -BUILD_DEPENDS= llvm>=3.2:${PORTSDIR}/devel/llvm +BUILD_DEPENDS= llvm-config${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION} RUN_DEPENDS:= ${BUILD_DEPENDS} SUB_FILES= pkg-message @@ -24,7 +27,8 @@ SUB_FILES= pkg-message USES= gmake iconv pathfix pkgconfig USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --enable-release +CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --enable-release \ + --with-tool-prefix=${LOCALBASE}/llvm${LLVM_VERSION}/bin USE_LDCONFIG= yes MAKE_ARGS+= prefix=${PREFIX} mandir=${PREFIX}/man \ @@ -45,8 +49,7 @@ OPTIONS_DEFAULT= ETC OPTIONS_SUB= yes -EMACS_CONFIGURE_ENABLE= --with-elisp -EMACS_CONFIGURE_DISABLE= --without-elisp +EMACS_CONFIGURE_WITH= elisp .include @@ -61,6 +64,12 @@ SUB_LIST+= NOCLANG="" SUB_LIST+= NOCLANG="@comment " .endif +.if ${PORT_OPTIONS:METC} +SUB_LIST+= ETC="" +.else +SUB_LIST+= ETC="@comment " +.endif + # automatically disable readline support if editline support is available .if exists(/usr/include/edit/readline/readline.h) CONFIGURE_ARGS+= --without-readline diff --git a/lang/pure/files/pkg-message.in b/lang/pure/files/pkg-message.in index dfa1aa19c52a..62b6af7ecae8 100644 --- a/lang/pure/files/pkg-message.in +++ b/lang/pure/files/pkg-message.in @@ -12,7 +12,7 @@ interpreter. Check pure(1) for details. %%NOCLANG%% %%NOCLANG%%To enable the inline C/C++ code compilation, %%NOCLANG%% -%%NOCLANG%% clang: lang/clang +%%NOCLANG%% clang: lang/clang32 %%NOCLANG%% %%NOCLANG%%is required. ====