3 files changed, 78 insertions, 3 deletions

diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index 3942b0296e89..f6d5f3a63a0d 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -6,13 +6,44 @@
 #
 
 PORTNAME=	mlmmj
-PORTVERSION=	0.8.3
+PORTVERSION=	1.0.0.r2
 CATEGORIES=	mail
 MASTER_SITES=	http://mlmmj.mmj.dk/files/
+DISTNAME=	mlmmj-1.0.0-RC2
 
 MAINTAINER=	xi@borderworlds.dk
 COMMENT=	Mailing list managing made joyful
 
+.if defined(WITH_PHP_WEBINTERFACE)
+USE_PHP=        yes
+WANT_PHP_WEB=   yes
+.endif
+
+.if defined(WITH_PERL_WEBINTERFACE)
+RUN_DEPENDS+=	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
+		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+		${SITE_PERL}/CGI/FastTemplate.pm:${PORTSDIR}/www/p5-CGI-FastTemplate
+.endif
+
+.if defined(WITH_PERL_WEBINTERFACE)
+PLIST_SUB+=	PERLWEB=""
+.else
+PLIST_SUB+=	PERLWEB="@comment "
+.endif
+
+.if defined(WITH_PHP_WEBINTERFACE)
+PLIST_SUB+=	PHPWEB=""
+.else
+PLIST_SUB+=	PHPWEB="@comment "
+.endif
+
+.if !defined(WITH_PERL_WEBINTERFACE) && !defined(WITH_PHP_WEBINTERFACE)
+PLIST_SUB+=	WEB="@comment "
+.else
+PLIST_SUB+=	WEB=""
+.endif
+
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
@@ -25,5 +56,23 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/share/mlmmj/listtexts
 	@${INSTALL_DATA} ${WRKSRC}/listtexts/* ${PREFIX}/share/mlmmj/listtexts
+.if defined(WITH_PERL_WEBINTERFACE)
+	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/README ${PREFIX}/www/mlmmj/perl-admin
+	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/htdocs
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-admin/htdocs/* ${PREFIX}/www/mlmmj/perl-admin/htdocs
+	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/templates
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/templates/* ${PREFIX}/www/mlmmj/perl-admin/templates
+	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/conf
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/conf/* ${PREFIX}/www/mlmmj/perl-admin/conf
+	@${MKDIR} ${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-user/mlmmj.cgi ${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/config.pl ${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/example.html ${PREFIX}/www/mlmmj/perl-user
+.endif
+.if defined(WITH_PHP_WEBINTERFACE)
+	@${MKDIR} ${PREFIX}/www/mlmmj/php-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-user/* ${PREFIX}/www/mlmmj/php-user
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mlmmj/distinfo b/mail/mlmmj/distinfo
index 76713f8dbf98..50484a3d5e43 100644
--- a/mail/mlmmj/distinfo
+++ b/mail/mlmmj/distinfo
@@ -1,2 +1,2 @@
-MD5 (mlmmj-0.8.3.tar.bz2) = 384a7b407613062ff09e996320f68aaf
-SIZE (mlmmj-0.8.3.tar.bz2) = 92659
+MD5 (mlmmj-1.0.0-RC2.tar.bz2) = 0d58324ad4d3cabdc752ed3de456bb2b
+SIZE (mlmmj-1.0.0-RC2.tar.bz2) = 99040
diff --git a/mail/mlmmj/pkg-plist b/mail/mlmmj/pkg-plist
index c1551145b859..e78ca8a6afaa 100644
--- a/mail/mlmmj/pkg-plist
+++ b/mail/mlmmj/pkg-plist
@@ -18,5 +18,31 @@ share/mlmmj/listtexts/sub-ok
 share/mlmmj/listtexts/subonlypost
 share/mlmmj/listtexts/unsub-confirm
 share/mlmmj/listtexts/unsub-ok
+%%PERLWEB%%www/mlmmj/perl-admin/htdocs/edit.cgi
+%%PERLWEB%%www/mlmmj/perl-admin/htdocs/index.cgi
+%%PERLWEB%%www/mlmmj/perl-admin/htdocs/save.cgi
+%%PERLWEB%%www/mlmmj/perl-admin/htdocs/dot.htaccess
+%%PERLWEB%%www/mlmmj/perl-admin/templates/index.html
+%%PERLWEB%%www/mlmmj/perl-admin/templates/edit_boolean.html
+%%PERLWEB%%www/mlmmj/perl-admin/templates/edit.html
+%%PERLWEB%%www/mlmmj/perl-admin/templates/edit_list.html
+%%PERLWEB%%www/mlmmj/perl-admin/templates/save.html
+%%PERLWEB%%www/mlmmj/perl-admin/templates/edit_string.html
+%%PERLWEB%%www/mlmmj/perl-admin/conf/config.pl
+%%PERLWEB%%www/mlmmj/perl-admin/conf/tunables.pl
+%%PERLWEB%%www/mlmmj/perl-admin/README
+%%PERLWEB%%www/mlmmj/perl-user/config.pl
+%%PERLWEB%%www/mlmmj/perl-user/example.html
+%%PERLWEB%%www/mlmmj/perl-user/mlmmj.cgi
+%%PHPWEB%%www/mlmmj/php-user/README
+%%PHPWEB%%www/mlmmj/php-user/example.html
+%%PHPWEB%%www/mlmmj/php-user/mlmmj.php
 @dirrm share/mlmmj/listtexts
 @dirrm share/mlmmj
+%%PERLWEB%%@dirrm www/mlmmj/perl-admin/htdocs
+%%PERLWEB%%@dirrm www/mlmmj/perl-admin/templates
+%%PERLWEB%%@dirrm www/mlmmj/perl-admin/conf
+%%PERLWEB%%@dirrm www/mlmmj/perl-admin
+%%PERLWEB%%@dirrm www/mlmmj/perl-user
+%%PHPWEB%%@dirrm www/mlmmj/php-user
+%%WEB%%@dirrm www/mlmmj