acme-client: Build in a separate package directory

4 files changed, 26 insertions, 21 deletions

diff --git a/pkg/acme-client/gen.lua b/pkg/acme-client/gen.lua
new file mode 100644
index 00000000..18750cc3
--- /dev/null
+++ b/pkg/acme-client/gen.lua
@@ -0,0 +1,24 @@
+set('srcdir', 'pkg/openbsd/src/usr.sbin/acme-client')
+cflags{
+	'-D _GNU_SOURCE',  -- for memmem
+	'-I pkg/openbsd/include',
+	'-I $builddir/pkg/libressl/include',
+	'-I $srcdir',
+	'-idirafter pkg/openbsd/src/sys',
+}
+
+pkg.deps = {
+	'pkg/libressl/headers',
+}
+
+yacc('parse', 'parse.y')
+exe('acme-client', [[
+	acctproc.c base64.c certproc.c chngproc.c dbg.c dnsproc.c
+	fileproc.c http.c jsmn.c json.c keyproc.c main.c netproc.c
+	$outdir/parse.tab.c revokeproc.c key.c util.c
+	$builddir/pkg/libressl/libtls.a.d
+]])
+file('bin/acme-client', '755', '$outdir/acme-client')
+man{'acme-client.1', 'acme-client.conf.5'}
+
+build('phony', table.keys(pkg.inputs.fetch), 'pkg/openbsd/fetch');
diff --git a/pkg/gen.lua b/pkg/gen.lua
index 40f93dc7..22960cc9 100644
--- a/pkg/gen.lua
+++ b/pkg/gen.lua
@@ -1,3 +1,4 @@
+subgen 'acme-client'
 subgen 'adobe-source-fonts'
 subgen 'alsa-lib'
 subgen 'alsa-utils'
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
index ab9578f8..7d73c025 100644
--- a/pkg/openbsd/gen.lua
+++ b/pkg/openbsd/gen.lua
@@ -28,27 +28,6 @@ lib('libbsd.a', [[
 ]])
 file('lib/libbsd.a', '644', '$outdir/libbsd.a')
 
--- acme-client
-sub('acme-client.ninja', function()
-	cflags{
-		'-D _GNU_SOURCE',  -- for memmem
-		'-I $builddir/pkg/libressl/include',
-	}
-
-	yacc('usr.sbin/acme-client/parse', 'usr.sbin/acme-client/parse.y')
-	cc('$outdir/usr.sbin/acme-client/parse.tab.c', nil, {cflags='$cflags -I $srcdir/usr.sbin/acme-client'})
-	exe('acme-client', [[
-		usr.sbin/acme-client/(
-			acctproc.c base64.c certproc.c chngproc.c dbg.c dnsproc.c
-			fileproc.c http.c jsmn.c json.c keyproc.c main.c netproc.c
-			parse.tab.c.o revokeproc.c key.c util.c
-		)
-		$builddir/pkg/libressl/libtls.a.d
-	]], {'pkg/libressl/headers'})
-	file('bin/acme-client', '755', '$outdir/acme-client')
-	man{'usr.sbin/acme-client/acme-client.1', 'usr.sbin/acme-client/acme-client.conf.5'}
-end)
-
 -- diff
 exe('diff', 'usr.bin/diff/(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a')
 file('bin/diff', '755', '$outdir/diff')
diff --git a/sets.lua b/sets.lua
index 0c687423..f00a9c9e 100644
--- a/sets.lua
+++ b/sets.lua
@@ -57,6 +57,7 @@ return {
 		'youtube-dl',
 	},
 	net={
+		'acme-client',
 		'hostap',
 		'ii',
 		'msmtp',