svn commit: r327601 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Thu Sep 19 08:05:05 2013
New Revision: 327601
URL: http://svnweb.freebsd.org/changeset/ports/327601

Log:
  Move the target for sanity checking to the end of bsd.port.mk so that
  WARNING and DEV_* can be defined anywhere
  While here, change sleep time from 5 to 10 so that users have time to read it [1]
  
  Suggested by:	many [1]

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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Sep 19 07:50:29 2013	(r327600)
+++ head/Mk/bsd.port.mk	Thu Sep 19 08:05:05 2013	(r327601)
@@ -6491,6 +6491,43 @@ install-license:
 	@${DO_NADA}
 .endif
 
+.if defined(WARNING)
+show-warnings:
+	@${ECHO_MSG} "/!\\ WARNING /!\\"
+.for m in ${WARNING}
+	@${ECHO_MSG} "${m}"
+.endfor
+	@${ECHO_MSG}
+	@sleep 10
+
+check-makefile:: show-warnings
+.endif
+
+.if defined(DEVELOPER)
+.if defined(DEV_WARNING)
+show-dev-warnings:
+	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\"
+	@${ECHO_MSG}
+.for m in ${DEV_WARNING}
+	@${ECHO_MSG} "${m}"
+.endfor
+	@${ECHO_MSG}
+	@sleep 10
+check-makefile:: show-dev-warnings
+.endif
+
+.if defined(DEV_ERROR)
+show-dev-errors:
+	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\"
+	@${ECHO_MSG}
+.for m in ${DEV_WARNING}
+	@${ECHO_MSG} "${m}"
+.endfor
+	@${ECHO_MSG}
+	@${FALSE}
+check-makefile:: show-dev-errors
+.endif
+.endif #DVELOPER
 .endif
 # End of post-makefile section.
 

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Sep 19 07:50:29 2013	(r327600)
+++ head/Mk/bsd.sanity.mk	Thu Sep 19 08:05:05 2013	(r327601)
@@ -91,41 +91,6 @@ DEV_WARNING+=	"USE_GNOME=ltverhack is no
 DEV_WARNING+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
 .endif
 
-.if defined(WARNING)
-show-warnings:
-.for m in ${WARNING}
-	@${ECHO_MSG} "${m}"
-.endfor
-	@sleep 5
-
-check-makefile:: show-warnings
-.endif
-
 .if defined(_PREMKINCLUDED)
 DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
 .endif
-
-.if defined(DEVELOPER)
-.if defined(DEV_WARNING)
-show-dev-warnings:
-	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\"
-	@${ECHO_MSG}
-.for m in ${DEV_WARNING}
-	@${ECHO_MSG} "${m}"
-.endfor
-	@${ECHO_MSG}
-	@sleep 5
-check-makefile:: show-dev-warnings
-.endif
-
-.if defined(DEV_ERROR)
-show-dev-errors:
-	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\"
-	@${ECHO_MSG}
-.for m in ${DEV_WARNING}
-	@${ECHO_MSG} "${m}"
-.endfor
-	@${FALSE}
-check-makefile:: show-dev-errors
-.endif
-.endif