- Update to 2.6.6

- Reset maintainership to ports@FreeBSD.org

PR:		ports/109991
Submitted by:	Gea-Suan Lin <gslin_AT_gslin dot org>

3 files changed, 87 insertions, 84 deletions

diff --git a/www/pnews/Makefile b/www/pnews/Makefile
index 685a1903a192..4bcfa60acae8 100644
--- a/www/pnews/Makefile
+++ b/www/pnews/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pnews
-PORTVERSION=	2.6.4
-PORTREVISION=	1
+PORTVERSION=	2.6.6
 PORTEPOCH=	1
 CATEGORIES=	www news
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,17 +15,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	gslin@gslin.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP Web-based News Reader
 
 USE_PHP=	yes
 NO_BUILD=	yes
 
-PNEWSDIR?=	${TARGETDIR}/www/pnews
+PNEWSDIR?=	www/pnews
+PNEWSFULLDIR=	${PREFIX}/${PNEWSDIR}
+PLIST_SUB+=	PNEWSDIR="${PNEWSDIR}"
 
 do-install:
-	@${MKDIR} ${PNEWSDIR}
-	@${CP} -R ${WRKSRC}/* ${PNEWSDIR}
-	@${CP} -R ${WRKSRC}/.htaccess ${WRKSRC}/* ${PNEWSDIR}
+	@${MKDIR} ${PNEWSFULLDIR}
+	@${CP} -R ${WRKSRC}/* ${PNEWSFULLDIR}
+	@${CP} -R ${WRKSRC}/.htaccess ${WRKSRC}/* ${PNEWSFULLDIR}
+	@${FIND} ${PNEWSFULLDIR} -path '*/.svn' | ${XARGS} ${RM} -fr
 
 .include <bsd.port.mk>
diff --git a/www/pnews/distinfo b/www/pnews/distinfo
index 1e1c8d5f6e84..b4a9cd411151 100644
--- a/www/pnews/distinfo
+++ b/www/pnews/distinfo
@@ -1,3 +1,3 @@
-MD5 (pnews264.tgz) = 7a1f1dc6e715e7fdd5834e69fdc1153e
-SHA256 (pnews264.tgz) = 992d8abf1c018bb999aa760cf25707743c5a80896ec7e283749e06956fcd5ece
-SIZE (pnews264.tgz) = 221187
+MD5 (pnews266.tgz) = dce902f22b6205401ebc1cd56b51543d
+SHA256 (pnews266.tgz) = 1178968f05312a9a79e51e2dfa42e9c90b4e61e2516430bff24bea8229e04f69
+SIZE (pnews266.tgz) = 404858
diff --git a/www/pnews/pkg-plist b/www/pnews/pkg-plist
index 3414e59d8368..343a7147f889 100644
--- a/www/pnews/pkg-plist
+++ b/www/pnews/pkg-plist
@@ -1,75 +1,76 @@
 @comment $FreeBSD$
