Index: head/x11-toolkits/hs-wxc/Makefile =================================================================== --- head/x11-toolkits/hs-wxc/Makefile (revision 377910) +++ head/x11-toolkits/hs-wxc/Makefile (revision 377911) @@ -1,32 +1,34 @@ # $FreeBSD$ PORTNAME= wxc PORTVERSION= 0.90.1.1 PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= wxHaskell C++ wrapper USE_CABAL= wxdirect>=0.90.1.0 USES= dos2unix USE_WX= 3.0 WX_COMPS= wx WX_UNICODE= yes OPTIONS_EXCLUDE=DOCS post-patch:: @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \ s|/sbin/ldconfig -n|/sbin/ldconfig -m| ; \ s|"2.9"|"3.0"|' \ ${WRKSRC}/Setup.hs .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 Index: head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal =================================================================== --- head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal (revision 377910) +++ head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal (nonexistent) @@ -1,11 +0,0 @@ ---- ./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 Property changes on: head/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal =================================================================== --- head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal (nonexistent) +++ head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal (revision 377911) @@ -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 Property changes on: head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal =================================================================== --- head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal (nonexistent) +++ head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal (revision 377911) @@ -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 Property changes on: head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property