Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/pmwiki/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	17 Nov 2009 08:04:24 -0000	1.27
+++ Makefile	12 Dec 2009 07:56:24 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pmwiki
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pmwiki.org/pub/pmwiki/
@@ -18,9 +18,10 @@
 USE_PHP=	mbstring session
 WANT_PHP_WEB=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
 
+PORTDOCS=	*
+
 PLIST_SUB+=	PMWIKIDIR=${PMWIKIDIR}
 SUB_LIST+=	PMWIKIDIR=${PMWIKIDIR}
 SUB_FILES=	pkg-message
@@ -35,10 +36,21 @@
 
 PMWIKIDIR?=	www/pmwiki
 
+CPIOFLAGS=	--quiet -pdm -R ${WWWOWN}:${WWWGRP}
+
+post-extract:
+	@${MV} ${WRKSRC}/README.txt ${WRKSRC}/docs
+	@${MV} ${WRKSRC}/docs/sample-config.php ${WRKSRC}
+
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/${PMWIKIDIR}
-	@${CP} -R ${WRKSRC}/ ${PREFIX}/${PMWIKIDIR}
+	@cd ${WRKSRC} && ${FIND} . ! \( -name docs -prune \) | \
+		${CPIO} ${CPIOFLAGS} ${PREFIX}/${PMWIKIDIR}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${PMWIKIDIR}
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/docs/* ${DOCSDIR}
+.endif
 
 post-install:
 	@${MKDIR} -m 775 ${PREFIX}/${PMWIKIDIR}/wiki.d
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/pmwiki/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo	17 Nov 2009 08:04:24 -0000	1.19
+++ distinfo	12 Dec 2009 07:56:24 -0000
@@ -1,3 +1,3 @@
-MD5 (pmwiki-2.2.7.tgz) = 6b1f94aab0e38ef28e29a2ba3fe7698a
-SHA256 (pmwiki-2.2.7.tgz) = 7cb3338ddd40ded484176f568cd183e3e30173dabfcb6f90e4c4f7884bfc7a2d
-SIZE (pmwiki-2.2.7.tgz) = 383197
+MD5 (pmwiki-2.2.8.tgz) = 2dae3af89cef0b6ceeaf35e94dbe5939
+SHA256 (pmwiki-2.2.8.tgz) = b4d25181a6345c417ee6ccbba3a468d106763a6b2d4b95b01ff9cfae44050bf3
+SIZE (pmwiki-2.2.8.tgz) = 384503
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/pmwiki/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	27 Aug 2009 09:04:55 -0000	1.12
+++ pkg-plist	12 Dec 2009 07:56:24 -0000
@@ -1,11 +1,4 @@
-%%PMWIKIDIR%%/README.txt
 %%PMWIKIDIR%%/cookbook/.htaccess
-%%PMWIKIDIR%%/docs/.htaccess
-%%PMWIKIDIR%%/docs/COPYING.txt
-%%PMWIKIDIR%%/docs/DOCUMENTATION.txt
-%%PMWIKIDIR%%/docs/INSTALL.txt
-%%PMWIKIDIR%%/docs/UPGRADE.txt
-%%PMWIKIDIR%%/docs/sample-config.php
 %%PMWIKIDIR%%/local/.htaccess
 %%PMWIKIDIR%%/pmwiki.php
 %%PMWIKIDIR%%/pub/guiedit/README
@@ -46,6 +39,7 @@
 %%PMWIKIDIR%%/pub/skins/print/print.css
 %%PMWIKIDIR%%/pub/skins/print/print.php
 %%PMWIKIDIR%%/pub/skins/print/print.tmpl
+%%PMWIKIDIR%%/sample-config.php
 %%PMWIKIDIR%%/scripts/.htaccess
 %%PMWIKIDIR%%/scripts/author.php
 %%PMWIKIDIR%%/scripts/authuser.php
@@ -221,6 +215,5 @@
 @dirrm %%PMWIKIDIR%%/pub/css
 @dirrm %%PMWIKIDIR%%/pub
 @dirrm %%PMWIKIDIR%%/local
-@dirrm %%PMWIKIDIR%%/docs
 @dirrm %%PMWIKIDIR%%/cookbook
 @dirrmtry %%PMWIKIDIR%%