From xmj@chaot.net  Sun Mar 23 23:14:28 2014
Return-Path: <xmj@chaot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 2C0FE19B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Mar 2014 23:14:28 +0000 (UTC)
Received: from dd16522.kasserver.com (dd16522.kasserver.com [85.13.137.124])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id C925E149
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Mar 2014 23:14:27 +0000 (UTC)
Received: from mx12.chaot.net (82.131.59.205.cable.starman.ee [82.131.59.205])
	by dd16522.kasserver.com (Postfix) with ESMTPSA id 566A48D4015
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2014 00:14:26 +0100 (CET)
Received: from localhost (1003@localhost [local]);
	by localhost (OpenSMTPD) with ESMTPA id be387b4f;
	for <FreeBSD-gnats-submit@freebsd.org>;
	Mon, 24 Mar 2014 00:57:41 +0200 (EET)
Message-Id: <12842099122550589741.enqueue@mx12.chaot.net>
Date: Mon, 24 Mar 2014 00:57:41 +0200 (EET)
From: Johannes Jost Meixner <xmj@chaot.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] games/linux-ssamtfe: Stage
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         187874
>Category:       ports
>Synopsis:       [PATCH] games/linux-ssamtfe: Stage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 23 23:20:01 UTC 2014
>Closed-Date:    Wed Mar 26 02:18:20 UTC 2014
>Last-Modified:  Wed Mar 26 02:20:02 UTC 2014
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #6: Wed Mar 19 11:02:48 EET 2014
>Description:
- Stagify

Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- linux-ssamtfe-1.05b3.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 348896)
+++ Makefile	(working copy)
@@ -28,7 +28,6 @@
 IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
@@ -65,54 +64,54 @@
 	@${ECHO_CMD} "${PKGNAME} requires a retail First Encounter disc"
 	@${FALSE}
 .endif
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for gro in ${GRO_FILES}
-	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00_${gro}.gro" ${DATADIR}/1_00_${gro}.gro
+	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00_${gro}.gro" ${STAGEDIR}${DATADIR}/1_00_${gro}.gro
 .endfor
 .if defined(GOLD)
 .for gro in "" _scripts
-	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00c${gro}.gro" ${DATADIR}/1_00c${gro}.gro
+	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00c${gro}.gro" ${STAGEDIR}${DATADIR}/1_00c${gro}.gro
 .endfor
 .endif
 .for gro in 1_00_ExtraTools 1_04_patch
-	${INSTALL_DATA} ${WRKSRC}/Data/${gro}.gro ${DATADIR}/${gro}.gro
+	${INSTALL_DATA} ${WRKSRC}/Data/${gro}.gro ${STAGEDIR}${DATADIR}/${gro}.gro
 .endfor
 .for dir in Controls Data Levels Demos Mods Scripts VirtualTrees
 	@cd ${CDROM_MOUNT}/Install && \
 		${FIND} ${dir} -type d -exec \
-			${MKDIR} "${DATADIR}/{}" \; && \
+			${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
 		${FIND} ${dir} -type f -exec \
-			${INSTALL_DATA} "${CDROM_MOUNT}/Install/{}" "${DATADIR}/{}" \;
+			${INSTALL_DATA} "${CDROM_MOUNT}/Install/{}" "${STAGEDIR}${DATADIR}/{}" \;
 .endfor
 .for dir in Controls Data Help Players SaveGame Scripts Temp
 	@cd ${WRKSRC}/Data && \
 		${FIND} ${dir} -type d -exec \
-			${MKDIR} "${DATADIR}/{}" \; && \
+			${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
 		${FIND} ${dir} -type f -exec \
-			${INSTALL_DATA} "${WRKSRC}/Data/{}" "${DATADIR}/{}" \;
+			${INSTALL_DATA} "${WRKSRC}/Data/{}" "${STAGEDIR}${DATADIR}/{}" \;
 .endfor
-	@${MKDIR} ${DATADIR}/Bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/Bin
 	@cd ${WRKSRC}/Data && \
 		${FIND} Bin -type f -exec \
-			${INSTALL_PROGRAM} "${WRKSRC}/Data/{}" "${DATADIR}/{}" \;
-	${BRANDELF} -t Linux ${DATADIR}/Bin/ssam_*
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+			${INSTALL_PROGRAM} "${WRKSRC}/Data/{}" "${STAGEDIR}${DATADIR}/{}" \;
+	${BRANDELF} -t Linux ${STAGEDIR}${DATADIR}/Bin/ssam_*
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MVORBIS}
-	${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${DATADIR}/Bin/libvorbisfile.so
+	${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${STAGEDIR}${DATADIR}/Bin/libvorbisfile.so
 .endif
-	@${FIND} -E ${DATADIR} -type f \
+	@${FIND} -E ${STAGEDIR}${DATADIR} -type f \
 		-iregex ".*\.(ctl|txt|lst|ini|cfg|des|reg)" \
 		-exec ${SH} -c "${SED} "s/`printf '\r'`//" '{}' \
 		>${WRKDIR}/tmp.txt; ${MV} ${WRKDIR}/tmp.txt '{}'" \;
-	@${ECHO} SERIOUS_MHZ=2000 > ${PREFIX}/etc/${PORTNAME}.conf.sample
+	@${ECHO} SERIOUS_MHZ=2000 > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 .if !exists(${PREFIX}/etc/${PORTNAME}.conf)
-	${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} -p ${WRKSRC}/README.liflg ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} -p ${WRKSRC}/README.liflg ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS:NREADME.liflg}
-	${LN} -sf ${DATADIR}/Help/${i} ${DOCSDIR}/${i}
+	${LN} -sf ${DATADIR}/Help/${i} ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 .endif
 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 348896)
