From owner-svn-ports-all@FreeBSD.ORG Wed Jan 8 08:32:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3C8087A; Wed, 8 Jan 2014 08:32:42 +0000 (UTC) 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 D40EB1EB7; Wed, 8 Jan 2014 08:32:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s088WgtG066577; Wed, 8 Jan 2014 08:32:42 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s088WgBa066575; Wed, 8 Jan 2014 08:32:42 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401080832.s088WgBa066575@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 08:32:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339074 - in head/lang/pure: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 08:32:43 -0000 Author: rene Date: Wed Jan 8 08:32:42 2014 New Revision: 339074 URL: http://svnweb.freebsd.org/changeset/ports/339074 Log: 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) Modified: head/lang/pure/Makefile head/lang/pure/files/pkg-message.in Modified: head/lang/pure/Makefile ============================================================================== --- head/lang/pure/Makefile Wed Jan 8 08:25:01 2014 (r339073) +++ head/lang/pure/Makefile Wed Jan 8 08:32:42 2014 (r339074) @@ -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 program 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 Modified: head/lang/pure/files/pkg-message.in ============================================================================== --- head/lang/pure/files/pkg-message.in Wed Jan 8 08:25:01 2014 (r339073) +++ head/lang/pure/files/pkg-message.in Wed Jan 8 08:32:42 2014 (r339074) @@ -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. ====