Date: Mon, 25 May 2015 15:36:41 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387388 - in head/security/keepass: . files Message-ID: <201505251536.t4PFafcx094489@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Mon May 25 15:36:40 2015 New Revision: 387388 URL: https://svnweb.freebsd.org/changeset/ports/387388 Log: Fix build with mono 4 PR: 200343 Submitted by: Ben Woods (maintainer) Added: head/security/keepass/files/patch-KeePass.sln (contents, props changed) head/security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj (contents, props changed) head/security/keepass/files/patch-KeePassLib_KeePassLib.csproj (contents, props changed) head/security/keepass/files/patch-KeePass_KeePass.csproj (contents, props changed) head/security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj (contents, props changed) Modified: head/security/keepass/Makefile Modified: head/security/keepass/Makefile ============================================================================== --- head/security/keepass/Makefile Mon May 25 15:02:28 2015 (r387387) +++ head/security/keepass/Makefile Mon May 25 15:36:40 2015 (r387388) @@ -20,7 +20,8 @@ RUN_DEPENDS= xdotool:${PORTSDIR}/x11/xdo EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} -USES= mono zip +USES= dos2unix mono zip +DOS2UNIX_GLOB= *.csproj *.sln INSTALLS_ICONS= yes SUB_FILES= ${PORTNAME}.sh Added: head/security/keepass/files/patch-KeePass.sln ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepass/files/patch-KeePass.sln Mon May 25 15:36:40 2015 (r387388) @@ -0,0 +1,80 @@ +--- KeePass.sln.orig 2015-05-25 15:16:50 UTC ++++ KeePass.sln +@@ -1,5 +1,6 @@ +-Microsoft Visual Studio Solution File, Format Version 10.00 +-# Visual Studio 2008 ++ ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 2012 + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}" +@@ -20,18 +21,6 @@ Global + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Win32.ActiveCfg = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|x64.ActiveCfg = Debug|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.Build.0 = Release|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Win32.ActiveCfg = Release|Any CPU +- {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|x64.ActiveCfg = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +@@ -44,18 +33,18 @@ Global + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Win32.ActiveCfg = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|x64.ActiveCfg = Debug|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.Build.0 = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Win32.ActiveCfg = Release|Any CPU ++ {53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|x64.ActiveCfg = Release|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +@@ -68,6 +57,18 @@ Global + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|Win32.ActiveCfg = Release|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|x64.ActiveCfg = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU ++ {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE Added: head/security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj Mon May 25 15:36:40 2015 (r387388) @@ -0,0 +1,15 @@ +--- KeePassLibSD/KeePassLibSD.csproj.orig 2015-05-25 15:16:50 UTC ++++ KeePassLibSD/KeePassLibSD.csproj +@@ -1,4 +1,4 @@ +-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> ++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> +@@ -381,5 +381,5 @@ + <Target Name="AfterBuild"> + </Target> + --> +- <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" /> ++ <Import Condition="'$(TargetFrameworkVersion)' == 'v4.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" /> + </Project> Added: head/security/keepass/files/patch-KeePassLib_KeePassLib.csproj ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepass/files/patch-KeePassLib_KeePassLib.csproj Mon May 25 15:36:40 2015 (r387388) @@ -0,0 +1,8 @@ +--- KeePassLib/KeePassLib.csproj.orig 2015-05-25 15:16:50 UTC ++++ KeePassLib/KeePassLib.csproj +@@ -1,4 +1,4 @@ +-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> ++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> Added: head/security/keepass/files/patch-KeePass_KeePass.csproj ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepass/files/patch-KeePass_KeePass.csproj Mon May 25 15:36:40 2015 (r387388) @@ -0,0 +1,8 @@ +--- KeePass/KeePass.csproj.orig 2015-05-25 15:16:50 UTC ++++ KeePass/KeePass.csproj +@@ -1,4 +1,4 @@ +-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> ++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> Added: head/security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj Mon May 25 15:36:40 2015 (r387388) @@ -0,0 +1,8 @@ +--- Translation/TrlUtil/TrlUtil.csproj.orig 2015-05-25 15:16:50 UTC ++++ Translation/TrlUtil/TrlUtil.csproj +@@ -1,4 +1,4 @@ +-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> ++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505251536.t4PFafcx094489>