git: 8b63b54d43cc - main - Cleanup: drop redundant DESTDIR propagation via MAKE_{ARGS,ENV}

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Tue, 16 May 2023 03:58:49 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8b63b54d43cc9f4a3c3af406790fc6f0d86db560

commit 8b63b54d43cc9f4a3c3af406790fc6f0d86db560
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-05-16 03:57:46 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
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 <bsd.port.mk>
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)