From owner-svn-ports-all@freebsd.org Fri Mar 3 10:42:50 2017 Return-Path: Delivered-To: svn-ports-all@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 4263FCF6E6F; Fri, 3 Mar 2017 10:42:50 +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 031A515F4; Fri, 3 Mar 2017 10:42: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 v23Agn7M023575; Fri, 3 Mar 2017 10:42:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23Agm9s023567; Fri, 3 Mar 2017 10:42:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201703031042.v23Agm9s023567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 3 Mar 2017 10:42:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435341 - in head/games/xlogical: . 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.23 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: Fri, 03 Mar 2017 10:42:50 -0000 Author: amdmi3 Date: Fri Mar 3 10:42:48 2017 New Revision: 435341 URL: https://svnweb.freebsd.org/changeset/ports/435341 Log: - Use upstream versioning scheme - Remove dead MASTER_SITE - Add mirror - Fix LICENSE - Add LICENSE_FILE - Move highscores to /var/games and fix highscore handling (setgid games) - Don't install useless docfiles - Install .desktop file - Fix build with clang 4.0 - Unbreak data files which were corrupted by unrestricted USES=dos2unix PR: 216642 Reported by: jbeich Approved by: maintainer timeout (aaron@baugher.biz, 1 month) Added: head/games/xlogical/files/patch-sdl__audio.cpp (contents, props changed) Modified: head/games/xlogical/Makefile head/games/xlogical/files/patch-Makefile.am head/games/xlogical/files/patch-images_Makefile.am head/games/xlogical/files/patch-music_Makefile.am head/games/xlogical/files/patch-sound_Makefile.am head/games/xlogical/pkg-descr head/games/xlogical/pkg-plist Modified: head/games/xlogical/Makefile ============================================================================== --- head/games/xlogical/Makefile Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/Makefile Fri Mar 3 10:42:48 2017 (r435341) @@ -2,31 +2,36 @@ # $FreeBSD$ PORTNAME= xlogical -PORTVERSION= 1.0p8 -PORTREVISION= 10 +DISTVERSION= 1.0-8 CATEGORIES= games -MASTER_SITES= http://changeling.ixionstudios.com/xlogical/downloads/ \ - http://freebsd.portsreview.info/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-/} +MASTER_SITES= https://changeling.ixionstudios.com/xlogical/downloads/ \ + http://mirror.amdmi3.ru/distfiles/ MAINTAINER= aaron@baugher.biz COMMENT= Remake of the classic puzzle game Logical -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" +CONFIGURE_ARGS= --localstatedir="/var/games" USES= autoreconf dos2unix gmake tar:bzip2 +DOS2UNIX_FILES= *.h *.cpp USE_SDL= sdl image mixer -OPTIONS_DEFINE= DOCS +DESKTOP_ENTRIES="XLogical" \ + "" \ + "" \ + "${PORTNAME}" \ + "Game;LogicGame;" \ + "" -post-extract: - @${CHMOD} 755 ${WRKSRC}/missing - @${RM} ${WRKSRC}/LICENSE +OPTIONS_DEFINE= DOCS post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/[A-Z][A-Z]* ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in AUTHORS ChangeLog NEWS README TODO + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +.endfor .include Modified: head/games/xlogical/files/patch-Makefile.am ============================================================================== --- head/games/xlogical/files/patch-Makefile.am Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/files/patch-Makefile.am Fri Mar 3 10:42:48 2017 (r435341) @@ -1,6 +1,6 @@ --- Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000 +++ Makefile.am -@@ -7,18 +7,15 @@ SCOREFILE = xlogical.scores +@@ -7,18 +7,12 @@ SCOREFILE = xlogical.scores FILEOWNER = bin FILEGROUP = games install-exec-am: $(bin_PROGRAMS) @@ -19,11 +19,8 @@ - chmod 660 $(localstatedir)/xlogical/xlogical.scores + $(SHELL) ./mkinstalldirs $(DESTDIR)$(datadir)/xlogical + $(BSD_INSTALL_DATA) $(DATAFILES) $(DESTDIR)$(datadir)/xlogical -+ chmod 640 $(DESTDIR)$(datadir)/xlogical/xlogical.levels -+ chmod 644 $(DESTDIR)$(datadir)/xlogical/xlogical.properties + $(SHELL) ./mkinstalldirs $(DESTDIR)$(localstatedir)/xlogical -+ $(BSD_INSTALL_DATA) $(SCOREFILE) $(DESTDIR)$(localstatedir)/xlogical -+ chmod 660 $(DESTDIR)$(localstatedir)/xlogical/xlogical.scores ++ $(BSD_INSTALL_DATA) $(SCOREFILE) $(DESTDIR)$(localstatedir)/xlogical/$(SCOREFILE).sample uninstall: rm -f $(datadir)/xlogical/xlogical.levels rm -f $(datadir)/xlogical/xlogical.properties Modified: head/games/xlogical/files/patch-images_Makefile.am ============================================================================== --- head/games/xlogical/files/patch-images_Makefile.am Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/files/patch-images_Makefile.am Fri Mar 3 10:42:48 2017 (r435341) @@ -1,6 +1,6 @@ --- images/Makefile.am.orig 2014-06-10 19:57:22.000000000 +0000 +++ images/Makefile.am -@@ -3,10 +3,10 @@ +@@ -3,10 +3,9 @@ SHELL=@SHELL@ install-data-am: @@ -11,7 +11,6 @@ + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/images + $(BSD_INSTALL_DATA) *.bmp *.jpg $(DESTDIR)$(datadir)/xlogical/images -+ chmod 644 $(DESTDIR)$(datadir)/xlogical/images/* uninstall: rm -f $(datadir)/xlogical/images/*.{bmp,jpg} rmdir $(datadir)/xlogical/images Modified: head/games/xlogical/files/patch-music_Makefile.am ============================================================================== --- head/games/xlogical/files/patch-music_Makefile.am Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/files/patch-music_Makefile.am Fri Mar 3 10:42:48 2017 (r435341) @@ -1,6 +1,6 @@ --- music/Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000 +++ music/Makefile.am -@@ -3,10 +3,10 @@ +@@ -3,10 +3,9 @@ SHELL=@SHELL@ install-data-am: @@ -11,7 +11,6 @@ + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/music + $(BSD_INSTALL_DATA) *.mod $(DESTDIR)$(datadir)/xlogical/music -+ chmod 644 $(DESTDIR)$(datadir)/xlogical/music/*.mod uninstall: rm -f $(datadir)/xlogical/music/*.mod rmdir $(datadir)/xlogical/music Added: head/games/xlogical/files/patch-sdl__audio.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xlogical/files/patch-sdl__audio.cpp Fri Mar 3 10:42:48 2017 (r435341) @@ -0,0 +1,28 @@ +--- sdl_audio.cpp.orig 2001-07-31 20:54:55 UTC ++++ sdl_audio.cpp +@@ -27,6 +27,7 @@ + #endif + + #include ++#include + #include + + #include +@@ -58,13 +59,13 @@ get_music_info( + char *start, *end; + int len = strlen( aPath ); + +- for( end=aPath+len; end >= 0; end-=1 ) ++ for( end=aPath+len; *end != '.'; end-=1 ) + { +- if (*end == '.') break; ++ assert(end > aPath); // make sure we don't go past the string boundary + } +- for( start=end; start >= 0; start-=1 ) ++ for( start=end; *start != *PATHSEP; start-=1 ) + { +- if (*start == *PATHSEP) break; ++ assert(start > aPath); // make sure we don't go past the string boundary + } + char *buf = new char[len+1]; + strncpy( buf, start+1, end-start-1 ); Modified: head/games/xlogical/files/patch-sound_Makefile.am ============================================================================== --- head/games/xlogical/files/patch-sound_Makefile.am Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/files/patch-sound_Makefile.am Fri Mar 3 10:42:48 2017 (r435341) @@ -1,6 +1,6 @@ --- sound/Makefile.am.orig 2014-06-10 17:24:39.000000000 +0000 +++ sound/Makefile.am -@@ -3,10 +3,10 @@ +@@ -3,10 +3,9 @@ SHELL=@SHELL@ install-data-am: @@ -11,7 +11,6 @@ + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical + $(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/sound + $(BSD_INSTALL_DATA) *.wav $(DESTDIR)$(datadir)/xlogical/sound -+ chmod 644 $(DESTDIR)$(datadir)/xlogical/sound/*.wav uninstall: rm -f $(datadir)/xlogical/sound/*.wav rmdir $(datadir)/xlogical/sound Modified: head/games/xlogical/pkg-descr ============================================================================== --- head/games/xlogical/pkg-descr Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/pkg-descr Fri Mar 3 10:42:48 2017 (r435341) @@ -1,5 +1,4 @@ XLogical is an action/puzzle game based on the classic game Logical from Rainbow Arts. - WWW: http://changeling.ixionstudios.com/xlogical/ Modified: head/games/xlogical/pkg-plist ============================================================================== --- head/games/xlogical/pkg-plist Fri Mar 3 10:31:45 2017 (r435340) +++ head/games/xlogical/pkg-plist Fri Mar 3 10:42:48 2017 (r435341) @@ -1,4 +1,4 @@ -bin/xlogical +@(,games,2555) bin/xlogical %%DATADIR%%/sound/block_ball.wav %%DATADIR%%/sound/teleport.wav %%DATADIR%%/sound/spinner_click.wav @@ -153,9 +153,9 @@ bin/xlogical %%DATADIR%%/xlogical.properties %%DATADIR%%/xlogical.levels %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -var/xlogical/xlogical.scores +@sample(,games,664) /var/games/xlogical/xlogical.scores.sample +@dir(,games,775) /var/games/xlogical