Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Apr 2014 19:59:07 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349886 - head/games/searchandrescue
Message-ID:  <201404011959.s31Jx771054020@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Tue Apr  1 19:59:07 2014
New Revision: 349886
URL: http://svnweb.freebsd.org/changeset/ports/349886
QAT: https://qat.redports.org/buildarchive/r349886/

Log:
  - Stage support
  - Do not remove a directory belonging to BSD.local.dist mtree
  
  Reported by:	poudriere
  With hat:	portmgr

Modified:
  head/games/searchandrescue/Makefile

Modified: head/games/searchandrescue/Makefile
==============================================================================
--- head/games/searchandrescue/Makefile	Tue Apr  1 19:53:48 2014	(r349885)
+++ head/games/searchandrescue/Makefile	Tue Apr  1 19:59:07 2014	(r349886)
@@ -3,7 +3,7 @@
 
 PORTNAME=	SearchAndRescue
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME:L}/Program/
 
@@ -20,10 +20,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME:L}_${PORTV
 PLIST_FILES=	bin/${PORTNAME} \
 		${DESKTOPDIR:S,${PREFIX}/,,}/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.xpm
-PLIST_DIRS=	${DESKTOPDIR:S,${PREFIX}/,,}
 
 #Respect PREFIX, LOCALBASE, CC, etc.
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		-e 's,%%PREFIX%%,${PREFIX},g' \
@@ -38,9 +36,8 @@ post-patch:
 		${WRKSRC}/sar/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sar/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/sar/icons/${PORTNAME}.xpm ${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${WRKSRC}/sar/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/sar/icons/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011959.s31Jx771054020>