D2735.id5951.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2735.id5951.diff
View Options

	Index: Mk/bsd.port.mk
	===================================================================
	--- Mk/bsd.port.mk
	+++ Mk/bsd.port.mk
	@@ -1558,10 +1558,13 @@
	.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
	WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
	.endif
	+WRKSRC?= ${WRKDIR}/${DISTNAME}
	+.if !defined(EXTRACT_WRKDIR)
	.if defined(NO_WRKSUBDIR)
	-WRKSRC?= ${WRKDIR}
	+EXTRACT_WRKDIR:= ${WRKSRC}
	.else
	-WRKSRC?= ${WRKDIR}/${DISTNAME}
	+EXTRACT_WRKDIR:= ${WRKDIR}
	+.endif
	.endif
	.if defined(WRKSRC_SUBDIR)
	WRKSRC:= ${WRKSRC}/${WRKSRC_SUBDIR}
	@@ -3036,7 +3039,7 @@
	@${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}"
	.endif

	-${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${WRKSRC}:
	+${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} ${WRKSRC}:
	@${MKDIR} ${.TARGET}

	# Warn user about deprecated packages. Advisory only.
	@@ -3258,9 +3261,9 @@
	@${RM} -rf ${WRKDIR}

	.if !target(do-extract)
	-do-extract:
	+do-extract: ${EXTRACT_WRKDIR}
	@for file in ${EXTRACT_ONLY}; do \
	- if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
	+ if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
	then \
	exit 1; \
	fi; \