From owner-svn-ports-head@freebsd.org  Tue Oct 18 16:05:21 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 948B4C165B1;
 Tue, 18 Oct 2016 16:05:21 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64085691;
 Tue, 18 Oct 2016 16:05:21 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IG5KqM060667;
 Tue, 18 Oct 2016 16:05:20 GMT (envelope-from dbn@FreeBSD.org)
Received: (from dbn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IG5KZU060666;
 Tue, 18 Oct 2016 16:05:20 GMT (envelope-from dbn@FreeBSD.org)
Message-Id: <201610181605.u9IG5KZU060666@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org
 using -f
From: David Naylor <dbn@FreeBSD.org>
Date: Tue, 18 Oct 2016 16:05:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424173 - head/lang/fsharp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2016 16:05:21 -0000

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/