Bug 185190 - lang/pure : switch devel/llvm to devel/llvm32
Summary: lang/pure : switch devel/llvm to devel/llvm32
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rene Ladan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-25 21:30 UTC by Rene Ladan
Modified: 2014-01-08 08:40 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Rene Ladan freebsd_committer freebsd_triage 2013-12-25 21:30:00 UTC
lang/pure depends on devel/llvm, which expired on 2013-11-04. Modify lang/pure to use devel/llvm32 (which is the current version of devel/llvm) instead.

Fix: 

Patch at http://people.freebsd.org/~rene/patches/lang__pure.diff

The 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).
How-To-Repeat: Tools/scripts/rmport devel/llvm
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-25 21:30:07 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-25 21:30:07 UTC
Maintainer of lang/pure,

Please note that PR ports/185190 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/185190

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Rene Ladan freebsd_committer freebsd_triage 2013-12-26 21:07:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rene

Track
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-01-08 08:32:49 UTC
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 <bsd.port.options.mk>
 
@@ -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.
 ====
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Rene Ladan freebsd_committer freebsd_triage 2014-01-08 08:32:52 UTC
State Changed
From-To: feedback->closed

Committed, timeout