Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Oct 2015 09:07:05 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398426 - head/games/scummvm/files
Message-ID:  <201510020907.t92975HH095925@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510020907.t92975HH095925>