Update to version 2.1:

Lire 2.1 is available for download from http://download.logreport.org/pub/.
Major changes since 2.0.3 (the previous stable release):

- Lire now requires DBD::SQLite, which uses SQLite 3.0.  (SQLite 2 has
  become obsolete and is no longer supported).  This means that the
  Lire database format has changed. If you have one or more old lire
  stores, you will need to convert each of them from SQLite2 format to
  SQLite3 format, like this:
        sqlite oldstore.db .dump | sqlite3 newstore.db
  This assumes that you have both sqlite2 and sqlite3 installed on your
  system, and that the names of the command line interface for the old
  and new version are sqlite and sqlite3 respectively (this is at least
  correct for Fedora).  After completion of the conversion(s), and
  after upgrading to Lire 2.1, SQLite 2 can be removed from your
  system, unless it is used by other applications than Lire of course.
- Improvement in exim2dlf, thanks to a patch contributed by Adrian Phillips.
  Version 4.67 of exim introduced pid to log_selector, exim2dlf now supports
  such log files too.  See also
  http://lists.logreport.org/pipermail/development/2008/000934.html.  Note
  that compatibility with pre-4.67 exim logfiles is preserved by this patch.
- Added the merge2combined and dlf2combined www scripts for merging web
  server logs of different types into one log file in combined format.

3 files changed, 9 insertions, 7 deletions

diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index 94816fb52c45..1cccc6d2b93b 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -12,8 +12,7 @@
 #
 
 PORTNAME=	lire
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.logreport.org/pub/
 
@@ -26,7 +25,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 		${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules \
-		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite2.pm:${PORTSDIR}/databases/p5-DBD-SQLite2 \
+		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
 		${SITE_PERL}/Curses/UI.pm:${PORTSDIR}/devel/p5-Curses-UI \
diff --git a/sysutils/lire/distinfo b/sysutils/lire/distinfo
index b010ea7b4e97..7031e36e87e4 100644
--- a/sysutils/lire/distinfo
+++ b/sysutils/lire/distinfo
@@ -1,3 +1,3 @@
-MD5 (lire-2.0.3.tar.gz) = 6a1521acf0e49da3ad2b9ff0fc65d813
-SHA256 (lire-2.0.3.tar.gz) = c04b08f9864575075199f4265202d6741579ee5259e06fa8fcf9f0b168a7e16b
-SIZE (lire-2.0.3.tar.gz) = 2622834
+MD5 (lire-2.1.tar.gz) = dd281000378ec732785d0e3ea09d45b7
+SHA256 (lire-2.1.tar.gz) = 728ab1f33f30735407591846f8ac23617c83151b6fa74d69db0f9e5b3ed5e288
+SIZE (lire-2.1.tar.gz) = 2880433
diff --git a/sysutils/lire/pkg-plist b/sysutils/lire/pkg-plist
index c0964f65b625..1ea9893e29b8 100644
--- a/sysutils/lire/pkg-plist
+++ b/sysutils/lire/pkg-plist
@@ -97,6 +97,8 @@ libexec/lire/lr_getbody
 libexec/lire/lr_mail
 libexec/lire/lr_processmail
 libexec/lire/lr_spool
+libexec/lire/www/dlf2combined
+libexec/lire/www/merge2combined
 sbin/lr_vendor_cron
 share/doc/lire/BUGS
 share/doc/lire/ChangeLog.2000.gz
@@ -817,6 +819,7 @@ share/perl5/LocaleData/nl/LC_MESSAGES/lire.mo
 @dirrm share/doc/lire/examples
 @dirrm share/doc/lire/dev-manual
 @dirrm share/doc/lire
+@dirrm libexec/lire/www
 @dirrm libexec/lire/convertors
 @dirrm libexec/lire
 @dirrm etc/lire/plugins
@@ -826,8 +829,8 @@ share/perl5/LocaleData/nl/LC_MESSAGES/lire.mo
 @dirrmtry var/lib/lire/data
 @dirrmtry var/lib/lire
 @dirrmtry var/lib
-@dirrmtry var
 @dirrmtry var/spool/lire
 @dirrmtry var/spool
+@dirrmtry var
 
 @dirrmtry share/perl5