Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Oct 2012 17:18:43 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305595 - head/Mk
Message-ID:  <201210091718.q99HIhjC043033@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Oct  9 17:18:43 2012
New Revision: 305595
URL: http://svn.freebsd.org/changeset/ports/305595

Log:
  - add STAT to bsd.commands.mk
  - use ${STAT} -f \"%z\" in make makesum to calculate size
  - speed up USE_PKGCONFIG by using a more efficient syntax [1]
    and test in the order it is most expected to appear: "yes/build"
    first, "both" second, "run being the last one.
  
  Reported by:	dougb [1]
  Exp-Run by:	beat

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

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Tue Oct  9 16:12:18 2012	(r305594)
+++ head/Mk/bsd.commands.mk	Tue Oct  9 17:18:43 2012	(r305595)
@@ -79,6 +79,7 @@ SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SORT?=		/usr/bin/sort
 STRIP_CMD?=	/usr/bin/strip
+STAT?=		/usr/bin/stat
 # Command to run commands as privileged user
 # Example: "/usr/local/bin/sudo -E sh -c" to use "sudo" instead of "su"
 SU_CMD?=	/usr/bin/su root -c

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Oct  9 16:12:18 2012	(r305594)
+++ head/Mk/bsd.port.mk	Tue Oct  9 17:18:43 2012	(r305595)
@@ -1657,20 +1657,15 @@ BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel
 CONFIGURE_ENV+=	MAKE=${GMAKE}
 .endif
 .if defined(USE_PKGCONFIG)
-.if ${USE_PKGCONFIG:L} == yes
-USE_PKGCONFIG=	build
-.endif
-.if ${USE_PKGCONFIG:L} == run
-RUN_DEPENDS+=	pkgconf:${PORTSDIR}/devel/pkgconf
-.endif
-.if ${USE_PKGCONFIG:L} == build
+.if ${USE_PKGCONFIG:L} == yes || ${USE_PKGCONFIG:L} == build
 BUILD_DEPENDS+=	pkgconf:${PORTSDIR}/devel/pkgconf
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
-.endif
-.if ${USE_PKGCONFIG:L} == both
+.elif ${USE_PKGCONFIG:L} == both
 RUN_DEPENDS+=	pkgconf:${PORTSDIR}/devel/pkgconf
 BUILD_DEPENDS+=	pkgconf:${PORTSDIR}/devel/pkgconf
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
+.elif ${USE_PKGCONFIG:L} == run
+RUN_DEPENDS+=	pkgconf:${PORTSDIR}/devel/pkgconf
 .endif
 .endif
 
@@ -4814,7 +4809,7 @@ makesum: check-checksum-algorithms
 					$$alg_executable $$file >> ${DISTINFO_FILE}; \
 				fi; \
 			done; \
-			${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${DISTINFO_FILE}; \
+			${ECHO_CMD} "SIZE ($$file) = `${STAT} -f \"%z\" $$file`" >> ${DISTINFO_FILE}; \
 		done \
 	)
 	@for file in ${_IGNOREFILES}; do \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091718.q99HIhjC043033>