-www/pnews/.htaccess
-www/pnews/auth.php
-www/pnews/auth/ftp.inc.php
-www/pnews/auth/ftps.inc.php
-www/pnews/auth/ldap.inc.php
-www/pnews/auth/mail.inc.php
-www/pnews/auth/mysql.inc.php
-www/pnews/auth/nntp.inc.php
-www/pnews/auth/nntps.inc.php
-www/pnews/auth/pgsql.inc.php
-www/pnews/auth/phpbb.inc.php
-www/pnews/auth/pop3.inc.php
-www/pnews/auth/pop3s.inc.php
-www/pnews/auth/sample.inc.php
-www/pnews/chg-lang.php
-www/pnews/clear-cache.php
-www/pnews/css/standard.css
-www/pnews/delete.php
-www/pnews/doc/acknowlege.php
-www/pnews/doc/copying.php
-www/pnews/doc/download.php
-www/pnews/doc/guide.php
-www/pnews/doc/header.php
-www/pnews/doc/history.php
-www/pnews/doc/index.php
-www/pnews/doc/requirement.php
-www/pnews/doc/style.css
-www/pnews/doc/url_rewrite.php
-www/pnews/download.php
-www/pnews/examples/config.inc.php
-www/pnews/examples/dot_htaccess
-www/pnews/examples/newsgroups-twbbs.lst
-www/pnews/examples/newsgroups.lst
-www/pnews/examples/nntp-test.php
-www/pnews/examples/robots.txt
-www/pnews/favicon.ico
-www/pnews/form-login.php
-www/pnews/forward.php
-www/pnews/html.inc.php
-www/pnews/index.php
-www/pnews/indexing.php
-www/pnews/language.inc.php
-www/pnews/language/big5-gb.tab
-www/pnews/language/big5-unicode.tab
-www/pnews/language/chinese.inc.php
-www/pnews/language/chinese_gb.inc.php
-www/pnews/language/english.inc.php
-www/pnews/language/finnish.inc.php
-www/pnews/language/fix-b2g.php
-www/pnews/language/fix-g2b.php
-www/pnews/language/french.inc.php
-www/pnews/language/gb-big5.tab
-www/pnews/language/gb-unicode.tab
-www/pnews/language/german.inc.php
-www/pnews/language/italian.inc.php
-www/pnews/language/slovak.inc.php
-www/pnews/language/unicode-big5.tab
-www/pnews/language/unicode-gb.tab
-www/pnews/nnrpclass.php
-www/pnews/post.php
-www/pnews/read-art.php
-www/pnews/read.php
-www/pnews/readcfg.inc.php
-www/pnews/reply.php
-www/pnews/utils.inc.php
-www/pnews/utils.js
-www/pnews/version.inc.php
-www/pnews/xpost.php
-@dirrmtry www/pnews/auth
-@dirrmtry www/pnews/css
-@dirrmtry www/pnews/doc
-@dirrmtry www/pnews/examples
-@dirrmtry www/pnews/language
-@dirrmtry www/pnews
+%%PNEWSDIR%%/.htaccess
+%%PNEWSDIR%%/auth.php
+%%PNEWSDIR%%/auth/ftp.inc.php
+%%PNEWSDIR%%/auth/ftps.inc.php
+%%PNEWSDIR%%/auth/ldap.inc.php
+%%PNEWSDIR%%/auth/mail.inc.php
+%%PNEWSDIR%%/auth/mysql.inc.php
+%%PNEWSDIR%%/auth/nntp.inc.php
+%%PNEWSDIR%%/auth/nntps.inc.php
+%%PNEWSDIR%%/auth/pgsql.inc.php
+%%PNEWSDIR%%/auth/phpbb.inc.php
+%%PNEWSDIR%%/auth/pop3.inc.php
+%%PNEWSDIR%%/auth/pop3s.inc.php
+%%PNEWSDIR%%/auth/sample.inc.php
+%%PNEWSDIR%%/chg-lang.php
+%%PNEWSDIR%%/clear-cache.php
+%%PNEWSDIR%%/css/standard.css
+%%PNEWSDIR%%/delete.php
+%%PNEWSDIR%%/doc/acknowlege.php
+%%PNEWSDIR%%/doc/copying.php
+%%PNEWSDIR%%/doc/download.php
+%%PNEWSDIR%%/doc/guide.php
+%%PNEWSDIR%%/doc/header.php
+%%PNEWSDIR%%/doc/history.php
+%%PNEWSDIR%%/doc/index.php
+%%PNEWSDIR%%/doc/requirement.php
+%%PNEWSDIR%%/doc/style.css
+%%PNEWSDIR%%/doc/tailer.php
+%%PNEWSDIR%%/doc/url_rewrite.php
+%%PNEWSDIR%%/download.php
+%%PNEWSDIR%%/examples/config.inc.php
+%%PNEWSDIR%%/examples/dot_htaccess
+%%PNEWSDIR%%/examples/newsgroups-twbbs.lst
+%%PNEWSDIR%%/examples/newsgroups.lst
+%%PNEWSDIR%%/examples/nntp-test.php
+%%PNEWSDIR%%/examples/robots.txt
+%%PNEWSDIR%%/favicon.ico
+%%PNEWSDIR%%/form-login.php
+%%PNEWSDIR%%/forward.php
+%%PNEWSDIR%%/html.inc.php
+%%PNEWSDIR%%/index.php
+%%PNEWSDIR%%/indexing.php
+%%PNEWSDIR%%/language.inc.php
+%%PNEWSDIR%%/language/big5-gb.tab
+%%PNEWSDIR%%/language/big5-unicode.tab
+%%PNEWSDIR%%/language/chinese.inc.php
+%%PNEWSDIR%%/language/chinese_gb.inc.php
+%%PNEWSDIR%%/language/english.inc.php
+%%PNEWSDIR%%/language/finnish.inc.php
+%%PNEWSDIR%%/language/fix-b2g.php
+%%PNEWSDIR%%/language/fix-g2b.php
+%%PNEWSDIR%%/language/french.inc.php
+%%PNEWSDIR%%/language/gb-big5.tab
+%%PNEWSDIR%%/language/gb-unicode.tab
+%%PNEWSDIR%%/language/german.inc.php
+%%PNEWSDIR%%/language/italian.inc.php
+%%PNEWSDIR%%/language/slovak.inc.php
+%%PNEWSDIR%%/language/unicode-big5.tab
+%%PNEWSDIR%%/language/unicode-gb.tab
+%%PNEWSDIR%%/nnrpclass.php
+%%PNEWSDIR%%/post.php
+%%PNEWSDIR%%/read-art.php
+%%PNEWSDIR%%/read.php
+%%PNEWSDIR%%/readcfg.inc.php
+%%PNEWSDIR%%/reply.php
+%%PNEWSDIR%%/utils.inc.php
+%%PNEWSDIR%%/utils.js
+%%PNEWSDIR%%/version.inc.php
+%%PNEWSDIR%%/xpost.php
+@dirrmtry %%PNEWSDIR%%/language
+@dirrmtry %%PNEWSDIR%%/examples
+@dirrmtry %%PNEWSDIR%%/doc
+@dirrmtry %%PNEWSDIR%%/css
+@dirrmtry %%PNEWSDIR%%/auth
+@dirrmtry %%PNEWSDIR%%