[Midnightbsd-cvs] mports [17513] trunk/Mk/bsd.mport.mk: revert the PKG_IGNORE_DEPENDS change to fix the grep error we see.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 26 20:30:56 EDT 2014


Revision: 17513
          http://svnweb.midnightbsd.org/mports/?rev=17513
Author:   laffer1
Date:     2014-09-26 20:30:56 -0400 (Fri, 26 Sep 2014)
Log Message:
-----------
revert the PKG_IGNORE_DEPENDS change to fix the grep error we see.  Print a nice message when package create fails. Also, remove the package cookie so we can re-run the target without issue

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

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2014-09-26 23:19:05 UTC (rev 17512)
+++ trunk/Mk/bsd.mport.mk	2014-09-27 00:30:56 UTC (rev 17513)
@@ -695,6 +695,9 @@
 .endif
 .endif
 
+# required by mport.create MPORT_CREATE_ARGS
+PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
+
 _GL_glesv2_LIB_DEPENDS=		libGLESv2.so:${PORTSDIR}/graphics/libglesv2
 _GL_egl_LIB_DEPENDS=		libEGL.so:${PORTSDIR}/graphics/libEGL
 _GL_gl_LIB_DEPENDS=		libGL.so:${PORTSDIR}/graphics/libGL
@@ -2209,6 +2212,8 @@
 		${ECHO_MSG} "Created ${PKGFILE}"; \
 		cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
 	else \
+		${ECHO_MSG} "Unable to create package ${PKGFILE}"; \
+		@cd ${.CURDIR} && rm -f ${PACKAGE_COOKIE} ${INSTALL_COOKIE} \
 		cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} delete-package; \
 		exit 1; \
 	fi



More information about the Midnightbsd-cvs mailing list