From owner-svn-ports-all@FreeBSD.ORG  Wed Nov 20 13:29:42 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AFA47BFE;
 Wed, 20 Nov 2013 13:29:42 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F5042AA1;
 Wed, 20 Nov 2013 13:29:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKDTgrc008293;
 Wed, 20 Nov 2013 13:29:42 GMT
 (envelope-from martymac@svn.freebsd.org)
Received: (from martymac@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKDTgcn008292;
 Wed, 20 Nov 2013 13:29:42 GMT
 (envelope-from martymac@svn.freebsd.org)
Message-Id: <201311201329.rAKDTgcn008292@svn.freebsd.org>
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Wed, 20 Nov 2013 13:29:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334416 - head/games/flightgear-mb339-pan
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.16
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Nov 2013 13:29:42 -0000

Author: martymac
Date: Wed Nov 20 13:29:41 2013
New Revision: 334416
URL: http://svnweb.freebsd.org/changeset/ports/334416

Log:
  - Enable staging
  - Cleanup WRKSRC handling

Modified:
  head/games/flightgear-mb339-pan/Makefile

Modified: head/games/flightgear-mb339-pan/Makefile
==============================================================================
--- head/games/flightgear-mb339-pan/Makefile	Wed Nov 20 13:26:34 2013	(r334415)
+++ head/games/flightgear-mb339-pan/Makefile	Wed Nov 20 13:29:41 2013	(r334416)
@@ -13,24 +13,32 @@ COMMENT=	A simulation of the MB-339 PAN 
 
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
-USE_ZIP=	yes
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
 RESTRICTED=	Redistribution prohibited
-PLIST=		${WRKDIR}/.pkg-plist
 
-NO_STAGE=	yes
+NO_BUILD=	yes
+USE_ZIP=	yes
+WRKSRC=	${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
+DATADIR=	${PREFIX}/share/flightgear/Aircraft
+
+PLIST=		${WRKDIR}/pkg-plist
+PLIST_DIRS=	%%DATADIR%%
+
+pre-extract:
+	@${MKDIR} ${WRKSRC}
+
 pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
-		| ${SED} -e 's|^|@exec ${MKDIR} share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${PLIST} && \
 	${FIND} * -type f | ${SORT} \
-		| ${SED} -e 's|^|share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 	${FIND} * -type d | ${SORT} -r \
-		| ${SED} -e 's|^|@dirrm share/flightgear/Aircraft/|' >> ${PLIST}
+		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/flightgear/Aircraft/)
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>