3 files changed, 198 insertions, 93 deletions

diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile
index 8347b207ff99..c353926085c8 100644
--- a/games/fretsonfire-data/Makefile
+++ b/games/fretsonfire-data/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	1.2.451
+PORTVERSION=	1.3.110
 CATEGORIES=	games python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 PKGNAMEPREFIX=	fretsonfire-
-DISTNAME=	${PKGNAMEPREFIX:S/f/F/g:S/o/O/}${PORTVERSION:S/$/-linux/}
+DISTNAME=	${PKGNAMEPREFIX:S/f/F/g:S/o/O/}${PORTVERSION}
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -20,9 +20,9 @@ COMMENT=	Frets on Fire data files
 NO_BUILD=	yes
 DATADIR=	share/${PKGNAMEPREFIX:S/-//}
 RESTRICTED=	Only Unreal Voodoo site is allowed to distribute the music
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/f/F/g:S/o/O/:S/-//}
+WRKSRC=		${WRKDIR}/Frets\ on\ Fire-${PORTVERSION}
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${PKGNAMEPREFIX:S/f/F/g:S/o/O/:S/-//}/${PORTNAME}
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}"
 
 do-install:
 	@${MKDIR} ${PREFIX}/${DATADIR}
diff --git a/games/fretsonfire-data/distinfo b/games/fretsonfire-data/distinfo
index c9807fa1c36b..f3472b82e1cd 100644
--- a/games/fretsonfire-data/distinfo
+++ b/games/fretsonfire-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (fretsonfire/FretsOnFire-1.2.451-linux.tar.gz) = 53e92f69447e371be5b8480918c1046d
-SHA256 (fretsonfire/FretsOnFire-1.2.451-linux.tar.gz) = caa4bdd619c54f674dda626184ee2e8202d05d2b9a554a5496f7d908ae097ad7
-SIZE (fretsonfire/FretsOnFire-1.2.451-linux.tar.gz) = 33258637
+MD5 (fretsonfire/FretsOnFire-1.3.110.tar.gz) = daa7e23ebc8ed5bc78aa5e9f4ca3471e
+SHA256 (fretsonfire/FretsOnFire-1.3.110.tar.gz) = c8cca75a897a8c4cadac06f92fd85b417ac41fc19fc719e89ddcd91a3c29f9da
+SIZE (fretsonfire/FretsOnFire-1.3.110.tar.gz) = 31676132
diff --git a/games/fretsonfire-data/pkg-plist b/games/fretsonfire-data/pkg-plist
index 2ff3531eed30..02cd9b39f59b 100644
--- a/games/fretsonfire-data/pkg-plist
+++ b/games/fretsonfire-data/pkg-plist
@@ -1,14 +1,157 @@
+%%DATADIR%%/mods/Chilly/neck.png
+%%DATADIR%%/mods/Chilly/flame2.png
+%%DATADIR%%/mods/Chilly/logo.png
+%%DATADIR%%/mods/Chilly/theme.ini
+%%DATADIR%%/mods/Chilly/flame1.svg
+%%DATADIR%%/mods/Chilly/logo.svg
+%%DATADIR%%/mods/Chilly/neck.svg
+%%DATADIR%%/mods/Chilly/flame1.png
+%%DATADIR%%/mods/Chilly/flame2.svg
+%%DATADIR%%/mods/LightGraphics/neck.png
+%%DATADIR%%/mods/LightGraphics/flame2.png
+%%DATADIR%%/mods/LightGraphics/2x.png
+%%DATADIR%%/mods/LightGraphics/logo.png
+%%DATADIR%%/mods/LightGraphics/star.svg
+%%DATADIR%%/mods/LightGraphics/star.png
+%%DATADIR%%/mods/LightGraphics/3x.svg
+%%DATADIR%%/mods/LightGraphics/4x.png
+%%DATADIR%%/mods/LightGraphics/loading.svg
+%%DATADIR%%/mods/LightGraphics/left.png
+%%DATADIR%%/mods/LightGraphics/star2.png
+%%DATADIR%%/mods/LightGraphics/light.png
+%%DATADIR%%/mods/LightGraphics/ball2.png
+%%DATADIR%%/mods/LightGraphics/editor.png
+%%DATADIR%%/mods/LightGraphics/glow.png
+%%DATADIR%%/mods/LightGraphics/keyboard.svg
+%%DATADIR%%/mods/LightGraphics/star2.svg
+%%DATADIR%%/mods/LightGraphics/light.svg
+%%DATADIR%%/mods/LightGraphics/star1.png
+%%DATADIR%%/mods/LightGraphics/flame1.svg
+%%DATADIR%%/mods/LightGraphics/pose.png
+%%DATADIR%%/mods/LightGraphics/2x.svg
+%%DATADIR%%/mods/LightGraphics/stage.ini
+%%DATADIR%%/mods/LightGraphics/editor.svg
+%%DATADIR%%/mods/LightGraphics/logo.svg
+%%DATADIR%%/mods/LightGraphics/right.svg
+%%DATADIR%%/mods/LightGraphics/right.png
+%%DATADIR%%/mods/LightGraphics/star1.svg
+%%DATADIR%%/mods/LightGraphics/cassette.svg
+%%DATADIR%%/mods/LightGraphics/left.svg
+%%DATADIR%%/mods/LightGraphics/3x.png
+%%DATADIR%%/mods/LightGraphics/ball1.svg
+%%DATADIR%%/mods/LightGraphics/neck.svg
+%%DATADIR%%/mods/LightGraphics/ball1.png
+%%DATADIR%%/mods/LightGraphics/keyboard.png
+%%DATADIR%%/mods/LightGraphics/cassette.png
+%%DATADIR%%/mods/LightGraphics/loading.png
+%%DATADIR%%/mods/LightGraphics/ball2.svg
+%%DATADIR%%/mods/LightGraphics/flame1.png
+%%DATADIR%%/mods/LightGraphics/4x.svg
+%%DATADIR%%/mods/LightGraphics/pose.svg
+%%DATADIR%%/mods/LightGraphics/glow.svg
+%%DATADIR%%/mods/LightGraphics/flame2.svg
+%%DATADIR%%/songs/defy/label.png
+%%DATADIR%%/songs/defy/guitar.ogg
+%%DATADIR%%/songs/defy/notes.mid
+%%DATADIR%%/songs/defy/song.ogg
+%%DATADIR%%/songs/defy/song.ini
+%%DATADIR%%/songs/bangbang/label.png
+%%DATADIR%%/songs/bangbang/guitar.ogg
+%%DATADIR%%/songs/bangbang/notes.mid
+%%DATADIR%%/songs/bangbang/song.ogg
+%%DATADIR%%/songs/bangbang/song.ini
+%%DATADIR%%/songs/twibmpg/label.png
+%%DATADIR%%/songs/twibmpg/guitar.ogg
+%%DATADIR%%/songs/twibmpg/notes.mid
+%%DATADIR%%/songs/twibmpg/song.ogg
+%%DATADIR%%/songs/twibmpg/song.ini
+%%DATADIR%%/songs/tutorial/guitar.ogg
+%%DATADIR%%/songs/tutorial/keyboard.svg
+%%DATADIR%%/songs/tutorial/pose.png
+%%DATADIR%%/songs/tutorial/esc.png
+%%DATADIR%%/songs/tutorial/script.txt
+%%DATADIR%%/songs/tutorial/esc.svg
+%%DATADIR%%/songs/tutorial/keyboard.png
+%%DATADIR%%/songs/tutorial/notes.mid
+%%DATADIR%%/songs/tutorial/song.ogg
+%%DATADIR%%/songs/tutorial/pose.svg
+%%DATADIR%%/songs/tutorial/song.ini
+%%DATADIR%%/songs/killscores.sh
+%%DATADIR%%/translations/old/fretsonfire_po.po
+%%DATADIR%%/translations/old/tutorial_po.po
+%%DATADIR%%/translations/tutorial_rus.po
+%%DATADIR%%/translations/french.mo
+%%DATADIR%%/translations/tutorial_ger.po
+%%DATADIR%%/translations/russian.mo
+%%DATADIR%%/translations/czech.mo
+%%DATADIR%%/translations/german.mo
+%%DATADIR%%/translations/tutorial_tur.po
+%%DATADIR%%/translations/fretsonfire_hu.po
+%%DATADIR%%/translations/update.py
+%%DATADIR%%/translations/tutorial_cz.po
+%%DATADIR%%/translations/fretsonfire_fr.po
+%%DATADIR%%/translations/fretsonfire_gl.po
+%%DATADIR%%/translations/fretsonfire_tur.po
+%%DATADIR%%/translations/fretsonfire_he.po
+%%DATADIR%%/translations/tutorial_it.po
+%%DATADIR%%/translations/fretsonfire_po.po
+%%DATADIR%%/translations/tutorial_nl.po
+%%DATADIR%%/translations/fretsonfire_sw.po
+%%DATADIR%%/translations/finnish.mo
+%%DATADIR%%/translations/tutorial_po.po
+%%DATADIR%%/translations/tutorial_hu.po
+%%DATADIR%%/translations/fretsonfire_nl.po
+%%DATADIR%%/translations/brazilian_portuguese.mo
+%%DATADIR%%/translations/spanish.mo
+%%DATADIR%%/translations/tutorial_gl.po
+%%DATADIR%%/translations/hebrew.mo
+%%DATADIR%%/translations/fretsonfire_rus.po
+%%DATADIR%%/translations/tutorial_es.po
+%%DATADIR%%/translations/turkish.mo
+%%DATADIR%%/translations/tutorial_sw.po
+%%DATADIR%%/translations/fretsonfire_cs.po
+%%DATADIR%%/translations/fretsonfire_ger.po
+%%DATADIR%%/translations/italian.mo
+%%DATADIR%%/translations/fretsonfire_fi.po
+%%DATADIR%%/translations/fretsonfire_por.po
+%%DATADIR%%/translations/tutorial_cs.po
+%%DATADIR%%/translations/tutorial_he.po
+%%DATADIR%%/translations/tutorial_fi.po
+%%DATADIR%%/translations/tutorial_por.po
+%%DATADIR%%/translations/tutorial_fr.po
+%%DATADIR%%/translations/hungarian.mo
+%%DATADIR%%/translations/dutch.mo
+%%DATADIR%%/translations/swedish.mo
+%%DATADIR%%/translations/fretsonfire_cz.po
+%%DATADIR%%/translations/fretsonfire_it.po
+%%DATADIR%%/translations/fretsonfire_es.po
+%%DATADIR%%/translations/galician.mo
+%%DATADIR%%/translations/polish.mo
+%%DATADIR%%/2x.png
 %%DATADIR%%/2x.svg
+%%DATADIR%%/3x.png
 %%DATADIR%%/3x.svg
+%%DATADIR%%/4x.png
 %%DATADIR%%/4x.svg
+%%DATADIR%%/Makefile
+%%DATADIR%%/PyOpenGL__init__.pyc
+%%DATADIR%%/ball1.png
 %%DATADIR%%/ball1.svg
+%%DATADIR%%/ball2.png
 %%DATADIR%%/ball2.svg
+%%DATADIR%%/bar.png
+%%DATADIR%%/bar.svg
+%%DATADIR%%/cassette.3DS
 %%DATADIR%%/cassette.dae
+%%DATADIR%%/cassette.png
 %%DATADIR%%/cassette.svg
 %%DATADIR%%/crunch1.ogg
 %%DATADIR%%/crunch2.ogg
 %%DATADIR%%/crunch3.ogg
+%%DATADIR%%/in.ogg
+%%DATADIR%%/cube.dae
 %%DATADIR%%/default.ttf
+%%DATADIR%%/editor.png
 %%DATADIR%%/editor.svg
 %%DATADIR%%/fiba1.ogg
 %%DATADIR%%/fiba2.ogg
@@ -17,135 +160,97 @@
 %%DATADIR%%/fiba5.ogg
 %%DATADIR%%/fiba6.ogg
 %%DATADIR%%/ghmidimap.txt
+%%DATADIR%%/glow.png
 %%DATADIR%%/glow.svg
+%%DATADIR%%/icon.ico
 %%DATADIR%%/icon.png
-%%DATADIR%%/in.ogg
+%%DATADIR%%/icon_mac_composed.icns
 %%DATADIR%%/international.ttf
 %%DATADIR%%/jurgen1.ogg
 %%DATADIR%%/jurgen2.ogg
 %%DATADIR%%/jurgen3.ogg
 %%DATADIR%%/jurgen4.ogg
 %%DATADIR%%/jurgen5.ogg
+%%DATADIR%%/key.3DS
 %%DATADIR%%/key.dae
+%%DATADIR%%/out.ogg
+%%DATADIR%%/keyboard.png
 %%DATADIR%%/keyboard.svg
+%%DATADIR%%/koopa.png
+%%DATADIR%%/koopa.svg
+%%DATADIR%%/koopa2.png
+%%DATADIR%%/koopa2.svg
 %%DATADIR%%/label.dae
+%%DATADIR%%/launcher-macosx.sh
+%%DATADIR%%/launcher.sh
+%%DATADIR%%/left.png
 %%DATADIR%%/left.svg
 %%DATADIR%%/library.dae
 %%DATADIR%%/library_label.dae
+%%DATADIR%%/light.png
+%%DATADIR%%/light.svg
+%%DATADIR%%/loading.png
 %%DATADIR%%/loading.svg
+%%DATADIR%%/logo.png
 %%DATADIR%%/logo.svg
 %%DATADIR%%/menu.ogg
-%%DATADIR%%/mods/Chilly/flame1.svg
-%%DATADIR%%/mods/Chilly/flame2.svg
-%%DATADIR%%/mods/Chilly/logo.svg
-%%DATADIR%%/mods/Chilly/neck.svg
-%%DATADIR%%/mods/Chilly/theme.ini
-%%DATADIR%%/mods/LightGraphics/2x.png
-%%DATADIR%%/mods/LightGraphics/2x.svg
-%%DATADIR%%/mods/LightGraphics/3x.png
-%%DATADIR%%/mods/LightGraphics/3x.svg
-%%DATADIR%%/mods/LightGraphics/4x.png
-%%DATADIR%%/mods/LightGraphics/4x.svg
-%%DATADIR%%/mods/LightGraphics/ball1.png
-%%DATADIR%%/mods/LightGraphics/ball1.svg
-%%DATADIR%%/mods/LightGraphics/ball2.png
-%%DATADIR%%/mods/LightGraphics/ball2.svg
-%%DATADIR%%/mods/LightGraphics/cassette.png
-%%DATADIR%%/mods/LightGraphics/cassette.svg
-%%DATADIR%%/mods/LightGraphics/editor.png
-%%DATADIR%%/mods/LightGraphics/editor.svg
-%%DATADIR%%/mods/LightGraphics/flame1.png
-%%DATADIR%%/mods/LightGraphics/flame1.svg
-%%DATADIR%%/mods/LightGraphics/flame2.png
-%%DATADIR%%/mods/LightGraphics/flame2.svg
-%%DATADIR%%/mods/LightGraphics/glow.png
-%%DATADIR%%/mods/LightGraphics/glow.svg
-%%DATADIR%%/mods/LightGraphics/keyboard.png
-%%DATADIR%%/mods/LightGraphics/keyboard.svg
-%%DATADIR%%/mods/LightGraphics/left.png
-%%DATADIR%%/mods/LightGraphics/left.svg
-%%DATADIR%%/mods/LightGraphics/light.png
-%%DATADIR%%/mods/LightGraphics/light.svg
-%%DATADIR%%/mods/LightGraphics/loading.png
-%%DATADIR%%/mods/LightGraphics/loading.svg
-%%DATADIR%%/mods/LightGraphics/logo.png
-%%DATADIR%%/mods/LightGraphics/logo.svg
-%%DATADIR%%/mods/LightGraphics/neck.png
-%%DATADIR%%/mods/LightGraphics/neck.svg
-%%DATADIR%%/mods/LightGraphics/pose.png
-%%DATADIR%%/mods/LightGraphics/pose.svg
-%%DATADIR%%/mods/LightGraphics/right.png
-%%DATADIR%%/mods/LightGraphics/right.svg
-%%DATADIR%%/mods/LightGraphics/stage.ini
-%%DATADIR%%/mods/LightGraphics/star.png
-%%DATADIR%%/mods/LightGraphics/star.svg
-%%DATADIR%%/mods/LightGraphics/star1.png
-%%DATADIR%%/mods/LightGraphics/star1.svg
-%%DATADIR%%/mods/LightGraphics/star2.png
-%%DATADIR%%/mods/LightGraphics/star2.svg
 %%DATADIR%%/myhero.ogg
+%%DATADIR%%/neck.png
 %%DATADIR%%/neck.svg
+%%DATADIR%%/note-star.3DS
+%%DATADIR%%/note.3DS
 %%DATADIR%%/note.dae
-%%DATADIR%%/out.ogg
+%%DATADIR%%/note.png
+%%DATADIR%%/note.svg
 %%DATADIR%%/perfect1.ogg
 %%DATADIR%%/perfect2.ogg
 %%DATADIR%%/perfect3.ogg
+%%DATADIR%%/pose.png
 %%DATADIR%%/pose.svg
+%%DATADIR%%/right.png
 %%DATADIR%%/right.svg
-%%DATADIR%%/songs/bangbang/guitar.ogg
-%%DATADIR%%/songs/bangbang/label.png
-%%DATADIR%%/songs/bangbang/notes.mid
-%%DATADIR%%/songs/bangbang/song.ini
-%%DATADIR%%/songs/bangbang/song.ogg
-%%DATADIR%%/songs/defy/guitar.ogg
-%%DATADIR%%/songs/defy/label.png
-%%DATADIR%%/songs/defy/notes.mid
-%%DATADIR%%/songs/defy/song.ini
-%%DATADIR%%/songs/defy/song.ogg
-%%DATADIR%%/songs/tutorial/esc.svg
-%%DATADIR%%/songs/tutorial/guitar.ogg
-%%DATADIR%%/songs/tutorial/keyboard.svg
-%%DATADIR%%/songs/tutorial/notes.mid
-%%DATADIR%%/songs/tutorial/pose.svg
-%%DATADIR%%/songs/tutorial/script.txt
-%%DATADIR%%/songs/tutorial/song.ini
-%%DATADIR%%/songs/tutorial/song.ogg
-%%DATADIR%%/songs/twibmpg/guitar.ogg
-%%DATADIR%%/songs/twibmpg/label.png
-%%DATADIR%%/songs/twibmpg/notes.mid
-%%DATADIR%%/songs/twibmpg/song.ini
-%%DATADIR%%/songs/twibmpg/song.ogg
+%%DATADIR%%/specialnote.dae
 %%DATADIR%%/stage.ini
+%%DATADIR%%/stage_audience1.png
 %%DATADIR%%/stage_audience1.svg
+%%DATADIR%%/stage_audience2.png
 %%DATADIR%%/stage_audience2.svg
+%%DATADIR%%/stage_background.png
 %%DATADIR%%/stage_background.svg
+%%DATADIR%%/stage_bassdrum.png
 %%DATADIR%%/stage_bassdrum.svg
+%%DATADIR%%/stage_drums.png
 %%DATADIR%%/stage_drums.svg
+%%DATADIR%%/stage_light.png
 %%DATADIR%%/stage_light.svg
+%%DATADIR%%/stage_lights1.png
 %%DATADIR%%/stage_lights1.svg
+%%DATADIR%%/stage_lights2.png
 %%DATADIR%%/stage_lights2.svg
+%%DATADIR%%/stage_speaker_cones.png
 %%DATADIR%%/stage_speaker_cones.svg
+%%DATADIR%%/stage_speakers.png
 %%DATADIR%%/stage_speakers.svg
+%%DATADIR%%/star.png
+%%DATADIR%%/star.svg
+%%DATADIR%%/star1.png
 %%DATADIR%%/star1.svg
+%%DATADIR%%/star2.png
 %%DATADIR%%/star2.svg
 %%DATADIR%%/start.ogg
+%%DATADIR%%/string.png
+%%DATADIR%%/string.svg
+%%DATADIR%%/testi.dae
+%%DATADIR%%/theme.ini
 %%DATADIR%%/title.ttf
-%%DATADIR%%/translations/brazilian_portuguese.mo
-%%DATADIR%%/translations/french.mo
-%%DATADIR%%/translations/german.mo
-%%DATADIR%%/translations/hebrew.mo
-%%DATADIR%%/translations/italian.mo
-%%DATADIR%%/translations/polish.mo
-%%DATADIR%%/translations/russian.mo
-%%DATADIR%%/translations/spanish.mo
-%%DATADIR%%/translations/swedish.mo
-@dirrm %%DATADIR%%/mods/Chilly
-@dirrm %%DATADIR%%/mods/LightGraphics
-@dirrm %%DATADIR%%/mods
+@dirrm %%DATADIR%%/translations/old
 @dirrm %%DATADIR%%/songs/twibmpg
 @dirrm %%DATADIR%%/songs/tutorial
 @dirrm %%DATADIR%%/songs/defy
 @dirrm %%DATADIR%%/songs/bangbang
-@dirrm %%DATADIR%%/songs
+@dirrm %%DATADIR%%/mods/Chilly
+@dirrm %%DATADIR%%/mods/LightGraphics
 @dirrm %%DATADIR%%/translations
+@dirrm %%DATADIR%%/songs
+@dirrm %%DATADIR%%/mods
 @dirrm %%DATADIR%%