Update to 0.9.6RC1 release:

- use new PHP framework
- register_globals is no longer required

4 files changed, 25 insertions, 17 deletions

diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile
index 0840e02a68e7..15fb8438f4bb 100644
--- a/mail/nocc/Makefile
+++ b/mail/nocc/Makefile
@@ -6,29 +6,21 @@
 #
 
 PORTNAME=	nocc
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6.r1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A web-based e-mail system which access POP3 and IMAP mail servers
 
-USE_PHP=	yes
+USE_PHP=	imap
 WANT_PHP_WEB=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NO_BUILD=	yes
 
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You have to configure PHP with IMAP support in order"
-	@${ECHO} "to let Nocc connect to your POP3/IMAP server."
-	@${ECHO} ""
-	@${ECHO} "If you have already compiled PHP without IMAP,"
-	@${ECHO} "press CTRL+C now and rebuild it before installing Nocc."
-	@${ECHO} ""
-
 pre-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
diff --git a/mail/nocc/distinfo b/mail/nocc/distinfo
index 9f5901fc8186..f6bd4f23ec78 100644
--- a/mail/nocc/distinfo
+++ b/mail/nocc/distinfo
@@ -1,2 +1,2 @@
-MD5 (nocc-0.9.5.tar.gz) = b48e45282fb8d3a63322499ea867e33a
-SIZE (nocc-0.9.5.tar.gz) = 110880
+MD5 (nocc-0.9.6RC1.tar.gz) = 61142b0a1003fdc12e92bcaf0968f483
+SIZE (nocc-0.9.6RC1.tar.gz) = 151538
diff --git a/mail/nocc/pkg-message b/mail/nocc/pkg-message
index 6186a0d5561e..e0c49aaf3ecd 100644
--- a/mail/nocc/pkg-message
+++ b/mail/nocc/pkg-message
@@ -2,5 +2,4 @@
 Nocc has been installed in %%PREFIX%%/www/nocc directory.
 Change into this directory and make changes to the config
 file (conf.php). The file is fairly well documented.
-Also be sure that register_globals = On in the Nocc directory.
 ****************************************************************
diff --git a/mail/nocc/pkg-plist b/mail/nocc/pkg-plist
index 92d5f0811183..d6c2ac4d3884 100644
--- a/mail/nocc/pkg-plist
+++ b/mail/nocc/pkg-plist
@@ -1,13 +1,18 @@
 www/nocc/action.php
 www/nocc/check.php
-www/nocc/check_lang.php
+www/nocc/class_local.php
 www/nocc/class_send.php
 www/nocc/class_smtp.php
+www/nocc/common.php
 @unexec if cmp -s %D/www/nocc/conf.php %D/www/nocc/conf.php.dist; then rm -f %D/www/nocc/conf.php; fi
 www/nocc/conf.php.dist
 @exec [ -f %B/conf.php ] || cp %B/%f %B/conf.php
 www/nocc/conf_lang.php
+www/nocc/contacts.php
+www/nocc/contacts_manager.php
 www/nocc/delete.php
+www/nocc/detect_cyr_charset.php
+www/nocc/down_mail.php
 www/nocc/download.php
 www/nocc/exception.php
 www/nocc/functions.php
@@ -17,9 +22,13 @@ www/nocc/index.php
 www/nocc/is_uploaded_file.php
 www/nocc/logout.php
 www/nocc/mime.php
-www/nocc/prefs.php
+www/nocc/proxy.php
 www/nocc/send.php
-www/nocc/wrong.php
+www/nocc/user_filters.php
+www/nocc/user_prefs.php
+www/nocc/html/error.php
+www/nocc/html/filter_prefs.php
+www/nocc/html/folders.php
 www/nocc/html/footer.php
 www/nocc/html/header.php
 www/nocc/html/html_bottom_table.php
@@ -30,6 +39,7 @@ www/nocc/html/html_mail_top.php
 www/nocc/html/html_top_table.php
 www/nocc/html/menu_inbox.php
 www/nocc/html/menu_inbox_opts.php
+www/nocc/html/menu_inbox_status.php
 www/nocc/html/menu_mail.php
 www/nocc/html/menu_prefs.php
 www/nocc/html/no_mail.php
@@ -38,6 +48,7 @@ www/nocc/html/prefs_error.php
 www/nocc/html/send.php
 www/nocc/html/send_confirmed.php
 www/nocc/html/send_error.php
+www/nocc/lang/ar-win.php
 www/nocc/lang/ar.php
 www/nocc/lang/bg.php
 www/nocc/lang/cs.php
@@ -46,18 +57,23 @@ www/nocc/lang/de.php
 www/nocc/lang/el.php
 www/nocc/lang/en.php
 www/nocc/lang/es.php
+www/nocc/lang/farsi.php
 www/nocc/lang/fi.php
 www/nocc/lang/fr.php
 www/nocc/lang/he.php
+www/nocc/lang/hr.php
 www/nocc/lang/hu.php
+www/nocc/lang/is.php
 www/nocc/lang/it.php
 www/nocc/lang/kr.php
+www/nocc/lang/lv.php
 www/nocc/lang/nl.php
 www/nocc/lang/nn.php
 www/nocc/lang/no.php
 www/nocc/lang/pl.php
 www/nocc/lang/pt-br.php
 www/nocc/lang/pt.php
+www/nocc/lang/ro.php
 www/nocc/lang/ru-iso.php
 www/nocc/lang/ru-koi.php
 www/nocc/lang/ru.php
@@ -65,6 +81,7 @@ www/nocc/lang/sk.php
 www/nocc/lang/sl.php
 www/nocc/lang/sr.php
 www/nocc/lang/sv.php
+www/nocc/lang/th.php
 www/nocc/lang/tr.php
 www/nocc/lang/zh-gb.php
 www/nocc/lang/zh-tw.php