From nobody@FreeBSD.org  Sat Mar  9 14:51:17 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 5B82867F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Mar 2013 14:51:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D295714
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Mar 2013 14:51:17 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r29EpGtZ068832
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 9 Mar 2013 14:51:16 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r29EpGaU068825;
	Sat, 9 Mar 2013 14:51:16 GMT
	(envelope-from nobody)
Message-Id: <201303091451.r29EpGaU068825@red.freebsd.org>
Date: Sat, 9 Mar 2013 14:51:16 GMT
From: Vitaly Magerya <vmagerya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update games/nlarn from 0.7 to 0.7.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: martin@arp242.net

>Number:         176785
>Category:       ports
>Synopsis:       [patch] update games/nlarn from 0.7 to 0.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 09 15:00:00 UTC 2013
>Closed-Date:    Thu Mar 28 15:41:06 UTC 2013
>Last-Modified:  Thu Mar 28 15:50:00 UTC 2013
>Originator:     Vitaly Magerya
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
>Description:
Update games/nlarn to 0.7.2.

Included is a patch to make nlarn not crash when it fails
to open a scoreboard file (which happens every time, since
it's scoreboard functionality is broken).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN nlarn.orig/Makefile nlarn/Makefile
--- nlarn.orig/Makefile	2013-03-08 12:51:34.000000000 +0200
+++ nlarn/Makefile	2013-03-09 12:48:46.000000000 +0200
@@ -1,12 +1,8 @@
-# Ports collection makefile for:  games/nlarn
-# Date created:			  2011-11-08
-# Whom:				  Martin Tournoij <martin@arp242.net>
-#
+# Created by: Martin Tournoij <martin@arp242.net>
 # $FreeBSD: games/nlarn/Makefile 313633 2013-03-08 10:51:34Z kwm $
-#
 
 PORTNAME=	nlarn
-PORTVERSION=	0.7
+PORTVERSION=	0.7.2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -15,24 +11,13 @@
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	premake4:${PORTSDIR}/devel/premake4
-
-WRKSRC=		${WRKDIR}/jaydg-nlarn-NLarn-${PORTVERSION}.0
 USE_LUA=	5.1
 USE_GNOME=	glib20
 USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 
-do-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/premake4 --os=bsd gmake
-
 post-configure:
-	@${REINPLACE_CMD} 's|$$(ARCH)||g; \
-		s|-I${LOCALBASE}|-I${LUA_INCDIR} -I${LOCALBASE}|g; \
-		s|-lz|-lz -llua-5.1 -lncurses -lpanel|g;' \
-	${WRKSRC}/nlarn.make
-
-	@${REINPLACE_CMD} 's|/usr/share/games/nlarn|${DATADIR}|' \
+	@${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \
 		${WRKSRC}/src/game.c
 
 do-install:
diff -ruN nlarn.orig/distinfo nlarn/distinfo
--- nlarn.orig/distinfo	2012-07-14 16:54:48.000000000 +0300
+++ nlarn/distinfo	2013-03-09 10:56:49.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (nlarn-0.7.tar.gz) = 21818bbc1691a8a79d3d6ce71934076895c2708725e5a0b431d46dba39e2795a
-SIZE (nlarn-0.7.tar.gz) = 244698
+SHA256 (nlarn-0.7.2.tar.gz) = 291fed77cb80261c5dfd375c702482f4d38415e3ce769b237ac22957d42dfbc8
+SIZE (nlarn-0.7.2.tar.gz) = 813829
diff -ruN nlarn.orig/files/patch-Makefile nlarn/files/patch-Makefile
--- nlarn.orig/files/patch-Makefile	1970-01-01 03:00:00.000000000 +0300
+++ nlarn/files/patch-Makefile	2013-03-09 11:15:12.000000000 +0200
@@ -0,0 +1,27 @@
+--- Makefile.orig	2012-07-06 20:29:35.000000000 +0300
++++ Makefile	2013-03-09 11:15:05.000000000 +0200
+@@ -102,13 +102,13 @@
+   LDFLAGS += $(shell pkg-config --libs glib-2.0)
+ 
+   # Configuration for ncurses
+-  ifeq ($(filter Darwin DragonFly OpenBSD,$(OS)),)
++  ifeq ($(filter Darwin DragonFly FreeBSD OpenBSD,$(OS)),)
+     CFLAGS  += $(shell ncurses5-config --cflags)
+     LDFLAGS += $(shell ncurses5-config --libs) -lpanel
+   else
+     # OS X is handled separately
+     ifneq ($(OS), Darwin)
+-      # DragonFly and OpenBSD have ncurses in base (and no config tool)
++      # DragonFly, FreeBSD and OpenBSD have ncurses in base (and no config tool)
+       LDFLAGS += -lncurses -lpanel
+     endif
+   endif
+@@ -117,6 +117,8 @@
+   # Debian and derivates use lua5.1, the rest of the world lua
+   ifneq ($(wildcard /etc/debian_version),)
+     lua = lua5.1
++  else ifeq ($(OS), FreeBSD)
++    lua = lua-5.1
+   else
+     lua = lua
+   endif
diff -ruN nlarn.orig/files/patch-premake4.lua nlarn/files/patch-premake4.lua
--- nlarn.orig/files/patch-premake4.lua	2012-07-14 16:54:48.000000000 +0300
+++ nlarn/files/patch-premake4.lua	1970-01-01 03:00:00.000000000 +0300
@@ -1,19 +0,0 @@
---- premake4.lua.orig	2011-11-08 23:01:23.000000000 +0100
-+++ premake4.lua	2011-11-08 23:01:44.000000000 +0100
-@@ -75,12 +75,11 @@
-       -- Add configuration for Lua
-       -- Debian and Ubuntu have a specific naming convention for the lua
-       -- package; fortunately it can be configured with pkg-config
--      if os.is("linux") and (get_linux_distribution() == "Debian"
--          or get_linux_distribution() == "Ubuntu")
-+      if os.is("bsd")
-       then
--        includedirs { get_dirs("include", "lua5.1") }
--        links { "lua5.1" }
--        libdirs { get_dirs("lib", "lua5.1") }
-+        includedirs { get_dirs("include", "lua-5.1") }
-+        links { "lua-5.1" }
-+        libdirs { get_dirs("lib", "lua-5.1") }
-       else
-         includedirs { get_dirs("include", "lua") }
-         links { "lua" }
diff -ruN nlarn.orig/files/patch-src-game.c nlarn/files/patch-src-game.c
--- nlarn.orig/files/patch-src-game.c	1970-01-01 03:00:00.000000000 +0300
+++ nlarn/files/patch-src-game.c	2013-03-09 12:47:25.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/game.c.orig	2012-07-06 20:29:35.000000000 +0300
++++ src/game.c	2013-03-09 12:23:13.000000000 +0200
+@@ -1353,7 +1354,7 @@
+     if (sb == NULL)
+     {
+         /* opening the file failed */
+-        log_add_entry(g->log, "Error opening scoreboard file \"%s\".");
++        log_add_entry(g->log, "Error opening scoreboard file.");
+         free(uscores);
+         return;
+     }
diff -ruN nlarn.orig/pkg-plist nlarn/pkg-plist
--- nlarn.orig/pkg-plist	2012-07-14 16:54:48.000000000 +0300
+++ nlarn/pkg-plist	2013-03-09 13:15:20.000000000 +0200
@@ -4,6 +4,7 @@
 %%DATADIR%%/maze
 %%DATADIR%%/maze_doc.txt
 %%DATADIR%%/monsters.lua
+%%DATADIR%%/nlarn-128.bmp
 %%DATADIR%%/nlarn.hlp
 %%DATADIR%%/nlarn.ini-sample
 %%DATADIR%%/nlarn.msg


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Mar 9 15:00:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176785 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: martin@arp242.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/176785: [patch] update games/nlarn from 0.7 to 0.7.2
Date: Sat, 9 Mar 2013 15:00:07 UT

 Maintainer of games/nlarn,
 
 Please note that PR ports/176785 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/176785
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Thu Mar 28 15:25:38 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176785 
State-Changed-From-To: feedback->closed 
State-Changed-By: pawel 
State-Changed-When: Thu Mar 28 15:41:05 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176785 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176785: commit references a PR
Date: Thu, 28 Mar 2013 15:41:07 +0000 (UTC)

 Author: pawel
 Date: Thu Mar 28 15:40:51 2013
 New Revision: 315473
 URL: http://svnweb.freebsd.org/changeset/ports/315473
 
 Log:
   Update to version 0.7.2
   
   PR:		ports/176785
   Submitted by:	Vitaly Magerya <vmagerya@gmail.com>
   Approved by:	maintainer timeout
 
 Added:
   head/games/nlarn/files/patch-Makefile   (contents, props changed)
   head/games/nlarn/files/patch-src-game.c   (contents, props changed)
 Deleted:
   head/games/nlarn/files/patch-premake4.lua
 Modified:
   head/games/nlarn/Makefile
   head/games/nlarn/distinfo   (contents, props changed)
   head/games/nlarn/pkg-plist   (contents, props changed)
 
 Modified: head/games/nlarn/Makefile
 ==============================================================================
 --- head/games/nlarn/Makefile	Thu Mar 28 15:22:11 2013	(r315472)
 +++ head/games/nlarn/Makefile	Thu Mar 28 15:40:51 2013	(r315473)
 @@ -1,12 +1,8 @@
 -# Ports collection makefile for:  games/nlarn
 -# Date created:			  2011-11-08
 -# Whom:				  Martin Tournoij <martin@arp242.net>
 -#
 +# Created by: Martin Tournoij <martin@arp242.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	nlarn
 -PORTVERSION=	0.7
 +PORTVERSION=	0.7.2
  CATEGORIES=	games
  MASTER_SITES=	SF
  
 @@ -15,24 +11,13 @@ COMMENT=	Roguelike game and as such a re
  
  LICENSE=	GPLv3
  
 -BUILD_DEPENDS=	premake4:${PORTSDIR}/devel/premake4
 -
 -WRKSRC=		${WRKDIR}/jaydg-nlarn-NLarn-${PORTVERSION}.0
  USE_LUA=	5.1
  USE_GNOME=	glib20
  USE_PKGCONFIG=	build
  USE_GMAKE=	yes
  
 -do-configure:
 -	cd ${WRKSRC} && ${LOCALBASE}/bin/premake4 --os=bsd gmake
 -
  post-configure:
 -	@${REINPLACE_CMD} 's|$$(ARCH)||g; \
 -		s|-I${LOCALBASE}|-I${LUA_INCDIR} -I${LOCALBASE}|g; \
 -		s|-lz|-lz -llua-5.1 -lncurses -lpanel|g;' \
 -	${WRKSRC}/nlarn.make
 -
 -	@${REINPLACE_CMD} 's|/usr/share/games/nlarn|${DATADIR}|' \
 +	@${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \
  		${WRKSRC}/src/game.c
  
  do-install:
 
 Modified: head/games/nlarn/distinfo
 ==============================================================================
 --- head/games/nlarn/distinfo	Thu Mar 28 15:22:11 2013	(r315472)
 +++ head/games/nlarn/distinfo	Thu Mar 28 15:40:51 2013	(r315473)
 @@ -1,2 +1,2 @@
 -SHA256 (nlarn-0.7.tar.gz) = 21818bbc1691a8a79d3d6ce71934076895c2708725e5a0b431d46dba39e2795a
 -SIZE (nlarn-0.7.tar.gz) = 244698
 +SHA256 (nlarn-0.7.2.tar.gz) = 291fed77cb80261c5dfd375c702482f4d38415e3ce769b237ac22957d42dfbc8
 +SIZE (nlarn-0.7.2.tar.gz) = 813829
 
 Added: head/games/nlarn/files/patch-Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/nlarn/files/patch-Makefile	Thu Mar 28 15:40:51 2013	(r315473)
 @@ -0,0 +1,27 @@
 +--- Makefile.orig	2012-07-06 20:29:35.000000000 +0300
 ++++ Makefile	2013-03-09 11:15:05.000000000 +0200
 +@@ -102,13 +102,13 @@
 +   LDFLAGS += $(shell pkg-config --libs glib-2.0)
 + 
 +   # Configuration for ncurses
 +-  ifeq ($(filter Darwin DragonFly OpenBSD,$(OS)),)
 ++  ifeq ($(filter Darwin DragonFly FreeBSD OpenBSD,$(OS)),)
 +     CFLAGS  += $(shell ncurses5-config --cflags)
 +     LDFLAGS += $(shell ncurses5-config --libs) -lpanel
 +   else
 +     # OS X is handled separately
 +     ifneq ($(OS), Darwin)
 +-      # DragonFly and OpenBSD have ncurses in base (and no config tool)
 ++      # DragonFly, FreeBSD and OpenBSD have ncurses in base (and no config tool)
 +       LDFLAGS += -lncurses -lpanel
 +     endif
 +   endif
 +@@ -117,6 +117,8 @@
 +   # Debian and derivates use lua5.1, the rest of the world lua
 +   ifneq ($(wildcard /etc/debian_version),)
 +     lua = lua5.1
 ++  else ifeq ($(OS), FreeBSD)
 ++    lua = lua-5.1
 +   else
 +     lua = lua
 +   endif
 
 Added: head/games/nlarn/files/patch-src-game.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/nlarn/files/patch-src-game.c	Thu Mar 28 15:40:51 2013	(r315473)
 @@ -0,0 +1,11 @@
 +--- src/game.c.orig	2012-07-06 20:29:35.000000000 +0300
 ++++ src/game.c	2013-03-09 12:23:13.000000000 +0200
 +@@ -1353,7 +1354,7 @@
 +     if (sb == NULL)
 +     {
 +         /* opening the file failed */
 +-        log_add_entry(g->log, "Error opening scoreboard file \"%s\".");
 ++        log_add_entry(g->log, "Error opening scoreboard file.");
 +         free(uscores);
 +         return;
 +     }
 
 Modified: head/games/nlarn/pkg-plist
 ==============================================================================
 --- head/games/nlarn/pkg-plist	Thu Mar 28 15:22:11 2013	(r315472)
 +++ head/games/nlarn/pkg-plist	Thu Mar 28 15:40:51 2013	(r315473)
 @@ -4,6 +4,7 @@ bin/nlarn
  %%DATADIR%%/maze
  %%DATADIR%%/maze_doc.txt
  %%DATADIR%%/monsters.lua
 +%%DATADIR%%/nlarn-128.bmp
  %%DATADIR%%/nlarn.hlp
  %%DATADIR%%/nlarn.ini-sample
  %%DATADIR%%/nlarn.msg
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
