From owner-svn-ports-head@FreeBSD.ORG Sun Mar 31 13:11:05 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6909692E; Sun, 31 Mar 2013 13:11:05 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5AC2FC41; Sun, 31 Mar 2013 13:11:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VDB5wM050926; Sun, 31 Mar 2013 13:11:05 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VDB5PZ050924; Sun, 31 Mar 2013 13:11:05 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201303311311.r2VDB5PZ050924@svn.freebsd.org> From: Gabor Pali Date: Sun, 31 Mar 2013 13:11:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315634 - 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 13:11:05 -0000 Author: pgj Date: Sun Mar 31 13:11:04 2013 New Revision: 315634 URL: http://svnweb.freebsd.org/changeset/ports/315634 Log: - Fix build with pkgtools Approved by: portmgr (miwi) Modified: head/lang/fsharp/Makefile head/lang/fsharp/pkg-plist Modified: head/lang/fsharp/Makefile ============================================================================== --- head/lang/fsharp/Makefile Sun Mar 31 12:58:43 2013 (r315633) +++ head/lang/fsharp/Makefile Sun Mar 31 13:11:04 2013 (r315634) @@ -3,6 +3,7 @@ PORTNAME= fsharp PORTVERSION= 3.0.25 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://nodeload.github.com/fsharp/fsharp/tar.gz/ \ CRITICAL @@ -21,5 +22,12 @@ USE_PKGCONFIG= build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +# This is currently a workaround for the differences between pkg_* and pkg(8). +.if defined(WITH_PKGNG) +PLIST_SUB+= LB="${LOCALBASE}/" +.else +PLIST_SUB+= LB="" +.endif + .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include Modified: head/lang/fsharp/pkg-plist ============================================================================== --- head/lang/fsharp/pkg-plist Sun Mar 31 12:58:43 2013 (r315633) +++ head/lang/fsharp/pkg-plist Sun Mar 31 13:11:04 2013 (r315634) @@ -17,107 +17,107 @@ bin/fsharpc bin/fsharpi bin/fsharpiAnyCpu -%%LOCALBASE%%/lib/mono/2.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/2.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.0/FSharp.Core.optdata -%%LOCALBASE%%/lib/mono/2.0/FSharp.Core.sigdata -%%LOCALBASE%%/lib/mono/2.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/2.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.0/policy.4.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.1/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/2.1/FSharp.Core.optdata -%%LOCALBASE%%/lib/mono/2.1/FSharp.Core.sigdata -%%LOCALBASE%%/lib/mono/2.1/FSharp.Core.xml -%%LOCALBASE%%/lib/mono/4.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/4.0/FSharp.Build.xml -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.Interactive.Settings.dll -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.Interactive.Settings.xml -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.Server.Shared.dll -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.Server.Shared.xml -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.dll -%%LOCALBASE%%/lib/mono/4.0/FSharp.Compiler.xml -%%LOCALBASE%%/lib/mono/4.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.0/FSharp.Core.optdata -%%LOCALBASE%%/lib/mono/4.0/FSharp.Core.sigdata -%%LOCALBASE%%/lib/mono/4.0/FSharp.Core.xml -%%LOCALBASE%%/lib/mono/4.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/4.0/fsc.exe -%%LOCALBASE%%/lib/mono/4.0/fsc.xml -%%LOCALBASE%%/lib/mono/4.0/fsi.exe -%%LOCALBASE%%/lib/mono/4.0/fsi.xml -%%LOCALBASE%%/lib/mono/4.0/fsiAnyCpu.exe -%%LOCALBASE%%/lib/mono/4.0/fsiAnyCpu.xml -%%LOCALBASE%%/lib/mono/4.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.0/policy.4.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Build.xml -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.Interactive.Settings.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.Interactive.Settings.xml -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.Server.Shared.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.Server.Shared.xml -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Compiler.xml -%%LOCALBASE%%/lib/mono/4.5/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/4.5/FSharp.Core.optdata -%%LOCALBASE%%/lib/mono/4.5/FSharp.Core.sigdata -%%LOCALBASE%%/lib/mono/4.5/FSharp.Core.xml -%%LOCALBASE%%/lib/mono/4.5/fsc.exe -%%LOCALBASE%%/lib/mono/4.5/fsc.xml -%%LOCALBASE%%/lib/mono/4.5/fsi.exe -%%LOCALBASE%%/lib/mono/4.5/fsi.xml -%%LOCALBASE%%/lib/mono/4.5/fsiAnyCpu.exe -%%LOCALBASE%%/lib/mono/4.5/fsiAnyCpu.xml -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v2.0/policy.4.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/FSharp.Compiler.Interactive.Settings.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/FSharp.Compiler.Server.Shared.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/FSharp.Compiler.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/fsc.exe -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/fsi.exe -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/fsiAnyCpu.exe -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft F#/v4.0/policy.4.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.4.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Build.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.Interactive.Settings.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.Server.Shared.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.FSharp.Targets -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsc.exe -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsi.exe -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsiAnyCpu.exe -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.2.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.2.3.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.4.0.FSharp.Core.dll -%%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.4.3.FSharp.Core.dll -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0 -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0 -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0/Framework -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs/F#/3.0 -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs/F# -@dirrm %%LOCALBASE%%/lib/mono/Microsoft SDKs -@dirrm %%LOCALBASE%%/lib/mono/Microsoft F#/v4.0 -@dirrm %%LOCALBASE%%/lib/mono/Microsoft F#/v2.0 -@dirrm %%LOCALBASE%%/lib/mono/Microsoft F# -@dirrmtry %%LOCALBASE%%/lib/mono/2.1 +%%LB%%lib/mono/2.0/FSharp.Build.dll +%%LB%%lib/mono/2.0/FSharp.Core.dll +%%LB%%lib/mono/2.0/FSharp.Core.optdata +%%LB%%lib/mono/2.0/FSharp.Core.sigdata +%%LB%%lib/mono/2.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/2.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/2.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/2.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/2.0/policy.4.3.FSharp.Core.dll +%%LB%%lib/mono/2.1/FSharp.Core.dll +%%LB%%lib/mono/2.1/FSharp.Core.optdata +%%LB%%lib/mono/2.1/FSharp.Core.sigdata +%%LB%%lib/mono/2.1/FSharp.Core.xml +%%LB%%lib/mono/4.0/FSharp.Build.dll +%%LB%%lib/mono/4.0/FSharp.Build.xml +%%LB%%lib/mono/4.0/FSharp.Compiler.Interactive.Settings.dll +%%LB%%lib/mono/4.0/FSharp.Compiler.Interactive.Settings.xml +%%LB%%lib/mono/4.0/FSharp.Compiler.Server.Shared.dll +%%LB%%lib/mono/4.0/FSharp.Compiler.Server.Shared.xml +%%LB%%lib/mono/4.0/FSharp.Compiler.dll +%%LB%%lib/mono/4.0/FSharp.Compiler.xml +%%LB%%lib/mono/4.0/FSharp.Core.dll +%%LB%%lib/mono/4.0/FSharp.Core.optdata +%%LB%%lib/mono/4.0/FSharp.Core.sigdata +%%LB%%lib/mono/4.0/FSharp.Core.xml +%%LB%%lib/mono/4.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/4.0/fsc.exe +%%LB%%lib/mono/4.0/fsc.xml +%%LB%%lib/mono/4.0/fsi.exe +%%LB%%lib/mono/4.0/fsi.xml +%%LB%%lib/mono/4.0/fsiAnyCpu.exe +%%LB%%lib/mono/4.0/fsiAnyCpu.xml +%%LB%%lib/mono/4.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/4.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/4.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/4.0/policy.4.3.FSharp.Core.dll +%%LB%%lib/mono/4.5/FSharp.Build.dll +%%LB%%lib/mono/4.5/FSharp.Build.xml +%%LB%%lib/mono/4.5/FSharp.Compiler.Interactive.Settings.dll +%%LB%%lib/mono/4.5/FSharp.Compiler.Interactive.Settings.xml +%%LB%%lib/mono/4.5/FSharp.Compiler.Server.Shared.dll +%%LB%%lib/mono/4.5/FSharp.Compiler.Server.Shared.xml +%%LB%%lib/mono/4.5/FSharp.Compiler.dll +%%LB%%lib/mono/4.5/FSharp.Compiler.xml +%%LB%%lib/mono/4.5/FSharp.Core.dll +%%LB%%lib/mono/4.5/FSharp.Core.optdata +%%LB%%lib/mono/4.5/FSharp.Core.sigdata +%%LB%%lib/mono/4.5/FSharp.Core.xml +%%LB%%lib/mono/4.5/fsc.exe +%%LB%%lib/mono/4.5/fsc.xml +%%LB%%lib/mono/4.5/fsi.exe +%%LB%%lib/mono/4.5/fsi.xml +%%LB%%lib/mono/4.5/fsiAnyCpu.exe +%%LB%%lib/mono/4.5/fsiAnyCpu.xml +%%LB%%lib/mono/Microsoft F#/v2.0/FSharp.Build.dll +%%LB%%lib/mono/Microsoft F#/v2.0/FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v2.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/Microsoft F#/v2.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v2.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v2.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v2.0/policy.4.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v4.0/FSharp.Build.dll +%%LB%%lib/mono/Microsoft F#/v4.0/FSharp.Compiler.Interactive.Settings.dll +%%LB%%lib/mono/Microsoft F#/v4.0/FSharp.Compiler.Server.Shared.dll +%%LB%%lib/mono/Microsoft F#/v4.0/FSharp.Compiler.dll +%%LB%%lib/mono/Microsoft F#/v4.0/FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v4.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/Microsoft F#/v4.0/fsc.exe +%%LB%%lib/mono/Microsoft F#/v4.0/fsi.exe +%%LB%%lib/mono/Microsoft F#/v4.0/fsiAnyCpu.exe +%%LB%%lib/mono/Microsoft F#/v4.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v4.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v4.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft F#/v4.0/policy.4.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/FSharp.Build.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0/policy.4.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Build.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.Interactive.Settings.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.Server.Shared.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Compiler.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.FSharp.Targets +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsc.exe +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsi.exe +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/fsiAnyCpu.exe +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.2.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.2.3.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.4.0.FSharp.Core.dll +%%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/policy.4.3.FSharp.Core.dll +@dirrm %%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0 +@dirrm %%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework/v2.0 +@dirrm %%LB%%lib/mono/Microsoft SDKs/F#/3.0/Framework +@dirrm %%LB%%lib/mono/Microsoft SDKs/F#/3.0 +@dirrm %%LB%%lib/mono/Microsoft SDKs/F# +@dirrm %%LB%%lib/mono/Microsoft SDKs +@dirrm %%LB%%lib/mono/Microsoft F#/v4.0 +@dirrm %%LB%%lib/mono/Microsoft F#/v2.0 +@dirrm %%LB%%lib/mono/Microsoft F# +@dirrmtry %%LB%%lib/mono/2.1