pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/wm/icewm



Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Feb 26 23:18:38 UTC 2025

Modified Files:
        pkgsrc/wm/icewm: distinfo
Added Files:
        pkgsrc/wm/icewm/patches: patch-lib_Makefile.in

Log Message:
icewm: Avoid non-portable use of "sed -i"

This popped up as a build failure on freebsd on drecklypkg ci.

FreeBSD Ports has another patch for this issue, but it does
not avoid use of the non-standard -i flag entirely, which is
easy in this case.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/wm/icewm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/icewm/patches/patch-lib_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/icewm/distinfo
diff -u pkgsrc/wm/icewm/distinfo:1.49 pkgsrc/wm/icewm/distinfo:1.50
--- pkgsrc/wm/icewm/distinfo:1.49       Mon Feb 24 18:05:08 2025
+++ pkgsrc/wm/icewm/distinfo    Wed Feb 26 23:18:38 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.49 2025/02/24 18:05:08 gutteridge Exp $
+$NetBSD: distinfo,v 1.50 2025/02/26 23:18:38 nia Exp $
 
 BLAKE2s (icewm-3.7.0.tar.gz) = d3c3d0b3d44a59de50ae946fcdc8219ae8235c8edc7b242836b05f9870f82efb
 SHA512 (icewm-3.7.0.tar.gz) = d6f20984175c77b5a9722b59d48ddd4b010ed32a24d7a79060829f3afb7e560f3429672d83404a89895cb88b064295be83fcf2b3d26e23a55e77d78d3cc259e2
 Size (icewm-3.7.0.tar.gz) = 2618625 bytes
+SHA1 (patch-lib_Makefile.in) = 7b3aa4d0feb083aa93e536822112f7ad75e69e20
 SHA1 (patch-src_ylocale.cc) = f5c5bada634b48dd958e37eb32115ee1efefe52d

Added files:

Index: pkgsrc/wm/icewm/patches/patch-lib_Makefile.in
diff -u /dev/null pkgsrc/wm/icewm/patches/patch-lib_Makefile.in:1.1
--- /dev/null   Wed Feb 26 23:18:38 2025
+++ pkgsrc/wm/icewm/patches/patch-lib_Makefile.in       Wed Feb 26 23:18:38 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2025/02/26 23:18:38 nia Exp $
+
+Avoid using non-portable "sed -i".
+
+--- lib/Makefile.in.orig       2025-02-26 17:18:13.395188424 +0000
++++ lib/Makefile.in
+@@ -1239,9 +1239,16 @@ uninstall-am: uninstall-dist_pkgdataDATA
+ 
+ 
+ install-data-hook:
+-      $(AM_V_GEN)sed -i 's|Exec=/.*/|Exec=$(bindir)/|' \
+-          $(DESTDIR)$(xsessiondir)/icewm.desktop \
+-          $(DESTDIR)$(xsessiondir)/icewm-session.desktop
++      $(AM_V_GEN)sed 's|Exec=/.*/|Exec=$(bindir)/|' \
++          $(DESTDIR)$(xsessiondir)/icewm.desktop > \
++          $(DESTDIR)$(xsessiondir)/icewm.desktop.new
++      $(AM_V_GEN)sed 's|Exec=/.*/|Exec=$(bindir)/|' \
++          $(DESTDIR)$(xsessiondir)/icewm-session.desktop > \
++          $(DESTDIR)$(xsessiondir)/icewm-session.desktop.new
++      $(AM_V_GEN)mv $(DESTDIR)$(xsessiondir)/icewm.desktop.new \
++              $(DESTDIR)$(xsessiondir)/icewm.desktop
++      $(AM_V_GEN)mv $(DESTDIR)$(xsessiondir)/icewm-session.desktop.new \
++              $(DESTDIR)$(xsessiondir)/icewm-session.desktop
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.



Home | Main Index | Thread Index | Old Index