diff -urN /usr/ports/graphics/pngwriter/Makefile graphics/pngwriter/Makefile
--- /usr/ports/graphics/pngwriter/Makefile	2005-01-28 19:43:48.000000000 +0900
+++ graphics/pngwriter/Makefile	2009-02-11 21:19:36.000000000 +0900
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	pngwriter
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ library for creating PNG images
@@ -24,6 +22,15 @@
 USE_GNOME=	pkgconfig
 CXXFLAGS+=	`pkg-config --cflags freetype2 libpng12` -I${LOCALBASE}/include
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	include/pngwriter.h \
+		lib/libpngwriter.a \
+		%%DATADIR%%/fonts/FreeMonoBold.ttf \
+		%%DATADIR%%/fonts/FreeSansBold.ttf
+PLIST_DIRS=	%%DATADIR%%/fonts \
+		%%DATADIR%%
+
 post-extract:
 	@${FIND} ${WRKSRC} -name "\.*" -delete
 
@@ -36,15 +43,12 @@
 	${INSTALL_DATA} ${WRKSRC}/src/pngwriter.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/libpngwriter.a ${PREFIX}/lib
 	@${MKDIR} ${DATADIR}/fonts
-	cd ${WRKSRC}/fonts && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/fonts
+	@(cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${DATADIR}/fonts)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
 	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/pngwriter/distinfo graphics/pngwriter/distinfo
--- /usr/ports/graphics/pngwriter/distinfo	2005-11-26 19:25:23.000000000 +0900
+++ graphics/pngwriter/distinfo	2009-02-11 21:17:39.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (pngwriter-0.5.3.tgz) = da54cdd1bd1257e4e4b0195a4320b07b
-SHA256 (pngwriter-0.5.3.tgz) = fda877865925d61bc35e0d3b9e62f9d639d7db25426c92d3e2ab8c52f39f616f
-SIZE (pngwriter-0.5.3.tgz) = 675747
+MD5 (pngwriter-0.5.4.tar.gz) = 842c3b1b2af9a7acc3ac0abc8015ba50
+SHA256 (pngwriter-0.5.4.tar.gz) = e17568e834f5195109a2a13509a679cca95d6087d27812564f7fcfc8ac700ee6
+SIZE (pngwriter-0.5.4.tar.gz) = 756781
diff -urN /usr/ports/graphics/pngwriter/pkg-plist graphics/pngwriter/pkg-plist
--- /usr/ports/graphics/pngwriter/pkg-plist	2004-08-14 13:53:50.000000000 +0900
+++ graphics/pngwriter/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,26 +0,0 @@
-include/pngwriter.h
-lib/libpngwriter.a
-%%PORTDOCS%%%%DOCSDIR%%/english/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/english/EXAMPLES
-%%PORTDOCS%%%%DOCSDIR%%/english/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/english/PNGwriterQuickReference_EN.pdf
-%%PORTDOCS%%%%DOCSDIR%%/english/README
-%%PORTDOCS%%%%DOCSDIR%%/espaniol/CAMBIOS
-%%PORTDOCS%%%%DOCSDIR%%/espaniol/EJEMPLOS
-%%PORTDOCS%%%%DOCSDIR%%/espaniol/LEAME
-%%PORTDOCS%%%%DOCSDIR%%/espaniol/LICENCIA
-%%PORTDOCS%%%%DOCSDIR%%/espaniol/PNGwriterQuickReference_ES.pdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/burro.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/lyapunov.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/lyapunov.espaniol.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/pngtest.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/pngtest.espaniol.cc
-%%DATADIR%%/fonts/FreeMonoBold.ttf
-%%DATADIR%%/fonts/FreeSansBold.ttf
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/espaniol
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/english
-%%PORTDOCS%%@dirrm %%DOCSDIR%%