Date: Wed, 11 Sep 2024 19:44:10 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 580837751735 - main - x11/imwheel: Fix build when package already installed Message-ID: <202409111944.48BJiAEk030560@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=580837751735447378440d46809783b77c9f18d4 commit 580837751735447378440d46809783b77c9f18d4 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-09-11 19:30:33 +0000 Commit: Cy Schubert <cy@FreeBSD.org> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409111944.48BJiAEk030560>