From owner-svn-ports-all@FreeBSD.ORG Sat Oct 19 11:19:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 658E473D; Sat, 19 Oct 2013 11:19:36 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 52727251A; Sat, 19 Oct 2013 11:19:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JBJa5O080014; Sat, 19 Oct 2013 11:19:36 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JBJZb7080010; Sat, 19 Oct 2013 11:19:35 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310191119.r9JBJZb7080010@svn.freebsd.org> From: Tijl Coosemans Date: Sat, 19 Oct 2013 11:19:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330859 - in head/games/pingus: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Oct 2013 11:19:36 -0000 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 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/