From nobody Tue Dec 10 17:48:28 2024 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 4Y75n92BwFz5gQ15; Tue, 10 Dec 2024 17:48:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y75n901zDz42jf; Tue, 10 Dec 2024 17:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733852909; 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=5xOy4k1CIo8GKe+gajhxkD/848Hn50/E/2lS8OSI19M=; b=KhLB4aB2S1r18eSjgzE4xo+HLR9OW5VZV1KgyNcZjvlsBQHo2wxJ13HXJoIx70QHOGLfl+ 5VOtq4J0vE4oGnormw8/OR1p6VGF57TCh1yYpK8szWwWg+8cVaA0qLoLlP44S/u9LnsbRh q1jC2uYgmfOfHTiBm9hHSRbgfa0WVkI6KRA+9nztzYALmKUmwvAWN0IPb14nogWx08FcPm QI5T8Yu/OPkC0DJXsDsi8jjUGaIi8xZrDc4EE/gH+XXVscV7ZCQg2S+pHD7rO/QepHcqgA W/FKSE3RCVGFXHY6BwyIKxU8YkQAR6DBm2r9dRCPHbo5mCPsy/7OYUd3d+lZjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733852909; 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=5xOy4k1CIo8GKe+gajhxkD/848Hn50/E/2lS8OSI19M=; b=w8fJ6Wgl7cbUXo8nqXGKHoR+2RFaQaUEIVC8XLRPI0QJ3+ybjLziPoMMCaIsk58KHSyc3I 9K80i3m285stw0xqqTlVA6QcBVXdlM3RQnirKsvq1TAz9SBIhmgotCghuaT8u3OAK0YtpF 5gs+Q9+TH14OEgmE6fgWM3btPfnKm+ImEtc5H7BeuGZ/mJi8Nx+kyydllL7PxzqQinmE4k g00pnCCny1jMp6/IfCr/rNwejVgjaSygzBFjbAcrbZvvgsF5iycFm249iaiBB3CVeuu25R P/xtbMdvXvlHzu278kMEfghaOoJtjUsAvZOCuULKe4pOkjFqGOl0S47y7bPF8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733852909; a=rsa-sha256; cv=none; b=XhfHypEn4c8EPmMBRgN01EhQsRmG8rQgn5BmItGAmiu3CdQGj5jK+8cGC8sR06uPqBreHv LW/VFKn9N6v+ZsyTVXeWobtJs/FO8zum+V/PYR7mdspejUMju0YCl8Ib2+K9omUCsahYaD A40yOrtSpsXHt3St7dXGiyz/99o1jhpKqjODt5OZmFFfo3Hp0Tse8dPsFdvOo2LNRMyHJy uF1X7v18at+vvEIeIQ46zn5247HTHQWESjgRYo9qyg+uNsZBXdkmkD49TxM4upUJX9M1ut Dnw8xb23X1FqHW8FpPijJhGnZCr5pqa1ri/AgRbf1TNDTf3GSfIzr8tRMsFsQA== 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 4Y75n86cMrzYJ1; Tue, 10 Dec 2024 17:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BAHmSBr068253; Tue, 10 Dec 2024 17:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAHmSqq068250; Tue, 10 Dec 2024 17:48:28 GMT (envelope-from git) Date: Tue, 10 Dec 2024 17:48:28 GMT Message-Id: <202412101748.4BAHmSqq068250@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: fa3634bb050b - main - archivers/zip: honor CC & CFLAGS 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3634bb050bdc7a84e29038c5533d9d1dca844f Auto-Submitted: auto-generated The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa3634bb050bdc7a84e29038c5533d9d1dca844f commit fa3634bb050bdc7a84e29038c5533d9d1dca844f Author: Larry Rosenman AuthorDate: 2024-12-10 17:45:55 +0000 Commit: Larry Rosenman CommitDate: 2024-12-10 17:48:25 +0000 archivers/zip: honor CC & CFLAGS and release maintainership PR: 270985 Reported by: Eric Camachat --- archivers/zip/Makefile | 5 ++-- archivers/zip/files/patch-unix_configure | 42 +++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index dcdc37d4787b..137affa64b28 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -1,11 +1,11 @@ PORTNAME= zip PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -MAINTAINER= ler@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Create/update ZIP files compatible with PKZIP WWW= https://infozip.sourceforge.net/Zip.html @@ -19,6 +19,7 @@ CPE_VENDOR= info-zip_project OPTIONS_DEFINE= DOCS +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" MAKEFILE= unix/Makefile ALL_TARGET= generic diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure index 3e421f3ffba6..bcd7e875e2c6 100644 --- a/archivers/zip/files/patch-unix_configure +++ b/archivers/zip/files/patch-unix_configure @@ -24,7 +24,7 @@ [ -f /xenix ] && CPP="${CC} -E" [ -f /lynx.os ] && CPP="${CC} -E" -@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/ +@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then echo "int foo() { return 0;}" > conftest.c $CC -c conftest.c >/dev/null 2>/dev/null echo Check if compiler generates underlines @@ -33,3 +33,43 @@ [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE" if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ] +@@ -519,7 +516,10 @@ done + + + echo Check for memset +-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c ++cat > conftest.c << _EOF_ ++#include ++int main(){ char k; memset(&k,0,0); return 0; } ++_EOF_ + $CC -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + +@@ -556,6 +556,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null + + echo Check for directory libraries + cat > conftest.c << _EOF_ ++#include + int main() { return closedir(opendir(".")); } + _EOF_ + +@@ -578,7 +579,10 @@ fi + # Dynix/ptx 1.3 needed this + + echo Check for readlink +-echo "int main(){ return readlink(); }" > conftest.c ++cat > conftest.c << _EOF_ ++#include ++int main() { return readlink(); } ++_EOF_ + $CC -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null +@@ -621,6 +625,7 @@ CFLAGS="${CFLAGS} ${OPT}" + + echo Check for valloc + cat > conftest.c << _EOF_ ++#include + main() + { + #ifdef MMAP