ports/159590: Port update: games/searchandrescue

Fri Aug 12 00:20:12 UTC 2011

The following reply was made to PR ports/159590; it has been noted by GNATS.

From: Jesse Smith <jessefrgsmith at yahoo.ca>
To: bug-followup at FreeBSD.org, jessefrgsmith at yahoo.ca
Cc:  
Subject: Re: ports/159590: Port update: games/searchandrescue
Date: Thu, 11 Aug 2011 20:56:37 -0300

 --=-CyQvcjy7iSknTTcawQCB
 Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: 7bit

 I think I found the problems. The Makefile patch now uses the PREFIX
 variable and I've corrected the "ls" command issue. Please see attached.

 --=-CyQvcjy7iSknTTcawQCB
 Content-Disposition: attachment; filename="sar-update.txt"
 Content-Type: text/plain; name="sar-update.txt"; charset="UTF-8"
 Content-Transfer-Encoding: 7bit

 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	searchandrescue/
 #	searchandrescue/files
 #	searchandrescue/files/patch-sar__Makefile
 #	searchandrescue/files/patch-sar__config.h
 #	searchandrescue/pkg-descr
 #	searchandrescue/distinfo
 #	searchandrescue/Makefile
 #
 echo c - searchandrescue/
 mkdir -p searchandrescue/ > /dev/null 2>&1
 echo c - searchandrescue/files
 mkdir -p searchandrescue/files > /dev/null 2>&1
 echo x - searchandrescue/files/patch-sar__Makefile
 sed 's/^X//' >searchandrescue/files/patch-sar__Makefile << 'b7c44910a3bbe6dd90515d8a0f719986'
 X--- ./sar/Makefile.orig	2011-08-07 16:06:58.000000000 -0300
 X+++ ./sar/Makefile	2011-08-11 20:36:24.000000000 -0300
 X@@ -1,18 +1,18 @@
 X # Platform Configurator generated Makefile
 X #
 X-PREFIX = $(DESTDIR)/usr/
 X+PREFIX = %%PREFIX%%
 X 
 X-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
 X+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 
 X 
 X INC_DIRS =
 X 
 X-LIBS = -lm -lSDL -lSDL_mixer -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lpthread
 X+LIBS = -lm -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lSDL -lSDL_mixer
 X 
 X-LIB_DIRS =  -L/usr/X11R6/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib/
 X+LIB_DIRS =  -L/usr/local/lib/ -L/usr/local/lib/ -L/usr/local/lib/
 X 
 X-CC = gcc
 X+CC = cc
 X 
 X-CPP = g++
 X+CPP = c++
 X 
 X # Appended stuff starts here
 X #
 X@@ -39,7 +39,7 @@
 X 
 X # Programs
 X LS      = ls
 X-LSFLAGS = -s -h -c --color=auto
 X+LSFLAGS = -s -h -c 
 X RM      = rm
 X RMFLAGS = -f
 X 
 b7c44910a3bbe6dd90515d8a0f719986
 echo x - searchandrescue/files/patch-sar__config.h
 sed 's/^X//' >searchandrescue/files/patch-sar__config.h << '6fe31faf622a6c44c7c1466725a502a9'
 X--- ./sar/config.h.orig	2011-04-03 16:12:49.000000000 -0300
 X+++ ./sar/config.h	2011-08-11 20:34:05.000000000 -0300
 X@@ -493,7 +493,7 @@
 X #define SAR_DEF_LOCAL_DATA_DIR  ".SearchAndRescue"
 X 
 X /* Global game dir */
 X-#define SAR_DEF_GLOBAL_DATA_DIR "/usr/share/games/searchandrescue"
 X+#define SAR_DEF_GLOBAL_DATA_DIR "/usr/local/share/searchandrescue"
 X 
 X /* Subdirs, one of each in the local and global game dirs */
 X #define SAR_DEF_AIRCRAFTS_DIR		"aircrafts"
 X@@ -555,7 +555,7 @@
 X #ifdef __MSW__
 X # define SAR_DEF_SAR_ICON_FILE		"SearchAndRescue.ico"
 X #else
 X-# define SAR_DEF_SAR_ICON_FILE		"/usr/share/pixmaps/SearchAndRescue.xpm"
 X+# define SAR_DEF_SAR_ICON_FILE		"/usr/local/share/pixmaps/SearchAndRescue.xpm"
 X #endif
 X 
 X /* Standard Texture Reference Names
 6fe31faf622a6c44c7c1466725a502a9
 echo x - searchandrescue/pkg-descr
 sed 's/^X//' >searchandrescue/pkg-descr << '6ea10701431770f66056d642e19830d8'
 XThis is a 3D flight simulator in which the player flies around
 Xthe map rescuing people. The game has a selection of several different
 Xhelicoptors and a jet airplane to choose from. The game includes
 Xtraining missions, more complete missions and a campaign mode as
 Xwell as a free flight option for people who just want to explore.
 X
 XWWW:	http://searchandrescue.sourceforge.net/
 6ea10701431770f66056d642e19830d8
 echo x - searchandrescue/distinfo
 sed 's/^X//' >searchandrescue/distinfo << '0cf83bb272bf5948389390904a392202'
 XSHA256 (SearchAndRescue-1.4.0.tar.gz) = 30837d0c5019b646f506c284c1adc01e5334e7befc145a00e64f0e7f21642757
 XSIZE (SearchAndRescue-1.4.0.tar.gz) = 1473062
 0cf83bb272bf5948389390904a392202
 echo x - searchandrescue/Makefile
 sed 's/^X//' >searchandrescue/Makefile << '6ef3e1ff1825f19dac87c4c7c717abbe'
 X# New ports collection makefile for:	SearchAndRescue
 X# Date created:			10 June 2010
 X# Whom:				Jesse Smith <jessefrgsmith at yahoo.ca>
 X#
 X# $FreeBSD: ports/games/searchandrescue/Makefile,v 1.3 2011/05/04 16:04:14 culot Exp $
 X#
 X
 XPORTNAME=	SearchAndRescue
 XPORTVERSION=	1.4.0
 XCATEGORIES=	games
 XMASTER_SITES=	SF/${PORTNAME:L}/Program/
 X
 XMAINTAINER=	jessefrgsmith at yahoo.ca
 XCOMMENT=	A flight simulator in which the player rescues people
 X
 XRUN_DEPENDS=	${LOCALBASE}/share/searchandrescue/human.ini:${PORTSDIR}/games/searchandrescue-data
 X
 XUSE_SDL=	mixer
 XUSE_XORG=	x11 xau xdmcp xext xmu xpm xxf86vm
 XUSE_GL=		glu
 XWRKSRC=		${WRKDIR}/${PORTNAME:L}_${PORTVERSION}
 X
 XPLIST_FILES=	bin/${PORTNAME} \
 X		${DESKTOPDIR:S,${PREFIX}/,,}/${PORTNAME}.desktop \
 X		share/pixmaps/${PORTNAME}.xpm
 XPLIST_DIRS=	${DESKTOPDIR:S,${PREFIX}/,,}
 X
 X#Respect PREFIX, LOCALBASE, CC, etc.
 Xpost-patch:
 X	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 X		-e 's,%%PREFIX%%,${PREFIX},g' \
 X		${WRKSRC}/sar/config.h
 X	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 X		-e 's,/usr/local,${LOCALBASE},g' \
 X		-e 's,/usr/X11R6,${LOCALBASE},g' \
 X		-e '/^CFLAGS = /s,=,= ${CFLAGS},g' \
 X		-e '/^CC = /s, = .*, = ${CC},' \
 X		-e '/^CPP = /s, = .*, = ${CXX},' \
 X		${WRKSRC}/sar/Makefile
 X
 Xdo-install:
 X	${INSTALL_PROGRAM} ${WRKSRC}/sar/${PORTNAME} ${PREFIX}/bin
 X	${MKDIR} ${DESKTOPDIR}
 X	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR}
 X	${INSTALL_DATA} ${WRKSRC}/sar/icons/${PORTNAME}.xpm ${PREFIX}/share/pixmaps
 X
 X.include <bsd.port.mk>
 6ef3e1ff1825f19dac87c4c7c717abbe
 exit

 --=-CyQvcjy7iSknTTcawQCB--