From nobody Tue May 16 03:58:49 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QL2Xn2yw1z4BV73; Tue, 16 May 2023 03:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QL2Xn2MWqz3tkR; Tue, 16 May 2023 03:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684209529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ymwFIMMWVbiPHe2pgwnx1ERWAbzjDzObpYQt9pbPOM=; b=nVb+O3IoXVi1puDihf1DnzTLJIYFKqRSjal5fiS7b83rqxLoj29W35C68VZteT/LjA8OQl r5h9dG5fX1GU6rqFqRTo7Qw3IQXOVaGragP0AJudlCPS6UlYV1hd2JU543AvQPdT+WuFal U6TOYHoc8YRXdmEGOr5HIkPUVBDqxh6vjnLLs84xTJVdN/fJoHt23hwkFVwslihzRgFX0s zGeymwhRDUx8c52Rc0Hwwggb0g00FMBqHEgD7PpHwQIyKCEBqkzuRoZv3hBXgozfH6JwU9 RHk4oq+XtAYlemUn1C5SvctIxKLxQaey5WD9fU3Z8BQsTdsBVDNJaCVmov0J3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684209529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ymwFIMMWVbiPHe2pgwnx1ERWAbzjDzObpYQt9pbPOM=; b=Az6Ow5XKIqQQJwAb5wAQAJyAFRjR9/R39rU3sG1t0kEJQlnXut7DwH8p2q5uvF7KoXGJAv Jh0QSZkLDj1P0QoOoblDgPoNawzStOlVXzpEgwwGZQ+RYizQmo5kWTFFCxyd6Co1YFrQc5 oHlL0xL/AuFG1vyZRIcs9zVpcHYoXO8aTHpK9R0jbai9lOrZdiO41Ob0L+5MUHytjJVUJw 1L7mU9y8bKXaUePLY09AY5umHQYebjl1lGkFA4zjfQg1Ub/61SRjefuu6PvQzclL7LqVIY tevN6uPShsXlkXB5YoFgsx2pOWP5YBBrKA8ZasbhIcV5EIgWsZPu/lHgrpM6xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684209529; a=rsa-sha256; cv=none; b=CcVNLeQ9lEHF05Du30kPPTLBvmTZW1jxpL8dycfiYLdeQEzk1uvgJ3XzrrKsppRtfSrUw0 BFofsAovj1WnXnDaYHmfT2BRFlCHglgSV41W9Lc0g4jvEb4kCGWhktHG39Utl9F5y/T4TL WPLMQ3+7DY8TrS9pvlXoJeIwnk6va76ZqcrmutC7CSNJpLr5aXWsUeLS2lsFuGlSSKY+pH z+EH5PSU+mB8Bj8ynNupsVvsC+ge5G1hxBiNNV6cMJhymt4BdhI1F4C6PTIOP21UeBX0rh 1CZdFKgsCHYif+VBusBQRJDkqaAKz96LTt2V95ljguzmQyOro0IkM6hAcKBScg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QL2Xn1R5Nz16s5; Tue, 16 May 2023 03:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34G3wn9C075598; Tue, 16 May 2023 03:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34G3wn2q075597; Tue, 16 May 2023 03:58:49 GMT (envelope-from git) Date: Tue, 16 May 2023 03:58:49 GMT Message-Id: <202305160358.34G3wn2q075597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8b63b54d43cc - main - Cleanup: drop redundant DESTDIR propagation via MAKE_{ARGS,ENV} List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b63b54d43cc9f4a3c3af406790fc6f0d86db560 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b63b54d43cc9f4a3c3af406790fc6f0d86db560 commit 8b63b54d43cc9f4a3c3af406790fc6f0d86db560 Author: Alexey Dokuchaev AuthorDate: 2023-05-16 03:57:46 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-16 03:57:46 +0000 Cleanup: drop redundant DESTDIR propagation via MAKE_{ARGS,ENV} Our framework usually DTRT; sometimes it's necessary to pass it explicitly, e.g. for ports with USES+=qmake or which use exotic build systems, but these are mostly staging dawn and apparently debug leftovers, so remove them to not confuse the reader. --- emulators/fs-uae-launcher/Makefile | 4 +--- graphics/gocr/Makefile | 6 ++---- lang/retro12/Makefile | 1 - math/oleo/Makefile | 1 - net-mgmt/netmagis-common/Makefile | 4 ++-- net/cvsync/Makefile | 3 +-- security/sslproxy/Makefile | 5 +++-- security/sslsplit/Makefile | 5 +++-- sysutils/ezjail/Makefile | 2 -- sysutils/keyd/Makefile | 2 +- sysutils/mtm/Makefile | 2 -- sysutils/pass-otp/Makefile | 7 +++---- www/igal2/Makefile | 1 - 13 files changed, 16 insertions(+), 27 deletions(-) diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile index 9a605c714aef..181474aa1da4 100644 --- a/emulators/fs-uae-launcher/Makefile +++ b/emulators/fs-uae-launcher/Makefile @@ -16,12 +16,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}python-lhafile>0:archivers/py-python-lhafile@${PY_FLAVOR} USES= gettext gmake gnome pathfix pyqt:5 python:3.4+ - USE_PYTHON= distutils autoplist noflavors USE_PYQT= pyqt5 sip -MAKE_ARGS+= DESTDIR=${STAGEDIR} prefix=${PREFIX} PYTHON=${PYTHON_CMD} - +MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD} PYDISTUTILS_INSTALLARGS+= --install-lib=${PYTHON_SITELIBDIR} OPTIONS_DEFINE= DOCS diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile index 60092c5566da..0c9cff389770 100644 --- a/graphics/gocr/Makefile +++ b/graphics/gocr/Makefile @@ -12,14 +12,12 @@ LICENSE= GPLv2 LIB_DEPENDS= libnetpbm.so:graphics/netpbm USES= gmake - GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-netpbm=${LOCALBASE} -MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} DESTDIR=${DESTDIR} +MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} PLIST_FILES= bin/gocr \ man/man1/gocr.1.gz - PORTDOCS= * DOCSRCDIR1= ${WRKSRC} @@ -39,7 +37,7 @@ post-patch: @${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in post-patch-X11-off: - @${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e '/gocr\.tcl/d' ${WRKSRC}/src/Makefile.in post-patch-X11-on: @${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/bin/gocr.tcl diff --git a/lang/retro12/Makefile b/lang/retro12/Makefile index 5a7ae5895150..478053ab4f42 100644 --- a/lang/retro12/Makefile +++ b/lang/retro12/Makefile @@ -19,7 +19,6 @@ SHEBANG_FILES= example/Atua* SHEBANG_LANG= retro MAKE_ENV= DATADIR=${DATADIR} \ - DESTDIR=${DESTDIR} \ DOCSDIR=${DOCSDIR} \ EXAMPLESDIR=${EXAMPLESDIR} \ PREFIX=${PREFIX} diff --git a/math/oleo/Makefile b/math/oleo/Makefile index 73513ec7b23b..4bc979c65d2e 100644 --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-xlt --without-sciplot # With -O2 configure hangs at "checking for working mktime..." CONFIGURE_ENV= CFLAGS="${CFLAGS:C/-O2//} -fwrapv" -MAKE_ARGS+= DESTDIR="${STAGEDIR}" BINARY_ALIAS= makeinfo=false # disable detecting local makeinfo diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile index 7c5683f248e3..d982b89c1a26 100644 --- a/net-mgmt/netmagis-common/Makefile +++ b/net-mgmt/netmagis-common/Makefile @@ -30,8 +30,8 @@ SLAVEDIRS= net-mgmt/netmagis-common \ net-mgmt/netmagis-www # Variables used in netmagis Makefiles -MAKE_ARGS+= DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX} -MAKE_ARGS+= TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh +MAKE_ARGS+= PREFIX=${PREFIX} TCLSH=${TCLSH} \ + TCLCONF=${TCL_LIBDIR}/tclConfig.sh .if ${PKGNAMESUFFIX} == -topo || ${PKGNAMESUFFIX} == -www ALL_TARGET=build${PKGNAMESUFFIX?=} diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile index c7c4e5a96298..a7fb4738e800 100644 --- a/net/cvsync/Makefile +++ b/net/cvsync/Makefile @@ -19,8 +19,7 @@ PORTDOCS= ChangeLog FAQ TODO PORTEXAMPLES= cvsync.conf cvsyncd-FreeBSD.conf \ cvsyncd-NetBSD.conf cvsyncd-OpenBSD.conf -MAKE_ENV+= DESTDIR="${STAGEDIR}" \ - PTHREAD_LIBS="-lpthread" \ +MAKE_ENV= PTHREAD_LIBS="-lpthread" \ INSTALL= \ INSTALL_BIN_OPTS="${INSTALL_PROGRAM}" \ INSTALL_MAN_OPTS="${INSTALL_MAN}" diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile index 3e0cb3feaa25..73c8ae1a2c96 100644 --- a/security/sslproxy/Makefile +++ b/security/sslproxy/Makefile @@ -19,8 +19,9 @@ GH_ACCOUNT= sonertari GH_PROJECT= SSLproxy MAKEFILE= GNUmakefile -MAKE_ENV= DESTDIR=${STAGEDIR} MANDIR=man INSTALLUID=${UID} INSTALLGID=${GID} -PLIST_FILES= bin/sslproxy man/man1/sslproxy.1.gz man/man5/sslproxy.conf.5.gz \ +MAKE_ENV= MANDIR=man INSTALLUID=${UID} INSTALLGID=${GID} +PLIST_FILES= bin/sslproxy man/man1/sslproxy.1.gz \ + man/man5/sslproxy.conf.5.gz \ "@sample etc/sslproxy.conf.sample" post-patch: diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile index 5139411e6134..3cd962594ba4 100644 --- a/security/sslsplit/Makefile +++ b/security/sslsplit/Makefile @@ -20,8 +20,9 @@ LIB_DEPENDS= libevent.so:devel/libevent \ USES= gmake pkgconfig tar:bzip2 uidfix ssl MAKEFILE= GNUmakefile -MAKE_ENV= DESTDIR=${STAGEDIR} MANDIR=${PREFIX}/man INSTALLUID=${UID} INSTALLGID=${GID} -PLIST_FILES= bin/sslsplit man/man1/sslsplit.1.gz man/man5/sslsplit.conf.5.gz \ +MAKE_ENV= MANDIR=${PREFIX}/man INSTALLUID=${UID} INSTALLGID=${GID} +PLIST_FILES= bin/sslsplit man/man1/sslsplit.1.gz \ + man/man5/sslsplit.conf.5.gz \ "@sample %%ETCDIR%%/sslsplit.conf.sample" post-install: diff --git a/sysutils/ezjail/Makefile b/sysutils/ezjail/Makefile index 9288de960873..fd0b809fbe0e 100644 --- a/sysutils/ezjail/Makefile +++ b/sysutils/ezjail/Makefile @@ -10,6 +10,4 @@ WWW= https://erdgeist.org/arts/software/ezjail/ USES= tar:bzip2 -MAKE_ENV= DESTDIR=${STAGEDIR} - .include diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile index 09f052473703..808b9806e92e 100644 --- a/sysutils/keyd/Makefile +++ b/sysutils/keyd/Makefile @@ -22,7 +22,7 @@ USE_GITHUB= yes USE_RC_SUBR= ${PORTNAME} GH_ACCOUNT= rvaiya SHEBANG_FILES= scripts/* -MAKE_ARGS= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \ +MAKE_ARGS= PREFIX="${PREFIX}" \ VERSION="${DISTVERSIONFULL}" COMMIT="" PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-application-mapper diff --git a/sysutils/mtm/Makefile b/sysutils/mtm/Makefile index 2d47963cc015..fe7152acf70d 100644 --- a/sysutils/mtm/Makefile +++ b/sysutils/mtm/Makefile @@ -16,8 +16,6 @@ USE_CSTD= gnu99 USE_GITHUB= yes GH_ACCOUNT= deadpixi -MAKE_ENV= DESTDIR="${DESTDIR}${PREFIX}" - CFLAGS+= -I${NCURSESINC} ${CPPFLAGS} LIBS+= -L${NCURSESLIB} -lncurses -lutil diff --git a/sysutils/pass-otp/Makefile b/sysutils/pass-otp/Makefile index 4bae39616dd6..b950604b14b0 100644 --- a/sysutils/pass-otp/Makefile +++ b/sysutils/pass-otp/Makefile @@ -17,15 +17,14 @@ RUN_DEPENDS= bash:shells/bash \ TEST_DEPENDS= expect:lang/expect \ git:devel/git -USES= gmake shebangfix -USE_GITHUB= YES +USES= gmake shebangfix +USE_GITHUB= yes GH_ACCOUNT= tadfisher SHEBANG_FILES= otp.bash test/*.sh test/*t NO_ARCH= yes NO_BUILD= yes -MAKE_ENV= DESTDIR=${STAGEDIR} \ - LIBDIR=${PREFIX}/libexec \ +MAKE_ENV= LIBDIR=${PREFIX}/libexec \ MANDIR=${MANPREFIX}/man \ BASHCOMPDIR=${PREFIX}/share/bash-completion/completions diff --git a/www/igal2/Makefile b/www/igal2/Makefile index 10b72ae1e528..709856b98fb3 100644 --- a/www/igal2/Makefile +++ b/www/igal2/Makefile @@ -16,7 +16,6 @@ CONFLICTS= igal-1.* USES= perl5 NO_BUILD= yes NO_ARCH= yes -MAKE_ENV+= DESTDIR=${STAGEDIR} OPTIONS_DEFINE= EXIF EXIF_DESC= Support EXIF data (-e option)