Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 14:40:48 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433038 - in head/games/njam: . files
Message-ID:  <201702011440.v11EemRG019519@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Feb  1 14:40:48 2017
New Revision: 433038
URL: https://svnweb.freebsd.org/changeset/ports/433038

Log:
  - 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

Modified:
  head/games/njam/Makefile
  head/games/njam/files/patch-src_njamedit.cpp

Modified: head/games/njam/Makefile
==============================================================================
--- head/games/njam/Makefile	Wed Feb  1 14:34:33 2017	(r433037)
+++ head/games/njam/Makefile	Wed Feb  1 14:40:48 2017	(r433038)
@@ -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>

Modified: head/games/njam/files/patch-src_njamedit.cpp
==============================================================================
--- head/games/njam/files/patch-src_njamedit.cpp	Wed Feb  1 14:34:33 2017	(r433037)
+++ head/games/njam/files/patch-src_njamedit.cpp	Wed Feb  1 14:40:48 2017	(r433038)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702011440.v11EemRG019519>