From nobody Wed Sep 11 19:44:10 2024 X-Original-To: dev-commits-ports-main@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 4X3rcC1F7cz5VJfc; Wed, 11 Sep 2024 19:44:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3rcB6m0kz4YGZ; Wed, 11 Sep 2024 19:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726083850; 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=/4RDq+DhLACf0bJ3BgYxnfzbYfsSfqwA+SUHvVul0Gc=; b=WheV19zyFc9Nu55SaZGiGvAfZRCs3000MDtJxpUmqKcHFmrZ/OBcLFQY8SkLDHO5TVlcg3 hNE+xR5+hsIjY1Bfu3B3L9kmOrdod4LOwKmRImqAh+iRXrShPW9gBi0cJ6YphWETr1Kv8y KFw73Tp17f/NONtWmZIkseWWx2w9GKC+VozN0Yon4NlSfGb/9o8/iqdp+eAVBo3foQ4Rr4 TujUjewwqbeL1xo3b9p0Iw0MK1AE+2uyAT74Z6Dvq4xnzRwZrYS5AmsqcO2ygfl1XC2Oxy KDiUJwmLt3mC7Iv3egEgkvlJl90C+TWciyFMRuNwhnFtH+SwSK6s7ALC3R2ROA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726083850; a=rsa-sha256; cv=none; b=bsYzgvCWjfiWpuyI7bDnIxR57jObn31f731KbCrg/wKpIcHIJvFzBp7TsjkVB0HZSi2k1P lIsCL+Sje4nbDqtuPs5QXlyhk6mjQE2giZAsAfqoTPeU4JHRGLMqcAUn/V5hpNQd3NCbfj wsAuiy271cqrKZ0ivAFVPyeaBPbvsbfiBMfMKT1p7cBy0OSvtQew+vWaddKBRpcAuEoWeW Al/LyxuwmdX8sLfmQkx8+o1c41dFHGciDDFKkbk3rnQUSRWZpftG8a4eSuCvTOtKcfg2Tk zZUSXF7WB2u7NBPwsVj/P/BnEhNqka+GLF/NmcsxlPNlHWlA/bDWkJbmWiNT8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726083850; 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=/4RDq+DhLACf0bJ3BgYxnfzbYfsSfqwA+SUHvVul0Gc=; b=SqlI9kXXPaIptDnOBAK+fy124H5lXvYpptI7Gzqo7UEQJSVfYDQZN+5kPqoK7su3F1KIGW 1MKOK6x9OpIju8nZBxvARjCH9RpzVePifPohQwMShKsZkt/WQMmtwNvCIeGs+RF14oOYsk xLvfJreslZjQTQCR8esGXJcFEA5SjRV3q13q6E94JQhJu9tlL4mRfaDw20bjz1EJVMRoLf F0R4vEaiUkpJssVAcBwBCiqkuSSrtjGliiMz6KWLY0SPIwWj39pvkH4flOw2sj02jLlwUr mv6HRsfjnyaxQTFfQGUmqr2VtChb/O0b6q6hf3UQcbo4qAFg0E4l/Q/L7ISapw== 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 4X3rcB6MwvzkPC; Wed, 11 Sep 2024 19:44:10 +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 48BJiAQs030563; Wed, 11 Sep 2024 19:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BJiAEk030560; Wed, 11 Sep 2024 19:44:10 GMT (envelope-from git) Date: Wed, 11 Sep 2024 19:44:10 GMT Message-Id: <202409111944.48BJiAEk030560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 580837751735 - main - x11/imwheel: Fix build when package already installed List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 580837751735447378440d46809783b77c9f18d4 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=580837751735447378440d46809783b77c9f18d4 commit 580837751735447378440d46809783b77c9f18d4 Author: Cy Schubert AuthorDate: 2024-09-11 19:30:33 +0000 Commit: Cy Schubert CommitDate: 2024-09-11 19:43:56 +0000 x11/imwheel: Fix build when package already installed The build should anchor its search for files in $STAGEDIR instead of /. --- x11/imwheel/files/patch-Makefile.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/x11/imwheel/files/patch-Makefile.in b/x11/imwheel/files/patch-Makefile.in index a6bd1d2cb2f0..19f555464724 100644 --- a/x11/imwheel/files/patch-Makefile.in +++ b/x11/imwheel/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2004-08-29 10:36:33 UTC -+++ Makefile.in -@@ -215,7 +215,7 @@ imwheel_LDADD = @GETOPT_LIBS@ -L$(top_bu +--- Makefile.in.orig 2004-08-29 03:36:33.000000000 -0700 ++++ Makefile.in 2024-09-11 12:36:57.567005000 -0700 +@@ -215,7 +215,7 @@ imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a man_MANS = imwheel.1 EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh @@ -9,16 +9,14 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -782,9 +782,9 @@ install-exec-hook: +@@ -782,9 +782,7 @@ @SUID_TRUE@ chown @suid@ $$progname ; \ @SUID_TRUE@ chmod u+s $$progname $(mkinstalldirs) $(ETCDIR) - -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true - -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true - -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc -+ -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true -+ -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true -+ -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc ++ install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc extras: $(EXTRA_PROGRAMS)