From nobody Wed Aug 31 11:42:38 2022 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 4MHj325mxjz4b7cc; Wed, 31 Aug 2022 11:42:38 +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 4MHj3253Fbz4K40; Wed, 31 Aug 2022 11:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946158; 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=4POFT6VdrscY0xzTyLITmhBzAqqYnTnOHCVOUDhkxLQ=; b=M7UtrNkSwDNgrlFYEoFedRsCPgJhEnQUEv7I3wMEfy7DF96SjAhuh37/Xk+CWgTapY2nFD zEU3/Fi0x0qs2rkkLgS0cDHB665oEaZptPzOZYGYyNNhdcFIHv19ZidHxczRC2ydlJmvvT CjYPfd1Voo8o32CfruvAmpgfnYFega1gBpb4kQYu5a9OjwFGrqnlomDkMYPRS1ElNZlmPt wqdF6R4X7UdGv4iVMHpiYOEbZ1adq6dyqL1LRxKGRcTGQWcrNHHkD8n8+GRNxwkF66jesa z3RAMJpc6SsUaj8w3X/JwMds6VTCB5T/7/SoI7JWCxBj4/5HAkXfaKUBrTQ4Ug== 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 4MHj3248DGz16Tn; Wed, 31 Aug 2022 11:42:38 +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 27VBgcKO093953; Wed, 31 Aug 2022 11:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VBgcn5093952; Wed, 31 Aug 2022 11:42:38 GMT (envelope-from git) Date: Wed, 31 Aug 2022 11:42:38 GMT Message-Id: <202208311142.27VBgcn5093952@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 3a0193f08744 - main - archivers/zstd: Use MAKE_ENV instead of patch files 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a0193f087441c73130b34f09ef4d391e78bf3ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946158; 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=4POFT6VdrscY0xzTyLITmhBzAqqYnTnOHCVOUDhkxLQ=; b=YlIOa7SfvLggAKt7Jkn3r99pGfqd7vGBRnPV9Kt3hvCcpjfXux7R4C2+VQZ2Bwd/UmW6VO gdsc1reOiS8g5Jbf9vY28bGg4+AmVQNL3dRBLyaEw7fdxXFiW8Kxl6u0FLUIWk0e2wVBxC yXJIjEvxPh0YBmQGDUJclTbIQVt7mi0KlrdjCyqyMK+CP07ODk1oFeGlfCndLu5O+GhIKx 34SLEP8z4XoPu+UUNa1QYetf2BUy41vEgkXlD073MBhJaVLqnE90cJCzpcXNZUEHelpDvV dLiTWioCTODgiqkfphO1h1/WhXij+cQya/9LwX/5d2He1yEXqRuOWHng0QRUEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661946158; a=rsa-sha256; cv=none; b=m2CJ61N8dR02ggWo9PHw1alzHHkGt3xGsrkRToAB1aF0IiDVy88dAG6Y+9BY+3QvFuFC+O AMpXP8Ys1JNMKtaPU6mvWgYcw7vTTe91ySm0XrenkMaVku5ygv39r2NCHehwLyAwVjUFGj a/SbkRFiJVoHpshHNukPV7Sp7wUCoy+IFHdFKNtjtvqAZ/SVxlmz7Hr21mGDcBUUkbcpzp F8avTGfOUtJ4paRb1tfa3dVUhVMq0eoAW6pT3QKAQetHWJj6oQyNnhR65vICcsZciCBULJ CEltilQ/29RFAT/auGvjsQ6BxUdaTB8HzeCLCbwx0DpmoJAQEXup1QMiBrNUYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a0193f087441c73130b34f09ef4d391e78bf3ad commit 3a0193f087441c73130b34f09ef4d391e78bf3ad Author: Po-Chuan Hsieh AuthorDate: 2022-08-31 11:21:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-08-31 11:40:51 +0000 archivers/zstd: Use MAKE_ENV instead of patch files --- archivers/zstd/Makefile | 4 ++ archivers/zstd/files/patch-lib-Makefile | 55 ---------------------------- archivers/zstd/files/patch-programs-Makefile | 44 ---------------------- 3 files changed, 4 insertions(+), 99 deletions(-) diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile index c3d6153e9861..0f444ca11498 100644 --- a/archivers/zstd/Makefile +++ b/archivers/zstd/Makefile @@ -20,6 +20,10 @@ USES= gmake localbase:ldflags tar:zst ALL_TARGET= default #BINARY_ALIAS= gmd5sum=md5sum TEST_TARGET= test +MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_MAN="${INSTALL_MAN}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/archivers/zstd/files/patch-lib-Makefile b/archivers/zstd/files/patch-lib-Makefile deleted file mode 100644 index a769fa8296c7..000000000000 --- a/archivers/zstd/files/patch-lib-Makefile +++ /dev/null @@ -1,55 +0,0 @@ -% sed -i .orig -e 's|INSTALL_|BSD_&|' lib/Makefile - ---- lib/Makefile.orig 2022-01-20 21:17:18 UTC -+++ lib/Makefile -@@ -292,8 +292,8 @@ else - INSTALL ?= install - endif - --INSTALL_PROGRAM ?= $(INSTALL) --INSTALL_DATA ?= $(INSTALL) -m 644 -+BSD_INSTALL_PROGRAM ?= $(INSTALL) -+BSD_INSTALL_DATA ?= $(INSTALL) -m 644 - - - libzstd.pc: libzstd.pc.in -@@ -314,7 +314,7 @@ install: install-pc install-static install-shared inst - .PHONY: install-pc - install-pc: libzstd.pc - [ -e $(DESTDIR)$(PKGCONFIGDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ -- $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ -+ $(BSD_INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ - - .PHONY: install-static - install-static: -@@ -322,7 +322,7 @@ install-static: - [ -e libzstd.a ] || $(MAKE) libzstd.a-release - [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ - @echo Installing static library -- $(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) -+ $(BSD_INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) - - .PHONY: install-shared - install-shared: -@@ -330,7 +330,7 @@ install-shared: - [ -e $(LIBZSTD) ] || $(MAKE) libzstd-release - [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/ - @echo Installing shared library -- $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) -+ $(BSD_INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) - ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) - ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) - -@@ -338,9 +338,9 @@ install-shared: - install-includes: - [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ - @echo Installing includes -- $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_DATA) zstd_errors.h $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_DATA) zdict.h $(DESTDIR)$(INCLUDEDIR) -+ $(BSD_INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) -+ $(BSD_INSTALL_DATA) zstd_errors.h $(DESTDIR)$(INCLUDEDIR) -+ $(BSD_INSTALL_DATA) zdict.h $(DESTDIR)$(INCLUDEDIR) - - .PHONY: uninstall - uninstall: diff --git a/archivers/zstd/files/patch-programs-Makefile b/archivers/zstd/files/patch-programs-Makefile deleted file mode 100644 index ee30a0cacc19..000000000000 --- a/archivers/zstd/files/patch-programs-Makefile +++ /dev/null @@ -1,44 +0,0 @@ -% sed -i .orig -e 's|INSTALL_|BSD_&|' programs/Makefile - ---- programs/Makefile.orig 2022-01-20 21:17:18 UTC -+++ programs/Makefile -@@ -391,10 +391,10 @@ else - INSTALL ?= install - endif - --INSTALL_PROGRAM ?= $(INSTALL) --INSTALL_SCRIPT ?= $(INSTALL_PROGRAM) --INSTALL_DATA ?= $(INSTALL) -m 644 --INSTALL_MAN ?= $(INSTALL_DATA) -+BSD_INSTALL_PROGRAM ?= $(INSTALL) -+BSD_INSTALL_SCRIPT ?= $(INSTALL_PROGRAM) -+BSD_INSTALL_DATA ?= $(INSTALL) -m 644 -+BSD_INSTALL_MAN ?= $(INSTALL_DATA) - - .PHONY: install - install: -@@ -403,18 +403,18 @@ install: - [ -e $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ - [ -e $(DESTDIR)$(MAN1DIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(MAN1DIR)/ - @echo Installing binaries -- $(INSTALL_PROGRAM) zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT) -+ $(BSD_INSTALL_PROGRAM) zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT) - ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/zstdcat$(EXT) - ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/unzstd$(EXT) - ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/zstdmt$(EXT) -- $(INSTALL_SCRIPT) zstdless $(DESTDIR)$(BINDIR)/zstdless -- $(INSTALL_SCRIPT) zstdgrep $(DESTDIR)$(BINDIR)/zstdgrep -+ $(BSD_INSTALL_SCRIPT) zstdless $(DESTDIR)$(BINDIR)/zstdless -+ $(BSD_INSTALL_SCRIPT) zstdgrep $(DESTDIR)$(BINDIR)/zstdgrep - @echo Installing man pages -- $(INSTALL_MAN) zstd.1 $(DESTDIR)$(MAN1DIR)/zstd.1 -+ $(BSD_INSTALL_MAN) zstd.1 $(DESTDIR)$(MAN1DIR)/zstd.1 - ln -sf zstd.1 $(DESTDIR)$(MAN1DIR)/zstdcat.1 - ln -sf zstd.1 $(DESTDIR)$(MAN1DIR)/unzstd.1 -- $(INSTALL_MAN) zstdgrep.1 $(DESTDIR)$(MAN1DIR)/zstdgrep.1 -- $(INSTALL_MAN) zstdless.1 $(DESTDIR)$(MAN1DIR)/zstdless.1 -+ $(BSD_INSTALL_MAN) zstdgrep.1 $(DESTDIR)$(MAN1DIR)/zstdgrep.1 -+ $(BSD_INSTALL_MAN) zstdless.1 $(DESTDIR)$(MAN1DIR)/zstdless.1 - @echo zstd installation completed - - .PHONY: uninstall