2 files changed, 105 insertions, 104 deletions

diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
index 373768fc3473..bb368fbec90f 100644
--- a/comms/rtl-sdr/Makefile
+++ b/comms/rtl-sdr/Makefile
@@ -23,6 +23,7 @@ USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
 OPTIONS_DEFINE=	DOXYGEN
+OPTIONS_SUB=	ues
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
diff --git a/comms/rtl-sdr/pkg-plist b/comms/rtl-sdr/pkg-plist
index c6a29e49803a..0c7442c634c7 100644
--- a/comms/rtl-sdr/pkg-plist
+++ b/comms/rtl-sdr/pkg-plist
@@ -12,107 +12,107 @@ lib/librtlsdr.so
 lib/librtlsdr.so.0
 lib/librtlsdr.so.0.0.5
 libdata/pkgconfig/librtlsdr.pc
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated_dup.js
-%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
-%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/convenience_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_5992cd9d624b1e0ab1a3765cc8208356.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_5992cd9d624b1e0ab1a3765cc8208356.js
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_9b50dc121478bf6bc9dc8d04765e08ed.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_9b50dc121478bf6bc9dc8d04765e08ed.js
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.js
-%%PORTDOCS%%%%DOCSDIR%%/html/doc.png
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js
-%%PORTDOCS%%%%DOCSDIR%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/files.js
-%%PORTDOCS%%%%DOCSDIR%%/html/folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/getopt_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.js
-%%PORTDOCS%%%%DOCSDIR%%/html/menudata.js
-%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
-%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png
-%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
-%%PORTDOCS%%%%DOCSDIR%%/html/navtree.css
-%%PORTDOCS%%%%DOCSDIR%%/html/navtree.js
-%%PORTDOCS%%%%DOCSDIR%%/html/navtreedata.js
-%%PORTDOCS%%%%DOCSDIR%%/html/navtreeindex0.js
-%%PORTDOCS%%%%DOCSDIR%%/html/open.png
-%%PORTDOCS%%%%DOCSDIR%%/html/reg__field_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/resize.js
-%%PORTDOCS%%%%DOCSDIR%%/html/rtl-sdr_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rtl-sdr__export_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rtlsdr__i2c_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/splitbar.png
-%%PORTDOCS%%%%DOCSDIR%%/html/structcmd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structcmd.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structcmd__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structcmd__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structcommand.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structcommand.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structcontroller__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structcontroller__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structdemod__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structdemod__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structdongle__info__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structdongle__info__t.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structdongle__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structdongle__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structe4k__pll__params.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structe4k__pll__params.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structe4k__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structe4k__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structgain__comb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structgain__comb.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structllist.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structllist.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structoption.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structoption.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structoutput__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structoutput__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structpll__settings.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structpll__settings.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__config.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__freq__range.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__freq__range.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__priv.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structr82xx__priv.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structreg__field.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structreg__field.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structreg__field__ops.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structreg__field__ops.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__config.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__dev.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__dev.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__dongle.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__dongle.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__tuner__iface.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structrtlsdr__tuner__iface.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structstrbuf.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structstrbuf.js
-%%PORTDOCS%%%%DOCSDIR%%/html/structtuning__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structtuning__state.js
-%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
-%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
-%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/html/tuner__e4k_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tuner__fc0012_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tuner__fc0013_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tuner__fc2580_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tuner__r82xx_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/annotated.html
+%%DOXYGEN%%%%DOCSDIR%%/html/annotated_dup.js
+%%DOXYGEN%%%%DOCSDIR%%/html/bc_s.png
+%%DOXYGEN%%%%DOCSDIR%%/html/bdwn.png
+%%DOXYGEN%%%%DOCSDIR%%/html/classes.html
+%%DOXYGEN%%%%DOCSDIR%%/html/closed.png
+%%DOXYGEN%%%%DOCSDIR%%/html/convenience_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_5992cd9d624b1e0ab1a3765cc8208356.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_5992cd9d624b1e0ab1a3765cc8208356.js
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_9b50dc121478bf6bc9dc8d04765e08ed.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_9b50dc121478bf6bc9dc8d04765e08ed.js
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.js
+%%DOXYGEN%%%%DOCSDIR%%/html/doc.png
+%%DOXYGEN%%%%DOCSDIR%%/html/doxygen.css
+%%DOXYGEN%%%%DOCSDIR%%/html/doxygen.png
+%%DOXYGEN%%%%DOCSDIR%%/html/dynsections.js
+%%DOXYGEN%%%%DOCSDIR%%/html/files.html
+%%DOXYGEN%%%%DOCSDIR%%/html/files.js
+%%DOXYGEN%%%%DOCSDIR%%/html/folderclosed.png
+%%DOXYGEN%%%%DOCSDIR%%/html/folderopen.png
+%%DOXYGEN%%%%DOCSDIR%%/html/getopt_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/index.html
+%%DOXYGEN%%%%DOCSDIR%%/html/jquery.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menu.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menudata.js
+%%DOXYGEN%%%%DOCSDIR%%/html/nav_f.png
+%%DOXYGEN%%%%DOCSDIR%%/html/nav_g.png
+%%DOXYGEN%%%%DOCSDIR%%/html/nav_h.png
+%%DOXYGEN%%%%DOCSDIR%%/html/navtree.css
+%%DOXYGEN%%%%DOCSDIR%%/html/navtree.js
+%%DOXYGEN%%%%DOCSDIR%%/html/navtreedata.js
+%%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex0.js
+%%DOXYGEN%%%%DOCSDIR%%/html/open.png
+%%DOXYGEN%%%%DOCSDIR%%/html/reg__field_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/resize.js
+%%DOXYGEN%%%%DOCSDIR%%/html/rtl-sdr_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/rtl-sdr__export_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/rtlsdr__i2c_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/splitbar.png
+%%DOXYGEN%%%%DOCSDIR%%/html/structcmd.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structcmd.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structcmd__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structcmd__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structcommand.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structcommand.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structcontroller__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structcontroller__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structdemod__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structdemod__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structdongle__info__t.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structdongle__info__t.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structdongle__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structdongle__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structe4k__pll__params.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structe4k__pll__params.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structe4k__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structe4k__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structgain__comb.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structgain__comb.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structllist.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structllist.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structoption.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structoption.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structoutput__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structoutput__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structpll__settings.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structpll__settings.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__config.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__config.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__freq__range.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__freq__range.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__priv.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structr82xx__priv.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structreg__field.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structreg__field.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structreg__field__ops.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structreg__field__ops.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__config.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__config.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__dev.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__dev.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__dongle.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__dongle.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__tuner__iface.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structrtlsdr__tuner__iface.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structstrbuf.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structstrbuf.js
+%%DOXYGEN%%%%DOCSDIR%%/html/structtuning__state.html
+%%DOXYGEN%%%%DOCSDIR%%/html/structtuning__state.js
+%%DOXYGEN%%%%DOCSDIR%%/html/sync_off.png
+%%DOXYGEN%%%%DOCSDIR%%/html/sync_on.png
+%%DOXYGEN%%%%DOCSDIR%%/html/tab_a.png
+%%DOXYGEN%%%%DOCSDIR%%/html/tab_b.png
+%%DOXYGEN%%%%DOCSDIR%%/html/tab_h.png
+%%DOXYGEN%%%%DOCSDIR%%/html/tab_s.png
+%%DOXYGEN%%%%DOCSDIR%%/html/tabs.css
+%%DOXYGEN%%%%DOCSDIR%%/html/tuner__e4k_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/tuner__fc0012_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/tuner__fc0013_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/tuner__fc2580_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%/html/tuner__r82xx_8h_source.html