Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2013 09:58:02 +0100
From:      Christoph Mallon <christoph.mallon@gmx.de>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        Christoph Mallon <christoph.mallon@gmx.de>
Subject:   ports/176986: [PATCH] games/uqm: Install the music and voice addons into the right place.
Message-ID:  <E1UGQSg-000O5J-6z@rotluchs.lokal>
Resent-Message-ID: <201303150900.r2F900H6089874@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         176986
>Category:       ports
>Synopsis:       [PATCH] games/uqm: Install the music and voice addons into the right place.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 15 09:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Mallon
>Release:        
>Organization:
>Environment:


	
>Description:
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.
>How-To-Repeat:
	
>Fix:
Please apply this patch.

--- 0001-games-uqm-Install-the-music-and-voice-addons-into-th.patch begins here ---
>From 20c0379ae686108208071d99b30ac57b7d53dbb3 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Fri, 15 Mar 2013 07:14:25 +0100
Subject: [PATCH] games/uqm: Install the music and voice addons into the right
 place.

The game looks for them in the directory addons/, not packages/.
---
 games/uqm/Makefile  | 7 ++++---
 games/uqm/pkg-plist | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index f08377b..ca2a0ad 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -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
@@ -46,13 +47,13 @@ USE_OPENAL=	al
 .endif
 
 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
 
 do-configure:
diff --git a/games/uqm/pkg-plist b/games/uqm/pkg-plist
index 0b3419d..0c0217c 100644
--- a/games/uqm/pkg-plist
+++ b/games/uqm/pkg-plist
@@ -2,9 +2,10 @@ 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
 @dirrm %%DATADIR%%/content/packages
+@dirrm %%DATADIR%%/content/addons
 @dirrm %%DATADIR%%/content
 @dirrm %%DATADIR%%
 @dirrm lib/uqm
-- 
1.8.1.5
--- 0001-games-uqm-Install-the-music-and-voice-addons-into-th.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1UGQSg-000O5J-6z>