Bug 176986 - [PATCH] games/uqm: Install the music and voice addons into the right place.
Summary: [PATCH] games/uqm: Install the music and voice addons into the right place.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alex Kozlov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-15 09:00 UTC by Christoph Mallon
Modified: 2013-04-18 09:00 UTC (History)
1 user (show)

See Also:


Attachments
0001-games-uqm-Install-the-music-and-voice-addons-into-th.patch (2.05 KB, patch)
2013-03-15 09:00 UTC, Christoph Mallon
no flags Details | Diff
patch.txt (3.62 KB, text/plain; charset=UTF-8)
2013-03-16 08:36 UTC, lightside
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Mallon 2013-03-15 09:00:00 UTC
The game looks for the music and voice data in the directory addons/, not packages/.

The maintainer and submitter of the last version update are X-GNATS-Notified.

Fix: Please apply this patch.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-15 09:00:12 UTC
Maintainer of games/uqm,

Please note that PR ports/176986 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/176986

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-15 09:00:13 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 lightside 2013-03-16 08:36:56 UTC
Hello, Christoph Mallon.
> The game looks for the music and voice data in the directory addons/, not packages/.

True. Thanks for pointing this out.
I checked your patch and it works (e.g. debug messages for add-ons 
directory).

 From my side, I also added Remix Packs add-ons to the patch, from:
http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-04-18 08:55:41 UTC
Author: ak
Date: Thu Apr 18 07:55:27 2013
New Revision: 316024
URL: http://svnweb.freebsd.org/changeset/ports/316024

Log:
  - Install the music and voice addons into the right place [1]
  - Add Remix Packs addons [2]
  
  PR:	ports/176986
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de> [1], Sender Ghost <lightside@gmx.com> [2]
  Approved by:	maintainer timeout (4 weeks)
  Feature safe:	yes

Modified:
  head/games/uqm/Makefile   (contents, props changed)
  head/games/uqm/distinfo   (contents, props changed)
  head/games/uqm/pkg-plist   (contents, props changed)

