Date: Sun, 31 Mar 2013 03:50:58 +0200 From: Gabor Pali <pgj@FreeBSD.org> To: Martin Wilke <miwi@freebsd.org> Cc: mono@freebsd.org Subject: Re: fsharp-3.0.25 failed on i386 8 Message-ID: <CAHnG2Cwgrqq=hwCW_CJBOYcLnigo42rtAxi0_Z6PqnHgoBbAgQ@mail.gmail.com> In-Reply-To: <CAHnG2CwmPnamQGQD21pMoTt=vW7qkndcTbh=Ut2H20j6QE4Y2g@mail.gmail.com> References: <201303300842.r2U8g1H0064530@pointyhat.freebsd.org> <0DC558B3-6CFA-468C-ADB0-8B56E1F335A4@freebsd.org> <CAHnG2CwmPnamQGQD21pMoTt=vW7qkndcTbh=Ut2H20j6QE4Y2g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sat, Mar 30, 2013 at 2:32 PM, Gabor Pali <pgj@freebsd.org> wrote:
> On Sat, Mar 30, 2013 at 9:47 AM, Martin Wilke <miwi@freebsd.org> wrote:
>> Could someone please have a look?
>
> Hum, I think the problem is that pkgng required me to include
> ${LOCALBASE} in pkg-plist otherwise it was not able to remove
> directories and files installed under the local Mono directory.
I have written up a patch for fixing this. I could only test this
with pkgng, but that worked. Actually, I am not doing too much here,
just maintain the old functionality if WITH_PKGNG is set, otherwise I
fall back to "do not use LOCALBASE in pkg-plist because pkgtools will
not like it" behavior.
This may cause some problems when PREFIX != LOCALBASE, but for
standard binary packages this should be okay.
[-- Attachment #2 --]
Index: fsharp/Makefile
===================================================================
--- fsharp/Makefile (revision 314770)
+++ fsharp/Makefile (working copy)
@@ -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 @@
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 <bsd.port.mk>
Index: fsharp/pkg-plist
===================================================================
--- fsharp/pkg-plist (revision 314770)
+++ fsharp/pkg-plist (working copy)
@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHnG2Cwgrqq=hwCW_CJBOYcLnigo42rtAxi0_Z6PqnHgoBbAgQ>