Update modlogan to version 0.8.10

--
From MAINTAINER: Michael Coulter <mjc@bitz.ca>

sysutils/modlogan/Makefile

@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/22 23:07:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2003/12/14 18:12:22 margarida Exp $
 
-COMMENT=		"modular log analyzer"
+COMMENT=	"modular log analyzer"
 
-DISTNAME=		modlogan-0.8.7
-CATEGORIES=		sysutils www
+DISTNAME=	modlogan-0.8.10
+CATEGORIES=	sysutils www
 
-HOMEPAGE=		http://jan.kneschke.de/projects/modlogan
+HOMEPAGE=	http://www.modlogan.org/
 
-MAINTAINER=		Michael Coulter <mjc@bitz.ca>
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modlogan/}
+
+MAINTAINER=	Michael Coulter <mjc@bitz.ca>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,8 +17,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/
-
 LIB_DEPENDS=	expat.3::textproc/expat \
 		gd.18::graphics/gd \
 		pcre::devel/pcre \
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/modlogan
 CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" \
 		 LDFLAGS="-L${LOCALBASE}/lib"
 
-NO_REGRESS=	YES
+NO_REGRESS=	Yes
 
 EXAMPLES=	doc/*.conf doc/*-dist
 DOCS=		doc/*.txt 

sysutils/modlogan/distinfo

@@ -1,3 +1,3 @@
-MD5 (modlogan-0.8.7.tar.gz) = a68545406463654aea802e5d50052ac3
-RMD160 (modlogan-0.8.7.tar.gz) = b22277320a44311332c84c8ce2c91450326c813c
-SHA1 (modlogan-0.8.7.tar.gz) = ab6f747a3e9b6d08b88aaea5ac127679794c0250
+MD5 (modlogan-0.8.10.tar.gz) = caf689da199b0c4b01b29aeefcbe6171
+RMD160 (modlogan-0.8.10.tar.gz) = df66aa47ef9d21b9450ea18a600f1749c4225d8f
+SHA1 (modlogan-0.8.10.tar.gz) = e10f6ddefb2818c416ec775946fbf4e570cf4b5d

sysutils/modlogan/patches/patch-src_mresolver_c

@@ -1,65 +0,0 @@
-$OpenBSD: patch-src_mresolver_c,v 1.1 2003/05/05 03:37:09 margarida Exp $
---- src/mresolver.c.orig	Sun Nov 10 13:49:54 2002
-+++ src/mresolver.c	Mon May  5 04:18:04 2003
-@@ -80,12 +80,12 @@ int resolver_start(mconfig *conf, mlogre
- 		const char *conv_ip;
- 
- 		/* start the resolver for the IP */
--		conv_ip = resolver_reverse_ip(recweb->req_host_ip);
-+		conv_ip = resolver_reverse_ip(recweb->req_host_ip->ptr);
- 
- 		if (conv_ip) {
- 			mdata *data = NULL;
- 
--			if (!mhash_in_hash(conf->query_hash, recweb->req_host_ip)) {
-+			if (!mhash_in_hash(conf->query_hash, recweb->req_host_ip->ptr)) {
- 				adns_query *query = malloc(sizeof(adns_query));
- 
- 				adns_submit(*(conf->adns),
-@@ -98,7 +98,7 @@ int resolver_start(mconfig *conf, mlogre
- 
- 				/* put ip and query into a hash */
- 
--				data = mdata_Query_create(recweb->req_host_ip, query);
-+				data = mdata_Query_create(recweb->req_host_ip->ptr, query);
- 				mhash_insert_sorted(conf->query_hash, data);
- 			}
- 			/* don't free query !! it will be removed by mhash_free */
-@@ -115,16 +115,16 @@ int resolver_finish(mconfig *conf, mlogr
- 	    rec->ext_type == M_RECORD_TYPE_WEB) {
- 		mlogrec_web * recweb = rec->ext;
- 
--		if (!recweb->req_host_name && recweb->req_host_ip) {
-+		if (!recweb->req_host_name->ptr && recweb->req_host_ip->ptr) {
- 			/* resolve the name if neccesary */
- 
- 			adns_answer *answer = NULL;
- 			mdata *query;
- 
- 			if (conf->debug_resolver)
--				fprintf(stderr, "%s.%d: resolve %-15s -- ", __FILE__, __LINE__, recweb->req_host_ip);
-+				fprintf(stderr, "%s.%d: resolve %-15s -- ", __FILE__, __LINE__, recweb->req_host_ip->ptr);
- 
--			if ((query = mhash_get_data(conf->query_hash, recweb->req_host_ip))) {
-+			if ((query = mhash_get_data(conf->query_hash, recweb->req_host_ip->ptr))) {
- 				if (!query->data.query.hostname) {
- 					adns_wait(*(conf->adns), query->data.query.query, &answer, NULL);
- 
-@@ -137,7 +137,7 @@ int resolver_finish(mconfig *conf, mlogr
- 						if (conf->debug_resolver)
- 							fprintf(stderr, "error      ");
- 
--						query->data.query.hostname = strdup(recweb->req_host_ip);
-+						query->data.query.hostname = strdup(recweb->req_host_ip->ptr);
- 					}
- 					free(answer);
- 				} else {
-@@ -149,7 +149,7 @@ int resolver_finish(mconfig *conf, mlogr
- 					fprintf(stderr, "--> %s\n", query->data.query.hostname);
- 
- 				if (!is_ip(query->data.query.hostname)) {
--					recweb->req_host_name = strdup(query->data.query.hostname);
-+					buffer_strcpy_len(recweb->req_host_name,query->data.query.hostname,strlen(query->data.query.hostname));
- 				}
- 			}
- 		}

sysutils/modlogan/pkg/DEINSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/05/02 02:53:05 margarida Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/12/14 18:12:23 margarida Exp $
 #
 # modlogan de-installation
 
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}/modlogan
 
-if [ -d $CONFIG_DIR ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -d $CONFIG_DIR ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you"

sysutils/modlogan/pkg/DESCR

@@ -3,5 +3,3 @@ ModLogAn is a modular logfile analyzer which is able to analyze
 Its template engine generates XHTML based on usersupplied themes
 which makes it possible to provide different look and feel.
 It's written in C and provides a plugin system.
-
-WWW: ${HOMEPAGE}

sysutils/modlogan/pkg/PFRAG.shared

@@ -1,10 +1,12 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/05/02 02:53:05 margarida Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2003/12/14 18:12:23 margarida Exp $
 lib/modlogan/libmla_input_bsdftpd.so
 lib/modlogan/libmla_input_clf.so
 lib/modlogan/libmla_input_flowraw.so
 lib/modlogan/libmla_input_ipchains.so
+lib/modlogan/libmla_input_ippl.so
 lib/modlogan/libmla_input_isdn4bsd.so
 lib/modlogan/libmla_input_isdnlog.so
+lib/modlogan/libmla_input_mod_log_sql.so
 lib/modlogan/libmla_input_msiis.so
 lib/modlogan/libmla_input_msmedia.so
 lib/modlogan/libmla_input_netscape.so
@@ -23,6 +25,7 @@ lib/modlogan/libmla_input_viruswall.so
 lib/modlogan/libmla_input_wuftpd.so
 lib/modlogan/libmla_mdata_brokenlink.so
 lib/modlogan/libmla_mdata_count.so
+lib/modlogan/libmla_mdata_ipplwatch.so
 lib/modlogan/libmla_mdata_location.so
 lib/modlogan/libmla_mdata_mailhist.so
 lib/modlogan/libmla_mdata_match.so
@@ -45,6 +48,7 @@ lib/modlogan/libmla_output_text.so
 lib/modlogan/libmla_output_webalizer.so
 lib/modlogan/libmla_processor_accounting.so
 lib/modlogan/libmla_processor_firewall.so
+lib/modlogan/libmla_processor_ippl.so
 lib/modlogan/libmla_processor_mail.so
 lib/modlogan/libmla_processor_null.so
 lib/modlogan/libmla_processor_telecom.so

sysutils/modlogan/pkg/PLIST

@@ -1,12 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/05/02 02:53:05 margarida Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/12/14 18:12:23 margarida Exp $
 bin/modlogan
 lib/modlogan/charset.alias
 lib/modlogan/libmla_input_bsdftpd.la
 lib/modlogan/libmla_input_clf.la
 lib/modlogan/libmla_input_flowraw.la
 lib/modlogan/libmla_input_ipchains.la
+lib/modlogan/libmla_input_ippl.la
 lib/modlogan/libmla_input_isdn4bsd.la
 lib/modlogan/libmla_input_isdnlog.la
+lib/modlogan/libmla_input_mod_log_sql.la
 lib/modlogan/libmla_input_msiis.la
 lib/modlogan/libmla_input_msmedia.la
 lib/modlogan/libmla_input_netscape.la
@@ -25,6 +27,7 @@ lib/modlogan/libmla_input_viruswall.la
 lib/modlogan/libmla_input_wuftpd.la
 lib/modlogan/libmla_mdata_brokenlink.la
 lib/modlogan/libmla_mdata_count.la
+lib/modlogan/libmla_mdata_ipplwatch.la
 lib/modlogan/libmla_mdata_location.la
 lib/modlogan/libmla_mdata_mailhist.la
 lib/modlogan/libmla_mdata_match.la
@@ -47,6 +50,7 @@ lib/modlogan/libmla_output_text.la
 lib/modlogan/libmla_output_webalizer.la
 lib/modlogan/libmla_processor_accounting.la
 lib/modlogan/libmla_processor_firewall.la
+lib/modlogan/libmla_processor_ippl.la
 lib/modlogan/libmla_processor_mail.la
 lib/modlogan/libmla_processor_null.la
 lib/modlogan/libmla_processor_telecom.la
@@ -75,6 +79,7 @@ share/locale/cs/LC_MESSAGES/modlogan.mo
 share/locale/de/LC_MESSAGES/modlogan.mo
 share/locale/es/LC_MESSAGES/modlogan.mo
 share/locale/fr/LC_MESSAGES/modlogan.mo
+share/locale/hu/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
@@ -82,3 +87,19 @@ share/locale/ru/LC_MESSAGES/modlogan.mo
 @dirrm share/examples/modlogan
 @dirrm share/doc/modlogan
 @dirrm lib/modlogan
+@cwd ${SYSCONFDIR}
+@extra modlogan/group.extension.conf
+@extra modlogan/group.host.conf
+@extra modlogan/group.os.conf
+@extra modlogan/group.searchengines.conf
+@extra modlogan/group.ua.conf
+@extra modlogan/group.url.conf
+@extra modlogan/ignore.searchengines.conf
+@extra modlogan/match.os.conf
+@extra modlogan/match.searchengines.conf
+@extra modlogan/match.ua.conf
+@extra modlogan/match.useragents.conf
+@extra modlogan/modlogan.conf
+@extra modlogan/modlogan.css
+@extra modlogan/modlogan.def.conf
+@extra modlogan/