Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Oct 2016 16:05:20 +0000 (UTC)
From:      David Naylor <dbn@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424173 - head/lang/fsharp
Message-ID:  <201610181605.u9IG5KZU060666@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Tue Oct 18 16:05:20 2016
New Revision: 424173
URL: https://svnweb.freebsd.org/changeset/ports/424173

Log:
  lang/fsharp: fix build on FreeBSD < 11.
  
   - change substitution since make(1) on FreeBSD 9 does not like variables
     within a substitution.
   - repeat tar substitution command since tar(1) on FreeBSD 9/10 does not
     obay the 'g' substitution command.
  
  Reported by:    pkg-fallout
  PR:             213584

Modified:
  head/lang/fsharp/Makefile

Modified: head/lang/fsharp/Makefile
==============================================================================
--- head/lang/fsharp/Makefile	Tue Oct 18 16:03:30 2016	(r424172)
+++ head/lang/fsharp/Makefile	Tue Oct 18 16:05:20 2016	(r424173)
@@ -36,7 +36,7 @@ NUGET_PACKAGEDIR=	${WRKSRC}/packages
 
 .for depend in ${NUGET_DEPENDS}
 id=		${depend:C/-.*$//}
-version=	${depend:S/${id}-//}
+version=	${depend:C/^[^-]*-//}
 group=		nuget_${id:S/.//g}
 nupkg=		${id:tl}.${version}.nupkg
 DISTFILES_${group}:=	${nupkg}:${group}
@@ -52,7 +52,7 @@ post-extract:
 .for nupkg in ${NUGET_NUPKGS}
 	@${MKDIR} ${NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S/-/./}
 	@tar -xf ${DISTDIR}/${nupkg:C/:.*$//} -C ${NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S/-/./} \
-		-s/%2B/\+/g \
+		-s/%2B/\+/g -s/%2B/\+/g -s/%2B/\+/g \
 		--exclude '\[Content_Types\].xml' \
 		--exclude package/ \
 		--exclude _rels/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610181605.u9IG5KZU060666>