4 files changed, 22 insertions, 29 deletions

diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index 0580f9eb2c7d..ade722642200 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -7,32 +7,37 @@
 #
 
 PORTNAME=	pngwriter
-PORTVERSION=	0.3.7
+PORTVERSION=	0.4.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ library for creating PNG images
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_REINPLACE=	yes
-ALL_TARGET=	libpngwriter
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/make.include.linux
+CXXFLAGS+=	`freetype-config --cflags` -I${LOCALBASE}/include
+
+do-build:
+	cd ${BUILD_WRKSRC} \
+		&& ${CXX} ${CXXFLAGS} -c pngwriter.cc -o pngwriter.o \
+		&& ${AR} rv libpngwriter.a pngwriter.o
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/pngwriter.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/libpngwriter.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/pngwriter/distinfo b/graphics/pngwriter/distinfo
index 7e684adb958a..30abf1e72037 100644
--- a/graphics/pngwriter/distinfo
+++ b/graphics/pngwriter/distinfo
@@ -1,2 +1,2 @@
-MD5 (pngwriter-0.3.7.tgz) = 72b4e2f09c3b4d81304fe1858b833c3a
-SIZE (pngwriter-0.3.7.tgz) = 463042
+MD5 (pngwriter-0.4.0.tar.gz) = 3b3e438199440eff89f92790859abe06
+SIZE (pngwriter-0.4.0.tar.gz) = 530704
diff --git a/graphics/pngwriter/files/patch-make.include.linux b/graphics/pngwriter/files/patch-make.include.linux
deleted file mode 100644
index 190dac39b70e..000000000000
--- a/graphics/pngwriter/files/patch-make.include.linux
+++ /dev/null
@@ -1,14 +0,0 @@
---- make.include.linux.orig	Fri Oct 17 23:39:10 2003
-+++ make.include.linux	Fri Nov  7 17:23:01 2003
-@@ -1,7 +1,7 @@
--CXX=g++
--CXXFLAGS= -O3 -Wall -Wno-deprecated
--INC= -I../src 
--LIBS= -L../src -lz -lpng -lpngwriter
-+CXX?=g++
-+CXXFLAGS+= -Wall -Wno-deprecated
-+INC= -I../src -I%%LOCALBASE%%/include
-+LIBS= -L../src -lz -lpng -lpngwriter -L%%LOCALBASE%%/lib
- INSTALL=install
- DESTDIR=/usr/local
- SELF=make.include.linux
diff --git a/graphics/pngwriter/pkg-plist b/graphics/pngwriter/pkg-plist
index 15157d00bcc8..3af9f61c926c 100644
--- a/graphics/pngwriter/pkg-plist
+++ b/graphics/pngwriter/pkg-plist
@@ -10,11 +10,13 @@ lib/libpngwriter.a
 %%PORTDOCS%%%%DOCSDIR%%/espaniol/LEAME
 %%PORTDOCS%%%%DOCSDIR%%/espaniol/LICENCIA
 %%PORTDOCS%%%%DOCSDIR%%/espaniol/PNGwriterQuickReference_ES.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/english
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/espaniol
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%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
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/espaniol
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/english
+%%PORTDOCS%%@dirrm %%DOCSDIR%%