diff --git a/graphics/rubyphoto/Makefile b/graphics/rubyphoto/Makefile
index 7f96a0970f7f..51f99e10595e 100644
--- a/graphics/rubyphoto/Makefile
+++ b/graphics/rubyphoto/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	graphics ruby www
 MASTER_SITES=	http://www.markhj.com/rubyphoto/files/
 
 MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	A program for creating web image galleries
+COMMENT=	program for creating web image galleries
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		${RUBY_SITELIBDIR}/image_size.rb:${PORTSDIR}/graphics/ruby-image_size \
 		${RUBY_SITELIBDIR}/xml/parser.rb:${PORTSDIR}/textproc/ruby-xmlparser
@@ -21,40 +21,26 @@ USE_RUBY=	yes
 RUBY_SHEBANG_FILES=	ruby_photo.rb
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/abspath.rb ${RUBY_SITELIBDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/findbin.rb ${RUBY_SITELIBDIR}
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${DATADIR}/sample_input
-	@${MKDIR} ${DATADIR}/templates
-	@${MKDIR} ${DATADIR}/templates/alternate
-	@${MKDIR} ${DATADIR}/swigs-converters
-	@${MKDIR} ${DATADIR}/xml-generators
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/README.html ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/album.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/config.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/dyn_resize.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/image_cat.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/image_size_cache.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/joke.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/myxml.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/photo.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/rp_debug.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ruby_photo.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/template.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/urlencode.rb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sample_input/* ${DATADIR}/sample_input
-	${INSTALL_DATA} ${WRKSRC}/templates/album.xml ${DATADIR}/templates
-	${INSTALL_DATA} ${WRKSRC}/templates/image.xml ${DATADIR}/templates
-	${INSTALL_DATA} ${WRKSRC}/templates/shared.xml ${DATADIR}/templates
-	${INSTALL_DATA} ${WRKSRC}/templates/tree.xml ${DATADIR}/templates
-	${INSTALL_DATA} ${WRKSRC}/templates/alternate/* ${DATADIR}/templates/alternate
-	${INSTALL_DATA} ${WRKSRC}/swigs-converters/* ${DATADIR}/swigs-converters
-	${INSTALL_DATA} ${WRKSRC}/xml-generators/* ${DATADIR}/xml-generators
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/abspath.rb ${STAGEDIR}${RUBY_SITELIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/findbin.rb ${STAGEDIR}${RUBY_SITELIBDIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/sample_input
+	@${MKDIR} ${STAGEDIR}${DATADIR}/templates/alternate
+	@${MKDIR} ${STAGEDIR}${DATADIR}/swigs-converters
+	@${MKDIR} ${STAGEDIR}${DATADIR}/xml-generators
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README.html \
+		${WRKSRC}/album.rb ${WRKSRC}/config.rb ${WRKSRC}/dyn_resize.rb \
+		${WRKSRC}/image_cat.rb ${WRKSRC}/image_size_cache.rb \
+		${WRKSRC}/joke.rb ${WRKSRC}/myxml.rb ${WRKSRC}/photo.rb \
+		${WRKSRC}/rp_debug.rb ${WRKSRC}/ruby_photo.rb \
+		${WRKSRC}/template.rb ${WRKSRC}/urlencode.rb ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sample_input/* ${STAGEDIR}${DATADIR}/sample_input
+	${INSTALL_DATA} ${WRKSRC}/templates/album.xml ${WRKSRC}/templates/image.xml \
+		${WRKSRC}/templates/shared.xml ${WRKSRC}/templates/tree.xml \
+		${STAGEDIR}${DATADIR}/templates
+	${INSTALL_DATA} ${WRKSRC}/templates/alternate/* ${STAGEDIR}${DATADIR}/templates/alternate
+	${INSTALL_DATA} ${WRKSRC}/swigs-converters/* ${STAGEDIR}${DATADIR}/swigs-converters
+	${INSTALL_DATA} ${WRKSRC}/xml-generators/* ${STAGEDIR}${DATADIR}/xml-generators
 
 .include <bsd.port.mk>