From amdmi3@amdmi3.ru  Sat Aug 24 03:46:32 2013
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 0249C20B;
	Sat, 24 Aug 2013 03:46:32 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.117.29])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id B44E02777;
	Sat, 24 Aug 2013 03:46:31 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.76)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1VD4nt-0006Q8-Si; Sat, 24 Aug 2013 07:46:21 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 76CFFA83;
	Sat, 24 Aug 2013 07:46:21 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 5A4CCF65; Sat, 24 Aug 2013 07:46:21 +0400 (MSK)
Message-Id: <20130824034621.5A4CCF65@hades.panopticon>
Date: Sat, 24 Aug 2013 07:46:21 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: acm@FreeBSD.org
Subject: [PATCH] games/pingus: fix build with clang, install icon
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         181498
>Category:       ports
>Synopsis:       [PATCH] games/pingus: fix build with clang, install icon
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    acm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 24 03:50:00 UTC 2013
>Closed-Date:    Sat Oct 19 13:20:25 CEST 2013
>Last-Modified:  Sat Oct 19 11:30:00 UTC 2013
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0 r251956: Tue Jun 18 21:41:37 MSK
>Description:
- Fix build with clang with two new patches
- Install icon and use it in a .desktop file
- While here, use space in WWW: and remove library version from LIB_DEPENDS

FYI, pingus 0.7.6 is out: http://pingus.seul.org/download.html

Port maintainer (acm@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- pingus-0.7.2_11.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 325285)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pingus
 PORTVERSION=	0.7.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://pingus.seul.org/files/
 
@@ -12,7 +12,7 @@
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		boost_regex:${PORTSDIR}/devel/boost-libs \
-		physfs.1:${PORTSDIR}/devel/physfs
+		physfs:${PORTSDIR}/devel/physfs
 
 USE_BZIP2=	yes
 USES=		iconv
@@ -21,7 +21,7 @@
 		with_linuxevdev=0
 USE_SDL=	sdl image mixer
 
-DESKTOP_ENTRIES=	"Pingus" "${COMMENT}" "" \
+DESKTOP_ENTRIES=	"Pingus" "${COMMENT}" "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 			"pingus" "" false
 
 PLIST=		${WRKDIR}/pkg-plist
@@ -33,6 +33,7 @@
 pre-install:
 	@${RM} -f ${PLIST}
 	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
+	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
 	@cd ${WRKSRC}/data && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
@@ -44,5 +45,6 @@
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${PREFIX}/share/pixmaps/${PORTNAME}.ico
 
 .include <bsd.port.mk>
Index: files/patch-src-editor-editor__screen.hpp
===================================================================
--- files/patch-src-editor-editor__screen.hpp	(revision 0)
+++ files/patch-src-editor-editor__screen.hpp	(working copy)
@@ -0,0 +1,11 @@
+--- src/editor/editor_screen.hpp.orig	2007-09-30 20:07:08.000000000 +0400
++++ src/editor/editor_screen.hpp	2013-08-23 23:08:40.689231327 +0400
+@@ -27,7 +27,7 @@
+ 
+ class DrawingContext;
+ class FileDialog;
+-class GUI::GUIManager;
++namespace GUI { class GUIManager; }
+ class Pathname;
+ 
+ namespace Editor {

Property changes on: files/patch-src-editor-editor__screen.hpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src-lisp-getters.hpp
===================================================================
--- files/patch-src-lisp-getters.hpp	(revision 0)
+++ files/patch-src-lisp-getters.hpp	(working copy)
@@ -0,0 +1,11 @@
+--- src/lisp/getters.hpp.orig	2007-08-17 20:20:09.000000000 +0400
++++ src/lisp/getters.hpp	2013-08-09 13:42:19.551761882 +0400
+@@ -30,7 +30,7 @@
+   if(lisp->get_list_size() != 2)
+     return false;
+   
+-  const Lisp* el = lisp->get_list_elem(1);
++  const Lisp* el = lisp->get_list_elem(1).get();
+   return get(el, val);
+ }
+ 

Property changes on: files/patch-src-lisp-getters.hpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 325285)
+++ pkg-descr	(working copy)
@@ -2,4 +2,4 @@
 currently 22 playable levels and runs under a wide variety of operating systems 
 (FreeBSD, Linux, Windows, etc.)
 
