svn commit: r520033 - head/Mk/Uses

[Adam Weinberger]

Author: adamw
Date: Fri Dec 13 13:48:55 2019
New Revision: 520033
URL: https://svnweb.freebsd.org/changeset/ports/520033

Log:
  Uses/makeinfo.mk: Only look for makeinfo from print/texinfo
  
  If systems are updated without running `make delete-old`, makeinfo
  may still be lingering around in /usr/bin. This causes eventual
  errors as it can't handle brand new emerging technology from 10
  years ago (like CSS).
  
  Instead of permitting makeinfo from base (which was removed in
  11.0-RELEASE), depend specifically on makeinfo from print/texinfo.
  
  Reviewed by:	bapt
  Differential Revision:	https://reviews.freebsd.org/D22795

Modified:
  head/Mk/Uses/makeinfo.mk

Modified: head/Mk/Uses/makeinfo.mk
==============================================================================
--- head/Mk/Uses/makeinfo.mk	Fri Dec 13 13:24:16 2019	(r520032)
+++ head/Mk/Uses/makeinfo.mk	Fri Dec 13 13:48:55 2019	(r520033)
@@ -15,11 +15,8 @@ _INCLUDE_USES_MAKEINFO_MK=	yes
 IGNORE=	USES=makeinfo - expects no arguments
 .endif
 
-.if exists(/usr/bin/makeinfo)
-MAKEINFO?=	/usr/bin/makeinfo
-.else
-BUILD_DEPENDS+=	makeinfo:print/texinfo
+# Depend specifically on makeinfo from ports
+BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:print/texinfo
 MAKEINFO?=	${LOCALBASE}/bin/makeinfo
-.endif
 
 .endif