- 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)

8 files changed, 55 insertions, 29 deletions

diff --git a/games/xlogical/Makefile b/games/xlogical/Makefile
index bcac5edd2eff..015035072eef 100644
--- a/games/xlogical/Makefile
+++ b/games/xlogical/Makefile
@@ -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 <bsd.port.mk>
diff --git a/games/xlogical/files/patch-Makefile.am b/games/xlogical/files/patch-Makefile.am
index c55a99dfc336..6607b7e28a7a 100644
--- a/games/xlogical/files/patch-Makefile.am
+++ b/games/xlogical/files/patch-Makefile.am
@@ -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
diff --git a/games/xlogical/files/patch-images_Makefile.am b/games/xlogical/files/patch-images_Makefile.am
index ceaf9759cfab..baffa9ba93e3 100644
--- a/games/xlogical/files/patch-images_Makefile.am
+++ b/games/xlogical/files/patch-images_Makefile.am
@@ -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
diff --git a/games/xlogical/files/patch-music_Makefile.am b/games/xlogical/files/patch-music_Makefile.am
index ed8bcd1c63c2..ff28288b2b69 100644
--- a/games/xlogical/files/patch-music_Makefile.am
+++ b/games/xlogical/files/patch-music_Makefile.am
@@ -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
diff --git a/games/xlogical/files/patch-sdl__audio.cpp b/games/xlogical/files/patch-sdl__audio.cpp
new file mode 100644
index 000000000000..c62566d1446f
--- /dev/null
+++ b/games/xlogical/files/patch-sdl__audio.cpp
@@ -0,0 +1,28 @@
+--- sdl_audio.cpp.orig	2001-07-31 20:54:55 UTC
++++ sdl_audio.cpp
+@@ -27,6 +27,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cassert>
+ #include <stdlib.h>
+ 
+ #include <SDL.h>
+@@ -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 );
diff --git a/games/xlogical/files/patch-sound_Makefile.am b/games/xlogical/files/patch-sound_Makefile.am
index c03e84ea7165..cd0674e29719 100644
--- a/games/xlogical/files/patch-sound_Makefile.am
+++ b/games/xlogical/files/patch-sound_Makefile.am
@@ -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
diff --git a/games/xlogical/pkg-descr b/games/xlogical/pkg-descr
index 4025ae737418..440b3d73fd2c 100644
--- a/games/xlogical/pkg-descr
+++ b/games/xlogical/pkg-descr
@@ -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/
diff --git a/games/xlogical/pkg-plist b/games/xlogical/pkg-plist
index fad43866e84b..2b202a830422 100644
--- a/games/xlogical/pkg-plist
+++ b/games/xlogical/pkg-plist
@@ -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