Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jan 2015 02:42:56 +0000 (UTC)
From:      Gabor Pali <pgj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377911 - in head/x11-toolkits/hs-wxc: . files
Message-ID:  <201501260242.t0Q2guuh044442@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pgj
Date: Mon Jan 26 02:42:55 2015
New Revision: 377911
URL: https://svnweb.freebsd.org/changeset/ports/377911
QAT: https://qat.redports.org/buildarchive/r377911/

Log:
  - Fix build on FreeBSD 8.x and 9.x
  
  Obtained from:	FreeBSD Haskell

Added:
  head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal   (contents, props changed)
     - copied, changed from r377910, head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal
  head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal   (contents, props changed)
Deleted:
  head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal
Modified:
  head/x11-toolkits/hs-wxc/Makefile

Modified: head/x11-toolkits/hs-wxc/Makefile
==============================================================================
--- head/x11-toolkits/hs-wxc/Makefile	Mon Jan 26 02:42:44 2015	(r377910)
+++ head/x11-toolkits/hs-wxc/Makefile	Mon Jan 26 02:42:55 2015	(r377911)
@@ -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 and modified: head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal (from r377910, head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal)
==============================================================================

Added: head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal	Mon Jan 26 02:42:55 2015	(r377911)
@@ -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?201501260242.t0Q2guuh044442>