+++ pkg-plist	(working copy)
@@ -117,7 +117,7 @@
 %%DATADIR%%/Scripts/Dedicated/DemoCoop/3_begin.ini
 %%DATADIR%%/Scripts/Dedicated/DemoCoop/3_end.ini
 %%DATADIR%%/Scripts/Dedicated/DemoCoop/init.ini
-%%NORMAL%%%%DATADIR%%/Scripts/Dedicated/Dedicated_startup.ini
+%%NORMAL%%%%DATADIR%%/Scripts/Dedicated_startup.ini
 %%DATADIR%%/Scripts/GLSettings/3Dfx-V1.ini
 %%DATADIR%%/Scripts/GLSettings/3Dfx-V2.ini
 %%DATADIR%%/Scripts/GLSettings/3Dfx-V3.ini
--- linux-ssamtfe-1.05b3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 23 23:20:06 UTC 2014 
Responsible-Changed-Why:  
swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187874 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Wed Mar 26 02:18:19 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187874 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187874: commit references a PR
Date: Wed, 26 Mar 2014 02:18:13 +0000 (UTC)

 Author: swills
 Date: Wed Mar 26 02:18:10 2014
 New Revision: 349210
 URL: http://svnweb.freebsd.org/changeset/ports/349210
 QAT: https://qat.redports.org/buildarchive/r349210/
 
 Log:
   - Stage
   
   PR:		ports/187874
   Submitted by:	Johannes Jost Meixner <xmj@chaot.net>
 
 Modified:
   head/games/linux-ssamtfe/Makefile
   head/games/linux-ssamtfe/pkg-plist
 
 Modified: head/games/linux-ssamtfe/Makefile
 ==============================================================================
 --- head/games/linux-ssamtfe/Makefile	Wed Mar 26 02:14:47 2014	(r349209)
 +++ head/games/linux-ssamtfe/Makefile	Wed Mar 26 02:18:10 2014	(r349210)
 @@ -28,7 +28,6 @@ SUB_FILES=	pkg-message
  IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
  .endif
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MVORBIS}
 @@ -65,54 +64,54 @@ do-install:
  	@${ECHO_CMD} "${PKGNAME} requires a retail First Encounter disc"
  	@${FALSE}
  .endif
 -	@${MKDIR} ${DATADIR}
 +	@${MKDIR} ${STAGEDIR}${DATADIR}
  .for gro in ${GRO_FILES}
 -	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00_${gro}.gro" ${DATADIR}/1_00_${gro}.gro
 +	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00_${gro}.gro" ${STAGEDIR}${DATADIR}/1_00_${gro}.gro
  .endfor
  .if defined(GOLD)
  .for gro in "" _scripts
 -	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00c${gro}.gro" ${DATADIR}/1_00c${gro}.gro
 +	${INSTALL_DATA} "${CDROM_MOUNT}/Install/1_00c${gro}.gro" ${STAGEDIR}${DATADIR}/1_00c${gro}.gro
  .endfor
  .endif
  .for gro in 1_00_ExtraTools 1_04_patch
 -	${INSTALL_DATA} ${WRKSRC}/Data/${gro}.gro ${DATADIR}/${gro}.gro
 +	${INSTALL_DATA} ${WRKSRC}/Data/${gro}.gro ${STAGEDIR}${DATADIR}/${gro}.gro
  .endfor
  .for dir in Controls Data Levels Demos Mods Scripts VirtualTrees
  	@cd ${CDROM_MOUNT}/Install && \
  		${FIND} ${dir} -type d -exec \
 -			${MKDIR} "${DATADIR}/{}" \; && \
 +			${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
  		${FIND} ${dir} -type f -exec \
 -			${INSTALL_DATA} "${CDROM_MOUNT}/Install/{}" "${DATADIR}/{}" \;
 +			${INSTALL_DATA} "${CDROM_MOUNT}/Install/{}" "${STAGEDIR}${DATADIR}/{}" \;
  .endfor
  .for dir in Controls Data Help Players SaveGame Scripts Temp
  	@cd ${WRKSRC}/Data && \
  		${FIND} ${dir} -type d -exec \
 -			${MKDIR} "${DATADIR}/{}" \; && \
 +			${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
  		${FIND} ${dir} -type f -exec \
 -			${INSTALL_DATA} "${WRKSRC}/Data/{}" "${DATADIR}/{}" \;
 +			${INSTALL_DATA} "${WRKSRC}/Data/{}" "${STAGEDIR}${DATADIR}/{}" \;
  .endfor
 -	@${MKDIR} ${DATADIR}/Bin
 +	@${MKDIR} ${STAGEDIR}${DATADIR}/Bin
  	@cd ${WRKSRC}/Data && \
  		${FIND} Bin -type f -exec \
 -			${INSTALL_PROGRAM} "${WRKSRC}/Data/{}" "${DATADIR}/{}" \;
 -	${BRANDELF} -t Linux ${DATADIR}/Bin/ssam_*
 -	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
 +			${INSTALL_PROGRAM} "${WRKSRC}/Data/{}" "${STAGEDIR}${DATADIR}/{}" \;
 +	${BRANDELF} -t Linux ${STAGEDIR}${DATADIR}/Bin/ssam_*
 +	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
  .if ${PORT_OPTIONS:MVORBIS}
 -	${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${DATADIR}/Bin/libvorbisfile.so
 +	${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${STAGEDIR}${DATADIR}/Bin/libvorbisfile.so
  .endif
 -	@${FIND} -E ${DATADIR} -type f \
 +	@${FIND} -E ${STAGEDIR}${DATADIR} -type f \
  		-iregex ".*\.(ctl|txt|lst|ini|cfg|des|reg)" \
  		-exec ${SH} -c "${SED} "s/`printf '\r'`//" '{}' \
  		>${WRKDIR}/tmp.txt; ${MV} ${WRKDIR}/tmp.txt '{}'" \;
 -	@${ECHO} SERIOUS_MHZ=2000 > ${PREFIX}/etc/${PORTNAME}.conf.sample
 +	@${ECHO} SERIOUS_MHZ=2000 > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
  .if !exists(${PREFIX}/etc/${PORTNAME}.conf)
 -	${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf
 +	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf
  .endif
  .if ${PORT_OPTIONS:MDOCS}
 -	@${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} -p ${WRKSRC}/README.liflg ${DOCSDIR}
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} -p ${WRKSRC}/README.liflg ${STAGEDIR}${DOCSDIR}
  .for i in ${PORTDOCS:NREADME.liflg}
 -	${LN} -sf ${DATADIR}/Help/${i} ${DOCSDIR}/${i}
 +	${LN} -sf ${DATADIR}/Help/${i} ${STAGEDIR}${DOCSDIR}/${i}
  .endfor
  .endif
  
 
 Modified: head/games/linux-ssamtfe/pkg-plist
 ==============================================================================
 --- head/games/linux-ssamtfe/pkg-plist	Wed Mar 26 02:14:47 2014	(r349209)
 +++ head/games/linux-ssamtfe/pkg-plist	Wed Mar 26 02:18:10 2014	(r349210)
 @@ -117,7 +117,7 @@ etc/ssamtfe.conf.sample
  %%DATADIR%%/Scripts/Dedicated/DemoCoop/3_begin.ini
  %%DATADIR%%/Scripts/Dedicated/DemoCoop/3_end.ini
  %%DATADIR%%/Scripts/Dedicated/DemoCoop/init.ini
 -%%NORMAL%%%%DATADIR%%/Scripts/Dedicated/Dedicated_startup.ini
 +%%NORMAL%%%%DATADIR%%/Scripts/Dedicated_startup.ini
  %%DATADIR%%/Scripts/GLSettings/3Dfx-V1.ini
  %%DATADIR%%/Scripts/GLSettings/3Dfx-V2.ini
  %%DATADIR%%/Scripts/GLSettings/3Dfx-V3.ini
 _______________________________________________
 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"
 
>Unformatted:
