Update to 1.6 release.

4 files changed, 40 insertions, 32 deletions

diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile
index 3a13ed0315e8..00bbbfa1d61e 100644
--- a/mail/nocc/Makefile
+++ b/mail/nocc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nocc
-DISTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A web-based e-mail system which access POP3 and IMAP mail servers
 
-USE_PHP=	imap pcre session
+USE_PHP=	iconv imap pcre session
 WANT_PHP_WEB=	yes
 
 SUB_FILES=	pkg-message
@@ -25,14 +25,14 @@ PORTDOCS=	*
 
 do-install:
 	${MKDIR} ${PREFIX}/www/nocc
-	${CP} -Rp ${WRKSRC}/fckeditor ${WRKSRC}/html ${WRKSRC}/js \
-		${WRKSRC}/lang ${WRKSRC}/themes \
+	${CP} -Rp ${WRKSRC}/classes ${WRKSRC}/config ${WRKSRC}/fckeditor \
+		${WRKSRC}/html ${WRKSRC}/js ${WRKSRC}/lang ${WRKSRC}/themes \
+		${WRKSRC}/utils \
 		${PREFIX}/www/nocc
-	${CP} -p ${WRKSRC}/*.php ${PREFIX}/www/nocc
-	${CP} -p ${WRKSRC}/conf.php.dist ${PREFIX}/www/nocc
-	@if [ ! -f ${PREFIX}/www/nocc/conf.php ]; then \
-		${CP} ${PREFIX}/www/nocc/conf.php.dist \
-			${PREFIX}/www/nocc/conf.php; \
+	${CP} -p ${WRKSRC}/*.php ${WRKSRC}/*.ico ${PREFIX}/www/nocc
+	@if [ ! -f ${PREFIX}/www/nocc/config/conf.php ]; then \
+		${CP} ${PREFIX}/www/nocc/config/conf.php.dist \
+			${PREFIX}/www/nocc/config/conf.php; \
 	fi
 	${CHOWN} -R www:www ${PREFIX}/www/nocc
 .if !defined(NOPORTDOCS)
diff --git a/mail/nocc/distinfo b/mail/nocc/distinfo
index d227857f5fe1..ad44ca2dcbbc 100644
--- a/mail/nocc/distinfo
+++ b/mail/nocc/distinfo
@@ -1,3 +1,3 @@
-MD5 (nocc-1.5.tar.gz) = e72133bc9932b390805e90b6142900a2
-SHA256 (nocc-1.5.tar.gz) = 021631b8fbb513a89edb99756c623a42fcb447ec7882bd1731b689dd7fb785fc
-SIZE (nocc-1.5.tar.gz) = 581490
+MD5 (nocc-1.6.tar.gz) = 2c60e059e1451ec56201866964258584
+SHA256 (nocc-1.6.tar.gz) = 589b6a3ab69fe314a98b85de29e32e1a5573442963266997929d2afcfa5d3e0e
+SIZE (nocc-1.6.tar.gz) = 576123
diff --git a/mail/nocc/files/pkg-message.in b/mail/nocc/files/pkg-message.in
index e0c49aaf3ecd..2c9bb0ef9af6 100644
--- a/mail/nocc/files/pkg-message.in
+++ b/mail/nocc/files/pkg-message.in
@@ -1,5 +1,5 @@
 ****************************************************************
 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.
+file (config/conf.php). The file is fairly well documented.
 ****************************************************************
diff --git a/mail/nocc/pkg-plist b/mail/nocc/pkg-plist
index f275ee69baec..3f327cd7e5cd 100644
--- a/mail/nocc/pkg-plist
+++ b/mail/nocc/pkg-plist
@@ -1,34 +1,29 @@
 www/nocc/action.php
-www/nocc/check.php
-www/nocc/class_local.php
-www/nocc/class_send.php
-www/nocc/class_smtp.php
+www/nocc/classes/class_local.php
+www/nocc/classes/class_send.php
+www/nocc/classes/class_smtp.php
+www/nocc/classes/exception.php
+www/nocc/classes/user_filters.php
+www/nocc/classes/user_prefs.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_charset.php
-www/nocc/conf_lang.php
+@unexec if cmp -s %D/www/nocc/config/conf.php %D/www/nocc/config/conf.php.dist; then rm -f %D/www/nocc/config/conf.php; fi
+www/nocc/config/conf.php.dist
+@exec [ -f %B/config/conf.php ] || cp %B/%f %B/config/conf.php
+www/nocc/config/conf_charset.php
+www/nocc/config/conf_lang.php
+www/nocc/config/login_alias.sample
+www/nocc/config/login_allowed.sample
 www/nocc/contacts.php
 www/nocc/contacts_manager.php
-www/nocc/crypt.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
+www/nocc/favicon.ico
 www/nocc/get_img.php
 www/nocc/help.php
-www/nocc/html_entity_decode.php
 www/nocc/index.php
-www/nocc/is_uploaded_file.php
 www/nocc/logout.php
-www/nocc/mime.php
-www/nocc/proxy.php
 www/nocc/send.php
-www/nocc/user_filters.php
-www/nocc/user_prefs.php
 www/nocc/fckeditor/editor/css/behaviors/disablehandles.htc
 www/nocc/fckeditor/editor/css/behaviors/hiddenfield.gif
 www/nocc/fckeditor/editor/css/behaviors/hiddenfield.htc
@@ -186,6 +181,8 @@ www/nocc/html/no_mail.php
 www/nocc/html/prefs.php
 www/nocc/html/send.php
 www/nocc/html/send_error.php
+www/nocc/html/submenu_mail.php
+www/nocc/html/submenu_prefs.php
 www/nocc/js/nocc.js
 www/nocc/lang/ar.php
 www/nocc/lang/bg.php
@@ -299,6 +296,15 @@ www/nocc/themes/standard/img/smilies/wink.png
 www/nocc/themes/standard/img/up.png
 www/nocc/themes/standard/print.css
 www/nocc/themes/standard/style.css
+www/nocc/utils/check.php
+www/nocc/utils/crypt.php
+www/nocc/utils/detect_cyr_charset.php
+www/nocc/utils/functions.php
+www/nocc/utils/html_entity_decode.php
+www/nocc/utils/is_uploaded_file.php
+www/nocc/utils/mime.php
+www/nocc/utils/proxy.php
+@dirrm www/nocc/utils
 @dirrm www/nocc/themes/standard/img/smilies
 @dirrm www/nocc/themes/standard/img
 @dirrm www/nocc/themes/standard
@@ -333,4 +339,6 @@ www/nocc/themes/standard/style.css
 @dirrm www/nocc/fckeditor/editor/css
 @dirrm www/nocc/fckeditor/editor
 @dirrm www/nocc/fckeditor
+@dirrm www/nocc/config
+@dirrm www/nocc/classes
 @dirrm www/nocc