4 files changed, 17 insertions, 64 deletions

diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 3b4a154696a2..adf109809e81 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	modlogan
-PORTVERSION=	0.7.18
+PORTVERSION=	0.8.1
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,8 +17,7 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
 		gd.2:${PORTSDIR}/graphics/gd \
 		intl.4:${PORTSDIR}/devel/gettext \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		ltdl.1:${PORTSDIR}/devel/libtool
+		expat.4:${PORTSDIR}/textproc/expat2
 
 .if defined(WITH_MYSQL)
 # To quote the author:
@@ -31,7 +30,7 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 # Please don't remove the comments, as soon as autoconf/libtool get's
 # updated in the ports collection the comments may be removed.
 # They serve as a reminder.
-#USE_LIBTOOL=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 #LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 USE_REINPLACE=	yes
@@ -40,17 +39,17 @@ CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=--with-mysql
 .endif
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/libxml"
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 MAN1=		modlogan.1
 DOC1=		faq.txt glosar manual.txt translations.txt \
-		using-plugins.txt writing-plugins.txt
+		using-plugins.txt writing-plugins.txt Changes-0.8.0.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:\@config_path\@:${PREFIX}/etc/modlogan:g' ${WRKSRC}/doc/modlogan.conf-dist.in
 
-post-configure:
-	${TOUCH} ${WRKSRC}/libltdl/config.status
+#post-configure:
+#	${TOUCH} ${WRKSRC}/libltdl/config.status
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -63,9 +62,8 @@ post-install:
 .for i in footer.ihtml header.ihtml output.tmpl convert_history_to_07x.pl convert_to_055.pl convert_to_060.pl
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/examples/modlogan/${i}
 .endfor
-	@# remove .la (can't use USE_LIBTOOL)
-	@# don't do that yet, it breaks modlogan since 0.7.16
-	-#${RM} ${PREFIX}/lib/libmla_*.la
+	@# remove .la
+	-${RM} ${PREFIX}/lib/libmla_*.la
 	${MV} ${PREFIX}/bin/${CONFIGURE_TARGET}-modlogan ${PREFIX}/bin/modlogan
 	${MV} ${PREFIX}/man/man1/${CONFIGURE_TARGET}-modlogan.1 ${PREFIX}/man/man1/modlogan.1
 .for i in css conf def.conf
diff --git a/textproc/modlogan/distinfo b/textproc/modlogan/distinfo
index e6da810e33a9..3e069d0db312 100644
--- a/textproc/modlogan/distinfo
+++ b/textproc/modlogan/distinfo
@@ -1 +1 @@
-MD5 (modlogan-0.7.18.tar.gz) = 5ec7adf81098172faa8ae185f001b2da
+MD5 (modlogan-0.8.1.tar.gz) = b643fa6542db10b80aed8d151f14f65b
diff --git a/textproc/modlogan/pkg-descr b/textproc/modlogan/pkg-descr
index ccdf17523c74..f895e6f9c0cd 100644
--- a/textproc/modlogan/pkg-descr
+++ b/textproc/modlogan/pkg-descr
@@ -8,4 +8,4 @@ into your database. Or a Memo generator that posts the
 monthly stats to your department mailing list for further
 investigation.
 
-WWW: http://www.kneschke.de/projekte/modlogan/
+WWW: http://www.modlogan.org/
diff --git a/textproc/modlogan/pkg-plist b/textproc/modlogan/pkg-plist
index 040d084faf49..55172b9f922f 100644
--- a/textproc/modlogan/pkg-plist
+++ b/textproc/modlogan/pkg-plist
@@ -2,11 +2,14 @@ bin/modlogan
 etc/modlogan/group.extension.conf
 etc/modlogan/group.host.conf
 etc/modlogan/group.os.conf
+etc/modlogan/group.searchengines.conf
 etc/modlogan/group.ua.conf
 etc/modlogan/group.url.conf
+etc/modlogan/ignore.searchengines.conf
 etc/modlogan/match.os.conf
 etc/modlogan/match.searchengines.conf
 etc/modlogan/match.ua.conf
+etc/modlogan/match.useragents.conf
 @unexec if cmp -s %D/etc/modlogan/modlogan.conf %D/etc/modlogan/modlogan.conf-dist; then rm -f %D/etc/modlogan/modlogan.conf; fi
 etc/modlogan/modlogan.conf-dist
 @unexec if cmp -s %D/etc/modlogan/modlogan.css %D/etc/modlogan/modlogan.css-dist; then rm -f %D/etc/modlogan/modlogan.css; fi
@@ -14,108 +17,59 @@ etc/modlogan/modlogan.css-dist
 @unexec if cmp -s %D/etc/modlogan/modlogan.def.conf %D/etc/modlogan/modlogan.def.conf-dist; then rm -f %D/etc/modlogan/modlogan.def.conf; fi
 etc/modlogan/modlogan.def.conf-dist
 @dirrm etc/modlogan
-lib/libmla_input_bsdftpd.la
 lib/libmla_input_bsdftpd.so
