diff -ruN --exclude=CVS /usr/ports/ftp/p5-Net-FTPServer/Makefile /home/staff/gslin/work/p5-Net-FTPServer/Makefile
--- /usr/ports/ftp/p5-Net-FTPServer/Makefile	Wed Apr 19 19:03:43 2006
+++ /home/staff/gslin/work/p5-Net-FTPServer/Makefile	Sat Aug 12 03:03:32 2006
@@ -21,10 +21,8 @@
 		${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
-		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 MAKE_ENV+=	NOCONF=1
@@ -58,16 +56,21 @@
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	requires perl 5.6.1 or later. Install lang/perl5 then try again
+IGNORE=		requires perl 5.6.1 or later. Install lang/perl5.8 then try again
+.endif
+
+.if ${PERL_LEVEL} < 500703
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/root,root/root,wheel/" \
-		-e "s,/usr/sbin,${PREFIX}/sbin," \
+		-e "s,/usr/sbin,${TARGETDIR}/sbin," \
 		${WRKSRC}/Net-FTPServer.spec.PL
 	@${REINPLACE_CMD} -e "s/-g root/-g wheel/" \
-		-e "s,$$.PREFIX./sbin,${PREFIX}/sbin," \
-		-e "s,$$.SITEPREFIX./sbin,${PREFIX}/sbin," \
+		-e "s,$$.PREFIX./sbin,${TARGETDIR}/sbin," \
+		-e "s,$$.SITEPREFIX./sbin,${TARGETDIR}/sbin," \
 		${WRKSRC}/Makefile.PL
 
 post-install:
@@ -77,7 +80,7 @@
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+	@${PERL} -p -e 's,PREFIX,${TARGETDIR},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/ftp/p5-Net-FTPServer/pkg-plist /home/staff/gslin/work/p5-Net-FTPServer/pkg-plist
--- /usr/ports/ftp/p5-Net-FTPServer/pkg-plist	Sun Jan 22 09:55:35 2006
+++ /home/staff/gslin/work/p5-Net-FTPServer/pkg-plist	Sat Aug 12 03:03:55 2006
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%SITE_PERL%%/Net/FTPServer.pm
 %%SITE_PERL%%/Net/FTPServer/DBeg1/DirHandle.pm
 %%SITE_PERL%%/Net/FTPServer/DBeg1/FileHandle.pm