svn commit: r476220 - head/games/searchandrescue
Tobias Kortkamp
tobik at FreeBSD.org
Thu Aug 2 05:57:27 UTC 2018
Author: tobik
Date: Thu Aug 2 05:57:25 2018
New Revision: 476220
URL: https://svnweb.freebsd.org/changeset/ports/476220
Log:
games/searchandrescue: Fix build on 12.0-CURRENT
Respect CPPFLAGS and stop doing weird things like defining __cplusplus
in the build itself.
In file included from <built-in>:388:
<command line>:8:9: warning: '__cplusplus' macro redefined [-Wmacro-redefined]
#define __cplusplus 1
^
<built-in>:384:9: note: previous definition is here
#define __cplusplus 201402L
^
In file included from disk.cpp:1:
In file included from /usr/include/c++/v1/stdio.h:102:
/usr/include/c++/v1/__config:327:20: error: cannot combine with previous 'char16_t' declaration specifier
typedef __char16_t char16_t;
^
/usr/include/c++/v1/__config:328:20: error: cannot combine with previous 'char32_t' declaration specifier
typedef __char32_t char32_t;
^
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/SearchAndRescue-1.4.0_6.log
While here
- Add license
- Add missing dependencies
Modified:
head/games/searchandrescue/Makefile
Modified: head/games/searchandrescue/Makefile
==============================================================================
--- head/games/searchandrescue/Makefile Thu Aug 2 05:48:38 2018 (r476219)
+++ head/games/searchandrescue/Makefile Thu Aug 2 05:57:25 2018 (r476220)
@@ -3,18 +3,21 @@
PORTNAME= SearchAndRescue
PORTVERSION= 1.4.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME:tl}/Program/
MAINTAINER= jessefrgsmith at yahoo.ca
COMMENT= Flight simulator in which the player rescues people
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
RUN_DEPENDS= ${LOCALBASE}/share/searchandrescue/human.ini:games/searchandrescue-data
USE_SDL= mixer
-USE_XORG= x11 xau xdmcp xext xmu xpm xxf86vm
-USE_GL= glu
+USE_XORG= ice sm x11 xau xdmcp xext xmu xpm xxf86vm
+USE_GL= gl glu
WRKSRC= ${WRKDIR}/${PORTNAME:tl}_${PORTVERSION}
PLIST_FILES= bin/${PORTNAME} \
@@ -30,6 +33,7 @@ post-patch:
-e 's,/usr/local,${LOCALBASE},g' \
-e 's,/usr/X11R6,${LOCALBASE},g' \
-e '/^CFLAGS = /s,=,= ${CFLAGS},g' \
+ -e '/^CPPFLAGS = /s, = .*, = ${CPPFLAGS},g' \
-e '/^CC = /s, = .*, = ${CC},' \
-e '/^CPP = /s, = .*, = ${CXX},' \
-e 's,-O6,,' \
More information about the svn-ports-head
mailing list