svn commit: r371608 - in head/games/uqm: . files

[Dmitry Marakasov]

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"