Re: update devel/got to 0.75 (adds gotwebd)

On Wed, Sep 07, 2022 at 12:57:09PM +0200, Stefan Sperling wrote:
> This patch updates the devel/got port to the 0.75 release.
>
> There is a new tool in the toolbox. I have created a new sub-package for it.
> Does this look alright?

looks correct here. ok

>
> diff refs/heads/master refs/heads/got-0.75
> commit - 28fc07ba2a1c1154c08027ca1e362374bed4099f
> commit + 2293189381871254dc551702f28fe2a94c32d63c
> blob - 1db4736f3a451e90c155b8f0a16191aa283444f1
> blob + f19c2b6b85e0244fb7f81507c4ae0be91f5bac9a
> --- devel/got/Makefile
> +++ devel/got/Makefile
> @@ -1,9 +1,11 @@
> COMMENT-main = game of trees version control system
> -COMMENT-web = game of trees repository server for web browsers
> +COMMENT-web = game of trees repository cgi script
> +COMMENT-webd = game of trees repository fast-cgi server
>
> -V = 0.74
> +V = 0.75
> DISTNAME = got-${V}
> PKGNAME-web = gotweb-${V}
> +PKGNAME-webd = gotwebd-${V}
> CATEGORIES = devel
> HOMEPAGE = https://gameoftrees.org
> MAINTAINER = Stefan Sperling <stsp@openbsd.org>
> @@ -11,19 +13,21 @@ MAINTAINER = Stefan Sperling <stsp@openbsd.org>
> # ISC
> PERMIT_PACKAGE = Yes
>
> -MULTI_PACKAGES = -main -web
> +MULTI_PACKAGES = -main -web -webd
>
> # uses pledge()
> WANTLIB-main = c curses m panel pthread util z
> WANTLIB-web = c util z
> +WANTLIB-webd = c util z
>
> MAKE_FLAGS = CC="${CC}"
> -ALL_TARGET = all web
> -INSTALL_TARGET = install web-install
> +ALL_TARGET = all web webd
> +INSTALL_TARGET = install web-install webd-install
>
> MASTER_SITES = https://gameoftrees.org/releases/
>
> -DEBUG_PACKAGES = ${BUILD_PACKAGES}
> +# no debug package for -webd because build-debug-info does not work with it
> +DEBUG_PACKAGES = -main -web
>
> BUILD_DEPENDS = www/kcgi>=0.12.0
>
> @@ -33,6 +37,7 @@ TEST_DEPENDS = devel/git \
> ${PKGPATH}=${V}
>
> PREFIX-web = ${VARBASE}/www
> +PREFIX-webd = ${VARBASE}/www
> TEST_TARGET = regress
> FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
>
> blob - 061981f6990a21566af1dd22ec3f1912e4b2df80
> blob + 547f16ee1ac3a077df470a34f5481622a2b06cc4
> --- devel/got/distinfo
> +++ devel/got/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (got-0.74.tar.gz) = /+uCigt5hk4WzvLsqY9exPLeisWI2CBT30kWp5tRfa0=
> -SIZE (got-0.74.tar.gz) = 648237
> +SHA256 (got-0.75.tar.gz) = quONg9omCkpQPQmOc3phbFm6O6ebksinHaBmjD31NrI=
> +SIZE (got-0.75.tar.gz) = 768451
> blob - /dev/null
> blob + 493f25d853b0d667ec338a839d5d4549da046637 (mode 644)
> --- /dev/null
> +++ devel/got/pkg/DESCR-webd
> @@ -0,0 +1,2 @@
> +Game of Trees Web Daemon (gotwebd) is a Fast-CGI server which displays
> +Git repository data and is designed to work with httpd(8).
> blob - /dev/null
> blob + f9e3ea03e9c5bcfba07a9936ff6615e13a8f36e9 (mode 644)
> --- /dev/null
> +++ devel/got/pkg/PLIST-webd
> @@ -0,0 +1,29 @@
> +@rcscript ${RCDIR}/gotwebd
> +bin/gotwebd/
> +bin/gotwebd/libexec/
> +@bin bin/gotwebd/libexec/got-read-blob
> +@bin bin/gotwebd/libexec/got-read-commit
> +@bin bin/gotwebd/libexec/got-read-gitconfig
> +@bin bin/gotwebd/libexec/got-read-gotconfig
> +@bin bin/gotwebd/libexec/got-read-object
> +@bin bin/gotwebd/libexec/got-read-pack
> +@bin bin/gotwebd/libexec/got-read-tag
> +@bin bin/gotwebd/libexec/got-read-tree
> +htdocs/gotwebd/
> +htdocs/gotwebd/android-chrome-192x192.png
> +htdocs/gotwebd/android-chrome-384x384.png
> +htdocs/gotwebd/apple-touch-icon.png
> +htdocs/gotwebd/browserconfig.xml
> +htdocs/gotwebd/favicon-16x16.png
> +htdocs/gotwebd/favicon-32x32.png
> +htdocs/gotwebd/favicon.ico
> +htdocs/gotwebd/got.png
> +htdocs/gotwebd/got_large.png
> +htdocs/gotwebd/gotweb.css
> +htdocs/gotwebd/mstile-150x150.png
> +htdocs/gotwebd/safari-pinned-tab.svg
> +htdocs/gotwebd/site.webmanifest
> +@cwd ${LOCALBASE}
> +@man man/man5/gotwebd.conf.5
> +@man man/man8/gotwebd.8
> +@bin sbin/gotwebd
> blob - /dev/null
> blob + 31f52acd176a8cbee77152ac748b26817231b660 (mode 644)
> --- /dev/null
> +++ devel/got/pkg/gotwebd.rc
> @@ -0,0 +1,7 @@
> +#!/bin/ksh
> +
> +daemon="${TRUEPREFIX}/sbin/gotwebd"
> +
> +. /etc/rc.d/rc.subr
> +
> +rc_cmd $1
>

--

Tracey Emery