From owner-svn-ports-head@FreeBSD.ORG  Tue Apr  1 19:59:07 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CBC8DA00;
 Tue,  1 Apr 2014 19:59:07 +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 B8AF330C;
 Tue,  1 Apr 2014 19:59:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31Jx7W8054021;
 Tue, 1 Apr 2014 19:59:07 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31Jx771054020;
 Tue, 1 Apr 2014 19:59:07 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404011959.s31Jx771054020@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 1 Apr 2014 19:59:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349886 - head/games/searchandrescue
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 19:59:07 -0000

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>