From 50ff2a53e44818f16e1c25384943db44b597c8aa Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 2 Oct 2015 09:07:05 +0000 Subject: 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. --- games/scummvm/files/patch-configure | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'games/scummvm') diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure index 84b9cd8ac4a2..7c47603d0952 100644 --- a/games/scummvm/files/patch-configure +++ b/games/scummvm/files/patch-configure @@ -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 -- cgit v1.2.3