svn commit: r540347 - head/devel/git-cinnabar

[Jan Beich]

Author: jbeich
Date: Wed Jun 24 20:52:34 2020
New Revision: 540347
URL: https://svnweb.freebsd.org/changeset/ports/540347

Log:
  devel/git-cinnabar: simplify MAKE_ENV and MAKE_ARGS
  
  - PYTHON_PATH is no longer used by git-cinnabar itself
  - Convert != to ${:!...!}
  - Convert /.. to :H
  
  Note, foreign variables can be factored out (dubious benefit):
  
    # Import devel/git variables (append if :group is missing)
    .for v in MAKE_ENV MAKE_ARGS WRKSRC:git
    ${v:S/:/_/}+=	${:!${SETENV} -u FLAVOR ${MAKE} -V ${v:C/:.*//} -C ${PORTSDIR}/devel/git!}
    .endfor

Modified:
  head/devel/git-cinnabar/Makefile   (contents, props changed)

Modified: head/devel/git-cinnabar/Makefile
==============================================================================
--- head/devel/git-cinnabar/Makefile	Wed Jun 24 20:49:21 2020	(r540346)
+++ head/devel/git-cinnabar/Makefile	Wed Jun 24 20:52:34 2020	(r540347)
@@ -23,12 +23,8 @@ USE_PYTHON=	flavors
 TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
-.ifnmake describe
-MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git
-MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git
-.endif
-MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
-MAKE_ARGS+=	SUBMODULE_STATUS=dummy
+MAKE_ENV=	${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!}
+MAKE_ARGS=	SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!}
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure