oasis

commit: 68a178aeac4def49ac1a32fe3bd42c503755787a
parent 15186e1639da43175f2bb345e8cd06450a549144
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 29 Nov 2021 10:40:03 -0800

sfeed: Update to 1.1

Diffstat:
M
.gitmodules
3
---
M
pkg/gen.lua
1
-
M
pkg/sfeed/gen.lua
14
+++++++++++++-
M
pkg/sfeed/ver
2
+-
D
pkg/sfeed_curses/gen.lua
17
-----------------
D
pkg/sfeed_curses/src
1
-
D
pkg/sfeed_curses/ver
1
-
M
scripts/outdated.py
1
-

8 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -286,9 +286,6 @@
 [submodule "pkg/sfeed/src"]
 	path = pkg/sfeed/src
 	url = git://git.codemadness.org/sfeed
-[submodule "pkg/sfeed_curses/src"]
-	path = pkg/sfeed_curses/src
-	url = git://git.codemadness.org/sfeed_curses
 [submodule "pkg/sinit/src"]
 	path = pkg/sinit/src
 	url = git://git.suckless.org/sinit
diff --git a/pkg/gen.lua b/pkg/gen.lua
@@ -100,7 +100,6 @@ subgen 'samurai'
 subgen 'sbase'
 subgen 'sdhcp'
 subgen 'sfeed'
-subgen 'sfeed_curses'
 subgen 'sinit'
 subgen 'skeleton'
 subgen 'sndio'
diff --git a/pkg/sfeed/gen.lua b/pkg/sfeed/gen.lua
@@ -1,6 +1,8 @@
 cflags{
 	'-std=c99', '-Wall', '-Wpedantic',
 	'-D _XOPEN_SOURCE=700',
+	[[-D 'SFEED_THEME="themes/mono.h"']],
+	'-isystem $builddir/pkg/netbsd-curses/include',
 }
 
 lib('libutil.a', {'util.c', 'xml.c'})
@@ -18,9 +20,19 @@ for _, tool in ipairs(tools) do
 	man{tool..'.1'}
 end
 
+exe('sfeed_curses', {
+	'sfeed_curses.c',
+	'libutil.a',
+	'$builddir/pkg/netbsd-curses/libcurses.a.d',
+}, 'pkg/netbsd-curses/headers')
+file('bin/sfeed_curses', '755', '$outdir/sfeed_curses')
+man{'sfeed_curses.1'}
+
 local scripts = {
-	'sfeed_update',
+	'sfeed_content',
+	'sfeed_markread',
 	'sfeed_opml_export',
+	'sfeed_update',
 }
 for _, script in ipairs(scripts) do
 	file('bin/'..script, '755', '$srcdir/'..script)
diff --git a/pkg/sfeed/ver b/pkg/sfeed/ver
@@ -1 +1 @@
-1.0 r0
+1.1 r0
diff --git a/pkg/sfeed_curses/gen.lua b/pkg/sfeed_curses/gen.lua
@@ -1,17 +0,0 @@
-cflags{
-	'-std=c99', '-Wall', '-Wpedantic',
-	'-D _XOPEN_SOURCE=700',
-	[[-D 'SFEED_THEME="themes/mono.h"']],
-	'-isystem $builddir/pkg/netbsd-curses/include',
-}
-
-pkg.deps = {'pkg/netbsd-curses/headers'}
-
-exe('sfeed_curses', {'sfeed_curses.c', '$builddir/pkg/netbsd-curses/libcurses.a.d'})
-file('bin/sfeed_curses', '755', '$outdir/sfeed_curses')
-file('bin/sfeed_content', '755', '$srcdir/sfeed_content')
-file('bin/sfeed_markread', '755', '$srcdir/sfeed_markread')
-
-man{'sfeed_curses.1', 'sfeed_content.1', 'sfeed_markread.1'}
-
-fetch 'git'
diff --git a/pkg/sfeed_curses/src b/pkg/sfeed_curses/src
@@ -1 +0,0 @@
-Subproject commit 7e4b1bb5850bd99213d82b758117294aa5abae2d
diff --git a/pkg/sfeed_curses/ver b/pkg/sfeed_curses/ver
@@ -1 +0,0 @@
-1.0 r0
diff --git a/scripts/outdated.py b/scripts/outdated.py
@@ -8,7 +8,6 @@ import urllib.request
 names = {
 	'awk': 'nawk',
 	'lpeg': 'lua:lpeg',
-	'sfeed_curses': 'sfeed-curses',
 	'sshfs': 'fusefs:sshfs',
 	'st': 'st-term',
 	'terminus-font': 'fonts:terminus',