Update to 0.7.12.

 ChangeLog (major topics only):
  - parser for isdn4bsd and qmail-scanner added
  - template output plug-in added (themes available from the homepage)
  - huge speed improvements
  - bugfixes
  - uses less memory
  - fix a symlink-race security problem

Submitted by:	maintainer

6 files changed, 14 insertions, 100 deletions

diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 361fc3f41e2b..d25c94a4eeb8 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	modlogan
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.12
 CATEGORIES=	textproc www
-MASTER_SITES=	http://www.kneschke.de/projekte/modlogan/download/ \
+MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
 
 MAINTAINER=	Alexander@Leidinger.net
@@ -31,7 +31,6 @@ 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_AUTOCONF=	yes
 #USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 #LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
@@ -43,11 +42,11 @@ CONFIGURE_ARGS+=--with-mysql
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 MAN1=		modlogan.1
-DOC1=		faq.txt glosar manual.txt plugin-options.txt \
+DOC1=		faq.txt glosar manual.txt translations.txt \
 		using-plugins.txt writing-plugins.txt
 
 post-patch:
-	@${PERL} -pi -e 's:\@sysconfdir\@:${PREFIX}/etc/modlogan:g' ${WRKSRC}/doc/modlogan.conf-dist.in
+	@${PERL} -pi -e 's:\@config_path\@:${PREFIX}/etc/modlogan:g' ${WRKSRC}/doc/modlogan.conf-dist.in
 
 post-configure:
 	${TOUCH} ${WRKSRC}/libltdl/config.status
