From owner-svn-ports-all@FreeBSD.ORG Mon Oct 27 21:46:35 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 094B6B88; Mon, 27 Oct 2014 21:46:35 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9460995; Mon, 27 Oct 2014 21:46:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9RLkYlk007518; Mon, 27 Oct 2014 21:46:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9RLkYgH007516; Mon, 27 Oct 2014 21:46:34 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410272146.s9RLkYgH007516@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 27 Oct 2014 21:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371608 - in head/games/uqm: . files 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.18-1 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: Mon, 27 Oct 2014 21:46:35 -0000 Author: amdmi3 Date: Mon Oct 27 21:46:33 2014 New Revision: 371608 URL: https://svnweb.freebsd.org/changeset/ports/371608 QAT: https://qat.redports.org/buildarchive/r371608/ Log: - Fix installation wrt. staging Approved by: portmgr blanket Modified: head/games/uqm/Makefile head/games/uqm/files/patch-build-unix-build_functions Modified: head/games/uqm/Makefile ============================================================================== --- head/games/uqm/Makefile Mon Oct 27 20:39:00 2014 (r371607) +++ head/games/uqm/Makefile Mon Oct 27 21:46:33 2014 (r371608) @@ -3,7 +3,7 @@ PORTNAME= uqm PORTVERSION= 0.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION:R} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm @@ -86,7 +86,7 @@ do-configure: @${ECHO_CMD} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state .endif @${ECHO_CMD} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state - @${ECHO_CMD} INPUT_install_prefix_VALUE=\'${STAGEDIR}${PREFIX}\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state @@ -96,7 +96,7 @@ do-build: @(cd ${WRKSRC} && ./build.sh uqm) do-install: - @(cd ${WRKSRC} && ./build.sh uqm install) + @(cd ${WRKSRC} && ${SETENV} STAGEDIR="${STAGEDIR}" ./build.sh uqm install) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/uqm/uqm Modified: head/games/uqm/files/patch-build-unix-build_functions ============================================================================== --- head/games/uqm/files/patch-build-unix-build_functions Mon Oct 27 20:39:00 2014 (r371607) +++ head/games/uqm/files/patch-build-unix-build_functions Mon Oct 27 21:46:33 2014 (r371608) @@ -1,5 +1,5 @@ --- build/unix/build_functions.orig 2011-05-20 23:25:22.000000000 +0400 -+++ build/unix/build_functions 2013-01-08 19:54:57.000000000 +0400 ++++ build/unix/build_functions 2014-09-11 17:04:15.000000000 +0400 @@ -56,7 +56,7 @@ eval "${TARGET}_requirements" eval "${TARGET}_prepare_config" @@ -9,3 +9,49 @@ eval "${TARGET}_save_config" } +@@ -264,39 +264,39 @@ + echo "Installing system-dependent data..." >&2 + eval LIBS="\${${BUILD_PROJECT}_INSTALL_LIBS}" + eval LIBDIR="\${${BUILD_PROJECT}_INSTALL_LIBDIR%/}/" +- mkdirhier "$LIBDIR" 0755 ++ mkdirhier "${STAGEDIR}$LIBDIR" 0755 + for LIB in $LIBS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_SRC%/}" + eval DEST="\$LIBDIR\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + local SHARE SHARED SHAREDIR + echo "Installing system-independent data..." >&2 + eval SHARED="\${${BUILD_PROJECT}_INSTALL_SHARED}" + eval SHAREDIR="\${${BUILD_PROJECT}_INSTALL_SHAREDIR%/}/" +- mkdirhier "$SHAREDIR" 0755 ++ mkdirhier "${STAGEDIR}$SHAREDIR" 0755 + for SHARE in $SHARED; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_SRC%/}" + eval DEST="\$SHAREDIR\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + local BINS BINDIR + echo "Installing binaries..." >&2 + eval BINS="\${${BUILD_PROJECT}_INSTALL_BINS}" + eval BINDIR="\${${BUILD_PROJECT}_INSTALL_BINDIR%/}/" +- mkdirhier "$BINDIR" 0755 ++ mkdirhier "${STAGEDIR}$BINDIR" 0755 + for BIN in $BINS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_SRC%/}" + eval DEST="\$BINDIR\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + eval "${TARGET}_post_install"