-WWW:	http://pingus.seul.org/
+WWW: http://pingus.seul.org/
--- pingus-0.7.2_11.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Aug 24 03:50:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181498 
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Sat Oct 19 13:19:58 CEST 2013 
State-Changed-Why:  
Committed in r330859. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181498: commit references a PR
Date: Sat, 19 Oct 2013 11:19:43 +0000 (UTC)

 Author: tijl
 Date: Sat Oct 19 11:19:35 2013
 New Revision: 330859
 URL: http://svnweb.freebsd.org/changeset/ports/330859
 
 Log:
   - Fix build with clang with two new patches
   - Install icon and use it in a .desktop file
   - While here, use space in WWW: and use new style LIB_DEPENDS
   
   PR:		ports/181498
   Submitted by:	amdmi3
   Approved by:	maintainer timeout (8 weeks)
 
 Added:
   head/games/pingus/files/patch-src-editor-editor__screen.hpp   (contents, props changed)
   head/games/pingus/files/patch-src-lisp-getters.hpp   (contents, props changed)
 Modified:
   head/games/pingus/Makefile
   head/games/pingus/pkg-descr   (contents, props changed)
 Directory Properties:
   head/games/pingus/distinfo   (props changed)
   head/games/pingus/files/patch-SConstruct   (props changed)
   head/games/pingus/files/patch-src-screenshot.cpp   (props changed)
   head/games/pingus/files/patch-src-tinygettext_iconv.cpp   (props changed)
 
 Modified: head/games/pingus/Makefile
 ==============================================================================
 --- head/games/pingus/Makefile	Sat Oct 19 11:07:36 2013	(r330858)
 +++ head/games/pingus/Makefile	Sat Oct 19 11:19:35 2013	(r330859)
 @@ -3,16 +3,16 @@
  
  PORTNAME=	pingus
  PORTVERSION=	0.7.2
 -PORTREVISION=	10
 +PORTREVISION=	11
  CATEGORIES=	games
  MASTER_SITES=	http://pingus.seul.org/files/
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	Free Lemmings-like game
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 -		boost_regex:${PORTSDIR}/devel/boost-libs \
 -		physfs.1:${PORTSDIR}/devel/physfs
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 +		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
 +		libphysfs.so:${PORTSDIR}/devel/physfs
  
  USE_BZIP2=	yes
  USES=		iconv
 @@ -21,8 +21,9 @@ SCONS_ARGS=	with_linuxusbmouse=0 \
  		with_linuxevdev=0
  USE_SDL=	sdl image mixer
  
 -DESKTOP_ENTRIES=	"Pingus" "${COMMENT}" "" \
 -			"pingus" "" false
 +DESKTOP_ENTRIES="Pingus" "${COMMENT}" \
 +		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 +		"pingus" "" "false"
  
  PLIST=		${WRKDIR}/pkg-plist
  
 @@ -34,6 +35,7 @@ post-patch:
  pre-install:
  	@${RM} -f ${PLIST}
  	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
 +	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
  	@cd ${WRKSRC}/data && \
  		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
  			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 @@ -45,5 +47,6 @@ do-install:
  		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
  			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
  	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 +	${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${PREFIX}/share/pixmaps/${PORTNAME}.ico
  
  .include <bsd.port.mk>
 
 Added: head/games/pingus/files/patch-src-editor-editor__screen.hpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/pingus/files/patch-src-editor-editor__screen.hpp	Sat Oct 19 11:19:35 2013	(r330859)
 @@ -0,0 +1,11 @@
 +--- src/editor/editor_screen.hpp.orig	2007-09-30 20:07:08.000000000 +0400
 ++++ src/editor/editor_screen.hpp	2013-08-23 23:08:40.689231327 +0400
 +@@ -27,7 +27,7 @@
 + 
 + class DrawingContext;
 + class FileDialog;
 +-class GUI::GUIManager;
 ++namespace GUI { class GUIManager; }
 + class Pathname;
 + 
 + namespace Editor {
 
 Added: head/games/pingus/files/patch-src-lisp-getters.hpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/pingus/files/patch-src-lisp-getters.hpp	Sat Oct 19 11:19:35 2013	(r330859)
 @@ -0,0 +1,11 @@
 +--- src/lisp/getters.hpp.orig	2007-08-17 20:20:09.000000000 +0400
 ++++ src/lisp/getters.hpp	2013-08-09 13:42:19.551761882 +0400
 +@@ -30,7 +30,7 @@
 +   if(lisp->get_list_size() != 2)
 +     return false;
 +   
 +-  const Lisp* el = lisp->get_list_elem(1);
 ++  const Lisp* el = lisp->get_list_elem(1).get();
 +   return get(el, val);
 + }
 + 
 
 Modified: head/games/pingus/pkg-descr
 ==============================================================================
 --- head/games/pingus/pkg-descr	Sat Oct 19 11:07:36 2013	(r330858)
 +++ head/games/pingus/pkg-descr	Sat Oct 19 11:19:35 2013	(r330859)
 @@ -2,4 +2,4 @@ Pingus is a free Lemmings-like game cove
  currently 22 playable levels and runs under a wide variety of operating systems 
  (FreeBSD, Linux, Windows, etc.)
  
 -WWW:	http://pingus.seul.org/
 +WWW: http://pingus.seul.org/
 _______________________________________________
 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:
