[Midnightbsd-cvs] mports [24025] trunk/Mk/extensions: use the new ordering logic

[laffer1 at midnightbsd.org]

Revision: 24025
          http://svnweb.midnightbsd.org/mports/?rev=24025
Author:   laffer1
Date:     2018-08-29 11:14:58 -0400 (Wed, 29 Aug 2018)
Log Message:
-----------
use the new ordering logic

Modified Paths:
--------------
    trunk/Mk/extensions/autoreconf.mk
    trunk/Mk/extensions/charsetfix.mk
    trunk/Mk/extensions/display.mk

Modified: trunk/Mk/extensions/autoreconf.mk
===================================================================
--- trunk/Mk/extensions/autoreconf.mk	2018-08-29 15:14:45 UTC (rev 24024)
+++ trunk/Mk/extensions/autoreconf.mk	2018-08-29 15:14:58 UTC (rev 24025)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 # $FreeBSD: head/Mk/Uses/autoreconf.mk 369909 2014-10-03 15:33:39Z tijl $
 #
-# Run autoreconf in CONFIGURE_WRKSRC to update configure, Makefile.in and
+# Run autoreconf in AUTORECONF_WRKSRC to update configure, Makefile.in and
 # other build scripts.
 #
 # Autoreconf encapsulates the following commands.  Each command applies to a
@@ -55,11 +55,8 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-BUILD_DEPENDS+=	autoconf-2.69:devel/autoconf \
-		autoheader-2.69:devel/autoconf \
-		autoreconf-2.69:devel/autoconf \
-		aclocal-1.15:devel/automake \
-		automake-1.15:devel/automake
+BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
+		automake>=1.16.1:devel/automake
 
 .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:devel/libtool
@@ -73,7 +70,8 @@
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
-.if ! ${autoreconf_ARGS:Mbuild}
+.if empty(autoreconf_ARGS)
+_USES_configure+=	470:do-autoreconf
 do-autoreconf:
 .for f in AUTHORS ChangeLog INSTALL NEWS README
 # Don't modify time stamps if the files already exist
@@ -87,6 +85,8 @@
 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
 .endif
 	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
+.elif ! ${autoreconf_ARGS:Mbuild}
+IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
 .endif
 
 .endif

Modified: trunk/Mk/extensions/charsetfix.mk
===================================================================
--- trunk/Mk/extensions/charsetfix.mk	2018-08-29 15:14:45 UTC (rev 24024)
+++ trunk/Mk/extensions/charsetfix.mk	2018-08-29 15:14:58 UTC (rev 24025)
@@ -2,6 +2,12 @@
 #
 # Lookup in Makefile.in to prevent a package from installing/modifying charset.alias
 #
+# Feature:	charsetfix
+# Usage:	USES=charsetfix
+# Valid ARGS:	does not require args
+#
+# MAINTAINER: ports at MidnightBSD.org
+
 .if !defined(_INCLUDE_USES_CHARSETFIX_MK)
 _INCLUDE_USES_CHARSETFIX_MK=	yes
 
@@ -11,8 +17,7 @@
 
 CHARSETFIX_MAKEFILEIN?=	Makefile.in
 
-post-patch: charsetfix-post-patch
-
+_USES_patch+=	600:charsetfix-post-patch
 charsetfix-post-patch:
 	@${FIND} ${WRKSRC} -name "${CHARSETFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|need_charset_alias=true|need_charset_alias=false|g ; \

Modified: trunk/Mk/extensions/display.mk
===================================================================
--- trunk/Mk/extensions/display.mk	2018-08-29 15:14:45 UTC (rev 24024)
+++ trunk/Mk/extensions/display.mk	2018-08-29 15:14:58 UTC (rev 24025)
@@ -10,24 +10,22 @@
 .if !defined(_INCLUDE_USES_DISPLAY_MK)
 _INCLUDE_USES_DISPLAY_MK=	yes
 
-display_ARGS?=	install
+.if empty(display_ARGS)
+display_ARGS=	install
+.endif
 
 .if !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
-	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
-	xkbcomp:${PORTSDIR}/x11/xkbcomp
+BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver \
+	${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
+	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+	xkbcomp:x11/xkbcomp
 
 XVFBPORT!=	port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
 XVFBPIDFILE=	/tmp/.xvfb-${XVFBPORT}.pid
 MAKE_ENV+=	DISPLAY=":${XVFBPORT}"
 
-.PHONY: start-display stop-display
-pre-${display_ARGS}: start-display
-
-post-${display_ARGS}: stop-display
-
+_USES_${display_ARGS}+=	290:start-display 860:stop-display
 start-display:
 	daemon -p ${XVFBPIDFILE} Xvfb :${XVFBPORT}