From owner-svn-ports-all@FreeBSD.ORG Mon Jan 26 02:42:57 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80D1B309; Mon, 26 Jan 2015 02:42:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 536FFA3A; Mon, 26 Jan 2015 02:42:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0Q2gvxr044445; Mon, 26 Jan 2015 02:42:57 GMT (envelope-from pgj@FreeBSD.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0Q2guuh044442; Mon, 26 Jan 2015 02:42:56 GMT (envelope-from pgj@FreeBSD.org) Message-Id: <201501260242.t0Q2guuh044442@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org using -f From: Gabor Pali Date: Mon, 26 Jan 2015 02:42:56 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jan 2015 02:42:57 -0000 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 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