2 files changed, 51 insertions, 52 deletions

diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index d3093595f15e..38f6dac0b4a1 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnjb
 PORTVERSION=	2.2.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/libnjb/pkg-plist b/audio/libnjb/pkg-plist
index 04fa252f7355..67027a4c7586 100644
--- a/audio/libnjb/pkg-plist
+++ b/audio/libnjb/pkg-plist
@@ -32,47 +32,57 @@ libdata/pkgconfig/libnjb.pc
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/byteorder_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/byteorder_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/classes.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/cursesplay_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/cursesplay.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/datafile_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/datafile_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/defs_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/delfile_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/deltr_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/delfile.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/deltr.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/doxygen.css
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/doxygen.png
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumpeax_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumptime_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumpeax.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumptime.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/eax_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/eax_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/examples.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/examples_8h_source.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files_8c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/functions.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/functions_vars.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/fwupgrade_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getfile_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getowner_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/gettr_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getusage_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/fwupgrade.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getfile.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getowner.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/gettr.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getusage.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x64.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x65.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x66.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x67.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_defs.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_enum.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6d.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6e.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x64.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x65.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x66.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x67.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x70.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x73.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x74.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x75.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_type.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_vars.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6d.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6e.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6f.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x64.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x65.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x66.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x67.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x70.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x73.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x74.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x75.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_defs.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_enum.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_type.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_vars.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__basic.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__codecs.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__datatagapi.html
@@ -90,36 +100,41 @@ libdata/pkgconfig/libnjb.pc
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__turboflags.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__types.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__unicodeflags.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/handshake_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/handshake.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/index.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/ioutil_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/ioutil_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/libnjb_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/libnjb_8h.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/libnjb_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/mainpage_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/modules.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njb__error_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njbtime_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njbtime_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/pl_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/play_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njb__error_8h_source.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlists.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlist_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlist_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlists_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/play.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/pl.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/procedure_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/procedure_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8c.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8h.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendfile_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendtr_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setowner_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setpbm_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/settime_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendfile.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendtr.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setowner.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setpbm.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/settime.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/songid_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/songid_8h_source.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbdfhdr__t.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjblibctr__t.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbplhdr__t.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbttaghdr__t.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb3__state__t.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__datafile__struct.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__device__entry.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__eax__struct.html
@@ -132,31 +147,15 @@ libdata/pkgconfig/libnjb.pc
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__state__t.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__struct.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__time__struct.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb3__state__t.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbdfhdr__t.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjblibctr__t.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbplhdr__t.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbttaghdr__t.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tabs.css
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_b.gif
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_l.gif
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_r.gif
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tabs.css
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tagtr_8c-example.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tracks_8c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tagtr.c-example.html
+%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tracks.c-example.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/unicode_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/unicode_8h_source.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/usb__io_8c.html
 %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/usb__io_8h_source.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x64.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x65.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x66.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x67.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6d.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6e.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x70.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x73.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x74.html
-%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x75.html
 %%PORTDOCS%%@dirrm share/doc/libnjb-%%PORTVERSION%%/html
 %%PORTDOCS%%@dirrm share/doc/libnjb-%%PORTVERSION%%
-