Index: head/games/xlogical/Makefile
===================================================================
--- head/games/xlogical/Makefile	(revision 435340)
+++ head/games/xlogical/Makefile	(revision 435341)
@@ -1,32 +1,37 @@
 # Created by: Aaron Baugher
 # $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
 
+DESKTOP_ENTRIES="XLogical" \
+		"" \
+		"" \
+		"${PORTNAME}" \
+		"Game;LogicGame;" \
+		""
+
 OPTIONS_DEFINE=	DOCS
 
-post-extract:
-	@${CHMOD} 755 ${WRKSRC}/missing
-	@${RM} ${WRKSRC}/LICENSE
-
 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>
Index: head/games/xlogical/files/patch-Makefile.am
===================================================================
--- head/games/xlogical/files/patch-Makefile.am	(revision 435340)
+++ head/games/xlogical/files/patch-Makefile.am	(revision 435341)
@@ -1,29 +1,26 @@
 --- 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)
 -	-chown $(FILEOWNER):$(FILEGROUP) $(bindir)/xlogical
 -	chmod 2755 $(bindir)/xlogical
 +	$(BSD_INSTALL_PROGRAM) $(bin_PROGRAMS) $(DESTDIR)$(bindir)/xlogical
  install-data-am: $(DATAFILES) $(SCOREFILE)
 -	$(SHELL) ./mkinstalldirs $(datadir)/xlogical
 -	cp $(DATAFILES) $(datadir)/xlogical
 -	chmod 640 $(datadir)/xlogical/xlogical.levels
 -	chmod 644 $(datadir)/xlogical/xlogical.properties
 -	-chown -R $(FILEOWNER):$(FILEGROUP) $(datadir)/xlogical
 -	$(SHELL) ./mkinstalldirs $(localstatedir)/xlogical
 -	cp $(SCOREFILE) $(localstatedir)/xlogical
 -	-chown $(FILEOWNER):$(FILEGROUP) $(localstatedir)/xlogical/xlogical.scores
 -	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
