From owner-svn-ports-all@freebsd.org  Fri Oct  2 09:07:06 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CEB7A0D083;
 Fri,  2 Oct 2015 09:07:06 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 0AD9219AB;
 Fri,  2 Oct 2015 09:07:06 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t92975T2095926;
 Fri, 2 Oct 2015 09:07:05 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t92975HH095925;
 Fri, 2 Oct 2015 09:07:05 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201510020907.t92975HH095925@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Fri, 2 Oct 2015 09:07:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398426 - head/games/scummvm/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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Oct 2015 09:07:06 -0000

Author: marino
Date: Fri Oct  2 09:07:05 2015
New Revision: 398426
URL: https://svnweb.freebsd.org/changeset/ports/398426

Log:
  games/scummvm: Partially revert configure patch
  
  The use of "$(prefix)" in the configure file seems not to be
  understand.  On FreeBSD, it's ignored but it actually causes failures
  on DragonFly.  I suspect these flags aren't actually used.
  
  If it turns out they are used, and support for non-standard PREFIX
  (not /usr/local) is desired, the REINPLACE_CMD macro can adjust
  /usr/local with in a post-patch target.

Modified:
  head/games/scummvm/files/patch-configure

Modified: head/games/scummvm/files/patch-configure
==============================================================================
--- head/games/scummvm/files/patch-configure	Fri Oct  2 08:40:57 2015	(r398425)
+++ head/games/scummvm/files/patch-configure	Fri Oct  2 09:07:05 2015	(r398426)
@@ -1,18 +1,14 @@
---- configure.orig	2015-09-17 05:07:32 UTC
+--- configure.orig	2014-07-11 21:10:26 UTC
 +++ configure
-@@ -2300,9 +2300,9 @@ case $_host_os in
+@@ -2300,7 +2300,7 @@ case $_host_os in
  		LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
  		LIBS="$LIBS -lnds9"
  		;;
 -	freebsd*)
--		LDFLAGS="$LDFLAGS -L/usr/local/lib"
--		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
 +	dragonfly*|freebsd*)
-+		LDFLAGS="$LDFLAGS -L$(prefix)/lib"
-+		CXXFLAGS="$CXXFLAGS -I$(prefix)/include"
+ 		LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ 		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
  		;;
- 	gamecube)
- 		_optimization_level=-Os
 @@ -3106,6 +3106,9 @@ case $_host_os in
  	android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
  		_posix=yes