4 files changed, 28 insertions, 16 deletions

diff --git a/games/searchandrescue/Makefile b/games/searchandrescue/Makefile
index 364e57537b14..ad8215ab26f1 100644
--- a/games/searchandrescue/Makefile
+++ b/games/searchandrescue/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	SearchAndRescue
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME:L}/Program/
 
diff --git a/games/searchandrescue/distinfo b/games/searchandrescue/distinfo
index 8a0e919d3ead..38a2967646ae 100644
--- a/games/searchandrescue/distinfo
+++ b/games/searchandrescue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SearchAndRescue-1.3.0.tar.gz) = 260a3962e0bccb2822a809707acecdfdec4061053a20ad67a33bbda60ca2e13c
-SIZE (SearchAndRescue-1.3.0.tar.gz) = 1472727
+SHA256 (SearchAndRescue-1.4.0.tar.gz) = 30837d0c5019b646f506c284c1adc01e5334e7befc145a00e64f0e7f21642757
+SIZE (SearchAndRescue-1.4.0.tar.gz) = 1473062
diff --git a/games/searchandrescue/files/patch-sar__Makefile b/games/searchandrescue/files/patch-sar__Makefile
index cf2767c625c6..03db42ecd724 100644
--- a/games/searchandrescue/files/patch-sar__Makefile
+++ b/games/searchandrescue/files/patch-sar__Makefile
@@ -1,27 +1,39 @@
---- ./sar/Makefile.orig	2011-04-01 15:29:49.000000000 -0300
-+++ ./sar/Makefile	2011-05-02 13:43:50.000000000 -0300
-@@ -1,12 +1,12 @@
+
+$FreeBSD$
+
+--- ./sar/Makefile.orig	2011-08-07 16:06:58.000000000 -0300
++++ ./sar/Makefile	2011-08-11 20:36:24.000000000 -0300
+@@ -1,18 +1,18 @@
  # Platform Configurator generated Makefile
  #
 -PREFIX = $(DESTDIR)/usr/
 +PREFIX = %%PREFIX%%
  
--CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -finline-functions -fexpensive-optimizations -D__USE_BSD -DHAVE_SDL_MIXER -Wno-write-strings -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_LIBXPM -DHAVE_XF86_VIDMODE -DNEW_GRAPHICS #-DOLD_GRAPHICS 
-+CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -D__USE_BSD -DUSE_XSHM -DHAVE_MWMUTIL_H -DUSE_LIBXPM -DHAVE_XF86_VIDMOD -DHAVE_SDL_MIXER -DNEW_GRAPHICS -I/usr/local/include #-DOLD_GRAPHICS 
+-CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -finline-functions -fexpensive-optimizations -D__USE_BSD -DHAVE_SDL_MIXER -Wno-write-strings -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_LIBXPM -DHAVE_XF86_VIDMODE
++CFLAGS = -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -D__USE_BSD -DUSE_XSHM -DHAVE_MWMUTIL_H -DUSE_LIBXPM -DHAVE_XF86_VIDMOD -DHAVE_SDL_MIXER -DNEW_GRAPHICS -I/usr/local/include #-DOLD_GRAPHICS 
  
  INC_DIRS =
  
 -LIBS = -lm -lSDL -lSDL_mixer -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lpthread
 +LIBS = -lm -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lSDL -lSDL_mixer
  
- LIB_DIRS =  -L/usr/X11R6/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib/
+-LIB_DIRS =  -L/usr/X11R6/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib/
++LIB_DIRS =  -L/usr/local/lib/ -L/usr/local/lib/ -L/usr/local/lib/
  
+-CC = gcc
++CC = cc
+ 
+-CPP = g++
++CPP = c++
+ 
+ # Appended stuff starts here
+ #
 @@ -39,7 +39,7 @@
  
  # Programs
  LS      = ls
 -LSFLAGS = -s -h -c --color=auto
-+LSFLAGS = -s -h -c
++LSFLAGS = -s -h -c 
  RM      = rm
  RMFLAGS = -f
  
diff --git a/games/searchandrescue/files/patch-sar__config.h b/games/searchandrescue/files/patch-sar__config.h
index d27c4514e4af..e71cbc4fe178 100644
--- a/games/searchandrescue/files/patch-sar__config.h
+++ b/games/searchandrescue/files/patch-sar__config.h
@@ -1,20 +1,20 @@
---- ./sar/config.h.orig	2010-06-03 02:05:00.000000000 +0400
-+++ ./sar/config.h	2010-07-22 23:21:05.772021076 +0400
-@@ -477,7 +477,7 @@
+--- ./sar/config.h.orig	2011-04-03 16:12:49.000000000 -0300
++++ ./sar/config.h	2011-08-11 20:34:05.000000000 -0300
+@@ -493,7 +493,7 @@
  #define SAR_DEF_LOCAL_DATA_DIR  ".SearchAndRescue"
  
  /* Global game dir */
 -#define SAR_DEF_GLOBAL_DATA_DIR "/usr/share/games/searchandrescue"
-+#define SAR_DEF_GLOBAL_DATA_DIR "%%LOCALBASE%%/share/searchandrescue"
++#define SAR_DEF_GLOBAL_DATA_DIR "/usr/local/share/searchandrescue"
  
  /* Subdirs, one of each in the local and global game dirs */
  #define SAR_DEF_AIRCRAFTS_DIR		"aircrafts"
-@@ -539,7 +539,7 @@
+@@ -555,7 +555,7 @@
  #ifdef __MSW__
  # define SAR_DEF_SAR_ICON_FILE		"SearchAndRescue.ico"
  #else
 -# define SAR_DEF_SAR_ICON_FILE		"/usr/share/pixmaps/SearchAndRescue.xpm"
-+# define SAR_DEF_SAR_ICON_FILE		"%%PREFIX%%/share/pixmaps/SearchAndRescue.xpm"
++# define SAR_DEF_SAR_ICON_FILE		"/usr/local/share/pixmaps/SearchAndRescue.xpm"
  #endif
  
  /* Standard Texture Reference Names