From owner-svn-ports-all@FreeBSD.ORG Wed Mar 26 02:18:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22A49DF3; Wed, 26 Mar 2014 02:18:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 035CC81C; Wed, 26 Mar 2014 02:18:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2Q2IAoI021876; Wed, 26 Mar 2014 02:18:10 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2Q2IAXW021874; Wed, 26 Mar 2014 02:18:10 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403260218.s2Q2IAXW021874@svn.freebsd.org> From: Steve Wills Date: Wed, 26 Mar 2014 02:18:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349210 - head/games/linux-ssamtfe X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 02:18:11 -0000 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 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 .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