Date: Thu, 29 Jan 2015 02:32:44 +0000 (UTC) From: Gabor Pali <pgj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378102 - in branches/2015Q1/x11-toolkits/hs-wxc: . files Message-ID: <201501290232.t0T2Wiba018152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pgj Date: Thu Jan 29 02:32:44 2015 New Revision: 378102 URL: https://svnweb.freebsd.org/changeset/ports/378102 QAT: https://qat.redports.org/buildarchive/r378102/ Log: MFH: r377911 - Fix build on FreeBSD 8.x and 9.x Obtained from: FreeBSD Haskell Approved by: portmgr (erwin) Added: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal - copied unchanged from r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal - copied unchanged from r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal Deleted: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal Modified: branches/2015Q1/x11-toolkits/hs-wxc/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-toolkits/hs-wxc/Makefile ============================================================================== --- branches/2015Q1/x11-toolkits/hs-wxc/Makefile Thu Jan 29 02:20:28 2015 (r378101) +++ branches/2015Q1/x11-toolkits/hs-wxc/Makefile Thu Jan 29 02:32:44 2015 (r378102) @@ -25,8 +25,10 @@ post-patch:: .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.if ${OSVERSION} >= 900000 -EXTRA_PATCHES+= ${PATCHDIR}/nopatch-wxc.cabal +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${PATCHDIR}/nopatch0-wxc.cabal +.else +EXTRA_PATCHES+= ${PATCHDIR}/nopatch1-wxc.cabal .endif .include <bsd.port.mk> Copied: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal (from r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal Thu Jan 29 02:32:44 2015 (r378102, copy of r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal) @@ -0,0 +1,11 @@ +--- ./wxc.cabal.orig 2014-03-22 21:53:20.000000000 +0100 ++++ ./wxc.cabal 2014-07-20 08:09:51.000000000 +0200 +@@ -161,6 +161,8 @@ + base >= 4 && < 5, + wxdirect >= 0.90.1.0 + ++ cc-options: -std=c++11 ++ + x-dll-sources: + src/cpp/apppath.cpp + src/cpp/dragimage.cpp Copied: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal (from r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal Thu Jan 29 02:32:44 2015 (r378102, copy of r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal) @@ -0,0 +1,11 @@ +--- wxc.cabal.orig 2015-01-16 21:06:43 UTC ++++ wxc.cabal +@@ -161,6 +161,8 @@ library + base >= 4 && < 5, + wxdirect >= 0.90.1.0 + ++ extra-libraries: stdc++ ++ + x-dll-sources: + src/cpp/apppath.cpp + src/cpp/dragimage.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501290232.t0T2Wiba018152>