commit fb78acd884b8a4b8b90652d5617f2b4d410731e8 Author: Steffen Nurpmeso <steffen@sdaoden.eu> Date: Mon Nov 28 19:43:09 2022 +0100 ipcalc: implement manual creation as suggested by farkuhar: in IRC diff --git a/ipcalc/.signature b/ipcalc/.signature index c0f3ce9d9..262932ec5 100644 --- a/ipcalc/.signature +++ b/ipcalc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33sCxo/j3kxYF7whVJ9lWwEsZfmsRH0oB7O9yd6AENTb8KKx95HEQ6wXHsIalp2rEaorYdS+GvuS5zUoNdCDsAw= -SHA256 (Pkgfile) = 829a136a7555b151c59ed2264b72e179767e6a1ef6f8fd4d3d9e96304ee543d0 +RWSagIOpLGJF30OJmIXuBYT787+xT8VGYc7h/44RqiXVAhaoEmiuKCxxmu0LDIb8LW6VruoCP0OKbt7SrAdRcJCpbvYBD4nD/Ag= +SHA256 (Pkgfile) = b4e1bf7c51422d2e770735bdd5876a168e8bb8d98097d5a43f5f4e3aa5ab010e SHA256 (.footprint) = 7afe696a7c62c307d705f3089bfdf168f6098e7ae4a97f173210ba2831f2eb53 SHA256 (ipcalc-1.0.2.tar.bz2) = 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 diff --git a/ipcalc/Pkgfile b/ipcalc/Pkgfile index 33a442ee6..0731bbd7c 100644 --- a/ipcalc/Pkgfile +++ b/ipcalc/Pkgfile @@ -5,7 +5,7 @@ name=ipcalc version=1.0.2 -release=1 +release=2 source=(https://gitlab.com/${name}/${name}/-/archive/${version}/\ ${name}-${version}.tar.bz2) @@ -15,22 +15,30 @@ build() { meson setup build ninja -C build - cat > ./ipcalc.1 <<- \! - .Dd Nov 26, 2022 - .Dt IPCALC 1 - .Os - . - .Sh NAME - .Nm ipcalc - .Nd Calculate IP broadcast, host range etc - . - .Bd -literal - ! - cat ipcalc.1.md >> ./ipcalc.1 - echo '.Ed' >> ./ipcalc.1 + # If ronn was found in $PATH, then a man-page should now appear in ./build + # ... otherwise, fall back to "enwrapped Markdown". + # FS#1435 offers another justification for installing ronn (the MD->groff ruby gem) + if [ -f build/ipcalc.1 ]; then + man=build/ipcalc.1 + else + man=./ipcalc.1 + cat > ./ipcalc.1 <<- \! + .Dd Nov 26, 2022 + .Dt IPCALC 1 + .Os + . + .Sh NAME + .Nm ipcalc + .Nd Calculate IP broadcast, host range etc + . + .Bd -literal + ! + cat ipcalc.1.md >> ./ipcalc.1 + echo '.Ed' >> ./ipcalc.1 + fi + install -D -m 0644 "${man}" "${PKG}"/usr/share/man/man1/${name}.1 install -D -m 0755 build/ipcalc "${PKG}"/usr/bin/${name} - install -D -m 0644 ipcalc.1 "${PKG}"/usr/share/man/man1/${name}.1 } # s-sh-mode