From braddo@tranceaddict.net  Tue Dec 18 09:22:43 2007
Return-Path: <braddo@tranceaddict.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9750016A418
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2007 09:22:43 +0000 (UTC)
	(envelope-from braddo@tranceaddict.net)
Received: from omta14.mta.everyone.net (sitemail2.everyone.net [216.200.145.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D1CA13C4DB
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2007 09:22:43 +0000 (UTC)
	(envelope-from braddo@tranceaddict.net)
Received: from dm02.mta.everyone.net (bigiplb-dsnat [172.16.0.19])
	by omta14.mta.everyone.net (Postfix) with ESMTP id 2E4B140641
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2007 01:22:43 -0800 (PST)
Received: by dm02.mta.everyone.net (EON-AUTHRELAY2[SSL] - 7cbe72ca)
	id dm02.47603925.13e437; Tue, 18 Dec 2007 01:22:42 -0800
Received: by tranceaddict.net (sSMTP sendmail emulation); Tue, 18 Dec 2007 20:22:41 +1100
Message-Id: <20071218012243.CFDEE3E2@dm02.mta.everyone.net>
Date: Tue, 18 Dec 2007 20:22:41 +1100
From: Brad Allen <braddo@tranceaddict.net>
Reply-To: Brad Allen <braddo@tranceaddict.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: braddo@tranceaddict.net
Subject: [maintainer-update] Fixed problems in games/stepmania-devel port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         118811
>Category:       ports
>Synopsis:       [maintainer-update] Fixed problems in games/stepmania-devel port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    chinsan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 18 09:30:01 UTC 2007
>Closed-Date:    Sat Jan 19 06:00:44 UTC 2008
>Last-Modified:  Sat Jan 19 06:00:44 UTC 2008
>Originator:     Brad Allen
>Release:        FreeBSD 7.0-BETA4 i386
>Organization:
>Environment:
System: FreeBSD pc.braddo 7.0-BETA4 FreeBSD 7.0-BETA4 #0: Wed Dec 5 18:39:45 EST 2007 root@pc.braddo:/usr/obj/usr/src/sys/CUSTOM i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- stepmania-devel.patch begins here ---
diff -ruN stepmania-devel.old/Makefile stepmania-devel/Makefile
--- stepmania-devel.old/Makefile	2007-12-18 19:32:46.000000000 +1100
+++ stepmania-devel/Makefile	2007-12-18 19:27:34.000000000 +1100
@@ -7,6 +7,7 @@
 
 PORTNAME=	stepmania
 PORTVERSION=	20071121
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://surfnet.dl.sourceforge.net/sourceforge/stepmania/ \
 		http://internap.dl.sourceforge.net/sourceforge/stepmania/
@@ -21,6 +22,8 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		m.3:${PORTSDIR}/misc/compat5x
 
+CONFLICTS=	stepmania-[0-9]*
+
 GNU_CONFIGURE=	yes
 USE_GL=		gl glu
 USE_XORG=	x11 xtst xrandr xau xdmcp xext xrender
@@ -28,7 +31,6 @@
 USE_GNOME=	gtk20
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include"
-DATADIR=	${PREFIX}/share/games/stepmania
 
 # Not yet implemented
 #		FFMPEG		"Enable ffmpeg support"			off \
@@ -54,15 +56,18 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lrt|-lrt -liconv|' ${WRKSRC}/src/Makefile.in
 
-post-install:
+do-install:
 	${MKDIR} ${PREFIX}/share/games
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/Songs
-	${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so ${DATADIR}
+	${MKDIR} ${PREFIX}/share/games/stepmania
+	${MKDIR} ${PREFIX}/share/games/stepmania/Announcers
+	${MKDIR} ${PREFIX}/share/games/stepmania/Songs
 	(cd ${WRKSRC} && ${UNZIP_CMD} -o Packages/StepMania.smzip)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "BGAnimations\
 	BackgroundEffects BackgroundTransitions Characters Courses\
-	Data NoteSkins Themes" ${DATADIR})
+	Data NoteSkins Themes" ${PREFIX}/share/games/stepmania)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania \
+	${PREFIX}/share/games/stepmania
+	${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so \
+	${PREFIX}/share/games/stepmania
 
 .include <bsd.port.post.mk>
diff -ruN stepmania-devel.old/pkg-plist stepmania-devel/pkg-plist
--- stepmania-devel.old/pkg-plist	2007-12-18 19:32:46.000000000 +1100
+++ stepmania-devel/pkg-plist	2007-12-18 18:02:08.000000000 +1100
@@ -1273,4 +1273,5 @@
 @dirrm share/games/stepmania/BackgroundEffects
 @dirrm share/games/stepmania/BGAnimations
 @dirrm share/games/stepmania/Songs
+@dirrm share/games/stepmania/Announcers
 @dirrm share/games/stepmania
--- stepmania-devel.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Dec 18 10:36:12 UTC 2007 
Responsible-Changed-Why:  
reclassify and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118811 
Responsible-Changed-From-To: freebsd-ports-bugs->chinsan 
Responsible-Changed-By: pav 
Responsible-Changed-When: Tue Dec 18 13:41:08 UTC 2007 
Responsible-Changed-Why:  
Over to chinsan, he already holds ports/118769 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118811 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Jan 19 05:59:40 UTC 2008 
State-Changed-Why:  
This isn't really a maintainer-update, since the port hasn't been 
added yet.  I'm going to close this and append the text to the earlier 
PR's audit trail. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118811 
>Unformatted:
