Date: Mon, 24 Mar 2014 00:38:57 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: acm@FreeBSD.org Subject: ports/187867: [PATCH] games/linux-savage: Stage Message-ID: <1105184907436788014.enqueue@mx12.chaot.net> Resent-Message-ID: <201403232240.s2NMe0Jv054538@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187867
>Category: ports
>Synopsis: [PATCH] games/linux-savage: Stage
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 23 22:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>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
Port maintainer (acm@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- linux-savage-2.00e.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348896)
+++ Makefile (working copy)
@@ -33,7 +33,6 @@
OPTIONS_DEFINE= NVIDIA_GL
NVIDIA_GL_DESC= Support for nvidia
-NO_STAGE= yes
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@@ -52,34 +51,33 @@
${TAR} xfz ${_DISTDIR}/${DISTFILES} --directory ${WRKSRC}
do-install:
- @${MKDIR} ${PREFIX}/${SAVAGEDIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${SAVAGEDIR}
.for DIRE in graveyard game
- @${MKDIR} ${PREFIX}/${SAVAGEDIR}/${DIRE}
+ @${MKDIR} ${STAGEDIR}${STAGEDIR}${PREFIX}/${SAVAGEDIR}/${DIRE}
@cd ${WRKSRC}/${DIRE} && \
- ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
+ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
${FIND} * -type f -name "*.so" -exec ${INSTALL_PROGRAM} "{}" \
- "${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
+ "${STAGEDIR}${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
${FIND} -E * -type f -iregex ".*\.(cfg|dat|db|dll|jpg|mcfg|objgroup|ogg|tga|txt|ttf|s2g|s2z)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \;
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \;
.endfor
- @${MKDIR} ${PREFIX}/${SAVAGEDIR}/libs
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${SAVAGEDIR}/libs
@cd ${WRKSRC}/libs && \
- ${FIND} * -type f -exec ${INSTALL_PROGRAM} "{}" "${PREFIX}/${SAVAGEDIR}/libs/{}" \;
+ ${FIND} * -type f -exec ${INSTALL_PROGRAM} "{}" "${STAGEDIR}${PREFIX}/${SAVAGEDIR}/libs/{}" \;
- ${INSTALL_PROGRAM} ${WRKSRC}/silverback.bin ${PREFIX}/${SAVAGEDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/silverback.bin ${STAGEDIR}${PREFIX}/${SAVAGEDIR}
.for FILE in savage savage_editor
- ${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
+ ${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
.endfor
- ${LN} -s ${PREFIX}/${SAVAGEDIR}/libs/libfmod-3.75.so ${PREFIX}/${SAVAGEDIR}/libs/libfmod.so
+ ${LN} -s ${PREFIX}/${SAVAGEDIR}/libs/libfmod-3.75.so ${STAGEDIR}${PREFIX}/${SAVAGEDIR}/libs/libfmod.so
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${PREFIX}/${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/licenses.txt ${PREFIX}/${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/licenses.txt ${STAGEDIR}${PREFIX}/${DOCSDIR}
.endif
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist (revision 348896)
+++ pkg-plist (working copy)
@@ -54,7 +54,6 @@
%%SAVAGEDIR%%/game/settings/user_sound_options.cfg
%%SAVAGEDIR%%/game/settings/user_tlgraphics_options.cfg
%%SAVAGEDIR%%/game/settings/userkeys.cfg
-%%SAVAGEDIR%%/game/startup.cfg
%%SAVAGEDIR%%/game/ui_game.cfg
%%SAVAGEDIR%%/game/ui_main.cfg
%%SAVAGEDIR%%/game/world/2castles.s2z
@@ -288,7 +287,6 @@
%%SAVAGEDIR%%/libs/libpng12.so.0
%%SAVAGEDIR%%/libs/libssl.so.0.9.8
%%SAVAGEDIR%%/libs/libstdc++.so.6
-%%SAVAGEDIR%%/scripts.log
%%SAVAGEDIR%%/silverback.bin
%%PORTDOCS%%%%DOCSDIR%%/licenses.txt
@dirrm %%SAVAGEDIR%%/graveyard/brushes/standard
--- linux-savage-2.00e.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?1105184907436788014.enqueue>