[Midnightbsd-cvs] mports [19249] trunk/Mk/bsd.mport.mk: refactor extract sequence

[laffer1 at midnightbsd.org]

Revision: 19249
          http://svnweb.midnightbsd.org/mports/?rev=19249
Author:   laffer1
Date:     2015-05-30 11:33:13 -0400 (Sat, 30 May 2015)
Log Message:
-----------
 refactor extract sequence

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-05-30 15:28:21 UTC (rev 19248)
+++ trunk/Mk/bsd.mport.mk	2015-05-30 15:33:13 UTC (rev 19249)
@@ -2150,12 +2150,13 @@
 .endif
 .endif
 
-#
 # Extract
-#
+
+clean-wrkdir:
+	@${RM} -rf ${WRKDIR}
+
 .if !target(do-extract)
 do-extract:
-	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
@@ -2163,13 +2164,11 @@
 			exit 1; \
 		fi; \
 	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
 	@if [ ${UID} = 0 ]; then \
 		${CHMOD} -R ug-s ${WRKDIR}; \
 		${CHOWN} -R 0:0 ${WRKDIR}; \
 	fi
 .endif
-.endif
 
 
 .if defined(MAGUS)
@@ -2639,8 +2638,8 @@
 				do-fetch post-fetch post-fetch-script
 
 _EXTRACT_DEP=	fetch
-_EXTRACT_SEQ=	extract-message checksum extract-depends pre-extract \
-				pre-extract-script do-extract \
+_EXTRACT_SEQ=	extract-message checksum extract-depends \
+				clean-wrkdir ${WRKDIR} pre-extract pre-extract-script do-extract \
 				post-extract post-extract-script 
 
 _PATCH_DEP=		extract