@@ -60,7 +59,7 @@ post-install:
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/modlogan
-.for i in footer.ihtml header.ihtml convert_history_to_07x.pl convert_to_055.pl convert_to_060.pl
+.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)
diff --git a/textproc/modlogan/distinfo b/textproc/modlogan/distinfo
index 207dd59a6f33..bf02d0c58347 100644
--- a/textproc/modlogan/distinfo
+++ b/textproc/modlogan/distinfo
@@ -1 +1 @@
-MD5 (modlogan-0.7.4.tar.gz) = 74d481b225a45bf7e1a3816ffa987395
+MD5 (modlogan-0.7.12.tar.gz) = 429b06b2a8febf86bb6e19819e0be126
diff --git a/textproc/modlogan/files/patch-aclocal.m4 b/textproc/modlogan/files/patch-aclocal.m4
deleted file mode 100644
index a9e5b37c60c8..000000000000
--- a/textproc/modlogan/files/patch-aclocal.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- aclocal.m4_bak	Tue Dec 26 12:57:08 2000
-+++ aclocal.m4	Tue Dec 26 12:57:22 2000
-@@ -672,6 +672,9 @@
- 		INSTOBJEXT=.mo
- 	      fi
- 	    fi
-+	    if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+		INTLLIBS='-lintl'
-+	    fi
- 	])
- 
-         if test "$CATOBJEXT" = "NONE"; then
diff --git a/textproc/modlogan/files/patch-configure b/textproc/modlogan/files/patch-configure
deleted file mode 100644
index 09a4c013ed79..000000000000
--- a/textproc/modlogan/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig	Wed Sep  5 16:56:33 2001
-+++ configure	Thu Sep  6 14:00:42 2001
-@@ -7610,6 +7609,9 @@
-   	# PORTME does your system automatically load deplibs for dlopen()?
- 	libltdl_cv_sys_dlopen_deplibs=unknown
- 	case "$host_os" in
-+	freebsd*)
-+	  libltdl_cv_sys_dlopen_deplibs=yes
-+	  ;;
- 	linux*)
- 	  libltdl_cv_sys_dlopen_deplibs=yes
- 	  ;;
-@@ -14476,7 +14478,9 @@
- 	    if test "$gt_cv_func_gettext_libintl" = "yes"; then
- 	      INTLLIBS='-lintl'
- 	    fi
--
-+	if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+		INTLLIBS='-lintl'
-+	fi
- fi
- 
-         if test "$CATOBJEXT" = "NONE"; then
diff --git a/textproc/modlogan/files/patch-fix_segfault b/textproc/modlogan/files/patch-fix_segfault
deleted file mode 100644
index 4f957af033d4..000000000000
--- a/textproc/modlogan/files/patch-fix_segfault
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: mconfig.c
-===================================================================
-RCS file: /cvsroot/modlogan/modlogan/src/mconfig.c,v
-retrieving revision 1.40
-diff -c -r1.40 mconfig.c
-*** src/mconfig.c	2001/09/23 22:54:00	1.40
---- src/mconfig.c	2001/09/24 09:29:37
-***************
-*** 665,670 ****
---- 665,672 ----
-  int mconfig_free(mconfig *conf) {
-  	if (!conf) return -1;
-  	
-+ 	mplugins_free(conf);
-+ 	
-  	if (conf->outputdir)	free(conf->outputdir);
-  	
-  #ifdef HAVE_LIBADNS
-***************
-*** 672,678 ****
-  	if (conf->adns)	free(conf->adns);
-  	if (conf->query_hash) mhash_free(conf->query_hash);
-  #endif
-- 	mplugins_free(conf);
-  	mlist_free(conf->loadplugins);
-  	mlist_free(conf->includepath);
-  	
---- 674,679 ----
-Index: misc.c
-===================================================================
-RCS file: /cvsroot/modlogan/modlogan/src/misc.c,v
-retrieving revision 1.13
-diff -c -r1.13 misc.c
-*** src/misc.c	2001/09/04 22:47:23	1.13
---- src/misc.c	2001/09/24 09:29:37
-***************
-*** 278,283 ****
---- 278,285 ----
-  	/* x and y denote the position in source respective destination string */
-  	register int x, y;
-  	unsigned char *str;
-+ 	
-+ 	if (!s) return NULL;
-  
-  	/* allocate memory for encoded string */
-  	str = (unsigned char *) malloc(3 * strlen(s) + 1);
-***************
-*** 307,312 ****
---- 309,316 ----
-  	/* work pointers */
-  	unsigned char *data;
-  	unsigned char *dest;
-+ 	
-+ 	if (!s) return NULL;
-  	
-  	/* allocate memory for decoded string */
-  	str = (unsigned char *) malloc(strlen(s) + 1);
diff --git a/textproc/modlogan/pkg-plist b/textproc/modlogan/pkg-plist
index 338f95ce2a3b..9f0dfff78ca0 100644
--- a/textproc/modlogan/pkg-plist
+++ b/textproc/modlogan/pkg-plist
@@ -3,6 +3,7 @@ etc/modlogan/group.extension.conf
 etc/modlogan/group.host.conf
 etc/modlogan/group.os.conf
 etc/modlogan/group.ua.conf
+etc/modlogan/group.url.conf
 etc/modlogan/match.os.conf
 etc/modlogan/match.searchengines.conf
 etc/modlogan/match.ua.conf
@@ -20,6 +21,7 @@ lib/libmla_input_flow.so
 lib/libmla_input_flowraw.so
 lib/libmla_input_hicom116.so
 lib/libmla_input_ipchains.so
+lib/libmla_input_isdn4bsd.so
 lib/libmla_input_isdnlog.so
 lib/libmla_input_msiis.so
 lib/libmla_input_msmedia.so
@@ -27,6 +29,7 @@ lib/libmla_input_netscape.so
 lib/libmla_input_null.so
 lib/libmla_input_pureftpd.so
 lib/libmla_input_qmail.so
+lib/libmla_input_qmailscanner.so
 lib/libmla_input_qtss.so
 lib/libmla_input_realserver.so
 lib/libmla_input_sendmail.so
@@ -63,7 +66,7 @@ lib/libmla_processor_web.so
 %%PORTDOCS%%share/doc/modlogan/faq.txt
 %%PORTDOCS%%share/doc/modlogan/glosar
 %%PORTDOCS%%share/doc/modlogan/manual.txt
-%%PORTDOCS%%share/doc/modlogan/plugin-options.txt
+%%PORTDOCS%%share/doc/modlogan/translations.txt
 %%PORTDOCS%%share/doc/modlogan/using-plugins.txt
 %%PORTDOCS%%share/doc/modlogan/writing-plugins.txt
 share/examples/modlogan/convert_history_to_07x.pl
@@ -71,11 +74,13 @@ share/examples/modlogan/convert_to_055.pl
 share/examples/modlogan/convert_to_060.pl
 share/examples/modlogan/footer.ihtml
 share/examples/modlogan/header.ihtml
+share/examples/modlogan/output.tmpl
 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/it/LC_MESSAGES/modlogan.mo
+share/locale/pl/LC_MESSAGES/modlogan.mo
 @dirrm share/doc/modlogan
 @dirrm share/examples/modlogan
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
@@ -88,3 +93,5 @@ share/locale/it/LC_MESSAGES/modlogan.mo
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true