21 files changed, 275 insertions, 283 deletions
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 1b947c43d3a9..82b95ac62b14 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ftpmirror
 PORTVERSION=	1.96
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.sai.msu.su/pub/unix/FTP/mirror/
 
@@ -30,7 +30,6 @@ post-configure:
 		${WRKSRC}/Fan/Fan.pm
 
 post-install:
-	-@[ -d ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/ftpmirror/pkg-plist b/ftp/ftpmirror/pkg-plist
index 6eb7724ecc41..d7da3cd9ffa0 100644
--- a/ftp/ftpmirror/pkg-plist
+++ b/ftp/ftpmirror/pkg-plist
@@ -1,264 +1,263 @@
 bin/rotate
 bin/ftpmirror
 etc/ftpmirror.cf-sample
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5File.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/MD5String.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage/Usage.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/full_setup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/find_archive.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/subst_directory.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_match.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/gen_subst.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/do_lock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/cleanup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/net_init.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/last_seq.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/step_synch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_step_mirror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/run_full_mirror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/quit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/put.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/fill_size.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_del.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/besame.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/date_check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/calc_offset.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/adjust_offset.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/mkdirinfo.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/remote_scanner.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/local_scanner.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/server_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/client_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/changer_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_uid.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/get_gid.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_any.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_remote.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/scan_local.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_encode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/attr_decode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/get_mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/cleanup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/validate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/compare.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/copyfrom.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/duplicate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/to_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill_checksum.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/fill.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_path.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/from_list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/parsetime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/update_master.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/append.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/mkdirhier.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/rmdirhier.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_level.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plog_mask.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/plock.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/encode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/decode.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4time.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/str4date.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/timezone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/isleap.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofyear.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/days.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/dayofweek.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/daysofmonth.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/nameofmonth.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/lookup.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/delete.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/index.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/load.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/fill.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/store.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/putdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stats.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/passive.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/putreq.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/getres.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/quit.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/login.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/do_login.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/port.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/acpt.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pasv.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cleardataconn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/makedataconn.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/list.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/put.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/stat.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/cwd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/pwd.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/type.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/image.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/ascii.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/size.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mtime.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/unlink.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/mkdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rmdir.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/rename.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/chmod.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/umask.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/group.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/idle.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_begin.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_add.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/d_end.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/generate.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/normalize.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/farm_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/genindex.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/synch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/getrev.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/parse_url.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/search.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_line.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_option.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/parse_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/combine_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/merge_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/dumpall.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/get_value.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/error.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addkey.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/try_check.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/getval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/delete.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/setval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/addval.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/combine.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/merge.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ref.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_code.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_hash.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_array.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_boolean.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_decimal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_octal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_integer.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_path.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_file.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_directory.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/want_timezone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/findpath.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/where.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/start.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/end.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/down.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/up.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/open.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/close.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/add_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/clr_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/perform_filter.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/unget.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getone.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_index.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/get_misc.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_local.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_ftp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dir_lslR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getline_lslR.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/summary.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/getcmp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/guess.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/fileglob.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mklist.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/scan_update.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/attr_cmp.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status_report.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/FATAL.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/DESTROY.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/stats.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/clearerror.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/error.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/fatal.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/status.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/dump.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putln.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getln.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/putdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/getdata.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/nowait.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/open_socket.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_client.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/do_server.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/new_client.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/close.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/handle.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/sockname.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/peername.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Attrib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Cool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/DIR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Farm.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/HTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Loader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/MD5.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Param.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Scan.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Fan/Usage.pm
+%%SITE_ARCH%%/auto/Fan/MD5/MD5.so
+%%SITE_ARCH%%/auto/Fan/MD5/MD5File.al
+%%SITE_ARCH%%/auto/Fan/MD5/MD5String.al
+%%SITE_ARCH%%/auto/Fan/MD5/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Usage/Usage.so
+%%SITE_ARCH%%/auto/Fan/full_setup.al
+%%SITE_ARCH%%/auto/Fan/find_archive.al
+%%SITE_ARCH%%/auto/Fan/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/new.al
+%%SITE_ARCH%%/auto/Fan/check.al
+%%SITE_ARCH%%/auto/Fan/subst_directory.al
+%%SITE_ARCH%%/auto/Fan/gen_match.al
+%%SITE_ARCH%%/auto/Fan/gen_subst.al
+%%SITE_ARCH%%/auto/Fan/do_lock.al
+%%SITE_ARCH%%/auto/Fan/cleanup.al
+%%SITE_ARCH%%/auto/Fan/net_init.al
+%%SITE_ARCH%%/auto/Fan/last_seq.al
+%%SITE_ARCH%%/auto/Fan/step_synch.al
+%%SITE_ARCH%%/auto/Fan/run_step_mirror.al
+%%SITE_ARCH%%/auto/Fan/run_full_mirror.al
+%%SITE_ARCH%%/auto/Fan/quit.al
+%%SITE_ARCH%%/auto/Fan/list.al
+%%SITE_ARCH%%/auto/Fan/get.al
+%%SITE_ARCH%%/auto/Fan/put.al
+%%SITE_ARCH%%/auto/Fan/fill_mtime.al
+%%SITE_ARCH%%/auto/Fan/fill_size.al
+%%SITE_ARCH%%/auto/Fan/add.al
+%%SITE_ARCH%%/auto/Fan/del.al
+%%SITE_ARCH%%/auto/Fan/local_add.al
+%%SITE_ARCH%%/auto/Fan/local_del.al
+%%SITE_ARCH%%/auto/Fan/remote_add.al
+%%SITE_ARCH%%/auto/Fan/remote_del.al
+%%SITE_ARCH%%/auto/Fan/besame.al
+%%SITE_ARCH%%/auto/Fan/date_check.al
+%%SITE_ARCH%%/auto/Fan/calc_offset.al
+%%SITE_ARCH%%/auto/Fan/adjust_offset.al
+%%SITE_ARCH%%/auto/Fan/mkdirinfo.al
+%%SITE_ARCH%%/auto/Fan/remote_scanner.al
+%%SITE_ARCH%%/auto/Fan/local_scanner.al
+%%SITE_ARCH%%/auto/Fan/server_filter.al
+%%SITE_ARCH%%/auto/Fan/client_filter.al
+%%SITE_ARCH%%/auto/Fan/changer_filter.al
+%%SITE_ARCH%%/auto/Fan/get_uid.al
+%%SITE_ARCH%%/auto/Fan/get_gid.al
+%%SITE_ARCH%%/auto/Fan/scan_any.al
+%%SITE_ARCH%%/auto/Fan/scan_remote.al
+%%SITE_ARCH%%/auto/Fan/scan_local.al
+%%SITE_ARCH%%/auto/Fan/Attrib/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Attrib/new.al
+%%SITE_ARCH%%/auto/Fan/Attrib/attr_encode.al
+%%SITE_ARCH%%/auto/Fan/Attrib/attr_decode.al
+%%SITE_ARCH%%/auto/Fan/Attrib/mtime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/get_mtime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/gmt2mdtm.al
+%%SITE_ARCH%%/auto/Fan/Attrib/cleanup.al
+%%SITE_ARCH%%/auto/Fan/Attrib/validate.al
+%%SITE_ARCH%%/auto/Fan/Attrib/compare.al
+%%SITE_ARCH%%/auto/Fan/Attrib/copyfrom.al
+%%SITE_ARCH%%/auto/Fan/Attrib/duplicate.al
+%%SITE_ARCH%%/auto/Fan/Attrib/to_line.al
+%%SITE_ARCH%%/auto/Fan/Attrib/fill_checksum.al
+%%SITE_ARCH%%/auto/Fan/Attrib/fill.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_path.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_line.al
+%%SITE_ARCH%%/auto/Fan/Attrib/from_list.al
+%%SITE_ARCH%%/auto/Fan/Attrib/parsetime.al
+%%SITE_ARCH%%/auto/Fan/Attrib/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/update_master.al
+%%SITE_ARCH%%/auto/Fan/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Cool/append.al
+%%SITE_ARCH%%/auto/Fan/Cool/mkdirhier.al
+%%SITE_ARCH%%/auto/Fan/Cool/rmdirhier.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog_level.al
+%%SITE_ARCH%%/auto/Fan/Cool/plog_mask.al
+%%SITE_ARCH%%/auto/Fan/Cool/plock.al
+%%SITE_ARCH%%/auto/Fan/Cool/encode.al
+%%SITE_ARCH%%/auto/Fan/Cool/decode.al
+%%SITE_ARCH%%/auto/Fan/Cool/str4time.al
+%%SITE_ARCH%%/auto/Fan/Cool/str4date.al
+%%SITE_ARCH%%/auto/Fan/Cool/timezone.al
+%%SITE_ARCH%%/auto/Fan/Cool/isleap.al
+%%SITE_ARCH%%/auto/Fan/Cool/dayofyear.al
+%%SITE_ARCH%%/auto/Fan/Cool/days.al
+%%SITE_ARCH%%/auto/Fan/Cool/dayofweek.al
+%%SITE_ARCH%%/auto/Fan/Cool/daysofmonth.al
+%%SITE_ARCH%%/auto/Fan/Cool/nameofmonth.al
+%%SITE_ARCH%%/auto/Fan/Cool/lookup.al
+%%SITE_ARCH%%/auto/Fan/Cool/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/DIR/new.al
+%%SITE_ARCH%%/auto/Fan/DIR/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/DIR/get.al
+%%SITE_ARCH%%/auto/Fan/DIR/add.al
+%%SITE_ARCH%%/auto/Fan/DIR/delete.al
+%%SITE_ARCH%%/auto/Fan/DIR/index.al
+%%SITE_ARCH%%/auto/Fan/DIR/load.al
+%%SITE_ARCH%%/auto/Fan/DIR/fill.al
+%%SITE_ARCH%%/auto/Fan/DIR/store.al
+%%SITE_ARCH%%/auto/Fan/DIR/update.al
+%%SITE_ARCH%%/auto/Fan/DIR/putdata.al
+%%SITE_ARCH%%/auto/Fan/DIR/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/FTP/stats.al
+%%SITE_ARCH%%/auto/Fan/FTP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/FTP/new.al
+%%SITE_ARCH%%/auto/Fan/FTP/passive.al
+%%SITE_ARCH%%/auto/Fan/FTP/putreq.al
+%%SITE_ARCH%%/auto/Fan/FTP/getres.al
+%%SITE_ARCH%%/auto/Fan/FTP/quit.al
+%%SITE_ARCH%%/auto/Fan/FTP/login.al
+%%SITE_ARCH%%/auto/Fan/FTP/do_login.al
+%%SITE_ARCH%%/auto/Fan/FTP/port.al
+%%SITE_ARCH%%/auto/Fan/FTP/acpt.al
+%%SITE_ARCH%%/auto/Fan/FTP/pasv.al
+%%SITE_ARCH%%/auto/Fan/FTP/cleardataconn.al
+%%SITE_ARCH%%/auto/Fan/FTP/makedataconn.al
+%%SITE_ARCH%%/auto/Fan/FTP/list.al
+%%SITE_ARCH%%/auto/Fan/FTP/get.al
+%%SITE_ARCH%%/auto/Fan/FTP/put.al
+%%SITE_ARCH%%/auto/Fan/FTP/stat.al
+%%SITE_ARCH%%/auto/Fan/FTP/chdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/cwd.al
+%%SITE_ARCH%%/auto/Fan/FTP/pwd.al
+%%SITE_ARCH%%/auto/Fan/FTP/type.al
+%%SITE_ARCH%%/auto/Fan/FTP/image.al
+%%SITE_ARCH%%/auto/Fan/FTP/ascii.al
+%%SITE_ARCH%%/auto/Fan/FTP/size.al
+%%SITE_ARCH%%/auto/Fan/FTP/mtime.al
+%%SITE_ARCH%%/auto/Fan/FTP/unlink.al
+%%SITE_ARCH%%/auto/Fan/FTP/mkdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/rmdir.al
+%%SITE_ARCH%%/auto/Fan/FTP/rename.al
+%%SITE_ARCH%%/auto/Fan/FTP/chmod.al
+%%SITE_ARCH%%/auto/Fan/FTP/umask.al
+%%SITE_ARCH%%/auto/Fan/FTP/group.al
+%%SITE_ARCH%%/auto/Fan/FTP/idle.al
+%%SITE_ARCH%%/auto/Fan/FTP/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Farm/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Farm/new.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_begin.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_add.al
+%%SITE_ARCH%%/auto/Fan/Farm/d_end.al
+%%SITE_ARCH%%/auto/Fan/Farm/generate.al
+%%SITE_ARCH%%/auto/Fan/Farm/normalize.al
+%%SITE_ARCH%%/auto/Fan/Farm/update.al
+%%SITE_ARCH%%/auto/Fan/Farm/farm_filter.al
+%%SITE_ARCH%%/auto/Fan/Farm/genindex.al
+%%SITE_ARCH%%/auto/Fan/Farm/synch.al
+%%SITE_ARCH%%/auto/Fan/Farm/getrev.al
+%%SITE_ARCH%%/auto/Fan/Farm/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/HTTP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/HTTP/new.al
+%%SITE_ARCH%%/auto/Fan/HTTP/get.al
+%%SITE_ARCH%%/auto/Fan/HTTP/parse_url.al
+%%SITE_ARCH%%/auto/Fan/HTTP/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Loader/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Loader/new.al
+%%SITE_ARCH%%/auto/Fan/Loader/search.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_line.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_option.al
+%%SITE_ARCH%%/auto/Fan/Loader/parse_file.al
+%%SITE_ARCH%%/auto/Fan/Loader/combine_hash.al
+%%SITE_ARCH%%/auto/Fan/Loader/merge_hash.al
+%%SITE_ARCH%%/auto/Fan/Loader/dumpall.al
+%%SITE_ARCH%%/auto/Fan/Loader/get_value.al
+%%SITE_ARCH%%/auto/Fan/Loader/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Param/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Param/new.al
+%%SITE_ARCH%%/auto/Fan/Param/error.al
+%%SITE_ARCH%%/auto/Fan/Param/addkey.al
+%%SITE_ARCH%%/auto/Fan/Param/try_check.al
+%%SITE_ARCH%%/auto/Fan/Param/getval.al
+%%SITE_ARCH%%/auto/Fan/Param/delete.al
+%%SITE_ARCH%%/auto/Fan/Param/setval.al
+%%SITE_ARCH%%/auto/Fan/Param/addval.al
+%%SITE_ARCH%%/auto/Fan/Param/dump.al
+%%SITE_ARCH%%/auto/Fan/Param/combine.al
+%%SITE_ARCH%%/auto/Fan/Param/merge.al
+%%SITE_ARCH%%/auto/Fan/Param/want_ref.al
+%%SITE_ARCH%%/auto/Fan/Param/want_code.al
+%%SITE_ARCH%%/auto/Fan/Param/want_hash.al
+%%SITE_ARCH%%/auto/Fan/Param/want_array.al
+%%SITE_ARCH%%/auto/Fan/Param/want_boolean.al
+%%SITE_ARCH%%/auto/Fan/Param/want_decimal.al
+%%SITE_ARCH%%/auto/Fan/Param/want_octal.al
+%%SITE_ARCH%%/auto/Fan/Param/want_integer.al
+%%SITE_ARCH%%/auto/Fan/Param/want_ipv4_addr.al
+%%SITE_ARCH%%/auto/Fan/Param/want_path.al
+%%SITE_ARCH%%/auto/Fan/Param/want_file.al
+%%SITE_ARCH%%/auto/Fan/Param/want_directory.al
+%%SITE_ARCH%%/auto/Fan/Param/want_timezone.al
+%%SITE_ARCH%%/auto/Fan/Param/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/Scan/findpath.al
+%%SITE_ARCH%%/auto/Fan/Scan/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/Scan/new.al
+%%SITE_ARCH%%/auto/Fan/Scan/where.al
+%%SITE_ARCH%%/auto/Fan/Scan/start.al
+%%SITE_ARCH%%/auto/Fan/Scan/end.al
+%%SITE_ARCH%%/auto/Fan/Scan/down.al
+%%SITE_ARCH%%/auto/Fan/Scan/up.al
+%%SITE_ARCH%%/auto/Fan/Scan/open.al
+%%SITE_ARCH%%/auto/Fan/Scan/close.al
+%%SITE_ARCH%%/auto/Fan/Scan/add_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/clr_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/perform_filter.al
+%%SITE_ARCH%%/auto/Fan/Scan/unget.al
+%%SITE_ARCH%%/auto/Fan/Scan/get.al
+%%SITE_ARCH%%/auto/Fan/Scan/getone.al
+%%SITE_ARCH%%/auto/Fan/Scan/get_index.al
+%%SITE_ARCH%%/auto/Fan/Scan/get_misc.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_local.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_ftp.al
+%%SITE_ARCH%%/auto/Fan/Scan/dir_lslR.al
+%%SITE_ARCH%%/auto/Fan/Scan/getline_lslR.al
+%%SITE_ARCH%%/auto/Fan/Scan/dump.al
+%%SITE_ARCH%%/auto/Fan/Scan/summary.al
+%%SITE_ARCH%%/auto/Fan/Scan/getcmp.al
+%%SITE_ARCH%%/auto/Fan/Scan/guess.al
+%%SITE_ARCH%%/auto/Fan/Scan/fileglob.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_mklist.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_mkdiff.al
+%%SITE_ARCH%%/auto/Fan/Scan/scan_update.al
+%%SITE_ARCH%%/auto/Fan/Scan/attr_cmp.al
+%%SITE_ARCH%%/auto/Fan/Scan/autosplit.ix
+%%SITE_ARCH%%/auto/Fan/TCP/status_report.al
+%%SITE_ARCH%%/auto/Fan/TCP/FATAL.al
+%%SITE_ARCH%%/auto/Fan/TCP/DESTROY.al
+%%SITE_ARCH%%/auto/Fan/TCP/new.al
+%%SITE_ARCH%%/auto/Fan/TCP/stats.al
+%%SITE_ARCH%%/auto/Fan/TCP/clearerror.al
+%%SITE_ARCH%%/auto/Fan/TCP/error.al
+%%SITE_ARCH%%/auto/Fan/TCP/fatal.al
+%%SITE_ARCH%%/auto/Fan/TCP/status.al
+%%SITE_ARCH%%/auto/Fan/TCP/dump.al
+%%SITE_ARCH%%/auto/Fan/TCP/putln.al
+%%SITE_ARCH%%/auto/Fan/TCP/getln.al
+%%SITE_ARCH%%/auto/Fan/TCP/putdata.al
+%%SITE_ARCH%%/auto/Fan/TCP/getdata.al
+%%SITE_ARCH%%/auto/Fan/TCP/nowait.al
+%%SITE_ARCH%%/auto/Fan/TCP/open_socket.al
+%%SITE_ARCH%%/auto/Fan/TCP/do_client.al
+%%SITE_ARCH%%/auto/Fan/TCP/do_server.al
+%%SITE_ARCH%%/auto/Fan/TCP/new_client.al
+%%SITE_ARCH%%/auto/Fan/TCP/close.al
+%%SITE_ARCH%%/auto/Fan/TCP/handle.al
+%%SITE_ARCH%%/auto/Fan/TCP/sockname.al
+%%SITE_ARCH%%/auto/Fan/TCP/peername.al
+%%SITE_ARCH%%/auto/Fan/TCP/autosplit.ix
+%%SITE_ARCH%%/Fan.pm
+%%SITE_ARCH%%/Fan/Attrib.pm
+%%SITE_ARCH%%/Fan/Cool.pm
+%%SITE_ARCH%%/Fan/DIR.pm
+%%SITE_ARCH%%/Fan/FTP.pm
+%%SITE_ARCH%%/Fan/Farm.pm
+%%SITE_ARCH%%/Fan/HTTP.pm
+%%SITE_ARCH%%/Fan/Loader.pm
+%%SITE_ARCH%%/Fan/MD5.pm
+%%SITE_ARCH%%/Fan/Param.pm
+%%SITE_ARCH%%/Fan/Scan.pm
+%%SITE_ARCH%%/Fan/TCP.pm
+%%SITE_ARCH%%/Fan/Usage.pm
diff --git a/ftp/p5-File-Fetch/Makefile b/ftp/p5-File-Fetch/Makefile
index f81b05b36704..1773f8d4e4aa 100644
--- a/ftp/p5-File-Fetch/Makefile
+++ b/ftp/p5-File-Fetch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	File-Fetch
 PORTVERSION=	0.48
+PORTREVISION=	1
 CATEGORIES=	ftp www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-File-Fetch/pkg-plist b/ftp/p5-File-Fetch/pkg-plist
index 05059ad2bd7e..6792957f29c7 100644
--- a/ftp/p5-File-Fetch/pkg-plist
+++ b/ftp/p5-File-Fetch/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/File/Fetch.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Fetch/.packlist
 %%PERL5_MAN3%%/File::Fetch.3.gz
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index 039e7ef96a09..691e7cb38437 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-FTP-Common
 PORTVERSION=	7.0.d
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTP-Common/pkg-plist b/ftp/p5-Net-FTP-Common/pkg-plist
index d2964c4a463e..d0f7eaf1a879 100644
--- a/ftp/p5-Net-FTP-Common/pkg-plist
+++ b/ftp/p5-Net-FTP-Common/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Net/FTP/Common.pm
 %%SITE_PERL%%/Net/FTP/Common.pod
 %%PERL5_MAN3%%/Net::FTP::Common.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Common/.packlist
diff --git a/ftp/p5-Net-FTP-Recursive/Makefile b/ftp/p5-Net-FTP-Recursive/Makefile
index 00a65f901472..b01c502ce95c 100644
--- a/ftp/p5-Net-FTP-Recursive/Makefile
+++ b/ftp/p5-Net-FTP-Recursive/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Net-FTP-Recursive
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTP-Recursive/pkg-plist b/ftp/p5-Net-FTP-Recursive/pkg-plist
index b8491f881747..d589b1c6da97 100644
--- a/ftp/p5-Net-FTP-Recursive/pkg-plist
+++ b/ftp/p5-Net-FTP-Recursive/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/FTP/Recursive.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive/.packlist
 %%PERL5_MAN3%%/Net::FTP::Recursive.3.gz
diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile
index 30656bb78918..cff47169186f 100644
--- a/ftp/p5-Net-FTPSSL/Makefile
+++ b/ftp/p5-Net-FTPSSL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FTPSSL
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTPSSL/pkg-plist b/ftp/p5-Net-FTPSSL/pkg-plist
index 6a326bb35d6a..563fb59aa0fe 100644
--- a/ftp/p5-Net-FTPSSL/pkg-plist
+++ b/ftp/p5-Net-FTPSSL/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Net/FTPSSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPSSL/.packlist
 %%PERL5_MAN3%%/Net::FTPSSL.3.gz
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 2818b16805fd..f8a4666366b8 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-FTPServer
 PORTVERSION=	1.125
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 12e445175760..2ba02c5b9b7b 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -23,7 +23,6 @@ bin/ro-ftpd.pl
 %%SITE_PERL%%/Net/FTPServer/RO/DirHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/FileHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer/.packlist
 %%PERL5_MAN3%%/Net::FTPServer.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::DBeg1::DirHandle.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::DBeg1::FileHandle.3.gz
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 63db590b17df..5577fa98b460 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	POE-Component-Client-FTP
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-plist b/ftp/p5-POE-Component-Client-FTP/pkg-plist
index cd6770e69aeb..9c3925039e64 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-plist
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/POE/Component/Client/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::FTP.3.gz
diff --git a/ftp/p5-SOAP-Transport-FTP/Makefile b/ftp/p5-SOAP-Transport-FTP/Makefile
index 3d6f7d2e6f95..e2652599b035 100644
--- a/ftp/p5-SOAP-Transport-FTP/Makefile
+++ b/ftp/p5-SOAP-Transport-FTP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Transport-FTP
 PORTVERSION=	0.711
+PORTREVISION=	1
 CATEGORIES=	ftp net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ftp/p5-SOAP-Transport-FTP/pkg-plist b/ftp/p5-SOAP-Transport-FTP/pkg-plist
index bd2f3a4f30f3..37afb22ac5c0 100644
--- a/ftp/p5-SOAP-Transport-FTP/pkg-plist
+++ b/ftp/p5-SOAP-Transport-FTP/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SOAP/Transport/FTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/FTP/.packlist
 %%PERL5_MAN3%%/SOAP::Transport::FTP.3.gz
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index aca28fcbf999..821608cb8c95 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paraget
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp perl5
 MASTER_SITES=	SF
 
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index 8009bda8d4d2..a0b8fe33e85d 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -17,4 +17,3 @@ man/man1/paraget.1.gz
 %%SITE_PERL%%/Net/Paraget/Server.pm
 %%SITE_PERL%%/Net/Paraget/ServerList.pm
 %%SITE_PERL%%/Net/Paraget/ServerQueue.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget/.packlist
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index daa40d47938b..2ab2fa8fdf73 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	profxp
 PORTVERSION=	3p2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://duncanthrax.net/profxp/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/p/-pre/}-src
@@ -25,8 +25,8 @@ post-patch1:
 	@${REINPLACE_CMD} -i '' '1s|^\#.*|#!${PERL}|' ${WRKSRC}/profxpv3.pl
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_SCRIPT} ${WRKSRC}/profxpv3.pl ${STAGEDIR}${PREFIX}/bin/profxp
-	${CP} -R ${WRKSRC}/profxp ${STAGEDIR}${SITE_PERL}
+	${CP} -R ${WRKSRC}/profxp ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index ed319fc880c8..d72c84e4c707 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
 
@@ -104,10 +104,6 @@ post-patch:
 		 /gcry_control/d' \
 
 post-install:
-.if ${PORT_OPTIONS:MPERL}
-	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
-		${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/wzdftpd/.packlist
-.endif
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 05dc1c3ea31a..868d5e0ab249 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -97,9 +97,8 @@ lib/libwzd_core.a
 lib/libwzd_core.so
 lib/libwzd_core.so.0
 lib/libwzd_core.so.0.801.1
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/wzdftpd/.packlist
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/wzdftpd/wzdftpd.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/wzdftpd.pm
+%%PERL%%%%SITE_ARCH%%/auto/wzdftpd/wzdftpd.so
+%%PERL%%%%SITE_ARCH%%/wzdftpd.pm
 %%MYSQL%%lib/wzdftpd/backends/libwzdmysql.a
 %%MYSQL%%lib/wzdftpd/backends/libwzdmysql.so
 %%PGSQL%%lib/wzdftpd/backends/libwzdpgsql.a