aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2017-02-01 22:40:48 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2017-02-01 22:40:48 +0800
commit454c9c0be10f1c29bca3c7a7da3d210aac59abcc (patch)
treedc5e4855830d56a7f830692554136093c168da4b
parent58ca4385c6003b5e0be87d243d3ace50c45a4028 (diff)
downloadfreebsd-ports-gnome-454c9c0be10f1c29bca3c7a7da3d210aac59abcc.tar.gz
freebsd-ports-gnome-454c9c0be10f1c29bca3c7a7da3d210aac59abcc.tar.zst
freebsd-ports-gnome-454c9c0be10f1c29bca3c7a7da3d210aac59abcc.zip
- Fix build with clang 4.0 by not defining __linux__
- Add LICENSE - Switch to options helpers - Regenerate patches PR: 216651 Submitted by: jbeich@FreeBSD.org
-rw-r--r--games/njam/Makefile13
-rw-r--r--games/njam/files/patch-src_njamedit.cpp2
2 files changed, 10 insertions, 5 deletions
diff --git a/games/njam/Makefile b/games/njam/Makefile
index afc449540124..ddb0266c6e17 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -11,9 +11,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Fast paced multiplayer pac-man clone
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
GNU_CONFIGURE= yes
-USES= gmake
-CPPFLAGS+= -I${LOCALBASE}/include -D__linux__
+USES= gmake localbase
USE_SDL= mixer image net sdl
PORTDOCS= *
@@ -34,9 +36,12 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e 's|/var/lib/games|/var/games|' \
${WRKSRC}/src/njam.cpp
+ @${REINPLACE_CMD} -e 's,#ifdef __linux__,#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__),; \
+ s,#ifndef __linux__,#if !defined(__linux__) \&\& !defined(__FreeBSD__) \&\& !defined(__DragonFly__),' \
+ ${WRKSRC}/src/*.cpp ${WRKSRC}/src/*.h
-post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/html/* ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
diff --git a/games/njam/files/patch-src_njamedit.cpp b/games/njam/files/patch-src_njamedit.cpp
index 5c2ff16ba040..8e690dfad502 100644
--- a/games/njam/files/patch-src_njamedit.cpp
+++ b/games/njam/files/patch-src_njamedit.cpp
@@ -1,4 +1,4 @@
---- src/njamedit.cpp.orig 2008-06-26 22:38:47.000000000 +0000
+--- src/njamedit.cpp.orig 2008-06-26 22:38:47 UTC
+++ src/njamedit.cpp
@@ -114,7 +114,7 @@ void NjamEngine::LevelEditor()
key = SDLK_a;