svn commit: r348865 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 23 15:34:13 2014
New Revision: 348865
URL: http://svnweb.freebsd.org/changeset/ports/348865
QAT: https://qat.redports.org/buildarchive/r348865/

Log:
  - Create package in WRKDIR/pkg/ instead of WORKDIR/ to avoid pkg-create bug
    not creating the PKGNAME.PKG_SUFX if PKGNAME already exists.
  
    Fixes regression packaging some from r348861
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.pkgng.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Sun Mar 23 15:32:49 2014	(r348864)
+++ head/Mk/bsd.pkgng.mk	Sun Mar 23 15:34:13 2014	(r348865)
@@ -245,10 +245,11 @@ do-package: ${TMPPLIST}
 	@for cat in ${CATEGORIES}; do \
 		${RM} -f ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \
 	done
-	@if ${SETENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -o ${WRKDIR} ${PKGNAME}; then \
+	@${MKDIR} ${WRKDIR}/pkg
+	@if ${SETENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -o ${WRKDIR}/pkg ${PKGNAME}; then \
 	      if [ -d ${PKGREPOSITORY} -a -w ${PKGREPOSITORY} ]; then \
-	          ${LN} -f ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null \
-			      || ${CP} -af ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
+	          ${LN} -f ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null \
+			      || ${CP} -af ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
 		      if [ "${PKGORIGIN}" = "ports-mgmt/pkg" -o "${PKGORIGIN}" = "ports-mgmt/pkg-devel" ]; then \
 			      if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
 			    	  if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Mar 23 15:32:49 2014	(r348864)
+++ head/Mk/bsd.port.mk	Sun Mar 23 15:34:13 2014	(r348865)
@@ -3763,10 +3763,11 @@ do-package: ${TMPPLIST}
 	if [ -f ${PKGMESSAGE} ]; then \
 		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
 	fi; \
-	if ${PKG_CMD} -S ${STAGEDIR} ${PKG_ARGS} ${WRKDIR}/${PKGNAME}${PKG_SUFX}; then \
+	${MKDIR} ${WRKDIR}/pkg; \
+	if ${PKG_CMD} -S ${STAGEDIR} ${PKG_ARGS} ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}; then \
 		if [ -d ${PKGREPOSITORY} -a -w ${PKGREPOSITORY} ]; then \
-			${LN} -f ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null || \
-			    ${CP} -af ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
+			${LN} -f ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null || \
+			    ${CP} -af ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
 			cd ${.CURDIR} && eval ${MAKE} package-links; \
 		fi; \
 	else \
@@ -3816,7 +3817,7 @@ delete-package: delete-package-links
 	@${RM} -f ${PKGFILE}
 .	else
 # When staging, the package may only be in the workdir if not root
-	@${RM} -f ${PKGFILE} ${WRKDIR}/${PKGNAME}${PKG_SUFX} 2>/dev/null || :
+	@${RM} -f ${PKGFILE} ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} 2>/dev/null || :
 .	endif
 .endif
 
@@ -3842,8 +3843,8 @@ delete-package-list: delete-package-link
 _INSTALL_PKG_ARGS=	-f
 .endif
 install-package:
-.if exists(${WRKDIR}/${PKGNAME}${PKG_SUFX})
-	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${WRKDIR}/${PKGNAME}${PKG_SUFX}
+.if exists(${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX})
+	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
 .else
 	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${PKGFILE}
 .endif