-lib/libmla_input_clf.la
 lib/libmla_input_clf.so
-lib/libmla_input_elmeg.la
 lib/libmla_input_elmeg.so
-lib/libmla_input_flow.la
 lib/libmla_input_flow.so
-lib/libmla_input_flowraw.la
 lib/libmla_input_flowraw.so
-lib/libmla_input_hicom116.la
 lib/libmla_input_hicom116.so
-lib/libmla_input_ipchains.la
 lib/libmla_input_ipchains.so
-lib/libmla_input_isdn4bsd.la
 lib/libmla_input_isdn4bsd.so
-lib/libmla_input_isdnlog.la
 lib/libmla_input_isdnlog.so
-lib/libmla_input_msiis.la
 lib/libmla_input_msiis.so
-lib/libmla_input_msmedia.la
 lib/libmla_input_msmedia.so
-lib/libmla_input_netscape.la
 lib/libmla_input_netscape.so
-lib/libmla_input_null.la
 lib/libmla_input_null.so
-lib/libmla_input_postfix.la
 lib/libmla_input_postfix.so
-lib/libmla_input_pureftpd.la
 lib/libmla_input_pureftpd.so
-lib/libmla_input_qmail.la
 lib/libmla_input_qmail.so
-lib/libmla_input_qmailscanner.la
 lib/libmla_input_qmailscanner.so
-lib/libmla_input_qtss.la
 lib/libmla_input_qtss.so
-lib/libmla_input_realserver.la
 lib/libmla_input_realserver.so
-lib/libmla_input_sendmail.la
 lib/libmla_input_sendmail.so
-lib/libmla_input_shoutcast.la
 lib/libmla_input_shoutcast.so
-lib/libmla_input_squid.la
 lib/libmla_input_squid.so
-lib/libmla_input_viruswall.la
 lib/libmla_input_viruswall.so
-lib/libmla_input_wuftpd.la
 lib/libmla_input_wuftpd.so
-lib/libmla_mdata_brokenlink.la
 lib/libmla_mdata_brokenlink.so
-lib/libmla_mdata_count.la
 lib/libmla_mdata_count.so
-lib/libmla_mdata_match.la
 lib/libmla_mdata_match.so
-lib/libmla_mdata_mailhist.la
 lib/libmla_mdata_mailhist.so
-lib/libmla_mdata_netmask.la
 lib/libmla_mdata_netmask.so
-lib/libmla_mdata_query.la
 lib/libmla_mdata_query.so
-lib/libmla_mdata_record.la
 lib/libmla_mdata_record.so
-lib/libmla_mdata_split.la
 lib/libmla_mdata_split.so
-lib/libmla_mdata_state.la
 lib/libmla_mdata_state.so
-lib/libmla_mdata_sublist.la
 lib/libmla_mdata_sublist.so
-lib/libmla_mdata_traffic.la
 lib/libmla_mdata_traffic.so
-lib/libmla_mdata_visit.la
 lib/libmla_mdata_visit.so
-lib/libmla_mdata_visited.la
 lib/libmla_mdata_visited.so
-lib/libmla_mdata_webhist.la
 lib/libmla_mdata_webhist.so
-lib/libmla_output_csv.la
 lib/libmla_output_csv.so
-lib/libmla_output_modlogan.la
 lib/libmla_output_modlogan.so
-lib/libmla_output_null.la
 lib/libmla_output_null.so
-lib/libmla_output_template.la
+lib/libmla_output_sybase_guj.so
 lib/libmla_output_template.so
-lib/libmla_output_text.la
 lib/libmla_output_text.so
-lib/libmla_output_tkcontrol.la
 lib/libmla_output_tkcontrol.so
-lib/libmla_output_webalizer.la
 lib/libmla_output_webalizer.so
-lib/libmla_processor_accounting.la
 lib/libmla_processor_accounting.so
-lib/libmla_processor_firewall.la
 lib/libmla_processor_firewall.so
-lib/libmla_processor_mail.la
 lib/libmla_processor_mail.so
-lib/libmla_processor_null.la
 lib/libmla_processor_null.so
-lib/libmla_processor_telecom.la
 lib/libmla_processor_telecom.so
-lib/libmla_processor_web.la
 lib/libmla_processor_web.so
+%%PORTDOCS%%share/doc/modlogan/Changes-0.8.0.txt
 %%PORTDOCS%%share/doc/modlogan/faq.txt
 %%PORTDOCS%%share/doc/modlogan/glosar
 %%PORTDOCS%%share/doc/modlogan/manual.txt
@@ -134,5 +88,6 @@ share/locale/es/LC_MESSAGES/modlogan.mo
 share/locale/fr/LC_MESSAGES/modlogan.mo
 share/locale/it/LC_MESSAGES/modlogan.mo
 share/locale/pl/LC_MESSAGES/modlogan.mo
+share/locale/ru/LC_MESSAGES/modlogan.mo
 @dirrm share/doc/modlogan
 @dirrm share/examples/modlogan