Index: head/games/xlogical/files/patch-images_Makefile.am
===================================================================
--- head/games/xlogical/files/patch-images_Makefile.am	(revision 435340)
+++ head/games/xlogical/files/patch-images_Makefile.am	(revision 435341)
@@ -1,17 +1,16 @@
 --- 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:
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/images
 -	cp *.{bmp,jpg} $(datadir)/xlogical/images
 -	chmod 644 $(datadir)/xlogical/images/*.{bmp,jpg}
 +	$(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
Index: head/games/xlogical/files/patch-music_Makefile.am
===================================================================
--- head/games/xlogical/files/patch-music_Makefile.am	(revision 435340)
+++ head/games/xlogical/files/patch-music_Makefile.am	(revision 435341)
@@ -1,17 +1,16 @@
 --- 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:
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/music
 -	cp *.mod $(datadir)/xlogical/music
 -	chmod 644 $(datadir)/xlogical/music/*.mod
 +	$(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
Index: head/games/xlogical/files/patch-sdl__audio.cpp
===================================================================
--- head/games/xlogical/files/patch-sdl__audio.cpp	(nonexistent)
+++ head/games/xlogical/files/patch-sdl__audio.cpp	(revision 435341)
@@ -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 );

Property changes on: head/games/xlogical/files/patch-sdl__audio.cpp
___________________________________________________________________
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
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/xlogical/files/patch-sound_Makefile.am
===================================================================
--- head/games/xlogical/files/patch-sound_Makefile.am	(revision 435340)
+++ head/games/xlogical/files/patch-sound_Makefile.am	(revision 435341)
@@ -1,17 +1,16 @@
 --- 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:
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
 -	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/sound
 -	cp *.wav $(datadir)/xlogical/sound
 -	chmod 644 $(datadir)/xlogical/sound/*.wav
 +	$(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
Index: head/games/xlogical/pkg-descr
===================================================================
--- head/games/xlogical/pkg-descr	(revision 435340)
+++ head/games/xlogical/pkg-descr	(revision 435341)
@@ -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/
Index: head/games/xlogical/pkg-plist
===================================================================
--- head/games/xlogical/pkg-plist	(revision 435340)
+++ head/games/xlogical/pkg-plist	(revision 435341)
@@ -1,161 +1,161 @@
-bin/xlogical
+@(,games,2555) bin/xlogical
 %%DATADIR%%/sound/block_ball.wav
 %%DATADIR%%/sound/teleport.wav
 %%DATADIR%%/sound/spinner_click.wav
 %%DATADIR%%/sound/paint_ball.wav
 %%DATADIR%%/sound/one_way.wav
 %%DATADIR%%/sound/new_pattern.wav
 %%DATADIR%%/sound/new_ball.wav
 %%DATADIR%%/sound/menu_click.wav
 %%DATADIR%%/sound/finish_spinner.wav
 %%DATADIR%%/sound/finish_level.wav
 %%DATADIR%%/sound/eject_ball.wav
 %%DATADIR%%/sound/catch_ball.wav
 %%DATADIR%%/sound/bonus_life.wav
 %%DATADIR%%/sound/time_warning.wav
 %%DATADIR%%/images/track_ulr.bmp
 %%DATADIR%%/images/track_ul.bmp
 %%DATADIR%%/images/track_udr.bmp
 %%DATADIR%%/images/track_udlr.bmp
 %%DATADIR%%/images/track_udl.bmp
 %%DATADIR%%/images/track_ud.bmp
 %%DATADIR%%/images/track_u.bmp
 %%DATADIR%%/images/track_r.bmp
 %%DATADIR%%/images/track_lr.bmp
 %%DATADIR%%/images/track_l.bmp
 %%DATADIR%%/images/track_dr.bmp
 %%DATADIR%%/images/track_dlr.bmp
 %%DATADIR%%/images/track_dl.bmp
 %%DATADIR%%/images/track_d.bmp
 %%DATADIR%%/images/title_text_4.jpg
 %%DATADIR%%/images/title_text_3.bmp
 %%DATADIR%%/images/title_text_2.bmp
 %%DATADIR%%/images/title_text_1.bmp
 %%DATADIR%%/images/timer.bmp
 %%DATADIR%%/images/teleport_ud.bmp
 %%DATADIR%%/images/teleport_lr.bmp
 %%DATADIR%%/images/teleport_base.bmp
 %%DATADIR%%/images/starttimer_20.bmp
 %%DATADIR%%/images/starttimer_19.bmp
 %%DATADIR%%/images/starttimer_18.bmp
 %%DATADIR%%/images/starttimer_17.bmp
 %%DATADIR%%/images/starttimer_16.bmp
 %%DATADIR%%/images/starttimer_15.bmp
 %%DATADIR%%/images/starttimer_14.bmp
 %%DATADIR%%/images/starttimer_13.bmp
 %%DATADIR%%/images/starttimer_12.bmp
 %%DATADIR%%/images/starttimer_11.bmp
 %%DATADIR%%/images/starttimer_10.bmp
 %%DATADIR%%/images/starttimer_09.bmp
 %%DATADIR%%/images/starttimer_08.bmp
 %%DATADIR%%/images/starttimer_07.bmp
 %%DATADIR%%/images/starttimer_06.bmp
 %%DATADIR%%/images/starttimer_05.bmp
 %%DATADIR%%/images/starttimer_04.bmp
 %%DATADIR%%/images/starttimer_03.bmp
 %%DATADIR%%/images/starttimer_02.bmp
 %%DATADIR%%/images/starttimer_01.bmp
 %%DATADIR%%/images/starttimer_00.bmp
 %%DATADIR%%/images/start_u.bmp
 %%DATADIR%%/images/start_r.bmp
 %%DATADIR%%/images/start_l.bmp
 %%DATADIR%%/images/start_d.bmp
 %%DATADIR%%/images/start_c.bmp
 %%DATADIR%%/images/spintopon.bmp
 %%DATADIR%%/images/spintopoff.bmp
 %%DATADIR%%/images/spinring_u.bmp
 %%DATADIR%%/images/spinring_r.bmp
 %%DATADIR%%/images/spinring_l.bmp
 %%DATADIR%%/images/spinring_d.bmp
 %%DATADIR%%/images/spinring.bmp
 %%DATADIR%%/images/spinred_2.bmp
 %%DATADIR%%/images/spinred_1.bmp
 %%DATADIR%%/images/spinred_0.bmp
 %%DATADIR%%/images/spindark.bmp
 %%DATADIR%%/images/spincoverred_2.bmp
 %%DATADIR%%/images/spincoverred_1.bmp
 %%DATADIR%%/images/spincoverred_0.bmp
 %%DATADIR%%/images/spincover_2.bmp
 %%DATADIR%%/images/spincover_1.bmp
 %%DATADIR%%/images/spincover_0.bmp
 %%DATADIR%%/images/spin_2.bmp
 %%DATADIR%%/images/spin_1.bmp
 %%DATADIR%%/images/spin_0.bmp
 %%DATADIR%%/images/slider_thumb.bmp
 %%DATADIR%%/images/slider.bmp
 %%DATADIR%%/images/sel_back_4.bmp
 %%DATADIR%%/images/sel_back_3.bmp
 %%DATADIR%%/images/sel_back_2.bmp
 %%DATADIR%%/images/sel_back_1.bmp
 %%DATADIR%%/images/scrollblock.bmp
 %%DATADIR%%/images/pattern_disp.bmp
 %%DATADIR%%/images/paint_base.bmp
 %%DATADIR%%/images/order_disp.bmp
 %%DATADIR%%/images/numbers.bmp
 %%DATADIR%%/images/next_base.bmp
 %%DATADIR%%/images/gem_c4.bmp
 %%DATADIR%%/images/gem_c3.bmp
 %%DATADIR%%/images/gem_c2.bmp
 %%DATADIR%%/images/gem_c1.bmp
 %%DATADIR%%/images/font_4.bmp
 %%DATADIR%%/images/font_3.bmp
 %%DATADIR%%/images/font_2.bmp
 %%DATADIR%%/images/font_1.bmp
 %%DATADIR%%/images/finish_4.bmp
 %%DATADIR%%/images/finish_3.bmp
 %%DATADIR%%/images/finish_2.bmp
 %%DATADIR%%/images/finish_1.bmp
 %%DATADIR%%/images/cover_ud.bmp
 %%DATADIR%%/images/cover_u.bmp
 %%DATADIR%%/images/cover_r.bmp
 %%DATADIR%%/images/cover_lr.bmp
 %%DATADIR%%/images/cover_l.bmp
 %%DATADIR%%/images/cover_d.bmp
 %%DATADIR%%/images/cover_center.bmp
 %%DATADIR%%/images/block_base.bmp
 %%DATADIR%%/images/ballmove5_5.bmp
 %%DATADIR%%/images/ballmove5_4.bmp
 %%DATADIR%%/images/ballmove5_3.bmp
 %%DATADIR%%/images/ballmove5_2.bmp
 %%DATADIR%%/images/ballmove5_1.bmp
 %%DATADIR%%/images/ballmove5_0.bmp
 %%DATADIR%%/images/ballmove4_4.bmp
 %%DATADIR%%/images/ballmove4_3.bmp
 %%DATADIR%%/images/ballmove4_2.bmp
 %%DATADIR%%/images/ballmove4_1.bmp
 %%DATADIR%%/images/ballmove4_0.bmp
 %%DATADIR%%/images/ballmove3_3.bmp
 %%DATADIR%%/images/ballmove3_2.bmp
 %%DATADIR%%/images/ballmove3_1.bmp
 %%DATADIR%%/images/ballmove3_0.bmp
 %%DATADIR%%/images/ball_c4.bmp
 %%DATADIR%%/images/ball_c3.bmp
 %%DATADIR%%/images/ball_c2.bmp
 %%DATADIR%%/images/ball_c1.bmp
 %%DATADIR%%/images/background_won.bmp
 %%DATADIR%%/images/background_time.bmp
 %%DATADIR%%/images/background_start.bmp
 %%DATADIR%%/images/background_hiscore.bmp
 %%DATADIR%%/images/background_gameover.bmp
 %%DATADIR%%/images/background_game.bmp
 %%DATADIR%%/images/background_complete.bmp
 %%DATADIR%%/images/arrow_u.bmp
 %%DATADIR%%/images/arrow_r.bmp
 %%DATADIR%%/images/arrow_l.bmp
 %%DATADIR%%/images/arrow_d.bmp
 %%DATADIR%%/images/track_ur.bmp
 %%DATADIR%%/music/wongame.mod
 %%DATADIR%%/music/pregame.mod
 %%DATADIR%%/music/intro.mod
 %%DATADIR%%/music/ingame.mod
 %%DATADIR%%/music/highscore.mod
 %%DATADIR%%/music/endgame.mod
 %%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