Modified: head/games/uqm/Makefile
==============================================================================
--- head/games/uqm/Makefile	Thu Apr 18 07:02:42 2013	(r316023)
+++ head/games/uqm/Makefile	Thu Apr 18 07:55:27 2013	(r316024)
@@ -3,6 +3,7 @@
 
 PORTNAME=	uqm
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/sc2/UQM/${PORTVERSION:R}
 DISTFILES=	${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
@@ -24,6 +25,12 @@ DATAVERSION=	0.7.0
 OPTIONS_DEFINE=	VOICE MUSIC OPENAL DOCS
 MUSIC_DESC=	Music add-on
 VOICE_DESC=	Voice add-on
+OPTIONS_GROUP=	REMIXES
+REMIX_PACKS=	1 2 3 4
+.for i in ${REMIX_PACKS}
+OPTIONS_GROUP_REMIXES+=REMIXPACK${i}
+REMIXPACK${i}_DESC=	UQM Remix Pack ${i} add-on
+.endfor
 
 .include <bsd.port.options.mk>
 
@@ -45,43 +52,58 @@ PLIST_SUB+=	MUSICADDON="@comment "
 USE_OPENAL=	al
 .endif
 
+.for i in ${REMIX_PACKS}
+.	if ${PORT_OPTIONS:MREMIXPACK${i}}
+MASTER_SITES+=	SF/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%20${i}:remixpack${i}
+DISTFILES+=	${PORTNAME}-remix-disc${i}.uqm:remixpack${i}
+PLIST_SUB+=	REMIXPACK${i}ADDON=""
+.	else
+PLIST_SUB+=	REMIXPACK${i}ADDON="@comment "
+.	endif
+.endfor
+
 post-extract:
-	${MKDIR} ${WRKSRC}/content/packages
+	${MKDIR} ${WRKSRC}/content/addons ${WRKSRC}/content/packages
 	${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-content.uqm ${WRKSRC}/content/packages/
 .ifdef(WITH_VOICE)
-	${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/packages/
+	${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/addons/
 .endif
 .ifdef(WITH_MUSIC)
-	${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/packages/
+	${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/addons/
 .endif
+.for i in ${REMIX_PACKS}
+.	if ${PORT_OPTIONS:MREMIXPACK${i}}
+	${CP} ${DISTDIR}/${PORTNAME}-remix-disc${i}.uqm ${WRKSRC}/content/addons/
+.	endif
+.endfor
 
 do-configure:
-	@${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' >  ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_debug_VALUE=\'nodebug\' >  ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state
 .if ${PORT_OPTIONS:MOPENAL}
-	@${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state
 .else
-	@${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state
 .endif
-	@${ECHO_MSG} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state
 .ifdef(NO_INET6)
-	@${ECHO_MSG} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state
 .else
-	@${ECHO_MSG} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state
 .endif
-	@${ECHO_MSG} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state
 .if ${ARCH} == "i386"
-	@${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state
 .else
-	@${ECHO_MSG} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state
 .endif
-	@${ECHO_MSG} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state
+	@${ECHO_CMD} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state
 	cd ${WRKSRC} && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config
 
 do-build:

Modified: head/games/uqm/distinfo
==============================================================================
--- head/games/uqm/distinfo	Thu Apr 18 07:02:42 2013	(r316023)
+++ head/games/uqm/distinfo	Thu Apr 18 07:55:27 2013	(r316024)
@@ -6,3 +6,11 @@ SHA256 (uqm-0.7.0-voice.uqm) = bcccf801b
 SIZE (uqm-0.7.0-voice.uqm) = 115143439
 SHA256 (uqm-0.7.0-3domusic.uqm) = c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82
 SIZE (uqm-0.7.0-3domusic.uqm) = 18980671
+SHA256 (uqm-remix-disc1.uqm) = b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8
+SIZE (uqm-remix-disc1.uqm) = 50188876
+SHA256 (uqm-remix-disc2.uqm) = 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade
+SIZE (uqm-remix-disc2.uqm) = 60282662
+SHA256 (uqm-remix-disc3.uqm) = e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d
+SIZE (uqm-remix-disc3.uqm) = 39924875
+SHA256 (uqm-remix-disc4.uqm) = a4c8197712a5b72a81c7ef7a2a33ea7d3ac90ab063c929dd68e7328a559a86d0
+SIZE (uqm-remix-disc4.uqm) = 86545760

Modified: head/games/uqm/pkg-plist
==============================================================================
--- head/games/uqm/pkg-plist	Thu Apr 18 07:02:42 2013	(r316023)
+++ head/games/uqm/pkg-plist	Thu Apr 18 07:55:27 2013	(r316024)
@@ -2,9 +2,14 @@ bin/uqm
 lib/uqm/uqm
 %%DATADIR%%/content/packages/uqm-0.7.0-content.uqm
 %%DATADIR%%/content/version
-%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-voice.uqm
-%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-3domusic.uqm
+%%VOICEADDON%%%%DATADIR%%/content/addons/uqm-0.7.0-voice.uqm
+%%MUSICADDON%%%%DATADIR%%/content/addons/uqm-0.7.0-3domusic.uqm
+%%REMIXPACK1ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc1.uqm
+%%REMIXPACK2ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc2.uqm
+%%REMIXPACK3ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc3.uqm
+%%REMIXPACK4ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc4.uqm
 @dirrm %%DATADIR%%/content/packages
+@dirrm %%DATADIR%%/content/addons
 @dirrm %%DATADIR%%/content
 @dirrm %%DATADIR%%
 @dirrm lib/uqm
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Alex Kozlov freebsd_committer freebsd_triage 2013-04-18 08:57:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 6 Alex Kozlov freebsd_committer freebsd_triage 2013-04-18 08:57:54 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!