diff --git a/x11/fnott/Makefile b/x11/fnott/Makefile index d4ab1834c5176..fd1963b34638a 100644 --- a/x11/fnott/Makefile +++ b/x11/fnott/Makefile @@ -1,6 +1,5 @@ PORTNAME= fnott -DISTVERSION= 1.4.1 -PORTREVISION= 1 +DISTVERSION= 1.5.0 CATEGORIES= x11 wayland MASTER_SITES= https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -13,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ tllist>=1.0.1:devel/tllist \ - wayland-protocols>0:graphics/wayland-protocols \ + wayland-protocols>=1.32:graphics/wayland-protocols \ scdoc:textproc/scdoc LIB_DEPENDS= libdbus-1.so:devel/dbus \ libepoll-shim.so:devel/libepoll-shim \ @@ -26,6 +25,11 @@ USES= compiler:c11 meson pkgconfig xorg USE_XORG= pixman WRKSRC= ${WRKDIR}/${PORTNAME} +OPTIONS_DEFINE= DOCS + +DOCS_BUILD_DEPENDS= scdoc:textproc/scdoc +DOCS_MESON_ENABLED= docs + post-patch: # Respect PREFIX for system-wide config @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ @@ -34,5 +38,8 @@ post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/xdg.c +# Let @sample handle default files under etc/ + @${REINPLACE_CMD} -e "/install.*sysconfdir/s/'[^']*/&', rename: &.sample/1" \ + ${WRKSRC}/meson.build .include diff --git a/x11/fnott/distinfo b/x11/fnott/distinfo index dcebab790ca95..690343451eee8 100644 --- a/x11/fnott/distinfo +++ b/x11/fnott/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689316884 -SHA256 (fnott-1.4.1.tar.gz) = 20da05357aa83b3541b6c02bb162af10c89519602bc91fdfaa190239ce303300 -SIZE (fnott-1.4.1.tar.gz) = 472835 +TIMESTAMP = 1713342069 +SHA256 (fnott-1.5.0.tar.gz) = 0d55adb362d632225e8a1f574ce57f477fba1abac62a3937ddb651de69e4652b +SIZE (fnott-1.5.0.tar.gz) = 472897 diff --git a/x11/fnott/pkg-plist b/x11/fnott/pkg-plist index 66d9d2e2642b5..3c961091996c8 100644 --- a/x11/fnott/pkg-plist +++ b/x11/fnott/pkg-plist @@ -1,9 +1,11 @@ bin/fnott bin/fnottctl -share/man/man1/fnott.1.gz -share/man/man1/fnottctl.1.gz -share/man/man5/fnott.ini.5.gz +%%PORTDOCS%%@sample etc/xdg/fnott/fnott.ini.sample share/applications/fnott.desktop -%%DATADIR%%/fnott.ini +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%share/man/man1/fnott.1.gz +%%PORTDOCS%%share/man/man1/fnottctl.1.gz +%%PORTDOCS%%share/man/man5/fnott.ini.5.gz share/zsh/site-functions/_fnott share/zsh/site-functions/_fnottctl