On Sun, Oct 06, 2024 at 10:47:50AM +0200, Antoine Jacoutot wrote:
> On Sun, Oct 06, 2024 at 10:35:22AM +0200, Matthieu Herrb wrote:
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/sway/pkg/PLIST,v
> > diff -u -p -u -r1.4 PLIST
> > --- pkg/PLIST 1 Dec 2023 20:52:37 -0000 1.4
> > +++ pkg/PLIST 6 Oct 2024 08:22:50 -0000
> > @@ -1,3 +1,4 @@
> > +@sample ${SYSCONFDIR}/sway/
> > bin/startsway.sh
> > @bin bin/sway
> > @bin bin/swaybar
> > @@ -27,9 +28,7 @@ share/bash-completion/completions/sway
> > share/bash-completion/completions/swaybar
> > share/bash-completion/completions/swaymsg
> > share/examples/sway/
> > -share/examples/sway/sway/
> > -@sample ${SYSCONFDIR}/sway/
>
> You still need this @sample, no?
make update-plist insists to move it to the top of PLIST.
This seems wrong by I don't understand why it happens.
Here's an updated diff, where I've moved it in place manually again:
Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/sway/Makefile,v
diff -u -p -u -r1.10 Makefile
--- Makefile 26 Feb 2024 18:22:16 -0000 1.10
+++ Makefile 6 Oct 2024 10:17:25 -0000
@@ -3,6 +3,7 @@ COMMENT = i3-compatible Wayland composit
GH_ACCOUNT = swaywm
GH_PROJECT = sway
GH_TAGNAME = 1.9
+REVISION = 0
CATEGORIES = wayland
@@ -43,7 +44,7 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sway
- mv ${WRKINST}${SYSCONFDIR}/sway ${PREFIX}/share/examples/sway/
+ cd ${WRKINST}${SYSCONFDIR}/sway/ && pax -rw .
${PREFIX}/share/examples/sway/
${INSTALL_SCRIPT} ${FILESDIR}/startsway.sh ${PREFIX}/bin
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /local/cvs/ports/wayland/sway/pkg/PLIST,v
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 1 Dec 2023 20:52:37 -0000 1.4
+++ pkg/PLIST 6 Oct 2024 10:17:25 -0000
@@ -27,9 +27,8 @@ share/bash-completion/completions/sway
share/bash-completion/completions/swaybar
share/bash-completion/completions/swaymsg
share/examples/sway/
-share/examples/sway/sway/
@sample ${SYSCONFDIR}/sway/
-share/examples/sway/sway/config
+share/examples/sway/config
@sample ${SYSCONFDIR}/sway/config
share/fish/
share/fish/vendor_completions.d/
--
Matthieu Herrb
