From owner-svn-ports-head@freebsd.org  Wed Feb  1 14:40:49 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C17BACCB3DC;
 Wed,  1 Feb 2017 14:40:49 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 784C7FD8;
 Wed,  1 Feb 2017 14:40:49 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11EemtB019521;
 Wed, 1 Feb 2017 14:40:48 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11EemRG019519;
 Wed, 1 Feb 2017 14:40:48 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201702011440.v11EemRG019519@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 1 Feb 2017 14:40:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r433038 - in head/games/njam: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Feb 2017 14:40:49 -0000

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;