Index: head/security/tinyca/Makefile
===================================================================
--- head/security/tinyca/Makefile	(revision 351331)
+++ head/security/tinyca/Makefile	(revision 351332)
@@ -1,53 +1,42 @@
 # Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
 
 PORTNAME=	tinyca
 PORTVERSION=	0.7.5
 PORTREVISION=	5
 CATEGORIES=	security net
 MASTER_SITES=	http://tinyca.sm-zone.net/ \
 		http://tinyca.sm-zone.net/old/
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Simple graphical interface to manage a small Certification Authority
 
 RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		zip:${PORTSDIR}/archivers/zip \
 		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
-USE_BZIP2=	yes
-USES=		perl5
+USES=		perl5 tar:bzip2 shebangfix
 USE_OPENSSL=	yes
+SHEBANG_FILES=	tinyca2
 NO_BUILD=	yes
+
 DOC_FILES=	INSTALL
 LIB_FILES=	CA.pm CERT.pm GUI.pm HELPERS.pm KEY.pm OpenSSL.pm REQ.pm TCONFIG.pm
 LIB2_FILES=	CALLBACK.pm HELPERS.pm TCONFIG.pm WORDS.pm X509_browser.pm X509_infobox.pm
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${SITE_PERL}/${PORTNAME}/
-	@${MKDIR} ${SITE_PERL}/${PORTNAME}/GUI
-.for file in ${LIB_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${file} ${SITE_PERL}/${PORTNAME}
-.endfor
-.for file in ${LIB2_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/lib/GUI/${file} ${SITE_PERL}/${PORTNAME}/GUI
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${PREFIX}/etc/tinyca.cnf.sample
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PORTNAME}/GUI
+	${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${SITE_PERL}/${PORTNAME}
+	${INSTALL_DATA} ${LIB2_FILES:S|^|${WRKSRC}/lib/GUI/|} ${STAGEDIR}${SITE_PERL}/${PORTNAME}/GUI
+	${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${STAGEDIR}${PREFIX}/etc/tinyca.cnf.sample
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		-e "s:%%SITE_PERL%%:${SITE_PERL}:g" \
 		-e "s:%%OPENSSLBASE%%:${OPENSSLBASE}:g" \
 		${WRKSRC}/tinyca2 >${WRKSRC}/tinyca.new
-	@${INSTALL_SCRIPT} ${WRKSRC}/tinyca.new ${PREFIX}/bin/tinyca
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/tinyca.new ${STAGEDIR}${PREFIX}/bin/tinyca
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/tinyca/pkg-plist
===================================================================
--- head/security/tinyca/pkg-plist	(revision 351331)
+++ head/security/tinyca/pkg-plist	(revision 351332)
@@ -1,20 +1,20 @@
 bin/tinyca
 etc/tinyca.cnf.sample
 %%SITE_PERL%%/tinyca/CA.pm
 %%SITE_PERL%%/tinyca/CERT.pm
 %%SITE_PERL%%/tinyca/GUI.pm
-%%SITE_PERL%%/tinyca/HELPERS.pm
-%%SITE_PERL%%/tinyca/KEY.pm
-%%SITE_PERL%%/tinyca/OpenSSL.pm
-%%SITE_PERL%%/tinyca/REQ.pm
-%%SITE_PERL%%/tinyca/TCONFIG.pm
 %%SITE_PERL%%/tinyca/GUI/CALLBACK.pm
 %%SITE_PERL%%/tinyca/GUI/HELPERS.pm
 %%SITE_PERL%%/tinyca/GUI/TCONFIG.pm
 %%SITE_PERL%%/tinyca/GUI/WORDS.pm
 %%SITE_PERL%%/tinyca/GUI/X509_browser.pm
 %%SITE_PERL%%/tinyca/GUI/X509_infobox.pm
-@dirrm %%SITE_PERL%%/tinyca/GUI
-@dirrm %%SITE_PERL%%/tinyca/
+%%SITE_PERL%%/tinyca/HELPERS.pm
+%%SITE_PERL%%/tinyca/KEY.pm
+%%SITE_PERL%%/tinyca/OpenSSL.pm
+%%SITE_PERL%%/tinyca/REQ.pm
+%%SITE_PERL%%/tinyca/TCONFIG.pm
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/tinyca/GUI
+@dirrm %%SITE_PERL%%/tinyca