1 files changed, 83 insertions, 82 deletions

diff --git a/mail/tkrat2/pkg-plist b/mail/tkrat2/pkg-plist
index b4b395afb49a..cfbcd8cf7166 100644
--- a/mail/tkrat2/pkg-plist
+++ b/mail/tkrat2/pkg-plist
@@ -1,92 +1,93 @@
 bin/tkrat
 lib/ratatosk/ratatoskrc
-lib/tkrat2.1/blt_busy1.0.so
-lib/tkrat2.1/pkgIndex.tcl
-lib/tkrat2.1/ratatosk2.1.so
+lib/tkrat/blt_busy1.0.so
+lib/tkrat/pkgIndex.tcl
+lib/tkrat/ratatosk2.1.so
 %%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/interface
 %%PORTDOCS%%%%DOCSDIR%%/userproc.example
 %%PORTDOCS%%%%DOCSDIR%%/userprocs
-share/tkrat2.1/alias.tcl
-share/tkrat2.1/client.tcl
-share/tkrat2.1/compose.tcl
-share/tkrat2.1/convert.tcl
-share/tkrat2.1/dbase.tcl
-share/tkrat2.1/dialog.tcl
-share/tkrat2.1/dsn.tcl
-share/tkrat2.1/exp.tcl
-share/tkrat2.1/folder.tcl
-share/tkrat2.1/font.tcl
-share/tkrat2.1/help.tcl
-share/tkrat2.1/html.tcl
-share/tkrat2.1/info.tcl
-share/tkrat2.1/keydef.tcl
-share/tkrat2.1/languages.tcl
-share/tkrat2.1/mime.tcl
-share/tkrat2.1/options.tcl
-share/tkrat2.1/pgp.tcl
-share/tkrat2.1/pkgIndex.tcl
-share/tkrat2.1/preferences.tcl
-share/tkrat2.1/print.tcl
-share/tkrat2.1/show.tcl
-share/tkrat2.1/source.tcl
-share/tkrat2.1/start.tcl
-share/tkrat2.1/tclIndex
-share/tkrat2.1/text_balText_de.tcl
-share/tkrat2.1/text_balText_en.tcl
-share/tkrat2.1/text_balText_fr.tcl
-share/tkrat2.1/text_balText_it.tcl
-share/tkrat2.1/text_balText_pl.tcl
-share/tkrat2.1/text_balText_pt.tcl
-share/tkrat2.1/text_balText_sr.tcl
-share/tkrat2.1/text_balText_sv.tcl
-share/tkrat2.1/text_changes_de.tcl
-share/tkrat2.1/text_changes_en.tcl
-share/tkrat2.1/text_changes_fr.tcl
-share/tkrat2.1/text_changes_it.tcl
-share/tkrat2.1/text_changes_pl.tcl
-share/tkrat2.1/text_changes_pt.tcl
-share/tkrat2.1/text_changes_sr.tcl
-share/tkrat2.1/text_changes_sv.tcl
-share/tkrat2.1/text_help_de.tcl
-share/tkrat2.1/text_help_en.tcl
-share/tkrat2.1/text_help_fr.tcl
-share/tkrat2.1/text_help_it.tcl
-share/tkrat2.1/text_help_pl.tcl
-share/tkrat2.1/text_help_pt.tcl
-share/tkrat2.1/text_help_sr.tcl
-share/tkrat2.1/text_help_sv.tcl
-share/tkrat2.1/text_t_de.tcl
-share/tkrat2.1/text_t_en.tcl
-share/tkrat2.1/text_t_fr.tcl
-share/tkrat2.1/text_t_it.tcl
-share/tkrat2.1/text_t_pl.tcl
-share/tkrat2.1/text_t_pt.tcl
-share/tkrat2.1/text_t_sr.tcl
-share/tkrat2.1/text_t_sv.tcl
-share/tkrat2.1/tkrat.xbm
-share/tkrat2.1/tkrat.xpm
-share/tkrat2.1/tkrat_small.xbm
-share/tkrat2.1/tkrat_smallmask.xbm
-share/tkrat2.1/tkratmask.xbm
-share/tkrat2.1/util/pkgIndex.tcl
-share/tkrat2.1/util/rat_balloon.tcl
-share/tkrat2.1/util/rat_ed.tcl
-share/tkrat2.1/util/rat_edit.tcl
-share/tkrat2.1/util/rat_enriched.tcl
-share/tkrat2.1/util/rat_fbox.tcl
-share/tkrat2.1/util/rat_ispell.tcl
-share/tkrat2.1/util/rat_list.tcl
-share/tkrat2.1/util/rat_textlist.tcl
-share/tkrat2.1/util/rat_tree.tcl
-share/tkrat2.1/vfolder.tcl
-share/tkrat2.1/vfolderdef.tcl
-share/tkrat2.1/watcher.tcl
-share/tkrat2.1/winctl.tcl
+%%DATADIR%%/alias.tcl
+%%DATADIR%%/client.tcl
+%%DATADIR%%/compose.tcl
+%%DATADIR%%/convert.tcl
+%%DATADIR%%/dbase.tcl
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/dsn.tcl
+%%DATADIR%%/exp.tcl
+%%DATADIR%%/folder.tcl
+%%DATADIR%%/font.tcl
+%%DATADIR%%/help.tcl
+%%DATADIR%%/html.tcl
+%%DATADIR%%/info.tcl
+%%DATADIR%%/keydef.tcl
+%%DATADIR%%/languages.tcl
+%%DATADIR%%/mime.tcl
+%%DATADIR%%/options.tcl
+%%DATADIR%%/pgp.tcl
+%%DATADIR%%/pkgIndex.tcl
+%%DATADIR%%/preferences.tcl
+%%DATADIR%%/print.tcl
+%%DATADIR%%/show.tcl
+%%DATADIR%%/source.tcl
+%%DATADIR%%/start.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/text_balText_de.tcl
+%%DATADIR%%/text_balText_en.tcl
+%%DATADIR%%/text_balText_fr.tcl
+%%DATADIR%%/text_balText_it.tcl
+%%DATADIR%%/text_balText_pl.tcl
+%%DATADIR%%/text_balText_pt.tcl
+%%DATADIR%%/text_balText_sr.tcl
+%%DATADIR%%/text_balText_sv.tcl
+%%DATADIR%%/text_changes_de.tcl
+%%DATADIR%%/text_changes_en.tcl
+%%DATADIR%%/text_changes_fr.tcl
+%%DATADIR%%/text_changes_it.tcl
+%%DATADIR%%/text_changes_pl.tcl
+%%DATADIR%%/text_changes_pt.tcl
+%%DATADIR%%/text_changes_sr.tcl
+%%DATADIR%%/text_changes_sv.tcl
+%%DATADIR%%/text_help_de.tcl
+%%DATADIR%%/text_help_en.tcl
+%%DATADIR%%/text_help_fr.tcl
+%%DATADIR%%/text_help_it.tcl
+%%DATADIR%%/text_help_pl.tcl
+%%DATADIR%%/text_help_pt.tcl
+%%DATADIR%%/text_help_sr.tcl
+%%DATADIR%%/text_help_sv.tcl
+%%DATADIR%%/text_t_de.tcl
+%%DATADIR%%/text_t_en.tcl
+%%DATADIR%%/text_t_fr.tcl
+%%DATADIR%%/text_t_it.tcl
+%%DATADIR%%/text_t_pl.tcl
+%%DATADIR%%/text_t_pt.tcl
+%%DATADIR%%/text_t_sr.tcl
+%%DATADIR%%/text_t_sv.tcl
+%%DATADIR%%/tkrat.xbm
+%%DATADIR%%/tkrat.xpm
+%%DATADIR%%/tkrat_small.xbm
+%%DATADIR%%/tkrat_smallmask.xbm
+%%DATADIR%%/tkratmask.xbm
+%%DATADIR%%/util/pkgIndex.tcl
+%%DATADIR%%/util/rat_balloon.tcl
+%%DATADIR%%/util/rat_ed.tcl
+%%DATADIR%%/util/rat_edit.tcl
+%%DATADIR%%/util/rat_enriched.tcl
+%%DATADIR%%/util/rat_fbox.tcl
+%%DATADIR%%/util/rat_ispell.tcl
+%%DATADIR%%/util/rat_list.tcl
+%%DATADIR%%/util/rat_textlist.tcl
+%%DATADIR%%/util/rat_tree.tcl
+%%DATADIR%%/vfolder.tcl
+%%DATADIR%%/vfolderdef.tcl
+%%DATADIR%%/watcher.tcl
+%%DATADIR%%/winctl.tcl
+man/man1/tkrat.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/tkrat2.1/util
-@dirrm share/tkrat2.1
+@dirrm %%DATADIR%%/util
+@dirrm %%DATADIR%%
 @dirrm lib/ratatosk
-@dirrm lib/tkrat2.1
+@dirrm lib/tkrat