From 006253b3c22b859662c17c74bc1aa93078bed791 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 1 Apr 2014 19:59:07 +0000 Subject: [PATCH] - Stage support - Do not remove a directory belonging to BSD.local.dist mtree Reported by: poudriere With hat: portmgr --- games/searchandrescue/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/games/searchandrescue/Makefile b/games/searchandrescue/Makefile index 6974ccddae50..21fd15d7ff6c 100644 --- a/games/searchandrescue/Makefile +++ b/games/searchandrescue/Makefile @@ -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}_${PORTVERSION} 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