On Wed, Feb 19, 2020 at 10:21:10PM +0100, Kristaps Dzonsons wrote:
> This patch updates slant to 0.0.23. The difference being that it uses
> the newest openradtool, which uses the sqlbox library instead of ksql.
Committed, thanks!
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/slant/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile 13 Feb 2020 20:11:46 -0000 1.5
> +++ Makefile 19 Feb 2020 21:13:58 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT = minimal remote system monitor
>
> -DISTNAME = slant-0.0.21
> -REVISION = 2
> +DISTNAME = slant-0.0.23
>
> CATEGORIES = sysutils
>
> @@ -18,8 +17,8 @@ PERMIT_PACKAGE = Yes
> WANTLIB += c curses sqlite3 tls z
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
> -RUN_DEPENDS = databases/ksql \
> - www/openradtool>=0.7.4
> +RUN_DEPENDS = databases/sqlbox \
> + www/openradtool>=0.8.5
>
> LIB_DEPENDS = databases/sqlite3
>
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/slant/patches/patch-Makefile,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-Makefile
> --- patches/patch-Makefile 24 Nov 2019 14:40:30 -0000 1.1
> +++ patches/patch-Makefile 19 Feb 2020 21:13:58 -0000
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1 2019/11/24 14:40:30 jturner Exp $
> -
> -Make slant compile with sqlbox
> -
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -131,13 +131,13 @@ slant-upgrade: slant-upgrade.in.sh
> - -e "s!@SHAREDIR@!$(SHAREDIR)!g" slant-upgrade.in.sh >$@
> -
> - slant-collectd: $(SLANT_COLLECTD_OBJS)
> -- $(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlite3
> $(LDADD_SLANT_COLLECTD)
> -+ $(CC) -o $@ $(LDFLAGS) $(SLANT_COLLECTD_OBJS) -lksql -lsqlbox -lsqlite3
> $(LDADD_SLANT_COLLECTD)
> -
> - params.h:
> - echo "#define DBFILE \"$(DBFILE)\"" > params.h
> -
> - slant-cgi: slant-cgi.o db.o json.o compats.o
> -- $(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi
> -lkcgijson -lz -lksql -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
> -+ $(CC) -static -o $@ $(LDFLAGS) slant-cgi.o db.o json.o compats.o -lkcgi
> -lkcgijson -lz -lksql -lsqlbox -lsqlite3 -lm -lpthread $(LDADD_SLANT_CGI)
> -
> - slant-cgi.o: params.h
> -
