sfeed: Update to 1.1

7 files changed, 14 insertions, 21 deletions

diff --git a/pkg/gen.lua b/pkg/gen.lua
index 1595ff11..57d89412 100644
--- 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
index d8bf6235..f2f3b388 100644
--- 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/src b/pkg/sfeed/src
-Subproject 3efc39c8c7d37de162b5baf6e1151db5ea1a711
+Subproject 90dc98b7326f08e59b1ba0d469f1db8e2c97bd6
diff --git a/pkg/sfeed/ver b/pkg/sfeed/ver
index 31a33e28..39a9ac35 100644
--- 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
deleted file mode 100644
index d681e49a..00000000
--- a/pkg/sfeed_curses/gen.lua
+++ /dev/null
@@ -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
deleted file mode 160000
-Subproject 7e4b1bb5850bd99213d82b758117294aa5abae2
diff --git a/pkg/sfeed_curses/ver b/pkg/sfeed_curses/ver
deleted file mode 100644
index 31a33e28..00000000
--- a/pkg/sfeed_curses/ver
+++ /dev/null
@@ -1 +0,0 @@
-1.0 r0