diff --git a/MOVED b/MOVED
index 8ce0ede83fb3..4d1062ca53a0 100644
--- a/MOVED
+++ b/MOVED
@@ -1,1518 +1,1520 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
 # $FreeBSD$
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
 #
 #     Port:	A port that was moved (category/portname).
 #     Moved to:	Where the port was moved to, or which port users
 #		can and should migrate to (category/portname).
 #		Blank indicates that the port was deleted.
 #     Date:	When the moving or the removal was done (YYYY-MM-DD,
 #		in PST/PDT).
 #     Why:	The reason why the port was moved or removed.
 #
 # Keep this list sorted in the chronological order.  New entries must
 # be added at the tail.
 #
 # Port|Moved to|Date|Why
 net/ratoolset|net/irrtoolset|2002-11-16|software was renamed
 chinese/linux-netscape47-communicator||2002-11-17|security vulnerability
 chinese/linux-netscape47-navigator||2002-11-17|security vulnerability
 chinese/netscape47-communicator||2002-11-17|security vulnerability
 chinese/netscape47-navigator||2002-11-17|security vulnerability
 japanese/eb2||2003-03-28|obsoleted by japanese/eb
 japanese/linux-netscape47-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability
 japanese/linux-netscape47-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability
 japanese/netscape-fonts|japanese/alias-fonts|2002-11-17|obsoleted by alias-fonts
 japanese/netscape3.language||2002-11-17|security vulnerability
 japanese/netscape4-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability
 japanese/netscape4-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability
 japanese/netscape47-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability
 japanese/netscape47-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability
 korean/linux-netscape47-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability
 korean/linux-netscape47-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability
 korean/netscape3||2002-11-17|security vulnerability
 korean/netscape4-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability
 korean/netscape4-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability
 korean/netscape47-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability
 korean/netscape47-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability
 russian/netscape4.language||2002-11-17|security vulnerability
 www/linux-netscape4|www/netscape48-navigator|2002-11-17|security vulnerability
 www/linux-netscape47-communicator|www/netscape48-communicator|2002-11-17|security vulnerability
 www/linux-netscape47-navigator|www/netscape48-navigator|2002-11-17|security vulnerability
 www/netscape3||2002-11-17|security vulnerability
 www/netscape3-gold||2002-11-17|security vulnerability
 www/netscape4-communicator|www/netscape48-communicator|2002-11-17|security vulnerability
 www/netscape4-communicator.us|www/netscape48-communicator|2002-11-17|security vulnerability
 www/netscape4-navigator|www/netscape48-navigator|2002-11-17|security vulnerability
 www/netscape47-communicator|www/netscape48-communicator|2002-11-17|security vulnerability
 www/netscape47-navigator|www/netscape48-navigator|2002-11-17|security vulnerability
 japanese/mhonarc|www/mhonarc|2002-11-17|current www/mhonarc could use Japanese
 graphics/linux_mesa||2002-11-17|Port was broken and out of date
 audio/cdrdao|sysutils/cdrdao|2002-11-18|misfiled, burns data CDs too
 sysutils/pkgview|sysutils/gnome-pkgview|2002-11-20|author has changed the binary and package name
 japanese/tvi||2002-11-21|development discontinued and distfile unavailable
 textproc/pt-aspell|portuguese/aspell|2002-11-21|new category
 math/p5-Math-Financial|finance/p5-Math-Financial|2002-11-21|new category
 graphics/xmms-avi|multimedia/xmms-avi|2002-11-21|new category
 misc/qhacc|finance/qhacc|2002-11-21|new category
 textproc/br-ispell|portuguese/ispell-pt_BR|2002-11-22|new category
 french/cups||2002-11-23|deleted since not supportable under cups 1.1.16
 french/cups-base||2002-11-23|deleted since not supportable under cups 1.1.16
 french/cups-lpr||2002-11-23|deleted since not supportable under cups 1.1.16
 korean/w3m|www/w3m-m17n|2002-11-23|www/w3m-m17n could handle Korean
 korean/gaim|net/gaim|2002-11-24|net/gaim could handle Korean
 palm/xcopilot|palm/pose|2002-11-24|pose supersceded xcopilot
 www/libxpg4-ns||2002-11-24|needless since all native netscapes are removed
 textproc/pspell-ispell||2002-11-28|this plugin was obsoleted by aspell
 audio/linux-realplayer|multimedia/linux-realplayer|2002-11-28|new category
 audio/xmms|multimedia/xmms|2002-11-28|new category
 graphics/avifile|multimedia/avifile|2002-11-28|new category
 graphics/divx4linux4|multimedia/linux-divx4linux4|2002-11-28|new category
 graphics/divx4linux|multimedia/linux-divx4linux|2002-11-28|new category
 graphics/ffmpeg|multimedia/ffmpeg|2002-11-28|new category
 graphics/gstreamer-player|multimedia/gstreamer-player|2002-11-28|new category
 graphics/gstreamer-plugins|multimedia/gstreamer-plugins|2002-11-28|new category
 graphics/gstreamer|multimedia/gstreamer|2002-11-28|new category
 graphics/gsubedit|multimedia/gsubedit|2002-11-28|new category
 graphics/libdivxdecore-devel|multimedia/libdivxdecore-devel|2002-11-28|new category
 graphics/libdivxdecore|multimedia/libdivxdecore|2002-11-28|new category
 graphics/libdivxencore|multimedia/libdivxencore|2002-11-28|new category
 graphics/libdvdcss|multimedia/libdvdcss|2002-11-28|new category
 graphics/libdvdread|multimedia/libdvdread|2002-11-28|new category
 graphics/libdv|multimedia/libdv|2002-11-28|new category
 graphics/libmovtar|multimedia/libmovtar|2002-11-28|new category
 graphics/libmpeg2|multimedia/libmpeg2|2002-11-28|new category
 graphics/linux-divxplayer|multimedia/linux-divxplayer|2002-11-28|new category
 graphics/mjpegtools|multimedia/mjpegtools|2002-11-28|new category
 graphics/mpeg4ip|multimedia/mpeg4ip|2002-11-28|new category
 graphics/mplayer-fonts|multimedia/mplayer-fonts|2002-11-28|new category
 graphics/mplayer-skins|multimedia/mplayer-skins|2002-11-28|new category
 graphics/mplayer|multimedia/mplayer|2002-11-28|new category
 graphics/ogle-gui|multimedia/ogle-gui|2002-11-28|new category
 graphics/ogle|multimedia/ogle|2002-11-28|new category
 graphics/ogmtools|multimedia/ogmtools|2002-11-28|new category
 graphics/okle|multimedia/okle|2002-11-28|new category
 graphics/openquicktime|multimedia/openquicktime|2002-11-28|new category
 graphics/oqtencoder|multimedia/oqtencoder|2002-11-28|new category
 graphics/oqtplayer|multimedia/oqtplayer|2002-11-28|new category
 graphics/win32-codecs|multimedia/win32-codecs|2002-11-28|new category
 graphics/xmps-opendivx-plugin|multimedia/xmps-opendivx-plugin|2002-11-28|new category
 graphics/xmps-win32-plugin|multimedia/xmps-win32-plugin|2002-11-28|new category
 editors/ooodict-pt_BR|portuguese/ooodict-pt_BR|2002-12-06|new category
 editors/ooodict-pt_PT|portuguese/ooodict-pt_PT|2002-12-06|new category
 editors/openoffice-pt|portuguese/openoffice|2002-12-06|new category
 editors/staroffice52-pt|portuguese/staroffice52|2002-12-06|new category
 www/frontpage-pt_BR|portuguese/frontpage-pt_BR|2002-12-06|new category
 audio/kdemultimedia3|multimedia/kdemultimedia3|2002-12-08|new category
 japanese/gn-mnews||2002-12-08|security vulnerability
 japanese/mnews||2002-12-08|security vulnerability
 japanese/mnews-gnspool||2002-12-08|security vulnerability
 japanese/mnews-im||2002-12-08|security vulnerability
 print/pips-sc20||2002-12-08|license problems
 print/pips-sc40||2002-12-08|license problems
 print/pips-sc480||2002-12-08|license problems
 print/pips-sc580||2002-12-08|license problems
 print/pips-sc880||2002-12-08|license problems
 print/pips-sc980||2002-12-08|license problems
 print/pips-sp810_820||2002-12-08|license problems
 print/pips720||2002-12-08|license problems
 print/pips780cs||2002-12-08|license problems
 print/pips790||2002-12-08|license problems
 print/pips820ug||2002-12-08|license problems
 print/pips920||2002-12-08|license problems
 print/pips-sc680_777||2002-12-08|license problems
 x11/launch.app||2002-12-08|security vulnerability
 net/icradius||2002-12-08|security vulnerability
 net/p5-IC-Radius||2002-12-08|security vulnerability
 net/radius||2002-12-08|security vulnerability
 net/xtradius||2002-12-08|security vulnerability
 net/gated||2002-12-13|no longer distributed by vendor
 japanese/gnomecore|x11/gnomecore|2002-12-16|patches integrated into the upstream
 www/comline|www/libwww|2003-01-03|part of libwww
 devel/dbregc||2003-01-05|no longer relevant
 lang/smalleiffel|lang/smarteiffel|2003-01-06|change name
 graphics/tosvcd|multimedia/tosvcd|2003-01-06|new category
 graphics/vcdgear|multimedia/vcdgear|2003-01-06|new category
 graphics/vcdimager|multimedia/vcdimager|2003-01-06|new category
 graphics/vcdpad|multimedia/vcdpad|2003-01-06|new category
 graphics/vcdtools|multimedia/vcdtools|2003-01-06|new category
 devel/autoconf254|devel/autoconf257|2003-01-06|new version from FSF
 devel/ncurses-dialog|devel/cdialog|2003-01-11|renamed by delete+add
 graphics/dvdrip|multimedia/dvdrip|2003-01-17|new category
 misc/pipebench|benchmarks/pipebench|2003-01-18|fix category
 math/xmgr||2003-01-19|removed, obsoleted, successor is grace
 x11/libhelp||2003-01-19|removed, didn't compile on current motif, only used by xmgr
 mail/xfaces||2003-01-19|removed, obsoleted, functionality taken over by faces
 devel/gnustep-devel|devel/gnustep|2003-01-20|merged
 devel/gnustep-devel|devel/gnustep|2003-01-20|merged
 x11-toolkits/gnustep-gui-devel|x11-toolkits/gnustep-gui|2003-01-20|merged
 x11-toolkits/gnustep-xgps|x11-toolkits/gnustep-back|2003-01-20|full substitute
 devel/ruby-unit|devel/ruby-testunit|2003-01-23|succeeded
 mail/p5-Mail-SpamAssassin-devel|mail/p5-Mail-SpamAssassin-snapshot|2003-01-25|directory renamed
 devel/uml|devel/umbrello|2003-01-26|project renamed
 x11-toolkits/qt30|x11-toolkits/qt31|2003-01-28|qt30 replaced by qt31
 x11-toolkits/qt31|x11-toolkits/qt32|2003-09-18|qt31 replaced by qt32
 misc/kde3-i18n-pt|portuguese/kde3-i18n|2003-01-28|new category
 misc/kde3-i18n-pt_BR|portuguese/kde3-i18n-pt_BR|2003-01-28|new category
 lang/php4||2003-01-29|integrated into www/mod_php4
 biology/gaussian||2003-01-31|deleted maintain is hard and gray in license
 graphics/xine_dvdnav_plugin||2003-02-01|integrated into graphics/libxine
 devel/ossp-mm||2003-02-01|accidental dupe of devel/mm
 archivers/linux_rar||2003-02-03|FreeBSD/i386 binary is available
 security/krb5-beta||2004-01-25|deleted: no longer in beta, MIT KRB5 1.3.2 released
 deskutils/gnucash|finance/gnucash|2003-02-05|new category
 x11-toolkits/crux||2003-02-07|deleted: added to GNOME 2.2 desktop
 textproc/ruby-erb||2003-02-09|ERb 1.x is obsolete: use the one included in ruby 1.8 or ruby16-shim-ruby18
 audio/lame-devel||2003-02-09|obsolete
 x11-fm/gnomemc||2003-02-10|obsolete
 x11/wmshutdown|sysutils/wmshutdown|2003-02-13|fix category
 security/kgpgapplet||2003-02-19|merged into kgpg
 net/ip-tun||2003-02-19|obsoleted by gif interfaces
 net/edonkey-gui-gtk-kioslave||2003-02-19|merged into edonkey-gui-gtk
 print/dvipdfm||2003-02-20|merged into teTeX
 net/amcl|net/gnome-mud|2003-02-23|project renamed
 net/openldap|net/openldap12|2003-02-23|port renamed
 net/openldap2|net/openldap20|2003-02-23|port renamed
 www/caudium|www/caudium10|2003-02-23|port renamed
 graphics/libdvdnav|multimedia/libdvdnav|2003-02-24|new category
 graphics/libxine|multimedia/libxine|2003-02-24|new category
 graphics/xine|multimedia/xine|2003-02-24|new category
 net/rdesktop-devel|net/rdesktop|2003-02-24|obsolete beta version
 java/jikes-devel|java/jikes|2003-02-24|stable version caught up with development version
 www/horde||2003-02-25|obsolete
 astro/kstars|misc/kdeedu3|2003-03-02|kstars included in kdeedu package
 devel/ruby-testunit||2003-03-03|integrated into ruby16-shim-ruby18
 graphics/qdraw||2003-03-24|obsolete
 x11-fm/rox-base||2003-03-24|obsolete
 graphics/xvid|multimedia/xvid|2003-03-29|new category
 print/dvipdfm-cjk|print/dvipdfmx|2003-03-29|port renamed
 games/tetris|games/bsdtris|2003-04-02|port renamed (see ports/13693)
 misc/p5-Business-CreditCard|finance/p5-Business-CreditCard|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment|finance/p5-Business-OnlinePayment|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-2CheckOut|finance/p5-Business-OnlinePayment-2CheckOut|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-AuthorizeNet|finance/p5-Business-OnlinePayment-AuthorizeNet|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-BankOfAmerica|finance/p5-Business-OnlinePayment-BankOfAmerica|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-Beanstream|finance/p5-Business-OnlinePayment-Beanstream|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-Cardstream|finance/p5-Business-OnlinePayment-Cardstream|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-Jettis|finance/p5-Business-OnlinePayment-Jettis|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-LinkPoint|finance/p5-Business-OnlinePayment-LinkPoint|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-MerchantCommerce|finance/p5-Business-OnlinePayment-MerchantCommerce|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-Network1Financial|finance/p5-Business-OnlinePayment-Network1Financial|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-PayConnect|finance/p5-Business-OnlinePayment-PayConnect|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-PaymentsGateway|finance/p5-Business-OnlinePayment-PaymentsGateway|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-SurePay|finance/p5-Business-OnlinePayment-SurePay|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-TCLink|finance/p5-Business-OnlinePayment-TCLink|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-VirtualNet|finance/p5-Business-OnlinePayment-VirtualNet|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-eSec|finance/p5-Business-OnlinePayment-eSec|2003-04-03|port renamed (see ports/50557)
 misc/p5-Business-OnlinePayment-WorldPay-Junior|finance/p5-Business-WorldPay-Junior|2003-04-03|port renamed (see ports/50557)
 math/p5-Math-Trig||2003-04-03|in base perl5 suite
 graphics/avidemux|multimedia/avidemux|2003-04-04|new category
 graphics/avinfo|multimedia/avinfo|2003-04-04|new category
 graphics/camserv|multimedia/camserv|2003-04-04|new category
 graphics/dtv|multimedia/dtv|2003-04-04|new category
 graphics/dumpmpeg|multimedia/dumpmpeg|2003-04-04|new category
 graphics/enjoympeg|multimedia/enjoympeg|2003-04-04|new category
 graphics/fxtv|multimedia/fxtv|2003-04-04|new category
 graphics/gopchop|multimedia/gopchop|2003-04-04|new category
 graphics/gxanim|multimedia/gxanim|2003-04-04|new category
 graphics/libdvbpsi|multimedia/libdvbpsi|2003-04-04|new category
 graphics/libfame|multimedia/libfame|2003-04-04|new category
 graphics/libquicktime|multimedia/libquicktime|2003-04-04|new category
 graphics/mmsclient|multimedia/mmsclient|2003-04-04|new category
 graphics/mpeg2codec|multimedia/mpeg2codec|2003-04-04|new category
 graphics/mpeg2play|multimedia/mpeg2play|2003-04-04|new category
 graphics/mpeg_encode|multimedia/mpeg_encode|2003-04-04|new category
 graphics/mpeg_play|multimedia/mpeg_play|2003-04-04|new category
 graphics/mpeg_stat|multimedia/mpeg_stat|2003-04-04|new category
 graphics/mpegedit|multimedia/mpegedit|2003-04-04|new category
 graphics/mpeg|multimedia/mpeg|2003-04-04|new category
 graphics/mpgtx|multimedia/mpgtx|2003-04-04|new category
 graphics/mplex|multimedia/mplex|2003-04-04|new category
 graphics/mtv|multimedia/mtv|2003-04-04|new category
 graphics/netshow|multimedia/netshow|2003-04-04|new category
 graphics/ppm2fli|multimedia/ppm2fli|2003-04-04|new category
 graphics/smpeg-xmms|multimedia/smpeg-xmms|2003-04-04|new category
 graphics/smpeg|multimedia/smpeg|2003-04-04|new category
 graphics/splitmpg|multimedia/splitmpg|2003-04-04|new category
 graphics/tkxanim|multimedia/tkxanim|2003-04-04|new category
 graphics/totem|multimedia/totem|2003-04-04|new category
 graphics/transcode|multimedia/transcode|2003-04-04|new category
 graphics/vlc|multimedia/vlc|2003-04-04|new category
 graphics/xanim|multimedia/xanim|2003-04-04|new category
 graphics/xawtv|multimedia/xawtv|2003-04-04|new category
 graphics/xine_d4d_plugin|multimedia/xine_d4d_plugin|2003-04-04|new category
 graphics/xine_d5d_plugin|multimedia/xine_d5d_plugin|2003-04-04|new category
 graphics/xmovie|multimedia/xmovie|2003-04-04|new category
 graphics/xmps|multimedia/xmps|2003-04-04|new category
 graphics/xtheater|multimedia/xtheater|2003-04-04|new category
 graphics/recmpeg|multimedia/recmpeg|2003-04-04|new category
 graphics/spigot|multimedia/spigot|2003-04-04|new category
 net/gaim-snapshot|net/gaim|2003-04-05|rolled into net/gaim
 net/jift||2003-04-05|lack of development
 x11-toolkits/pike-gtk||2003-04-09|included in pike
 japanese/samba20|japanese/samba|2003-04-13|security vulnerability
 japanese/ptex-euc|japanese/ptex|2003-04-13|all 3 charset are supported
 japanese/ptex-jis|japanese/ptex|2003-04-13|all 3 charset are supported by japanese/ptex
 japanese/ptex-sjis|japanese/ptex|2003-04-13|all 3 charset are supported by japanese/ptex
 japanese/ptex-common|japanese/ptex-base|2003-04-13|only used by one port
 misc/kde3-i18n-he|hebrew/kde3-i18n|2003-04-13|new category
 misc/kde3-i18n-hu|hungarian/kde3-i18n|2003-04-13|new category
 misc/kde3-i18n-vi|vietnamese/kde3-i18n|2003-04-13|new category
 sysutils/asrpages|misc/asr-manpages|2003-04-15|port revived
 emulators/linux-vmware-toolbox|emulators/linux-vmware-toolbox2|2003-04-19|port renamed
 emulators/vmware-guestd|emulators/vmware-guestd3|2003-04-19|port renamed
 archivers/ruby-zlib||2003-04-19|integrated into ruby16-shim-ruby18
 math/ruby-bigfloat||2003-04-19|integrated into ruby16-shim-ruby18
 palm/prc-tools-binutils||2003-04-27|integrate into palm/prc-tools
 palm/prc-tools-gcc||2003-04-27|integrate into palm/prc-tools
 multimedia/gini|net/gini|2003-04-27|inappropriate primary CATEGORIES
 graphics/gimp-manual-ps||2003-04-29|new versions of the manual not available as PS
 archivers/pkzip||2003-05-05|port contained a security vulnerability with no sign of a fix
 audio/mxv||2003-05-05|port was broken with no sign of a fix
 audio/openag||2003-05-05|port was broken with no sign of a fix
 databases/p5-Msql||2003-05-05|port was broken with no sign of a fix
 databases/sixpack||2003-05-05|port was broken with no sign of a fix
 devel/arm-aout-gcc295||2003-05-05|port was broken with no sign of a fix
 devel/arm-elf-gcc31||2003-05-05|port was broken with no sign of a fix
 devel/codemedic||2003-05-05|port was broken with no sign of a fix
 devel/flux||2003-05-05|port was broken with no sign of a fix
 devel/gecc||2003-05-05|port was broken with no sign of a fix
 devel/glade--||2003-05-05|port was broken with no sign of a fix
 devel/ilu||2003-05-05|port was broken with no sign of a fix
 emulators/vmware||2003-05-05|port was broken with no sign of a fix
 graphics/ruby-gimp||2003-05-05|port was broken with no sign of a fix
 graphics/p5-Gimp||2003-05-05|port depended on the broken PDL port which was removed
 japanese/ee||2003-05-05|port was broken with no sign of a fix
 japanese/kdevelop||2003-05-05|port was broken with no sign of a fix
 korean/byeoroo||2003-05-05|port was broken with no sign of a fix
 lang/gpc||2003-05-05|port was broken with no sign of a fix
 misc/cassowary||2003-05-05|port was broken with no sign of a fix
 net/coda_client||2003-05-05|port was broken with no sign of a fix
 net/coda_server||2003-05-05|port was broken with no sign of a fix
 net/gtk+licq||2003-05-05|port was broken with no sign of a fix
 net/icukrell||2003-05-05|port was broken with no sign of a fix
 net/macipgw||2003-05-05|port was broken with no sign of a fix
 net/trafcount||2003-05-05|port was broken with no sign of a fix
 net/zephyr||2003-05-05|port was broken with no sign of a fix
 news/xvnews||2003-05-05|port was broken with no sign of a fix
 print/pdflib3||2003-05-05|port was broken with no sign of a fix
 textproc/xsl-docbook-modular||2003-05-05|port was broken with no sign of a fix
 www/eddie||2003-05-05|port was broken with no sign of a fix
 www/wn||2003-05-05|port contained a security vulnerability with no sign of a fix
 x11-fm/jafm||2003-05-05|port was broken with no sign of a fix
 x11-servers/Xatm||2003-05-05|port was broken with no sign of a fix
 audio/gdcd||2003-05-05|port was broken with no sign of a fix
 devel/SN|devel/sourcenav|2003-05-07|renamed by upstream
 japanese/gp||2003-05-07|development discontinued and distfile unavailable
 www/orion-devel|www/orion|2003-05-08|stable version caught up with development version
 editors/xemacs21-mule-common||2003-05-09|needless since new xemacs21-mule is 21.4.12
 x11-toolkits/fltk-xunicode|x11-toolkits/fltk|2003-05-11|maintenance discontinued
 www/nautilus-gtkhtml||2003-05-11|maintenance discontinued
 editors/xemacs21-sumo||2003-05-12|needless since merged to xemacs-{mule-}packages
 editors/xemacs21-mule-sumo||2003-05-12|needless since merged to xemacs-{mule-}packages
 japanese/xemacs21-sumo-canna||2003-05-12|needless since merged to xemacs-{mule-}packages
 japanese/xemacs21-sumo-canna+freewnn||2003-05-12|needless since merged to xemacs-{mule-}packages
 japanese/xemacs21-sumo-canna+wnn6||2003-05-12|needless since merged to xemacs-{mule-}packages
 japanese/xemacs21-sumo-freewnn||2003-05-12|needless since merged to xemacs-{mule-}packages
 japanese/xemacs21-sumo-wnn6||2003-05-12|needless since merged to xemacs-{mule-}packages
 editors/xemacs-additional-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-basic-mule-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-comm-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-games-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-libs-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-oa-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-prog-packages||2003-05-12|obsolete xemacs package category
 editors/xemacs-wp-packages||2003-05-12|obsolete xemacs package category
 devel/p5-Time|devel/p5-Time-modules|2003-05-13|Use devel/p5-Time-modules port instead
 www/sqmgrlog|www/sarg|2003-05-15|Renamed into sarg
 devel/adabroker||2003-05-19|no longer maintained, does not compile with latest compiler
 chinese/rxvt||2003-05-20|no longer needed
 chinese/rxvt-big5||2003-05-20|no longer needed
 chinese/rxvt-gb||2003-05-20|no longer needeD
 misc/p5-DataCash||2003-05-20|No longer available
 net/p5-Net-BGP4|net/p5-Net-BGP|2003-05-21|module was renamed
 x11-wm/kde-icontheme-crystal||2003-05-22|Included in kdelibs
 devel/p5-File-Tools||2003-05-22|Newer version included into Perl distribution
 lang/php4|lang/php4|2003-05-22|re-separated from www/mod_php4
 x11-servers/XttXF98srv-EGC||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-GA968||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-GANBWAP||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-MGA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-NEC480||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-NECS3||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-NKVNEC||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-PWLB||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-PWSKB||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-SVGA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-TGUI||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-WABEP||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-WABS||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 x11-servers/XttXF98srv-WSNA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server
 www/phoenix|www/mozilla-firebird|2003-06-02|project changed names
 x11/gswitchit_applet||2003-06-02|replaced by GNOME 2 version in x11/gswitchit
 audio/agsatellite|net/linux-agsatellite|2003-06-02|accurate category and name
 devel/understand_ada|devel/linux-understand_ada|2003-06-02|accurate naming
 devel/understand_c|devel/linux-understand_c|2003-06-02|accurate naming
 misc/edonkey-tool-list|misc/linux-edonkey-tool-list|2003-06-02|accurate naming
 misc/edonkey-tool-recovermet|misc/linux-edonkey-tool-recovermet|2003-06-02|accurate naming
 multimedia/xmovie|multimedia/linux-xmovie|2003-06-02|accurate naming
 net/edonkey-core|net/linux-edonkey-core|2003-06-02|accurate naming
 audio/xnap|net/xnap|2003-06-02|accurate category
 x11-wm/bbrun|x11/bbrun|2003-06-03|accurate category
 x11-wm/bbapm|sysutils/bbapm|2003-06-03|accurate category
 x11-wm/icemc|misc/icemc|2003-06-03|accurate category
 net/bittorrent|net/py-bittorrent|2003-06-06|duplicate entry
 textproc/py-trex||2003-06-08|part of py-xml
 devel/pear-install|devel/pear-PEAR|2003-06-08|merged
 textproc/gnomespell-devel|textproc/gnomespell|2003-06-11|rolled into gnomespell
 mail/evolution-devel|mail/evolution|2003-06-11|rolled into evolution
 misc/wmessage|x11/wmessage|2003-06-12|accurate category
 net/mldonkey-src|net/mldonkey|2003-06-15|no londer needed
 news/straw||2003-06-20|port was broken with no sign of a fix
 devel/libtool|devel/libtool13|2003-06-26|move to versioned libtool portnames
 www/mozilla-vendor|www/mozilla|2003-07-01|vendor tree in sync with 1.4
 www/mozilla-embedded-vendor|www/mozilla-embedded|2003-07-01|vendor tree in sync with 1.4
 www/mozilla-headers-vendor|www/mozilla-headers|2003-07-01|vendor tree in sync with 1.4
 www/skipstone||2003-07-01|port is more than a year old with no update in sight
 graphics/glass||2003-07-03|useless
 www/linux-phoenix|www/linux-mozillafirebird|2003-07-03|legal problem with name
 graphics/kpovmodeler||2003-07-03|now part of kdegraphics
 www/linux-opera7|www/linux-opera|2003-07-09|move to www/linux-opera
 www/xswallow||2003-07-12|port is obsolete
 net/gnut||2003-07-12|security vulnerability, and no active development
 www/mod_log_mysql|www/mod_log_sql|2003-07-12|renamed by author in new version
 x11/gnomecore||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnomeapplets||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/linux-xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnome||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnome-fifth-toe||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-wm/sawfish||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 audio/gnomemedia||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 sysutils/gtop||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-fm/nautilus||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 audio/gnomeaudio||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 games/gnomegames||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 misc/gnomeutils||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 misc/gnomeuserdocs||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-wm/spager||2003-07-15|removed as it depends on sawfish
 mail/gtkgrepmail||2003-07-15|removed as it depends on gnomecore
 x11-toolkits/eazel-themes||2003-07-15|removed as it depends on sawfish
 chinese/pycodec||2003-07-20|is replaced by converters/py-cjkcodecs
 korean/pycodec||2003-07-20|is replaced by converters/py-cjkcodecs
 devel/jakarta-ant|devel/apache-ant|2003-07-21|project renamed
 games/newkind||2003-07-22|project abandoned
 print/acroread4|print/acroread5|2003-07-24|security vulnerability
 print/acroread-commfont|print/acroread5-commfont|2003-07-24|security vulnerability
 japanese/acroread-jpnfont|japanese/acroread5-jpnfont|2003-07-24|security vulnerability
 korean/acroread-korfont|korean/acroread5-korfont|2003-07-24|security vulnerability
 chinese/acroread-chsfont|chinese/acroread5-chsfont|2003-07-24|security vulnerability
 chinese/acroread-chtfont|chinese/acroread5-chtfont|2003-07-24|security vulnerability
 x11-wm/xfwm4|x11-wm/xfce4-wm|2003-07-27|rename it to be consistent with other xfce4 ports
 misc/shc||2003-07-30|broken for nearly a year
 mail/icqmail||2003-07-30|port no longer works, and is no longer developed
 games/bnetd||2003-07-30|project was abandoned for legal reasons
 devel/gnome-devel||2003-07-30|no longer needed after GNOME 1.4 removal
 devel/gnome2-devel||2003-07-30|no longer needed after GNOME 1.4 removal
 x11-toolkits/Motif-dummy||2003-07-31|dummy port is no longer used
 korean/netdic||2003-08-05|not functional and not maintained anymore
 misc/gnomeutils2|deskutils/gnomeutils2|2003-08-06|repo move to a better category
 misc/gucharmap|deskutils/gucharmap|2003-08-06|repo move to a better category
 net/cphone||2003-08-06|port was marked broken for 3 months with no fix submitted
 devel/crystal||2003-08-06|port was marked broken for 3 months with no fix submitted
 net/cvsupit||2003-08-06|port was marked broken for 3 months with no fix submitted
 www/encompass||2003-08-06|port was marked broken for 3 months with no fix submitted
 news/glitter||2003-08-06|port was marked broken for 3 months with no fix submitted
 x11-toolkits/iv||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/jtex209-both||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/jtex209-ascii||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/jtex209-ntt||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/sjxa||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/skk-elisp||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/vfghostscript||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/vfghostscript5||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/vfghostscript55||2003-08-06|port was marked broken for 3 months with no fix submitted
 japanese/xnetmaj||2003-08-06|port was marked broken for 3 months with no fix submitted
 devel/kelp||2003-08-06|port was marked broken for 3 months with no fix submitted
 korean/ftghostscript5||2003-08-06|port was marked broken for 3 months with no fix submitted
 korean/ghostscript55httf||2003-08-06|port was marked broken for 3 months with no fix submitted
 korean/htexp||2003-08-06|port was marked broken for 3 months with no fix submitted
 textproc/no-ispell||2003-08-06|port was marked broken for 3 months with no fix submitted
 net/opengatekeeper||2003-08-06|port was marked broken for 3 months with no fix submitted
 net/openh323proxy||2003-08-06|port was marked broken for 3 months with no fix submitted
 security/p5-Authen-Krb4||2003-08-06|port was marked broken for 3 months with no fix submitted
 x11-toolkits/p5-GnomeApplet||2003-08-06|port was marked broken for 3 months with no fix submitted
 lang/ruby|lang/ruby16|2003-08-07|renamed
 lang/ruby-devel|lang/ruby18|2003-08-07|renamed
 lang/ruby_r|lang/ruby16_r|2003-08-07|renamed
 lang/ruby_r-devel|lang/ruby18_r|2003-08-07|renamed
 lang/ruby_static|lang/ruby16_static|2003-08-07|renamed
 lang/ruby_static-devel|lang/ruby18_static|2003-08-07|renamed
 x11-wm/metacity-setup||2003-08-07|distfiles have disappeared and functionality exists in x11-wm/metacity
 biology/p5-bioperl-devel|biology/p5-bioperl|2003-08-07|port was marked broken for 3 months with no fix submitted
 cad/pisces||2003-08-07|port was marked broken for 3 months with no fix submitted
 cad/sis||2003-08-07|port was marked broken for 3 months with no fix submitted
 chinese/dia||2003-08-07|port was marked broken for 3 months with no fix submitted
 chinese/mozilla-tclp||2003-08-07|port was marked broken for 3 months with no fix submitted
 devel/uds||2003-08-07|port was marked broken for 3 months with no fix submitted
 devel/py-htmlkit||2003-08-07|port was marked broken for 3 months with no fix submitted
 devel/sdcc||2003-08-07|port was marked broken for 3 months with no fix submitted
 devel/ptl||2003-08-07|port was marked broken for 3 months with no fix submitted
 devel/silc-toolkit||2003-08-07|port was marked broken for 3 months with no fix submitted
 lang/pnet||2003-08-07|port was marked broken for 3 months with no fix submitted
 lang/wxbasic||2003-08-07|port was marked broken for 3 months with no fix submitted
 math/siag||2003-08-07|port was marked broken for 3 months with no fix submitted
 net/samba-tng||2003-08-07|port was marked broken for 3 months with no fix submitted
 print/xpp||2003-08-07|port was marked broken for 3 months with no fix submitted
 www/viewml||2003-08-07|port was marked broken for 3 months with no fix submitted
 x11/wscan||2003-08-07|port was marked broken for 3 months with no fix submitted
 x11-toolkits/ruby-fltk||2003-08-07|port was marked broken for 3 months with no fix submitted
 x11-wm/scwm||2003-08-07|port was marked broken for 3 months with no fix submitted
 net/ruby-romp||2003-08-08|discontinued
 audio/ruby-qt2sound||2003-08-09|obsolete
 graphics/ruby-qt2gl||2003-08-09|obsolete
 textproc/ruby-qt2xml||2003-08-09|obsolete
 x11-toolkits/ruby-qt2||2003-08-09|obsolete
 x11-toolkits/ruby-qt2canvas||2003-08-09|obsolete
 x11-toolkits/ruby-qt2iconview||2003-08-09|obsolete
 x11-toolkits/ruby-qt2table||2003-08-09|obsolete
 x11-wm/toolbox||2003-08-09|superseded by bbconf
 devel/p5-DateTime-LeapSecond|devel/p5-DateTime|2003-08-09|integrated into devel/p5-DateTime
 deskutils/bulb||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 ftp/gtm||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 net/gnomicu||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 palm/gnomepilot||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 palm/gnomepilot-conduits||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 sysutils/bubblemon||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 sysutils/battstat-applet||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11/gbackground||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11/gnoclip||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11/gvid||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11/libpanel||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11-fm/file_applet_menu||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 x11-toolkits/panel--||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 mail/flink||2003-08-12|removed as part of GNOME 1.4 desktop phase out
 net/openldap20|net/openldap20-server|2003-08-13|split into -client and -server
 net/openldap21|net/openldap21-server|2003-08-13|split into -client and -server
 net/openldap22|net/openldap22-server|2003-08-13|split into -client and -server
 x11-toolkits/gtk-industrial-theme|x11-toolkits/gnome-themes-extras|2003-08-14|gtk-industrial-theme is now included with gnome-themes-extras
 devel/gnomedebug||2003-08-17|remove stale, broken port
 devel/gide|devel/anjuta|2003-08-17|gide was superceded by anjuta
 graphics/gd2|graphics/gd|2003-08-19|Cleanup gd-related ports
 graphics/gd-nox11|graphics/gd|2003-08-19|Cleanup gd-related ports
 graphics/p5-GD2|graphics/p5-GD|2003-08-19|Cleanup gd-related ports
 mail/sonicmail||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 mail/gbiff||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 x11/gnomeres_applet||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 x11/finder||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 x11-clocks/zclock||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 x11/stockticker_applet||2003-08-19|removed as part of GNOME 1.4 desktop phase out
 net/ekg|polish/ekg|2003-08-19|moved to new polish category
 net/gnugadu|polish/gnugadu|2003-08-19|moved to new polish category
 misc/pl-sms|polish/sms|2003-08-19|moved to new polish category
 misc/kde3-i18n-pl|polish/kde3-i18n|2003-08-19|moved to new polish category
 misc/koffice-i18n-pl|polish/koffice-i18n|2003-08-19|moved to new polish category
 textproc/pl-aspell|polish/aspell|2003-08-19|moved to new polish category
 www/bmsync||2003-08-19|obsolete
 shells/tcsh||2003-08-21|removed, already in base system, not really maintained
 x11/ruby-panel-applet||2003-08-22|GNOME 1.4 desktop is gone
 emulators/truereality||2003-08-25|Lack of developement in recent years
 www/bacon||2003-08-26|removed as unmaintained for two years
 mail/mailfilter||2003-08-26|removed as unmaintained for two years
 security/py-amkCrypto||2003-08-27|replaced by security/py-pycrypto
 devel/libdjbdns|dns/libdjbdns|2003-09-05|moved to new dns category
 devel/p5-POE-Component-Client-DNS|dns/p5-POE-Component-Client-DNS|2003-09-05|moved to new dns category
 net/adns|dns/adns|2003-09-05|moved to new dns category
 net/bind8|dns/bind8|2003-09-05|moved to new dns category
 net/bind84|dns/bind84|2003-09-05|moved to new dns category
 net/bind9|dns/bind9|2003-09-05|moved to new dns category
 net/bind9-dlz|dns/bind9-dlz|2003-09-05|moved to new dns category
 net/ddclient|dns/ddclient|2003-09-05|moved to new dns category
 net/ddup|dns/ddup|2003-09-05|moved to new dns category
 net/dhid|dns/dhid|2003-09-05|moved to new dns category
 net/dhisd|dns/dhisd|2003-09-05|moved to new dns category
 net/djbdns|dns/djbdns|2003-09-05|moved to new dns category
 net/dlint|dns/dlint|2003-09-05|moved to new dns category
 net/dnrd|dns/dnrd|2003-09-05|moved to new dns category
 net/dns_balance|dns/dns_balance|2003-09-05|moved to new dns category
 net/dnsmasq|dns/dnsmasq|2003-09-05|moved to new dns category
 net/dnssecwalker|dns/dnssecwalker|2003-09-05|moved to new dns category
 net/dnstop|dns/dnstop|2003-09-05|moved to new dns category
 net/dnstracer|dns/dnstracer|2003-09-05|moved to new dns category
 net/dnsutl|dns/dnsutl|2003-09-05|moved to new dns category
 net/dnswalk|dns/dnswalk|2003-09-05|moved to new dns category
 net/domtools|dns/domtools|2003-09-05|moved to new dns category
 net/ez-ipupdate|dns/ez-ipupdate|2003-09-05|moved to new dns category
 net/firedns|dns/firedns|2003-09-05|moved to new dns category
 net/ghtool|dns/ghtool|2003-09-05|moved to new dns category
 net/h2n|dns/h2n|2003-09-05|moved to new dns category
 net/hesiod|dns/hesiod|2003-09-05|moved to new dns category
 net/host|dns/host|2003-09-05|moved to new dns category
 net/idnkit|dns/idnkit|2003-09-05|moved to new dns category
 net/ipcheck|dns/ipcheck|2003-09-05|moved to new dns category
 net/maradns|dns/maradns|2003-09-05|moved to new dns category
 net/mdnsd|dns/mdnsd|2003-09-05|moved to new dns category
 net/mydns|dns/mydns|2003-09-05|moved to new dns category
 net/noip|dns/noip|2003-09-05|moved to new dns category
 net/nsd|dns/nsd|2003-09-05|moved to new dns category
 net/nslint|dns/nslint|2003-09-05|moved to new dns category
 net/nsping|dns/nsping|2003-09-05|moved to new dns category
 net/odsclient|dns/odsclient|2003-09-05|moved to new dns category
 net/p5-BIND-Conf_Parser|dns/p5-BIND-Conf_Parser|2003-09-05|moved to new dns category
 net/p5-DNS-Config|dns/p5-DNS-Config|2003-09-05|moved to new dns category
 net/p5-DNS-Zone|dns/p5-DNS-Zone|2003-09-05|moved to new dns category
 net/p5-Net-DNS|dns/p5-Net-DNS|2003-09-05|moved to new dns category
 net/p5-Net-DNS-SEC|dns/p5-Net-DNS-SEC|2003-09-05|moved to new dns category
 net/p5-Net-DNS-ZoneFile|dns/p5-Net-DNS-ZoneFile|2003-09-05|moved to new dns category
 net/p5-Tie-DNS|dns/p5-Tie-DNS|2003-09-05|moved to new dns category
 net/pdnsd|dns/pdnsd|2003-09-05|moved to new dns category
 net/posadis|dns/posadis|2003-09-05|moved to new dns category
 net/powerdns|dns/powerdns|2003-09-05|moved to new dns category
 net/py-adns|dns/py-adns|2003-09-05|moved to new dns category
 net/py-dns|dns/py-dns|2003-09-05|moved to new dns category
 net/sleuth|dns/sleuth|2003-09-05|moved to new dns category
 net/staticcharge|dns/staticcharge|2003-09-05|moved to new dns category
 net/totd|dns/totd|2003-09-05|moved to new dns category
 net/walker|dns/walker|2003-09-05|moved to new dns category
 net/gnomemeeting2|net/gnomemeeting|2003-09-07|no need to keep two versions in ports tree
 irc/ircproxy-freebsd-port|irc/ircproxy|2003-09-08|fix directory name
 audio/soribada||2003-09-09|project closed
 devel/bonobo-activation|devel/libbonobo|2003-09-18|merged into libbonobo
 x11-fonts/fontilus|sysutils/gnomecontrolcenter2|2003-09-18|merged into gnomecontrolcenter2
 misc/stickynotes_applet|x11/gnomeapplets2|2003-09-18|merged into gnomeapplets2
 x11-toolkits/gtk-thinice-engine|x11-toolkits/gnome-themes|2003-09-18|merged into gnome-themes
 korean/qt31|x11-toolkits/qt32|2003-09-19|no need to patch in qt32
 net/zebra-pj|net/quagga|2003-09-28|renamed
 japanese/tcsh-nls-asuka||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-ayanami||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-generic||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-koshiki||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-merril||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-miyakonjo||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-multi||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-rishu||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-roomi||2003-09-28|Port was broken and out of date
 japanese/tcsh-nls-ruri2||2003-09-28|Port was broken and out of date
 mail/exim-ldap||2003-09-29|Depends on ancient OpenLDAP, which should be retired
 editors/wordperfect||2003-09-29|obsolete, sources pulled from the internet
 sysutils/arson||2003-09-30|unfetchable, maintainer request to remove
 www/mozilla-embedded||2003-10-01|was seldom used and broken
 www/mozilla-embedded-devel||2003-10-01|was seldom used and broken
 net/6to4|net/hf6to4|2003-10-04|Replaced by net/hf6to4
 security/rsaref||2003-10-04|Port is no longer useful
 sysytils/clean_|sysutils/clean|2003-11-15|Reinstated clean
 graphics/Mesa5||2003-10-06|Dupe port, see graphics/mesagl
 math/drgenius|math/drgeo|2003-10-06|Move drgenius to drgeo
 devel/asm2html||2003-10-07|Dupe port, see textproc/asm2html
 www/chimera2||2003-10-18|Development discontinued, port no longer useful
 net/silc-doc||2003-10-25|Documentation is installed by silc-client now
 astro/x3arth||2003-10-26|FTP layout changed, port no longer works
 graphics/xmms-gforce||2003-10-27|Project disappeared, sources no longer available
 mail/smapi|news/husky-smapi|2003-10-29|Superseded by news/husky-smapi
 devel/ruby-yaml||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 net/ruby-drb||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 net/ruby-gserver||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 net/ruby-soap||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 net/ruby-xmlrpc||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 security/ruby-openssl||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 sysutils/ruby-devel-logger||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 textproc/ruby-rexml||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 www/ruby-webrick||2003-10-31|integrated into ruby18 and ruby16-shim-ruby18
 editors/AbiWord|editors/AbiWord2|2003-10-31|2.0 is the new stable release
 www/adzapper||2003-11-03|Development is dead, doesn't work with Python2
 lang/jgnat||2003-11-03|Broken and not supported by ACT
 lang/jgnat-doc-html||2003-11-03|Broken and not supported by ACT
 lang/jgnat-doc-info||2003-11-03|Broken and not supported by ACT
 lang/jgnat-doc-ps||2003-11-03|Broken and not supported by ACT
 lang/jgnat-doc-txt||2003-11-03|Broken and not supported by ACT
 devel/amulet||2003-11-03|Development stopped in 1998; see OpenAmulet instead
 german/cheapcall||2003-11-03|Mastersite disappeared, author no longer available
 news/pan|news/pan2|2003-11-03|Stable release can be found in news/pan2
 misc/solfege|audio/solfege|2003-11-05|better category
 print/pktrace|print/mftrace|2003-11-05|program renamed
 databases/mysql-jdbc-mm|databases/mysql-connector-java|2003-11-05|renamed
 sysutils/prune|sysutils/fileprune|2003-11-06|renamed because of conflict with graphviz
 graphics/Mesa3|graphics/libglut|2003-11-06|split into graphics/mesagl and graphics/libglut
 japanese/openoffice|japanese/openoffice-1.0|2003-11-07|renamed
 japanese/openoffice-devel|japanese/openoffice-1.1|2003-11-07|renamed
 editors/openoffice|editors/openoffice-1.0|2003-11-07|renamed
 editors/openoffice-devel|editors/openoffice-1.1|2003-11-07|renamed
 editors/openoffice-ar|editors/openoffice-1.0-ar|2003-11-07|renamed
 editors/openoffice-dk|editors/openoffice-1.0-dk|2003-11-07|renamed
 editors/openoffice-es|editors/openoffice-1.0-es|2003-11-07|renamed
 editors/openoffice-gr|editors/openoffice-1.0-gr|2003-11-07|renamed
 editors/openoffice-it|editors/openoffice-1.0-it|2003-11-07|renamed
 editors/openoffice-nl|editors/openoffice-1.0-nl|2003-11-07|renamed
 editors/openoffice-se|editors/openoffice-1.0-se|2003-11-07|renamed
 editors/openoffice-tr|editors/openoffice-1.0-tr|2003-11-07|renamed
 chinese/openoffice-zh_CN|chinese/openoffice-1.0-zh_CN|2003-11-07|renamed
 chinese/openoffice-zh_TW|chinese/openoffice-1.0-zh_TW|2003-11-07|renamed
 french/openoffice|french/openoffice-1.0|2003-11-07|renamed
 german/openoffice|german/openoffice-1.0|2003-11-07|renamed
 korean/openoffice|korean/openoffice-1.0|2003-11-07|renamed
 polish/openoffice|polish/openoffice-1.0|2003-11-07|renamed
 portuguese/openoffice|portuguese/openoffice-1.0|2003-11-07|renamed
 russian/openoffice|russian/openoffice-1.0|2003-11-07|renamed
 chinese/chitex||2003-11-07|port was broken for >3 months with no fix submitted
 comms/bayonne||2003-11-07|port was broken for >3 months with no fix submitted
 emulators/xpinmame||2003-11-07|port was broken for >3 months with no fix submitted
 french/spip||2003-11-07|port was broken for >3 months with no fix submitted
 ftp/moxftp||2003-11-07|port was broken for >3 months with no fix submitted
 games/rollemup||2003-11-07|port was broken for >3 months with no fix submitted
 games/xpuyo||2003-11-07|port was broken for >3 months with no fix submitted
 graphics/imlib3d||2003-11-07|port was broken for >3 months with no fix submitted
 graphics/vterrain-sdk||2003-11-07|port was broken for >3 months with no fix submitted
 graphics/vterrain-apps||2003-11-07|port was broken for >3 months with no fix submitted
 korean/hlatex-mffonts-wansung||2003-11-07|port was broken for >3 months with no fix submitted
 korean/imhangul_status_applet||2003-11-07|port was broken for >3 months with no fix submitted
 lang/ETHOberonV4||2003-11-07|port was broken for >3 months with no fix submitted
 multimedia/xine_d4d_plugin||2003-11-07|port was broken for >3 months with no fix submitted
 multimedia/xine_d5d_plugin||2003-11-07|port was broken for >3 months with no fix submitted
 print/pdflib4||2003-11-07|port was broken for >3 months with no fix submitted
 www/beonex||2003-11-07|port was broken for >3 months with no fix submitted
 www/gn||2003-11-07|port was broken for >3 months with no fix submitted
 x11-toolkits/fox-xunicode||2003-11-07|port was broken for >3 months with no fix submitted
 x11/twin||2003-11-07|port was broken for >3 months with no fix submitted
 cad/felt|science/felt|2003-11-08|moved to science category
 cad/kaskade|math/kaskade|2003-11-08|moved to math category
 misc/icemc||2003-11-08|author no longer develops program, distfile gone
 editors/openoffice-1.1-cz|editors/openoffice-1.1-cs|2003-11-08|Czech language ISO code is cs
 editors/openoffice-1.1-sl|editors/openoffice-1.1-sk|2003-11-08|Slovak language ISO code is sk
 security/pgp5||2003-11-08|Software is outdated
 x11-toolkits/wxgtk-devel|x11-toolkits/wxgtk|2003-11-10|renamed
 net/lmule||2003-11-10|project has been abadoned in favor of net/xmule
 net/kxicq-devel||2003-11-13|unmaintained, better KDE ICQ clients available
 x11-fonts/ae_fonts_mono|arabic/ae_fonts_mono|2003-11-15|Moved to new arabic category
 x11-fonts/ae_fonts_ttf|arabic/ae_fonts_ttf|2003-11-15|Moved to new arabic category
 x11-fonts/khotot|arabic/khotot|2003-11-15|Moved to new arabic category
 x11-fonts/kacst_fonts|arabic/kacst_fonts|2003-11-15|Moved to new arabic category
 misc/kde3-i18n-ar|arabic/kde3-i18n|2003-11-15|Moved to new arabic category
 misc/koffice-i18n-ar|arabic/koffice-i18n|2003-11-15|Moved to new arabic category
 net/geta|dns/geta|2003-11-16|moved to new dns category
 devel/arm-rtems-gcj|devel/arm-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/i386-rtems-gcj|devel/i386-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/m68k-rtems-gcj|devel/m68k-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/mips-rtems-gcj|devel/mips-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/powerpc-rtems-gcj|devel/powerpc-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/sh-rtems-gcj|devel/sh-rtems-gcc|2003-11-18|Now included in the gcc port
 devel/sparc-rtems-gcj|devel/sparc-rtems-gcc|2003-11-18|Now included in the gcc port
 www/netraider||2003-11-20|Mastersite gone for 2 years, was listed as alpha quality
 security/whisker|security/nikto|2003-11-20|Discontinued by author, who recommends nikto
 sysutils/medusa||2003-11-27|Obsolete, and broken on 64-bit platforms
 databases/postgresql7-client|databases/postgresql-client|2003-12-04|Duplicate after postgresql update
 cad/metis-edf|math/metis-edf|2003-12-09|moved to math category
 textproc/ruby-rdoc||2003-12-15|integrated into ruby18 and ruby16-shim-ruby18
 mail/mailscanner|mail/MailScanner|2003-12-16|renamed port to MailScanner
 net/py-soap||2003-12-16|author no longer distributes the module
 deskutils/xfce4-notes|deskutils/xfce4-notes-plugin|2003-12-20|renamed
 devel/sip||2003-12-27|Integrated into py-sip
 java/orion||2003-12-29|Duplicate of www/orion
 www/p5-HTML-MagicTemplate|textproc/p5-Text-MagicTemplate|2003-12-30|Integrated into Text::MagicTemplate
 games/steam|games/linux-steam|2004-01-02|Port renamed
 x11/gtk-smooth-engine|x11-toolkits/gtk-smooth-engine|2004-01-03|Re-import into correct category
 www/gnujsp||2004-01-05|Project abandoned, contain security compromise
 irc/irssi+perl|irc/irssi|2004-01-05|Main irssi port has Perl support
 devel/simpleparse|devel/py-simpleparse|2004-01-06|readd as py-simpleparse
 devel/anjuta-devel|devel/anjuta|2004-01-07|moved to devel/anjuta as new stable release
 x11-toolkits/guile-gobject||2004-01-07|Broken for a while, with no new versions
 devel/glade||2004-01-07|Superseded by devel/glade2
 devel/p5-Glade-Perl||2004-01-07|No longer works under new glade2
 chinese/abiword||2004-01-07|Patches were no longer available, was unmaintained
 textproc/xhtml-1.1|textproc/xhtml-11|2004-01-07|Renamed to fit naming convention
 textproc/rtf2htm||2004-01-09|renamed to unrtf, which already exists
 net/everybuddy|net/ayttm|2004-01-09|renamed port to ayttm
 sysutils/xw||2004-01-10|Project dead and disappeared
 net/papaya-plugins||2004-01-10|Integrated in net/papaya
 lang/fpl||2004-01-10|Distfiles and maintainer dispappeared
 lang/ghc6|lang/ghc|2004-01-15|Make 6.x default version
 net/nttcp|benchmarks/nttcp|2004-01-16|Moved to right category
 net/ttcp|benchmarks/ttcp|2004-01-16|Moved to right category
 editors/ooodict-hu_HU|hungarian/ooodict|2004-01-16|Moved to right category
 deskutils/mrproject|deskutils/planner|2004-01-16|Project renamed
 deskutils/libmrproject|deskutils/planner|2004-01-16|Project renamed
 net/isc-dhcp3||2004-01-18|Split in four partial slave ports
 www/mozilla-headers||2004-01-18|Headers are now installed as part of the main mozilla port
 www/mozilla-headers-devel||2004-01-18|Headers are now installed as part of the main mozilla port
 mail/MailScanner|mail/mailscanner|2004-01-18|renamed to lowercase directory name
 mail/MailScanner-devel|mail/mailscanner-devel|2004-01-18|renamed to lowercase directory name
 misc/sh-utils|sysutils/coreutils|2004-01-21|Merged into sysutils/coreutils port
 sysutils/fileutils|sysutils/coreutils|2004-01-21|Merged into sysutils/coreutils port
 textproc/textutils|sysutils/coreutils|2004-01-21|Merged into sysutils/coreutils port
 x11-toolkits/at-spi|accessibility/at-spi|2004-01-22|Category change
 devel/atk|accessibility/atk|2004-01-22|Category change
 editors/dasher|accessibility/dasher|2004-01-22|Category change
 x11-toolkits/gail|accessibility/gail|2004-01-22|Category change
 x11/gnomemag|accessibility/gnomemag|2004-01-22|Category change
 x11/gnopernicus|accessibility/gnopernicus|2004-01-22|Category change
 sysutils/gok|accessibility/gok|2004-01-22|Category change
 audio/gnomespeech|accessibility/gnomespeech|2004-01-22|Category change
 deskutils/cbb|finance/cbb|2004-01-22|moved to finance category
 deskutils/gnofin|finance/gnofin|2004-01-22|moved to finance category
 deskutils/moneydance|finance/moneydance|2004-01-22|moved to finance category
 deskutils/xinvest|finance/xinvest|2004-01-22|moved to finance category
 devel/libstocks|finance/libstocks|2004-01-22|moved to finance category
 misc/emma|finance/emma|2004-01-22|moved to finance category
 misc/gnomepm|finance/gnomepm|2004-01-22|moved to finance category
 misc/p5-Finance-Currency-Convert|finance/p5-Finance-Currency-Convert|2004-01-22|moved to finance category
 misc/p5-Finance-Quote|finance/p5-Finance-Quote|2004-01-22|moved to finance category
 misc/p5-Finance-QuoteHist|finance/p5-Finance-QuoteHist|2004-01-22|moved to finance category
 misc/quantlib|finance/quantlib|2004-01-22|moved to finance category
 misc/wmstock|finance/wmstock|2004-01-22|moved to finance category
 misc/xquote|finance/xquote|2004-01-22|moved to finance category
 java/xalan-j|textproc/xalan-j|2004-01-22|moved to textproc category
 x11-toolkits/render|x11/renderext|2004-01-24|moved to x11 category
 x11-toolkits/xrender|x11/libXrender|2004-01-24|moved to x11 category
 net/py-rrdtool||2004-01-28|mastersite disappeared and functionality exists in net/py-rrdtool_lgpl
 graphics/sketch|graphics/skencil|2004-01-28|Project renamed
 devel/linux-atk|accessibility/linux-atk|2004-01-29|new category
 lang/ifc8||2004-01-31|should be updated in ifc
 net/forgate|net/4g8|2004-02-01|Project renamed
 multimedia/WMxmms||2004-02-01|Port broken for >2 months
 devel/clo++||2004-02-01|Port broken for >2 months
 audio/evilbar||2004-02-01|Port broken for >2 months
 net/platero||2004-02-01|Port broken for >2 months
 math/ruby-gsl||2004-02-01|Port broken for >2 months
 x11-fm/vide||2004-02-01|Port broken for >2 months
 devel/gettext-old|devel/gettext|2004-02-03|Switch to latest stable version of gettext
 x11/kgamma|graphics/kdegraphics3|2004-02-05|Kgamma is now a part of kdegraphics
 devel/libgtop||2004-02-06|Obsolete and no longer maintained
 devel/ruby-libgtop||2004-02-06|Obsolete and no longer maintained
 devel/p5-GTop||2004-02-06|Obsolete and no longer maintained
 www/p5-Apache-VMonitor||2004-02-06|Depends on obsolete libgtop
 deskutils/loserjabber|deskutils/logjam2|2004-02-07|Renamed to Logjam
 x11/wmbsdbatt|sysutils/wmbsdbatt|2004-02-09|Moved to more appropriate category
 converters/ktnef|deskutils/kdepim3|2004-02-09|ktnef is now included in kdepim
 lang/g95|lang/gfortran|2004-02-11|change to appropreate name
 www/mozilla-firebird|www/firefox|2004-02-11|Project changed names
 x11-wm/mosfet-liquid||2004-02-13|obsolete
 mail/mozilla-thunderbird|mail/thunderbird|2004-02-14|Name change to fit the project
 devel/linux-p4v|devel/p4v|2004-02-14|FreeBSD native version of port now available
 mail/p5-Mail-SpamAssassin-snapshot||2004-02-14|No longer needed
 lang/squeak2|lang/squeak3|2004-02-17|Outdated, obsolete and no longer needed
 www/mozilla-gtk2|www/mozilla|2004-02-17|GTK2 mozilla is now the default
 www/mozilla-devel-gtk2|www/mozilla-devel|2004-02-17|GTK2 mozilla is now the default
 games/myth2_demo||2004-02-21|Port broken for >6 months
 irc/ircatlite||2004-02-21|Software has not been developed in >4 years
 net/NeTraMet|net-mgmt/NeTraMet|2004-02-22|new category
 net/aggregate|net-mgmt/aggregate|2004-02-22|new category
 net/aguri|net-mgmt/aguri|2004-02-22|new category
 net/airport|net-mgmt/airport|2004-02-22|new category
 net/angst|net-mgmt/angst|2004-02-22|new category
 net/annextools|net-mgmt/annextools|2004-02-22|new category
 net/ap-utils|net-mgmt/ap-utils|2004-02-22|new category
 net/argus|net-mgmt/argus|2004-02-22|new category
 net/arpwatch|net-mgmt/arpwatch|2004-02-22|new category
 net/arts++|net-mgmt/arts++|2004-02-22|new category
 net/aspathtree|net-mgmt/aspathtree|2004-02-22|new category
 net/bandwidthd|net-mgmt/bandwidthd|2004-02-22|new category
 net/bgpq|net-mgmt/bgpq|2004-02-22|new category
 net/bpft|net-mgmt/bpft|2004-02-22|new category
 net/braa|net-mgmt/braa|2004-02-22|new category
 net/bsd-airtools|net-mgmt/bsd-airtools|2004-02-22|new category
 net/cdpd|net-mgmt/cdpd|2004-02-22|new category
 net/cdpr|net-mgmt/cdpr|2004-02-22|new category
 net/cfgstoragemk|net-mgmt/cfgstoragemk|2004-02-22|new category
 net/cflowd|net-mgmt/cflowd|2004-02-22|new category
 net/choparp|net-mgmt/choparp|2004-02-22|new category
 net/cidr|net-mgmt/cidr|2004-02-22|new category
 net/cisco_conf|net-mgmt/cisco_conf|2004-02-22|new category
 net/ciscoconf|net-mgmt/ciscoconf|2004-02-22|new category
 net/clog|net-mgmt/clog|2004-02-22|new category
 net/confregdecode|net-mgmt/confregdecode|2004-02-22|new category
 net/cricket|net-mgmt/cricket|2004-02-22|new category
 net/darkstat|net-mgmt/darkstat|2004-02-22|new category
 net/dhcpconf|net-mgmt/dhcpconf|2004-02-22|new category
 net/disco|net-mgmt/disco|2004-02-22|new category
 net/docsis|net-mgmt/docsis|2004-02-22|new category
 net/driftnet|net-mgmt/driftnet|2004-02-22|new category
 net/echolot|net-mgmt/echolot|2004-02-22|new category
 net/ehnt|net-mgmt/ehnt|2004-02-22|new category
 net/etherape|net-mgmt/etherape|2004-02-22|new category
 net/ettercap|net-mgmt/ettercap|2004-02-22|new category
 net/flow-extract|net-mgmt/flow-extract|2004-02-22|new category
 net/flow-tools|net-mgmt/flow-tools|2004-02-22|new category
 net/flowscan|net-mgmt/flowscan|2004-02-22|new category
 net/fprobe|net-mgmt/fprobe|2004-02-22|new category
 net/gps|net-mgmt/gps|2004-02-22|new category
 net/icmpmonitor|net-mgmt/icmpmonitor|2004-02-22|new category
 net/icmpquery|net-mgmt/icmpquery|2004-02-22|new category
 net/ifgraph|net-mgmt/ifgraph|2004-02-22|new category
 net/iftop|net-mgmt/iftop|2004-02-22|new category
 net/iog|net-mgmt/iog|2004-02-22|new category
 net/ipacctd|net-mgmt/ipacctd|2004-02-22|new category
 net/ipaudit|net-mgmt/ipaudit|2004-02-22|new category
 net/ipcad|net-mgmt/ipcad|2004-02-22|new category
 net/ipcalc|net-mgmt/ipcalc|2004-02-22|new category
 net/ipfm|net-mgmt/ipfm|2004-02-22|new category
 net/ipv6calc|net-mgmt/ipv6calc|2004-02-22|new category
 net/irrtoolset|net-mgmt/irrtoolset|2004-02-22|new category
 net/isic|net-mgmt/isic|2004-02-22|new category
 net/junipoll|net-mgmt/junipoll|2004-02-22|new category
 net/knowlan|net-mgmt/knowlan|2004-02-22|new category
 net/libsmi|net-mgmt/libsmi|2004-02-22|new category
 net/mbrowse|net-mgmt/mbrowse|2004-02-22|new category
 net/mrtg|net-mgmt/mrtg|2004-02-22|new category
 net/nagios-plugins|net-mgmt/nagios-plugins|2004-02-22|new category
 net/nagios|net-mgmt/nagios|2004-02-22|new category
 net/nat|net-mgmt/nat|2004-02-22|new category
 net/nbtscan|net-mgmt/nbtscan|2004-02-22|new category
 net/nefu|net-mgmt/nefu|2004-02-22|new category
 net/net-snmp-tkmib|net-mgmt/net-snmp-tkmib|2004-02-22|new category
 net/net-snmp|net-mgmt/net-snmp|2004-02-22|new category
 net/net-snmp4|net-mgmt/net-snmp4|2004-02-22|new category
 net/netams|net-mgmt/netams|2004-02-22|new category
 net/netmask|net-mgmt/netmask|2004-02-22|new category
 net/netqc|net-mgmt/netqc|2004-02-22|new category
 net/netsaint-plugins|net-mgmt/netsaint-plugins|2004-02-22|new category
 net/netsaint|net-mgmt/netsaint|2004-02-22|new category
 net/netspoc|net-mgmt/netspoc|2004-02-22|new category
 net/nitpicker|net-mgmt/nitpicker|2004-02-22|new category
 net/nocol|net-mgmt/nocol|2004-02-22|new category
 net/nrpe|net-mgmt/nrpe|2004-02-22|new category
 net/nrpep|net-mgmt/nrpep|2004-02-22|new category
 net/nsc|net-mgmt/nsc|2004-02-22|new category
 net/nsca|net-mgmt/nsca|2004-02-22|new category
 net/nstreams|net-mgmt/nstreams|2004-02-22|new category
 net/openvmps|net-mgmt/openvmps|2004-02-22|new category
 net/oproute|net-mgmt/oproute|2004-02-22|new category
 net/p0f|net-mgmt/p0f|2004-02-22|new category
 net/p5-Altoids|net-mgmt/p5-Altoids|2004-02-22|new category
 net/p5-Cflow|net-mgmt/p5-Cflow|2004-02-22|new category
 net/p5-JUNOScript|net-mgmt/p5-JUNOScript|2004-02-22|new category
 net/p5-Mon|net-mgmt/p5-Mon|2004-02-22|new category
 net/p5-Net-CIDR|net-mgmt/p5-Net-CIDR|2004-02-22|new category
 net/p5-Net-IP|net-mgmt/p5-Net-IP|2004-02-22|new category
 net/p5-Net-IPv4Addr|net-mgmt/p5-Net-IPv4Addr|2004-02-22|new category
 net/p5-Net-IPv6Addr|net-mgmt/p5-Net-IPv6Addr|2004-02-22|new category
 net/p5-Net-Netmask|net-mgmt/p5-Net-Netmask|2004-02-22|new category
 net/p5-Net-SNMP|net-mgmt/p5-Net-SNMP|2004-02-22|new category
 net/p5-Net-SNMP3|net-mgmt/p5-Net-SNMP3|2004-02-22|new category
 net/p5-NetAddr-IP|net-mgmt/p5-NetAddr-IP|2004-02-22|new category
 net/p5-SNMP-MIB-Compiler|net-mgmt/p5-SNMP-MIB-Compiler|2004-02-22|new category
 net/p5-SNMP-Util|net-mgmt/p5-SNMP-Util|2004-02-22|new category
 net/p5-SNMP|net-mgmt/p5-SNMP|2004-02-22|new category
 net/p5-SNMP_Session|net-mgmt/p5-SNMP_Session|2004-02-22|new category
 net/p5-Telnet-Cisco|net-mgmt/p5-Telnet-Cisco|2004-02-22|new category
 net/p5-Tie-NetAddr-IP|net-mgmt/p5-Tie-NetAddr-IP|2004-02-22|new category
 net/packit|net-mgmt/packit|2004-02-22|new category
 net/pancho|net-mgmt/pancho|2004-02-22|new category
 net/pixilate|net-mgmt/pixilate|2004-02-22|new category
 net/pmacct|net-mgmt/pmacct|2004-02-22|new category
 net/portmon|net-mgmt/portmon|2004-02-22|new category
 net/py-ipy|net-mgmt/py-ipy|2004-02-22|new category
 net/py-snmp|net-mgmt/py-snmp|2004-02-22|new category
 net/rancid|net-mgmt/rancid|2004-02-22|new category
 net/rate|net-mgmt/rate|2004-02-22|new category
 net/remarp|net-mgmt/remarp|2004-02-22|new category
 net/ruby-snmp|net-mgmt/ruby-snmp|2004-02-22|new category
 net/satellite|net-mgmt/satellite|2004-02-22|new category
 net/scdp|net-mgmt/scdp|2004-02-22|new category
 net/scli|net-mgmt/scli|2004-02-22|new category
 net/scotty3|net-mgmt/scotty3|2004-02-22|new category
 net/sendip|net-mgmt/sendip|2004-02-22|new category
 net/sing|net-mgmt/sing|2004-02-22|new category
 net/sipcalc|net-mgmt/sipcalc|2004-02-22|new category
 net/sting|net-mgmt/sting|2004-02-22|new category
 net/subcalc|net-mgmt/subcalc|2004-02-22|new category
 net/sysmon|net-mgmt/sysmon|2004-02-22|new category
 net/tas|net-mgmt/tas|2004-02-22|new category
 net/tcpreplay|net-mgmt/tcpreplay|2004-02-22|new category
 net/trafd|net-mgmt/trafd|2004-02-22|new category
 net/whatmask|net-mgmt/whatmask|2004-02-22|new category
 net/wide-dhcp|net-mgmt/wide-dhcp|2004-02-22|new category
 net/zabbix|net-mgmt/zabbix|2004-02-22|new category
 graphics/hdf|science/hdf|2004-02-25|moved to better fitting category
 graphics/hdf5|science/hdf5|2004-02-25|moved to better fitting category
 mail/vpopmail-stable|mail/vpopmail|2004-02-26|vpopmail is now stable
 security/geheimnis|misc/kdeutils3|2004-02-28|obsolete
 chinese/stardict2|textproc/stardict2|2004-02-29|better category
 chinese/stardict|textproc/stardict2|2004-02-29|newer version
 textproc/p5-XML-Filter-Base||2004-03-01|deleted from CPAN
 textproc/orchard-c||2004-03-01|removed (obsolete)
 textproc/p5-Orchard-Perl||2004-03-01|removed (obsolete)
 devel/p5-POE-Component-IKC-ReallySimple||2004-03-01|obsolete - deleted from CPAN
 devel/p5-POE-Session-Cascading||2004-03-01|obsolete - deleted from CPAN
 games/linux_nwndata|games/nwndata|2004-03-01|Data files are not Linux-specific
 games/linux_nwnclient|games/linux-nwnclient|2004-03-01|Misnamed
 sysutils/linux-e2fsprogs|sysutils/e2fsprogs|2004-03-01|Native version available
 sysutils/fsck_ext2fs|sysutils/e2fsprogs|2004-03-01|Better utility
 audio/audacity-devel|audio/audacity|2004-03-03|removed (obsolete)
 japanese/vfxdvi118||2004-03-04|removed (obsolate)
 japanese/vfxdvi240||2004-03-04|removed (obsolate)
 japanese/vfxdvi300||2004-03-04|removed (obsolate)
 japanese/vfxdvi360||2004-03-04|removed (obsolate)
 japanese/vfxdvi400||2004-03-04|removed (obsolate)
 japanese/vfxdvi600||2004-03-04|removed (obsolate)
 games/gcompris|games/gcompris2|2004-03-05|removed, obsoleted, successor is gcompris2
 devel/pear||2004-03-06|removed, obsolete
 graphics/filmgimp|graphics/cinepaint|2004-03-06|renamed
 sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author
 x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33
 mail/ksig|misc/ksig|2004-03-09|ksig is now a part of the kdeaddons ports
 mail/exim-old|mail/exim|2004-03-09|No security maintenance from author, successor is exim
 sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author
 textproc/dico|french/dico|2004-03-14|better category
 x11-fonts/Xft|x11-fonts/libXft|2004-03-16|port renamed
 devel/ulex|devel/ocaml-ulex|2004-03-19|port renamed
 textproc/yaxi|textproc/ocaml-yaxi|2004-03-19|port renamed
 devel/camomile|devel/ocaml-camomile|2004-03-19|port renamed
 archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed
 devel/imake|devel/imake-4|2004-03-19|removed, obsoleted by imake-4 long ago
 net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category
 multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better
 editors/emacs|editors/emacs19|2004-03-20|emacs 19.x moved to a non-default port location
 editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
 editors/openoffice-1.1-gr|editors/openoffice-1.1-el|2004-03-20|correct ISO code
 print/rubber|textproc/rubber|2004-03-22|remove duplicate port
 print/libgnomeprint20||2004-03-23|removed obsolete port
 x11-toolkits/libgnomeprintui20||2004-03-23|removed obsolete port
 textproc/whitespace.el||2004-03-24|removed obsolete port
 editors/openoffice-1.1-sl-SL|editors/openoffice-1.1-sl_SI|2004-03-25|correct ISO code
 www/webcpp|textproc/webcpp|2004-03-25|moved to textproc category
 editors/xemacs21|editors/xemacs|2004-03-27|removed old version of xemacs 21.x
 mail/mew-xemacs21|mail/mew|2004-03-28|removed old version of xemacs 21.x
 mail/mew2-xemacs21|mail/mew2|2004-03-28|removed old version of xemacs 21.x
 mail/mew3-xemacs21|mail/mew3|2004-03-28|removed old version of xemacs 21.x
 net/memcached|databases/memcached|2004-03-27|remove duplicate port
 japanese/emacs21-emcws|japanese/emacs-emcws|2004-03-29|emacs 21.x moved to default port location
 x11-wm/9menu|x11/9menu|2004-03-29|accurate category
 japanese/postgresql-man|japanese/postgresql73-man|2004-04-01|renamed
 textproc/no-aspell|textproc/nn-aspell|2004-04-01|renamed to textproc/nn-aspell
 www/zope-cmf13|www/zope-cmf|2004-04-01|old version no longer needed
 multimedia/acme|sysutils/gnomecontrolcenter2|2004-04-04|merged into gnomecontrolcenter2
 x11/gswitchit|x11/gnomeapplets2|2004-04-04|merged into gnomeapplets2
 devel/gnomevfs-extras|devel/gnomevfs2|2004-04-04|merged into gnomevfs2
 games/scummvm|emulators/scummvm|2004-04-06|new category
 ftp/wget+ipv6|ftp/wget|2004-04-06|removed, ftp/wget has this function
 misc/metatheme2||2004-04-09|removed obsolete port
 x11-fm/apotheke||2004-04-10|removed obsolete port
 devel/glg||2004-04-10|removed unfetchable port
 devel/py-orbit|devel/py-orbit2|2004-04-10|removed deprecated port
 devel/veepee||2004-04-10|removed deprecated port
 graphics/cybervrml97||2004-04-10|removed unfetchable port
 security/inflex||2004-04-10|removed deprecated port
 www/Mosaic||2004-04-10|removed broken port
 x11-servers/XttXF86srv-3DLabs||2004-04-10|removed broken port
 x11-servers/XttXF86srv-8514||2004-04-10|removed broken port
 x11-servers/XttXF86srv-AGX||2004-04-10|removed broken port
 x11-servers/XttXF86srv-I128||2004-04-10|removed broken port
 x11-servers/XttXF86srv-Mach32||2004-04-10|removed broken port
 x11-servers/XttXF86srv-Mach64||2004-04-10|removed broken port
 x11-servers/XttXF86srv-Mach8||2004-04-10|removed broken port
 x11-servers/XttXF86srv-Mono||2004-04-10|removed broken port
 x11-servers/XttXF86srv-P9000||2004-04-10|removed broken port
 x11-servers/XttXF86srv-S3||2004-04-10|removed broken port
 x11-servers/XttXF86srv-S3V||2004-04-10|removed broken port
 x11-servers/XttXF86srv-SVGA||2004-04-10|removed broken port
 x11-servers/XttXF86srv-VGA16||2004-04-10|removed broken port
 x11-servers/XttXF86srv-W32||2004-04-10|removed broken port
 x11-servers/XttXF86srv-common||2004-04-10|removed broken port
 x11-servers/XttXF86srv-xfs||2004-04-10|removed broken port
 emulators/scummvm|games/scummvm|2004-04-13|new category
 www/mod_jk2|www/mod_jk-apache2|2004-04-18|prefer mod_jk2 for mod_jk 2.x branch
 mail/smunge||2004-04-19|removed port depending on OpenLDAP 1.2
 net/eudc-emacs20||2004-04-19|removed port depending on OpenLDAP 1.2
 net/openldap12||2004-04-19|removed ancient port
 net/py-ldap1||2004-04-19|removed port depending on OpenLDAP 1.2
 www/web500gw||2004-04-19|removed port depending on OpenLDAP 1.2
 games/neverputt|games/neverball|2004-04-19|merged into neverball
 emulators/linux-ePSXe||2004-04-19|removed port with broken dependencies
 net/papaya||2004-04-19|removed broken port
 www/scoop||2004-04-19|removed port with broken dependencies
 math/R-letter|math/R-project|2004-04-20|renamed
 math/R-a4|math/R-project|2004-04-20|slave port removed
 irc/pure-xemacs-devel-mule|irc/pure-xemacs21-mule|2004-04-29|was for xemacs-21.4
 irc/irchat-pj-xemacs-devel-mule|irc/irchat-pj-xemacs21-mule|2004-04-29|was for xemacs-21.4
 devel/avrprog|devel/avrdude|2004-04-29|obsoleted by devel/avrdude
 math/R-project|math/R|2004-04-30|port renamed to match project name
 print/pfaedit|print/fontforge|2004-05-01|renamed by upgrading
 converters/cvs2svn|devel/cvs2svn|2004-05-01|corrected category
 net/py-shadow-bittorrent|net/py-bittornado|2004-05-01|project renamed
 net/py-shadow-bittorrent-core|net/py-bittornado-core|2004-05-01|project renamed
 net/openldap20-client|net/openldap21-client|2004-05-03|removed EOL version of OpenLDAP
 net/openldap20-server||2004-05-03|removed EOL version of OpenLDAP
 security/libgcrypt-devel|security/libgcrypt|2004-05-03|1.2.0 is now the new stable version
 security/newpg|security/gnupg-devel|2004-05-03|newpg replaced by gnupg-devel
 graphics/p5-GD1|graphics/p5-GD|2004-05-01|removed (obsolete)
 japanese/gd1|japanese/gd|2004-05-01|removed (obsolete)
 russian/gd|ukrainian/gd|2004-05-01|removed (obsolete)
 graphics/gd1|graphics/gd|2004-05-01|removed (obsolete)
 lang/pike75|lang/pike76|2004-05-06|finished repocopy
 net/coda_doc||2004-05-07|finished removing coda 4.x
 net/coda_intro||2004-05-07|finished removing coda 4.x
 devel/as80||2004-05-07|Abandoned software; consider an alternative like devel/asl
 devel/qt-designer||2004-05-07|Removed broken port
 devel/uisp|devel/avrdude|2004-05-07|Abandoned software
 dns/weedns_sc||2004-05-07|Incompatible with current server protocol
 lang/cel||2004-05-07|Abandoned software
 lang/crossgo32-f77||2004-05-07|Abandoned software
 mail/gmail||2004-05-07|Removed broken port
 misc/libh||2004-05-07|Removed broken port
 net/openreg||2004-05-07|Removed broken port
 net/hawk||2004-05-07|Removed broken port
 japanese/tgif2tex|print/tgif2tex|2004-05-09|renamed
 www/caudium-devel|www/caudium12|2004-05-11|development version temporarily retired
 lang/pike74|lang/pike76|2004-05-11|replaced by newer development version
 russian/xxkb|x11/xxkb|2004-05-12|better category
 databases/zpygresqlda||2004-05-14|depended on obsolete versions of Zope and Python
 lang/ruby-python||2004-05-14|obsolete now that there are so many Ruby libraries
 lang/tclX80|lang/tclX|2004-05-14|replaced by lang/tclX
 misc/libelysium||2004-05-14|ancient version of this software
 audio/traymp|audio/gmpc|2004-05-16|project renamed
 security/avmailgate||2004-05-18|removed due to licensing concerns
 databases/postgresql-client|databases/postgresql7|2004-05-25|Remove the -client port because of dependencies problem
 deskutils/logjam2|deskutils/logjam|2004-05-26|GTK2 logjam is now default
 devel/camlp4||2004-05-27|removed, no longer works, no longer developed
 audio/mpio-driver||2004-05-31|no longer needed with mpiosh 0.7.1
 x11-toolkits/buffy|x11-themes/buffy|2004-06-02|new category
 x11-toolkits/clean-theme-gtk|x11-themes/clean-theme-gtk|2004-06-02|new category
 x11-toolkits/colorstep|x11-themes/colorstep|2004-06-02|new category
 x11-toolkits/engradient|x11-themes/engradient|2004-06-02|new category
 x11-toolkits/geramik|x11-themes/geramik|2004-06-02|new category
 x11-toolkits/gnome-industrial-theme|x11-themes/gnome-industrial-theme|2004-06-02|new category
 x11-toolkits/gnome-look|x11-themes/gnome-look|2004-06-02|new category
 x11-toolkits/gnome-themes|x11-themes/gnome-themes|2004-06-02|new category
 x11-toolkits/gnome-themes-extras|x11-themes/gnome-themes-extras|2004-06-02|new category
 x11-toolkits/gtk-Mac2-theme|x11-themes/gtk-Mac2-theme|2004-06-02|new category
 x11-toolkits/gtk-aqualightblue-theme|x11-themes/gtk-aqualightblue-theme|2004-06-02|new category
 x11-toolkits/gtk-bluecurve-theme|x11-themes/gtk-bluecurve-theme|2004-06-02|new category
 x11-toolkits/gtk-cleanice-engine|x11-themes/gtk-cleanice-engine|2004-06-02|new category
 x11-toolkits/gtk-engines|x11-themes/gtk-engines|2004-06-02|new category
 x11-toolkits/gtk-engines-collection|x11-themes/gtk-engines-collection|2004-06-02|new category
 x11-toolkits/gtk-engines2|x11-themes/gtk-engines2|2004-06-02|new category
 x11-toolkits/gtk-flat-theme|x11-themes/gtk-flat-theme|2004-06-02|new category
 x11-toolkits/gtk-flat-theme2|x11-themes/gtk-flat-theme2|2004-06-02|new category
 x11-toolkits/gtk-industrial-theme|x11-themes/gtk-industrial-theme|2004-06-02|new category
 x11-toolkits/gtk-qn-x11-theme|x11-themes/gtk-qn-x11-theme|2004-06-02|new category
 x11-toolkits/gtk-qnxtheme|x11-themes/gtk-qnxtheme|2004-06-02|new category
 x11-toolkits/gtk-smooth-engine|x11-themes/gtk-smooth-engine|2004-06-02|new category
 x11-toolkits/gtk-xfce-engine|x11-themes/gtk-xfce-engine|2004-06-02|new category
 x11-toolkits/gtk-zenith-theme|x11-themes/gtk-zenith-theme|2004-06-02|new category
 x11-toolkits/icegradient|x11-themes/icegradient|2004-06-02|new category
 x11-toolkits/qt-bluecurve-theme|x11-themes/qt-bluecurve-theme|2004-06-02|new category
 x11-toolkits/thinice|x11-themes/thinice|2004-06-02|new category
 x11-toolkits/whistlerk|x11-themes/whistlerk|2004-06-02|new category
 x11-toolkits/xenophilia|x11-themes/xenophilia|2004-06-02|new category
 x11-toolkits/xenostep|x11-themes/xenostep|2004-06-02|new category
 x11-wm/aquaosk|x11-themes/aquaosk|2004-06-02|new category
 x11-wm/fvwm-themes|x11-themes/fvwm-themes|2004-06-02|new category
 x11-wm/kdeartwork3|x11-themes/kdeartwork3|2004-06-02|new category
 x11-wm/kwin_flatcurve|x11-themes/kwin_flatcurve|2004-06-02|new category
 x11-wm/mkultra|x11-themes/mkultra|2004-06-02|new category
 x11-wm/qinx|x11-themes/qinx|2004-06-02|new category
 x11-wm/qnxstyle|x11-themes/qnxstyle|2004-06-02|new category
 x11-wm/sapphire-themes|x11-themes/sapphire-themes|2004-06-02|new category
 x11-toolkits/gtk-qt-engine|x11-themes/gtk-qt-engine|2004-06-02|new category
 x11-toolkits/gtkbe|x11-themes/gtkbe|2004-06-02|new category
 x11-toolkits/gtkstep|x11-themes/gtkstep|2004-06-02|new category
 x11-toolkits/gtkstep-pastel|x11-themes/gtkstep-pastel|2004-06-02|new category
 sysutils/mkisofs|sysutils/cdrtools|2004-06-02|merged
 sysutils/mkisofs-devel|sysutils/cdrtools-devel|2004-06-02|merged
 lang/squeak3|lang/squeak|2004-06-03|New stable version
 net-mgmt/dhcpconf||2004-06-03|Obsolete and no longer maintained
 net/samba-devel|net/samba3|2004-06-07|considered stable
 chinese/mkisofs|sysutils/cdrtools-cjk|2004-06-07|replaced by a superset
 chinese/cdrtools|sysutils/cdrtools-cjk|2004-06-07|replaced by a superset
 devel/libltdl|devel/libltdl15|2004-06-08|autotools cleanup
 www/httperf|benchmarks/httperf|2004-06-10|moved to more accurate category
 japanese/xdvik-vflib-pk118|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pk240|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pk300|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pk360|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pk400|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pk600|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/xdvik-vflib-pkall|japanese/xdvik-vflib|2004-06-18|no longer maintained
 japanese/ptex-pkfonts118||2004-06-18|no longer maintained
 japanese/ptex-pkfonts240||2004-06-18|no longer maintained
 japanese/ptex-pkfonts300||2004-06-18|no longer maintained
 japanese/ptex-pkfonts360||2004-06-18|no longer maintained
 japanese/ptex-pkfonts400||2004-06-18|no longer maintained
 japanese/ptex-pkfonts600||2004-06-18|no longer maintained
 misc/gpt|misc/gpt31|2004-06-18|repocopy to preserve version 3.1 for misc/globus2
 textproc/p5-Search-OpenFTS|textproc/openfts|2004-06-19|duplicate of textproc/openfts
 devel/ORBacus||2004-06-20|port broken for >2 months
 devel/libcache||2004-06-20|port broken for >2 months
 devel/linguist||2004-06-20|port broken for >2 months
 textproc/p5-XML-Xerces||2004-06-20|port broken for >2 months
 textproc/p5-XML-Xerces-BagOfTricks||2004-06-20|depended on removed port textproc/p5-XML-Xerces
 audio/spiralsynthbaby||2004-06-20|port broken for >2 months
 x11-toolkits/xclass||2004-06-20|port broken for >2 months
 comms/xtt516||2004-06-20|depended on removed port x11-toolkits/xclass
 emulators/hfsplusutils||2004-06-20|port broken for >2 months
 www/orion||2004-06-20|port broken for >2 months
 lang/qc--||2004-06-20|port broken for >2 months
 print/libpdf++||2004-06-20|port broken for >2 months
 security/siphon||2004-06-20|port broken for >2 months
 chinese/dictd||2004-06-20|port broken for >2 months
 finance/moneydance||2004-06-20|port broken for >2 months
 x11-themes/mkultra||2004-06-20|port broken for >2 months
 lang/python15||2004-06-21|removed deprecated port
 lang/python20||2004-06-21|removed deprecated port
 converters/xunicode||2004-06-21|no longer maintained
 www/mozilla-devel-gtk1||2004-06-28|removed obsolete port
 security/drwebd|security/drweb|2004-06-29|functionality already in security/drweb
 www/drivel|deskutils/drivel|2004-06-30|moved to category deskutils
 devel/autoconf257||2004-07-01|autotools cleanup
 devel/automake17||2004-07-01|autotools cleanup
 devel/libtool14||2004-07-01|autotools cleanup
 math/libgmp-freebsd|math/libgmp4|2004-07-02|superseded by API compatible version
 devel/umbrello|devel/kdesdk3|2004-07-02|Umbrello was integrated into kdesdk package
 korean/mkisofs|sysutils/cdrtools-cjk|2004-07-02|superseded
 net/kopete|net/kdenetwork3|2004-07-02|kopete was integrated into the kdenetwork3 port
 www/p5-Flash-FLAP|www/p5-AMF-Perl|2004-07-04|renamed
 net/gnomenetwork|net/gnomenettool|2004-07-05|gnomenettool replaces the unmaintained gnomenetwork
 misc/cfe||2004-07-06|no longer exists
 devel/p5-WWW-Mechanize-FormFiller|www/p5-WWW-Mechanize-FormFiller|2004-07-09|moved to correct category (www)
 editors/moleskine||2004-07-09|project officially dead for last 1.5 years
 mail/sendmail-old|mail/sendmail811|2004-07-17|renamed
 lang/php4-dtc|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
 lang/php4-horde|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
 lang/php4-nms|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
 www/mod_php4-twig|www/mod_php4|2004-07-19|Useless with the new PHP modular infrastructure
 databases/php4-sybase|databases/php4-sybase_ct|2004-07-21|Switch to use the new working library
 databases/php5-sybase|databases/php5-sybase_ct|2004-07-21|Switch to use the new working library
 textproc/cocoon|www/cocoon|2004-07-22|Moved to better category www
 audio/mq3||2004-07-23|Obsolete QT2 Application
 devel/moonshine||2004-07-23|Obsolete QT2 Application
 devel/qtez||2004-07-23|Obsolete QT2 Application
 mail/liamail||2004-07-23|Obsolete QT2 Application
 x11-fonts/xfontselector||2004-07-23|Obsolete QT2 Application
 x11-wm/xwmm||2004-07-23|Obsolete QT2 Application
 japanese/qt23||2004-07-23|QT2 is obsolete
 x11-toolkits/qt2-static||2004-07-23|QT2 is obsolete
 x11-toolkits/qt23||2004-07-23|QT2 is obsolete
 java/eclipse-xsd|java/eclipse-emf|2004-07-25|merged
 emulators/freesci|games/freesci|2004-07-26|Moved to better category games
 net/zebra-devel|net/zebra|2004-07-27|The same as net/zebra for some time
 mail/pear-mailparse|mail/pecl-mailparse|2004-07-30|Renamed
 security/lcrzo|net/netwib|2004-08-01|The project has been renamed and port moved to better category
 security/lcrzoex|net-mgmt/netwox|2004-08-01|The project has been renamed and port moved to better category
 devel/autoconf|devel/autoconf253|2004-08-03|autotools cleanup
 devel/automake|devel/automake15|2004-08-03|autotools cleanup
 mail/balsa2|mail/balsa|2004-08-06|Balsa 2.x has been moved to the balsa port
 net/pdtpd|net/squall|2004-08-08|The project has been renamed
 sysutils/fastresolve|dns/fastresolve|2004-08-08|Move to the right category
 audio/p5-dapple|audio/p5-Net-DAAP-Client|2004-08-09|Module renamed
 audio/p5-Net-DAAP-Client-Auth||2004-08-09|Obsoleted
 x11-servers/XFree86-4-Server-snap|x11-servers/XFree86-4-Server|2004-08-09|Obsoleted by XFree86-4-Server update
 net/ntp-devel||2004-08-10|Cleanup, NTP development branch has been dormant for a long while.
 shells/bash3|shells/bash|2004-08-11|move latest stable version to unnumbered directory
 audio/songpring||2004-08-15|Obsolete, it has not been developed since 2000
 audio/mpt||2004-08-15|Obsolete, it has not been developed since 2000
 net/SSLtelnet||2004-08-15|Unfixed security vulnerabilities
 audio/mppdec|audio/musepack|2004-08-15|musepack is a newer version
 databases/tora||2004-08-15|Based on QT2 which is obsolete
 games/nethack33-qt||2004-08-15|Based on QT2 which is obsolete
 math/rcalc||2004-08-15|Stale version, many bugs
 korean/hlatexp||2004-08-15|Port was unfetchable
 korean/hlatexp-pkfonts1200||2004-08-15|Port was unfetchable
 korean/hlatexp-pkfonts300||2004-08-15|Port was unfetchable
 korean/hlatexp-pkfonts600||2004-08-15|Port was unfetchable
 misc/sword-modules||2004-08-17|Obsoleted
 print/tipa|print/latex-tipa|2004-08-18|Port renamed for better categorisation
 ftp/lukemftpd|ftp/tnftpd|2004-08-18|Vendor name change
 x11-toolkits/notif2|x11-themes/notif2|2004-08-20|Better category
 www/apache13-fp||2004-08-20|Obsolete and unfixed security vulnerabilities
 www/mod_csacek||2004-08-20|Obsolete and broken
 archivers/linux-unace||2004-08-20|Segfaults on startup
 misc/cheatah||2004-08-20|Abandoned by the upstream authors
 japanese/platex209-euc|japanese/platex209|2004-08-20|renamed
 japanese/platex209-jis|japanese/platex209|2004-08-20|renamed
 japanese/platex209-sjis|japanese/platex209|2004-08-20|renamed
 japanese/xdvik-vflib|japanese/xdvik|2004-08-20|renamed
 japanese/dvipsk-vflib|japanese/dvipsk|2004-08-20|no longer maintained
 emulators/vmware_xf4mod||2004-08-20|This module is now part of XFree86 as of 4.1.0
 misc/bibletime-doc||2004-08-27|Documentation has included in base port
 security/keyprint|security/opieprint|2004-08-28|newer version with a new name
 www/quanta|www/kdewebdev|2004-08-30|renamed
 net/kontact-plugins||2004-08-30|removed
 palm/kpilot|deskutils/kdepim3|2004-08-30|kpilot has been reintegrated into kdepim
 devel/calltree|devel/callgrind|2004-09-01|renamed by author
 sysutils/top||2004-09-02|No longer maintained
 sysutils/portindex||2004-09-13|Removed on maintainer's request
 russian/gaim|net/gaim|2004-10-12|Functionality merged into original Gaim
 graphics/py-magick||2004-10-12|Broken without view for a fix
 net/netatalk-devel|net/netatalk|2004-10-12|Netatalk port upgraded to 2.0.0
 textproc/p5-XML-RSS-Parser|textproc/p5-XML-RAI|2004-10-13|Module was integrated into XML-RAI package
 misc/kwordquiz|misc/kdeedu3|2004-10-13|kwordquiz was integrated into the kdeedu3 port
 audio/libvorbis-aotuv|audio/libvorbis|2004-10-13|The aoTuV enhancement has been merged into the mainstream
 graphics/kolourpaint|graphics/kdegraphics3|2004-10-13|kolourpaint was integrated into the kdegraphics3 port
 graphics/kimagemapeditor|www/kdewebdev|2004-10-13|kimagemapeditor was integrated into the kdewebdev port
 devel/automake18|devel/automake19|2004-10-15|automake18 replaced with automake19
 www/zope-cmftransforms|www/zope-portaltransforms|2004-10-16|renamed by authors
 dns/bind9-sdb-mysql||2004-10-17|No longer maintained
 www/phpnuke||2004-10-17|security vulnerabilities and no longer maintained
 misc/bookcase|misc/tellico|2004-10-17|renamed
 audio/net-rhythmbox|audio/rhythmbox|2004-10-20|broken and audio/rhythmbox has more features
 devel/ruby-gconf|devel/ruby-gconf2|2004-10-22|did not install
 devel/whups||2004-10-22|not compatible with latest version of Horde
 french/abispell-fr-FR||2004-10-22|did not work with AbiWord-2.0
 games/crafty-open-small||2004-10-23|failed to fetch
 games/fsgs||2004-10-23|removed for legal reasons
 games/hlserver-pvk||2004-10-23|current version no longer available
 games/hlserver-snow||2004-10-23|current version does not work with FreeBSD
 games/hlserver-svencoop||2004-10-23|current version does not work with FreeBSD
 games/hlserver-trainhunters||2004-10-23|current version no longer available
 games/utserver-asu||2004-10-23|checksum failure
 graphics/ruby-gdchart||2004-10-23|build failure
 hebrew/pine||2004-10-23|contained serious vulnerabilities
 mail/cyrus|cyrus-imapd22|2004-10-23|contained serious vulnerabilities
 archivers/alz2zip||2004-10-23|no longer maintained
 x11-wm/fbdesk|x11/fbdesk|2004-10-24|better category
 audio/streamtuner-live365|audio/streamtuner|2004-10-28|plugins rolled into main port
 audio/streamtuner-local|audio/streamtuner|2004-10-28|plugins rolled into main port
 audio/streamtuner-python|audio/streamtuner|2004-10-28|plugins rolled into main port
 audio/streamtuner-xiph|audio/streamtuner|2004-10-28|plugins rolled into main port
 www/p5-HTTPD-Tools|www/p5-HTTPD-User-Manage|2004-10-29|module was renamed
 irc/liece|irc/riece|2004-10-31|Upgrade to irc/riece
 irc/liece-dcc|irc/riece|2004-10-31|Integrated into irc/riece
 irc/liece-emacs20|irc/rieceemacs20|2004-10-31|Upgrade to irc/riece-emacs20
 japanese/ndtpd|japanese/ebnetd|2004-10-31|successor project
 net/dcgui|net/valknut|2004-10-31|renamed
 japanese/lookup-mule||2004-11-05|no longer supported
 emulators/linux-mupen64|emulators/mupen64|2004-11-08|replaced with native port
 math/fftpack|math/bihar|2004-11-08|more suitable name
 security/md5crk||2004-11-08|project shut down
 devel/p5-Filter-CBC|security/p5-Filter-CBC|2004-11-09|moved to security category
 devel/p5-POE-Component-Pcap|net/p5-POE-Component-Pcap|2004-11-09|moved to net category
 devel/p5-POE-Component-Client-Ping|net/p5-POE-Component-Client-Ping|2004-11-09|moved to net category
 devel/p5-POE-Component-DBIAgent|databases/p5-POE-Component-DBIAgent|2004-11-09|moved to databases category
 devel/p5-POE-Component-Client-POP3|mail/p5-POE-Component-Client-POP3|2004-11-09|moved to mail category
 devel/p5-POE-Component-Client-HTTP|www/p5-POE-Component-Client-HTTP|2004-11-09|moved to www category
 devel/p5-POE-Component-Client-UserAgent|www/p5-POE-Component-Client-UserAgent|2004-11-09|moved to www category
 www/galeon2|www/galeon|2004-11-09|renamed to galeon
 www/mozilla-gtk1||2004-11-09|obsoleted by gtk2 version
 devel/sdcc|lang/sdcc|2004-11-18|remove duplicate port
 devel/jude_take|devel/jude-community|2004-11-23|renamed by upstream
 chinese/linux-gtk||2004-11-27|deleted due to dependency being removed
 chinese/cle_base||2004-11-27|deleted due to security problem
 mail/xpbiff-youbin||2004-11-27|deleted due to dependency being removed
 mail/youbin||2004-11-27|deleted due to security problem
 japanese/sdic||2004-11-27|deleted due to dependency being removed
 japanese/edict-sdic||2004-11-27|deleted due to checksum failure
 devel/ruby-flex_rb||2004-11-27|deleted due to build failure
 japanese/linux_locale||2004-11-27|not needed with linux_base7 and later
 mail/postfix20|mail/postfix|2004-11-27|obsolete
 math/ruby-math3d||2004-11-27|deleted due to build failure
 misc/biblereader||2004-11-27|deleted due to fetch failure
 misc/grdb||2004-11-27|depended on GTK1, which is obsolete
 java/phpeclipse_phphelp|java/phpeclipse|2004-11-28|merged
 java/phpeclipse_sql|java/phpeclipse|2004-11-28|merged
 java/phpeclipse_tidy|java/phpeclipse|2004-11-28|merged
 java/jakarta-log4j|devel/log4j|2004-11-28|no longer part of the Jakarta project
 textproc/ruby-wordnet||2004-11-28|deleted due to build failure
 textproc/se-ispell|textproc/ispell|2004-11-28|use textproc/ispell with ISPELL_SE=yes instead
 textproc/tei-xsl-fo||2004-11-28|removed due to checksum failure
 textproc/tei-xsl-html||2004-11-28|removed due to checksum failure
 www/jonah||2004-11-28|did not run with horde2.x
 x11-fonts/mkfontalias||2004-11-28|master site disappeared
 games/quakeserver||2004-11-28|install and fetch problems
 picobsd/ssh-picobsd||2004-11-28|deleted due to build failure
 net/partysip||2004-11-28|deleted because due to link failure
 audio/mBox|audio/mbox|2004-11-29|renamed to mbox because mbox and mBox are duplicate ports
 graphics/digikamplugins|graphics/kipi-plugins|2004-12-01|merged into kipi-plugins
 mail/milter-sender||2004-12-02|removed on author's request
 editors/AbiWord2|editors/abiword|2004-12-04|renamed to abiword
 multimedia/avidemux||2004-12-09|no longer maintained by the author
 devel/arch|devel/tla|2004-12-09|removed obsolete version of arch
 japanese/estraier|textproc/estraier|2004-12-11|accurate category
 math/gnumeric2|math/gnumeric|2004-12-11|renamed to gnumeric
 chinese/gnumeric|math/gnumeric|2004-12-11|obsoleted by gtk2 version
 japanese/gnumeric|math/gnumeric|2004-12-11|obsoleted by gtk2 version
 devel/bison|devel/bison-devel|2004-12-11|finished repocopy and needs alpha version
 sysutils/bacula|sysutils/bacula-server|2004-12-12|split into client and server
 x11-toolkits/gtkextra--||2004-12-12|removed obsolete port
 games/gnomoku||2004-12-12|removed obsolete port
 net/gabber||2004-12-12|removed obsolete port
 x11-toolkits/gnome--||2004-12-12|removed obsolete port
 dns/dnssecwalker|dns/walker|2004-12-13|duplicate ports
 print/pxfonts||2004-12-19|already included in the teTeX distribution
 print/txfonts||2004-12-19|already included in the teTeX distribution
 audio/juk|multimedia/kdemultimedia3|2004-12-22|juk has been integrated into kdemultimedia3
 databases/sqlite|databases/sqlite2|2004-12-23|port renamed
 print/acroread5|print/acroread|2004-12-23|last Acrobat Reader port remaining
 graphics/gimp-devel|graphics/gimp|2004-12-24|GIMP 2.2 is now stable
 x11-toolkits/xtermcontrol|x11/xtermcontrol|2004-12-25|new category
 multimedia/gstreamer-player||2004-12-26|Unmaintained by developers
 www/horde2|www/horde|2004-12-26|Resurrect www/horde
 mail/imp3|mail/imp|2004-12-26|Resurrect mail/imp
 games/xblast-beta|games/xblast|2004-12-28|xblast is newest version now
 emulators/linux-zsnes||2004-12-30|feature-complete native version available
 net/tor|security/tor|2005-01-08|duplicate ports
 palm/rapip|palm/synce-kde|2005-01-08|renamed
 benchmarks/bytebench|benchmarks/unixbench|2005-01-08|revived under new name
 audio/trm|audio/libtunepimp|2005-01-09|trm is now part of libtunepimp
 java/kaffe-devel|java/kaffe|2005-01-10|merge kaffe-devel into kaffe
 audio/gqmpeg|audio/gqmpeg-devel|2005-01-12|finished repocopy
 graphics/libtheora|multimedia/libtheora|2005-01-13|finished repocopy
 www/bluefish-devel|www/bluefish|2005-01-13|devel port no long needed after update
 irc/xchat-micryption|irc/xchat-mircryption|2005-01-17|Fix port name typo
 www/turck-mmcache|www/eaccelerator|2005-01-19|project changed name
 sysutils/task|sysutils/sleuthkit|2005-01-19|broken, unmaintained, better alternative exists
 graphics/gthumb2|graphics/gthumb|2005-01-23|moved to non-versioned directory
 devel/bugbuddy2|devel/bugbuddy|2005-01-24|moved to non-versioned directory
 x11-toolkits/eel2|x11-toolkits/eel|2005-01-25|moved to non-versioned directory
 graphics/eog2|graphics/eog|2005-01-25|moved to non-versioned directory
 x11/gdm2|x11/gdm|2005-01-25|moved to non-versioned directory
 editors/gedit2|editors/gedit|2005-01-25|moved to non-versioned directory
 print/ggv2|print/ggv|2005-01-25|moved to non-versioned directory
 editors/ghex2|editors/ghex|2005-01-25|moved to non-versioned directory
 x11-fm/xfce4-fm-icons||2005-01-26|got obsolete by xfce 4.2 update
 misc/xfce4-panel-themes||2005-01-26|got obsolete by xfce 4.2 update
 x11-wm/xfce4-menueditor||2005-01-30|got obsolete since it is now included in xfce4-desktop
 databases/postgresql72||2005-01-30|removed, 7.2 branch is retired
 databases/postgresql73|databases/postgresql73-server|2005-01-30|port split into postgresql73-server and -client
 databases/postgresql7|databases/postgresql74-server|2005-01-30|port split into postgresql74-server and -client
 x11-themes/lila-xffm||2005-02-02|don't work with new xfce4
 x11-themes/lila-xfce4-panel||2005-02-02|don't work with new xfce4
 print/teTeX-latex2e||2005-02-06|obsolete by new teTeX-texmf
 emulators/qcl|science/qcl|2005-02-10|moved to better category
 security/rng_82802||2005-02-14|obsolete
 audio/xmms-arts||2005-02-18|port was broken or obsolete
 biology/spdbv||2005-02-18|port was broken or obsolete
 databases/mysql-gui||2005-02-18|port was broken or obsolete
 databases/ruby-sqlrelay||2005-02-18|port was broken or obsolete
 databases/ruby-dbd_sqlrelay||2005-02-18|port depended on removed port
 deskutils/multisync-evolution||2005-02-18|port was broken or obsolete
 devel/arm-aout-binutils||2005-02-18|port was broken or obsolete
 devel/cl-port-cmucl||2005-02-18|port was broken or obsolete
 devel/gdb52||2005-02-18|port was broken or obsolete
 finance/opale||2005-02-18|port was broken or obsolete
 ftp/ruby-curl||2005-02-18|port was broken or obsolete
 french/daCode||2005-02-18|port depended on removed port
 games/kpacman||2005-02-18|port was broken or obsolete
 graphics/ruby-libexif||2005-02-18|port was broken or obsolete
 japanese/postgresql||2005-02-18|port was broken or obsolete
 japanese/xemacs-devel-canna||2005-02-18|port was broken or obsolete
 korean/hlatex-wansung||2005-02-18|port was broken or obsolete
 korean/hlatex-psfonts-wansung||2005-02-18|port was broken or obsolete
 korean/nhppf||2005-02-18|port was broken or obsolete
 korean/mozilla-klp||2005-02-18|port was broken or obsolete
 lang/mlton||2005-02-18|port was broken or obsolete
 lang/ruby-ri||2005-02-18|port was broken or obsolete
 mail/aileron||2005-02-18|port was broken or obsolete
 mail/cyrus-imapd||2005-02-18|port was broken or obsolete
 mail/smtp-vilter||2005-02-18|port was broken or obsolete
 misc/Howto||2005-02-18|port was broken or obsolete
 net-mgmt/ruby-snmp||2005-02-18|port was broken or obsolete
 net/ruby-jabber4r||2005-02-18|port was broken or obsolete
 palm/syncmal||2005-02-18|port was broken or obsolete
 print/lilypond-devel||2005-02-18|port was broken or obsolete
 security/ruby-acl||2005-02-18|port was broken or obsolete
 shells/bash1||2005-02-18|port was broken or obsolete
 textproc/gutenbook||2005-02-18|port was broken or obsolete
 textproc/sgmltools||2005-02-18|port was broken or obsolete
 textproc/spell||2005-02-18|port was broken or obsolete
 www/grail||2005-02-18|port was broken or obsolete
 www/mod_php3||2005-02-18|port was broken or obsolete
 lang/php3||2005-02-18|port was broken or obsolete
 x11-themes/aquaosk||2005-02-18|port was broken or obsolete
 x11-themes/kwin_flatcurve||2005-02-18|port was broken or obsolete
 x11-toolkits/flu||2005-02-18|port was broken or obsolete
 x11-toolkits/hs-gtk+hs||2005-02-18|port was broken or obsolete
 x11-toolkits/p5-Glade||2005-02-18|port was broken or obsolete
 x11-wm/wmx||2005-02-18|port was broken or obsolete
 x11/wmessage||2005-02-18|port was broken or obsolete
 lang/aleph|lang/afnix|2005-02-19|project renamed
 net/ipw||2005-02-19|abandoned
 misc/pg|sysutils/heirloom|2005-02-21|abandoned
 science/cdcl-gtk|science/cdcl|2005-02-24|master port depend on gtk now
 science/ruby-dcl-gtk|science/ruby-dcl|2005-02-24|master port depend on gtk now
 www/pear-APC|www/pecl-APC|2005-02-26|software is now pecl
 mail/namg||2005-02-27|obsolete/no longer exists
 games/scorched3d-devel|games/scorched3d|2005-03-04|move to non-devel directory
 net/lmd||2005-03-04|Project dead and disappeared
 net/loadd||2005-03-04|Project dead and disappeared
 games/QNetChess|games/qnetchess|2005-03-09|port name lowercased
 biology/act|biology/artemis|2005-03-12|act is redundant with new artemis
 multimedia/nautilus-media||2005-03-12|Deprecated, and no longer builds
 chinese/scim-chinese|chinese/scim-pinyin|2005-03-13|project renamed
 games/netpanzerdata|games/netpanzer-data|2005-03-13|port name changed
 databases/py-PySQLite|databases/py-PySQLite10|2005-03-14|renamed
 mail/sylpheed-gtk2|mail/sylpheed2|2005-03-16|obsoleted by official gtk2 version
 x11-toolkits/bakery_gnomeui||2005-03-17|obsolete/no port need this
 www/konqueror-nsplugins|x11/kdebase3|2005-03-20|moved back into kdebase3
 science/mxp|graphics/mxp|2005-03-25|fix category
 misc/kfile_torrent|net/kdenetwork3|2005-03-27|kfile_torrent included in kdenetwork package
 multimedia/linux-divxplayer||2005-04-02|developer's dropped the application
 audio/rebler||2005-04-07|Project dead and disappeared
 net/linux-edonkey-gui-gtk|net/edonkey-gui-gtk|2005-04-07|Dead port, native version available
 misc/nwrite||2005-04-08|Project dead and disappeared
 textproc/p5-Sort-PolySort||2005-04-08|Deprecated, no longer on CPAN
 devel/p5-Server-FastPL||2005-04-08|Deprecated, no longer on CPAN
 math/p5-Statistics-Table-F||2005-04-08|Deprecated, no longer on CPAN
 math/p5-Math-BigIntFast||2005-04-08|Deprecated, no longer on CPAN
 www/p5-HTML-Navigation||2005-04-08|Deprecated, no longer on CPAN
 net/icqnix||2005-04-09|abandoned project
 mail/msmtp-devel||2005-04-10|Development version is not active anymore
 graphics/nip|graphics/nip2|2005-04-10|Name changed in new version
 databases/pear-sqlite|databases/pecl-sqlite|2005-04-13|Project is now PECL extension
 www/flashplugin-mozilla-devel|www/flashplugin-mozilla|2005-04-20|Merged with flashplugin-mozilla
 www/flashplugin-firefox|www/flashplugin-mozilla|2005-04-20|Merged with flashplugin-mozilla
 games/baduki||2005-04-21|Abandoned
 www/opera-devel|www/opera|2005-04-21|stable version caught up with -devel
 mail/policyd|mail/postfix-policyd-spf|2005-04-24|port renamed
 sysutils/gdesklets-sysinfo||2005-04-26|Project abandoned
 mail/sendmail812|mail/sendmail|2005-04-26|obsolete
 net/licq-jons-gtk-gui||2005-04-26|Project abandoned
 mail/courier-authlib|security/courier-authlib|2005-04-26|moved into the right category
 x11/user-selector-applet|x11/fast-user-switch-applet|2005-04-30|Project renamed
 mail/milter-spamc||2005-05-07|author does not permit distribution of patch files
 www/mod_throttle||2005-05-07|author does not permit distribution of patch files
 www/mod_watch||2005-05-07|author does not permit distribution of patch files
 www/mod_watch4||2005-05-07|author does not permit distribution of patch files
 japanese/postgresql7-man|japanese/postgresql74-man|2005-05-08|port renamed
 devel/libuta|devel/wftk|2005-05-11|wftk is a fork of libuta which is not any longer maintained
 x11-toolkits/wxgtk||2005-05-12|obsolete
 x11-toolkits/wxgtk-common|x11-toolkits/wxgtk24|2005-05-12|old wxgtk 2.4.2 port renamed
 x11-toolkits/wxgtk-contrib||2005-05-12|obsolete
 x11-toolkits/wxgtk-contrib-common|x11-toolkits/wxgtk24-contrib|2005-05-12|old wxgtk 2.4.2 port renamed
 x11-toolkits/wxgtk-docs|x11-toolkits/wxgtk24-docs|2005-05-12|old wxgtk 2.4.2 port renamed
 x11-toolkits/wxgtk2|x11-toolkits/wxgtk24|2005-05-12|old wxgtk 2.4.2 port renamed
 x11-toolkits/wxgtk2-contrib|x11-toolkits/wxgtk24-contrib|2005-05-12|old wxgtk 2.4.2 port renamed
 x11-toolkits/wxgtk2-unicode||2005-05-12|broken
 x11-toolkits/wxgtk2-unicode-contrib||2005-05-12|broken
 x11-toolkits/py-wxPython|x11-toolkits/py-wxPython24|2005-05-12|old wxgtk 2.4.2-based port renamed
 x11-toolkits/wxgtk2-common-devel|x11-toolkits/wxgtk26-common|2005-05-12|renamed
 x11-toolkits/wxgtk2-contrib-common-devel|x11-toolkits/wxgtk26-contrib-common|2005-05-12|renamed
 x11-toolkits/wxgtk2-contrib-devel|x11-toolkits/wxgtk26-contrib|2005-05-12|renamed
 x11-toolkits/wxgtk2-devel|x11-toolkits/wxgtk26|2005-05-12|renamed
 x11-toolkits/wxgtk2-unicode-contrib-devel|x11-toolkits/wxgtk26-unicode-contrib|2005-05-12|renamed
 x11-toolkits/wxgtk2-unicode-devel|x11-toolkits/wxgtk26-unicode|2005-05-12|renamed
 x11-toolkits/wxgtk2-utils-devel|x11-toolkits/wxgtk2-contrib-utils|2005-05-12|renamed
 mail/sendmail811|mail/sendmail|2005-05-13|obsolete
 games/xpilot-ng|games/xpilot-ng-server|2005-05-15|split into -client and -server
 devel/p5-POE-Component-EasyDBI|databases/p5-POE-Component-EasyDBI|2005-05-15|move to a better category
 www/mnogosearch|www/mnogosearch31|2004-05-15|finished repocopy
 net/amule|net/amule1|2005-05-16|port renamed
 net/amule-devel|net/amule2|2005-05-16|obsolete
 databases/firebird|databases/firebird-server|2005-05-17|split into -client and -server
 audio/mpeg4ip-faad||2005-05-19|Port no longer needed with new mpeg4ip-1.3
 net/iperf|benchmarks/iperf|2005-05-21|better category
 misc/kile-i18n|editors/kile|2005-05-22|Merged with kile
 x11-wm/gnome2wmaker||2005-05-22|obsolete and unsupported
 mail/bogofilter-current||2005-05-26|newer stable version available
 chinese/linux-mozillafirebird-zh_CN||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 chinese/linux-mozillafirebird-zh_TW||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 german/linux-mozillafirebird||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 japanese/linux-mozillafirebird-gtk1||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 japanese/linux-mozillafirebird-gtk2||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 russian/linux-mozillafirebird||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 www/linux-mozillafirebird|www/linux-firefox|2005-05-27|obsolete, use linux-firefox instead
 www/linux-mozillafirebird-el||2005-05-27|obsolete, use linux-firefox with localization xpi instead
 textproc/py-martel||2005-05-31|obsolete, not up-to-date and is only a subset of biology/py-biopython
 multimedia/gstreamer-plugins-xine||2005-05-31|obsolete, use gstreamer-ffmpeg instead
 audio/libmusepack|audio/libmpcdec|2005-05-31|moved, lib rename.
 devel/idlefork||2005-06-03|has been integrated into Pyhton 2.3+
 editors/gxedit||2005-06-03|project no longer exists
 misc/yaucg||2005-06-03|master site disappeared, script probably broken
 net/archie.el||2005-06-03|master site disappeared
 deskutils/menueditor|deskutils/smeg|2005-06-05|project renamed
 databases/jdbc-oracle816|databases/jdbc-oracle8i|2005-06-05|Obsolete version
 ftp/wget-devel|ftp/wget|2005-06-10|stable version caught up with -devel
 emulators/linux_base-6||2005-06-10|security bugs
 www/netscape7||2005-06-10|security bugs
+devel/p5-File-Spec|devel/p5-PathTools|2005-06-11|module was merged with Cwd and renamed
+textproc/p5-PodParser|textproc/p5-Pod-Parser|2005-06-11|module was renamed
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 74043bf7914d..69a366abab9a 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,35 +1,29 @@
 # New ports collection makefile for:	p5-Archive-Tar
 # Date created:				Nov 14 2000
 # Whom:	      				Roman Shterenzon <roman@xpert.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Archive-Tar
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Archive
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@oven.org
 COMMENT=	Perl module for creation and manipulation of tar files
 
 RUN_DEPENDS=	${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
 MAN3=		Archive::Tar.3 Archive::Tar::File.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 52443e5b9efc..47c4b6554776 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,34 +1,28 @@
 # New ports collection makefile for:	Archive-Zip
 # Date created:				Mon Jan  1 09:33:13 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Archive-Zip
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Archive
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Perl module to create, manipulate, read, and write Zip archive files
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Archive::Zip.3 Archive::Zip::Tree.3 Archive::Zip::FAQ.3 Archive::Zip::MemberRead.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/p5-PerlIO-gzip/Makefile b/archivers/p5-PerlIO-gzip/Makefile
index 111366ded2ab..fee2af0e3705 100644
--- a/archivers/p5-PerlIO-gzip/Makefile
+++ b/archivers/p5-PerlIO-gzip/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	PerlIO-gzip
 # Date created:	   08 December 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	PerlIO-gzip
 PORTVERSION=	0.17
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PerlIO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Perl extension to provide a PerlIO layer to gzip/gunzip
 
 PERL_CONFIGURE=	yes
 
 MAN3=		PerlIO::gzip.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Perl 5.8 or newer required. Install lang/perl5.8 and try again."
+IGNORE=	Perl 5.8 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index 462950429c62..6a23e785992a 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -1,29 +1,29 @@
 # New ports collection makefile for:    p5-Device-SerialPort
 # Date created:				July 6th 2003
 # Whom:	      				Nick Sayer <nsayer@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Device-SerialPort
 PORTVERSION=	1.002
 CATEGORIES=	comms perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Device
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A perl5 module for simple serial port control
 
 PERL_CONFIGURE=	yes
 
 MAN1=		modemtest.1
 MAN3=		Device::SerialPort.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index d7cbaee995ea..621210cb0305 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:    p5-MIME-Base64
 # Date created:                         June 21th 1997
 # Whom:                                 ache@freebsd.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	MIME-Base64
 PORTVERSION=	3.05
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MIME
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Perl5 module for Base64 and Quoted-Printable encodings
 
 PERL_CONFIGURE=	YES
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		MIME::Base64.3 \
 		MIME::QuotedPrint.3
 
 .include <bsd.port.mk>
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index 94d761730b5d..16259a466073 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -1,41 +1,41 @@
 # New ports collection makefile for:	POE-Component-LaDBI
 # Date created:	   09 February 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Component-LaDBI
 PORTVERSION=	1.2.1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Perl extension for asynchronous non-blocking DBI calls in POE
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::LaDBI.3 POE::Component::LaDBI::Commands.3 \
 		POE::Component::LaDBI::Engine.3 \
 		POE::Component::LaDBI::Request.3 \
 		POE::Component::LaDBI::Response.3
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${RM} ${WRKSRC}/*.pl
 
 post-patch:
 	@${PERL} -pi -e 's!(?=read_answer_yes\()!0 and !;' ${WRKSRC}/Makefile.PL
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 11c3815336f6..1486c3345bb9 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -1,109 +1,109 @@
 # New ports collection makefile for:	SQL-Translator
 # Date created:				12 Apr 2004
 # Whom:					Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	SQL-Translator
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SQL
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Manipulate structured data definitions (SQL and more)
 
 BUILD_DEPENDS=	${SITE_PERL}/Class/Base.pm:${PORTSDIR}/devel/p5-Class-Base \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz \
 		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Spreadsheet/ParseExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/RecordParser.pm:${PORTSDIR}/textproc/p5-Text-RecordParser \
 		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
 		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN1=		sqlt-diagram.1 \
 		sqlt-diff.1 \
 		sqlt-dumper.1 \
 		sqlt-graph.1 \
 		sqlt.1
 MAN3=		SQL::Translator.3 \
 		SQL::Translator::Manual.3 \
 		SQL::Translator::Parser.3 \
 		SQL::Translator::Parser::DBI.3 \
 		SQL::Translator::Parser::DBI::MySQL.3 \
 		SQL::Translator::Parser::DBI::PostgreSQL.3 \
 		SQL::Translator::Parser::DBI::SQLite.3 \
 		SQL::Translator::Parser::DBI::Sybase.3 \
 		SQL::Translator::Parser::Excel.3 \
 		SQL::Translator::Parser::MySQL.3 \
 		SQL::Translator::Parser::Oracle.3 \
 		SQL::Translator::Parser::PostgreSQL.3 \
 		SQL::Translator::Parser::SQLite.3 \
 		SQL::Translator::Parser::Storable.3 \
 		SQL::Translator::Parser::Sybase.3 \
 		SQL::Translator::Parser::XML.3 \
 		SQL::Translator::Parser::XML::SQLFairy.3 \
 		SQL::Translator::Parser::YAML.3 \
 		SQL::Translator::Parser::xSV.3 \
 		SQL::Translator::Producer.3 \
 		SQL::Translator::Producer::ClassDBI.3 \
 		SQL::Translator::Producer::Diagram.3 \
 		SQL::Translator::Producer::Dumper.3 \
 		SQL::Translator::Producer::GraphViz.3 \
 		SQL::Translator::Producer::HTML.3 \
 		SQL::Translator::Producer::MySQL.3 \
 		SQL::Translator::Producer::Oracle.3 \
 		SQL::Translator::Producer::POD.3 \
 		SQL::Translator::Producer::PostgreSQL.3 \
 		SQL::Translator::Producer::SQLite.3 \
 		SQL::Translator::Producer::Storable.3 \
 		SQL::Translator::Producer::Sybase.3 \
 		SQL::Translator::Producer::TT::Table.3 \
 		SQL::Translator::Producer::TTSchema.3 \
 		SQL::Translator::Producer::XML.3 \
 		SQL::Translator::Producer::XML::SQLFairy.3 \
 		SQL::Translator::Producer::YAML.3 \
 		SQL::Translator::Schema.3 \
 		SQL::Translator::Schema::Constants.3 \
 		SQL::Translator::Schema::Constraint.3 \
 		SQL::Translator::Schema::Field.3 \
 		SQL::Translator::Schema::Index.3 \
 		SQL::Translator::Schema::Procedure.3 \
 		SQL::Translator::Schema::Table.3 \
 		SQL::Translator::Schema::Trigger.3 \
 		SQL::Translator::Schema::View.3 \
 		SQL::Translator::Utils.3 \
 		Test::SQL::Translator.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
 EXTRA_PATCHES+=	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm \
 		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Utils.pm \
 		${PATCHDIR}/5.005_03-patch-t::05bgep-re.t \
 		${PATCHDIR}/5.005_03-patch-t::19sybase-parser.t \
 		${PATCHDIR}/5.005_03-patch-t::27sqlite-parser.t \
 		${PATCHDIR}/5.005_03-patch-t::31dumper.t
 
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index 28c3eb15908c..fd0b7a006d0f 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -1,42 +1,43 @@
 # New ports collection makefile for:	wfb2sql
 # Date created:		August 21st, 2003
 # Whom:			Sean Chittenden <seanc@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	wfb2sql
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	CIA World Fact Book to SQL Conversion Utility
 
 BUILD_DEPENDS=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	YES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wfb2sql ${LOCALBASE}/bin/wfb2sql
 	@${ECHO} "bin/wfb2sql" >> ${TMPPLIST}
 
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/wfb2sqlrc ${EXAMPLESDIR}/wfb2sqlrc
 	@${ECHO} "share/examples/${PORTNAME}/wfb2sqlrc" >> ${TMPPLIST}
 	@${ECHO} "@dirrm share/examples/${PORTNAME}" >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/wfb2sql.html ${DOCSDIR}
 	@${ECHO} "share/doc/${PORTNAME}/wfb2sql.html" >> ${TMPPLIST}
 	@${ECHO} "@dirrm share/doc/${PORTNAME}/" >> ${TMPPLIST}
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/Makefile b/devel/Makefile
index 16587676d324..694a8c0293fb 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,1556 +1,1556 @@
 # $FreeBSD$
 #
 
     COMMENT = Development utilities
 
     SUBDIR += ElectricFence
     SUBDIR += ORBit
     SUBDIR += ORBit2
     SUBDIR += SpecTcl
     SUBDIR += ZendOptimizer
     SUBDIR += a2dev
     SUBDIR += aap
     SUBDIR += ac-archive
     SUBDIR += ace
     SUBDIR += ace+tao
     SUBDIR += ace+tao-doc
     SUBDIR += acpicatools
     SUBDIR += activitymail
     SUBDIR += adabindx
     SUBDIR += adabooch
     SUBDIR += adabooch-doc-html
     SUBDIR += adacurses
     SUBDIR += adasdl
     SUBDIR += aegis
     SUBDIR += agenda-headers
     SUBDIR += agenda-libs
     SUBDIR += agenda-snow-libs
     SUBDIR += agenda-static-libs
     SUBDIR += agide
     SUBDIR += ald
     SUBDIR += alf
     SUBDIR += allegro
     SUBDIR += anjuta
     SUBDIR += antlr
     SUBDIR += apache-ant
     SUBDIR += apr
     SUBDIR += apr-svn
     SUBDIR += argouml
     SUBDIR += argp-standalone
     SUBDIR += argtable
     SUBDIR += arm-elf-binutils
     SUBDIR += arm-elf-gcc295
     SUBDIR += arm-rtems-binutils
     SUBDIR += arm-rtems-g77
     SUBDIR += arm-rtems-gcc
     SUBDIR += arm-rtems-gdb
     SUBDIR += arm-rtems-objc
     SUBDIR += as31
     SUBDIR += asis
     SUBDIR += asl
     SUBDIR += asmutils
     SUBDIR += astyle
     SUBDIR += atlas
     SUBDIR += atlas-devel
     SUBDIR += aunit
     SUBDIR += autobook
     SUBDIR += autoconf213
     SUBDIR += autoconf253
     SUBDIR += autoconf259
     SUBDIR += autodia
     SUBDIR += autogen
     SUBDIR += automake14
     SUBDIR += automake15
     SUBDIR += automake19
     SUBDIR += avalon-framework
     SUBDIR += avarice
     SUBDIR += avltree
     SUBDIR += avr-binutils
     SUBDIR += avr-gcc
     SUBDIR += avr-gdb
     SUBDIR += avr-libc
     SUBDIR += avra
     SUBDIR += avrdude
     SUBDIR += bcc
     SUBDIR += bcpp
     SUBDIR += beagle
     SUBDIR += bglibs
     SUBDIR += bicyclerepair
     SUBDIR += bin86
     SUBDIR += bison
     SUBDIR += bison-devel
     SUBDIR += bison1875
     SUBDIR += bitkeeper
     SUBDIR += bnf
     SUBDIR += boaconstructor
     SUBDIR += boehm-gc
     SUBDIR += bonobo
     SUBDIR += bonobo-conf
     SUBDIR += boost
     SUBDIR += boost-python
     SUBDIR += bugbuddy
     SUBDIR += bugzilla
     SUBDIR += buildtool
     SUBDIR += buildtool-doc
     SUBDIR += byaccj
     SUBDIR += c2lib
     SUBDIR += c2man
     SUBDIR += c2mdoc
     SUBDIR += c4
     SUBDIR += c_c++_reference
     SUBDIR += c_parser
     SUBDIR += calibrator
     SUBDIR += callgrind
     SUBDIR += cbrowser
     SUBDIR += cc65
     SUBDIR += ccache
     SUBDIR += cccc
     SUBDIR += ccdoc
     SUBDIR += ccmalloc
     SUBDIR += cdecl
     SUBDIR += cdialog
     SUBDIR += cdk
     SUBDIR += cdoc
     SUBDIR += cedet
     SUBDIR += cedet-emacs20
     SUBDIR += cflow
     SUBDIR += cflow2vcg
     SUBDIR += cgilib
     SUBDIR += cgprof
     SUBDIR += chora
     SUBDIR += cil
     SUBDIR += cl-asdf
     SUBDIR += cl-asdf-clisp
     SUBDIR += cl-asdf-cmucl
     SUBDIR += cl-asdf-sbcl
     SUBDIR += cl-port
     SUBDIR += cl-port-clisp
     SUBDIR += cl-port-sbcl
     SUBDIR += cl-split-sequence
     SUBDIR += cl-split-sequence-clisp
     SUBDIR += cl-split-sequence-cmucl
     SUBDIR += cl-split-sequence-sbcl
     SUBDIR += cl-uffi
     SUBDIR += cl-uffi-cmucl
     SUBDIR += cl-uffi-sbcl
     SUBDIR += clanlib
     SUBDIR += clanlib-devel
     SUBDIR += clig
     SUBDIR += clint
     SUBDIR += clisp-hyperspec
     SUBDIR += cmake
     SUBDIR += cocktail
     SUBDIR += codecrusader
     SUBDIR += codeville
     SUBDIR += codeworker
     SUBDIR += cogito
     SUBDIR += colorer
     SUBDIR += commoncpp
     SUBDIR += cons
     SUBDIR += cons-test
     SUBDIR += cook
     SUBDIR += cpan-upload
     SUBDIR += cppadvio
     SUBDIR += cppunit
     SUBDIR += cproto
     SUBDIR += crossgo32
     SUBDIR += crossgo32-djgpp2
     SUBDIR += crossgo32-djgpp2-pdcurses
     SUBDIR += cscope
     SUBDIR += cscout
     SUBDIR += cssc
     SUBDIR += cstringbuffer
     SUBDIR += ctags
     SUBDIR += cut
     SUBDIR += cutils
     SUBDIR += cvs+ipv6
     SUBDIR += cvs2cl
     SUBDIR += cvs2html
     SUBDIR += cvs2p4
     SUBDIR += cvs2svn
     SUBDIR += cvsadmin
     SUBDIR += cvsbook
     SUBDIR += cvschk
     SUBDIR += cvsd
     SUBDIR += cvsdelta
     SUBDIR += cvsdiff2patch
     SUBDIR += cvsgraph
     SUBDIR += cvslines
     SUBDIR += cvsmapfs
     SUBDIR += cvsmonitor
     SUBDIR += cvsnt
     SUBDIR += cvspadm
     SUBDIR += cvsplot
     SUBDIR += cvsps
     SUBDIR += cvsps-devel
     SUBDIR += cvsstat
     SUBDIR += cvstrac
     SUBDIR += cvsutils
     SUBDIR += cvsweb
     SUBDIR += cvsweb3
     SUBDIR += cvswrap
     SUBDIR += cweb
     SUBDIR += cxmon
     SUBDIR += cxref
     SUBDIR += cxxtest
     SUBDIR += darcs
     SUBDIR += darts
     SUBDIR += datadesigner
     SUBDIR += dbus
     SUBDIR += dbus-sharp
     SUBDIR += ddd
     SUBDIR += decompyle
     SUBDIR += desktop-file-utils
     SUBDIR += devhelp
     SUBDIR += devtodo
     SUBDIR += dia2code
     SUBDIR += dialyzer
     SUBDIR += diffconvert
     SUBDIR += directfb
     SUBDIR += distcc
     SUBDIR += distel
     SUBDIR += dits
     SUBDIR += dmake
     SUBDIR += dmalloc
     SUBDIR += doc++
     SUBDIR += doctorj
     SUBDIR += dotconf
     SUBDIR += doxygen
     SUBDIR += dparser
     SUBDIR += dprog
     SUBDIR += dumb
     SUBDIR += dwarfdump
     SUBDIR += e4graph
     SUBDIR += ebnf2yacc
     SUBDIR += eboxy
     SUBDIR += ecb
     SUBDIR += ecb-emacs20
     SUBDIR += ecgi
     SUBDIR += ecos-tools
     SUBDIR += eet
     SUBDIR += eieio
     SUBDIR += eieio-emacs20
     SUBDIR += elf
     SUBDIR += elfio
     SUBDIR += elfsh
     SUBDIR += elftoaout
     SUBDIR += elib
     SUBDIR += elib-emacs19
     SUBDIR += elib-emacs20
     SUBDIR += entity
     SUBDIR += epm
     SUBDIR += epydoc
     SUBDIR += eric
     SUBDIR += eris
     SUBDIR += erlslang
     SUBDIR += error
     SUBDIR += esdl
     SUBDIR += esvn
     SUBDIR += excalibur-configuration
     SUBDIR += f77flow
     SUBDIR += fam
     SUBDIR += fampp
     SUBDIR += fastcrc
     SUBDIR += fastdep
     SUBDIR += fc++
     SUBDIR += ffcall
     SUBDIR += fhist
     SUBDIR += fib
     SUBDIR += flick
     SUBDIR += florist
     SUBDIR += flowdesigner
     SUBDIR += flyspray
     SUBDIR += fnccheck
     SUBDIR += fnorb
     SUBDIR += fortran-utils
     SUBDIR += fpc-fvision
     SUBDIR += fpc-gdb
     SUBDIR += fpc-gdbint
     SUBDIR += fpc-regexpr
     SUBDIR += fpp
     SUBDIR += freebase
     SUBDIR += freelibiberty
     SUBDIR += freeride
     SUBDIR += freescope
     SUBDIR += frink
     SUBDIR += fsmgenerator
     SUBDIR += ftnchek
     SUBDIR += funnelweb
     SUBDIR += g-wrap
     SUBDIR += g2c
     SUBDIR += gaa
     SUBDIR += gamin
     SUBDIR += gaphor
     SUBDIR += gauche-gaunit
     SUBDIR += gauche-readline
     SUBDIR += gauche-sdl
     SUBDIR += gaul
     SUBDIR += gccxml
     SUBDIR += gconf
     SUBDIR += gconf2
     SUBDIR += gconfmm
     SUBDIR += gconfmm26
     SUBDIR += gcvs
     SUBDIR += gdb53
     SUBDIR += gdb53-act
     SUBDIR += gdb6
     SUBDIR += gdbmods
     SUBDIR += gengameng
     SUBDIR += gengetopt
     SUBDIR += genproto
     SUBDIR += gettext
     SUBDIR += gettext-lint
     SUBDIR += getxml
     SUBDIR += gindent
     SUBDIR += glade2
     SUBDIR += glademm
     SUBDIR += glib12
     SUBDIR += glib20
     SUBDIR += glibmm
     SUBDIR += global
     SUBDIR += glrparser
     SUBDIR += glui
     SUBDIR += gmake
     SUBDIR += gnome-vfsmm
     SUBDIR += gnome2-hacker-tools
     SUBDIR += gnomebuild
     SUBDIR += gnomecommon
     SUBDIR += gnomecrash
     SUBDIR += gnomevfs
     SUBDIR += gnomevfs2
     SUBDIR += gnu-autoconf
     SUBDIR += gnu-automake
     SUBDIR += gnu-libtool
     SUBDIR += gnulibiberty
     SUBDIR += gnustep
     SUBDIR += gnustep-make
     SUBDIR += gob2
     SUBDIR += gonzui
     SUBDIR += gorm
     SUBDIR += gperf
     SUBDIR += gputils
     SUBDIR += gsoap
     SUBDIR += gstreamer-plugins-gconf
     SUBDIR += gstreamer-plugins-gnomevfs
     SUBDIR += gstreamer-plugins-sdl
     SUBDIR += gtgt
     SUBDIR += gtranslator
     SUBDIR += guikachu
     SUBDIR += gvd
     SUBDIR += gwenhywfar
     SUBDIR += happydoc
     SUBDIR += hapy
     SUBDIR += hptools
     SUBDIR += hs-alex
     SUBDIR += hs-buddha
     SUBDIR += hs-c2hs
     SUBDIR += hs-cpphs
     SUBDIR += hs-crypto
     SUBDIR += hs-drift
     SUBDIR += hs-green-card
     SUBDIR += hs-haddock
     SUBDIR += hs-happy
     SUBDIR += hs-hat
     SUBDIR += hs-hdoc
     SUBDIR += hs-hmake
     SUBDIR += hs-hpl
     SUBDIR += hs-idoc
     SUBDIR += hs-popenhs
     SUBDIR += hs-tclhaskell-ghc
     SUBDIR += hs-uni
     SUBDIR += hypersrc
     SUBDIR += i386-rtems-binutils
     SUBDIR += i386-rtems-g77
     SUBDIR += i386-rtems-gcc
     SUBDIR += i386-rtems-gdb
     SUBDIR += i386-rtems-objc
     SUBDIR += i960-rtems-binutils
     SUBDIR += i960-rtems-gcc
     SUBDIR += i960-rtems-gdb
     SUBDIR += ice
     SUBDIR += icu
     SUBDIR += icu2
     SUBDIR += id-utils
     SUBDIR += ifd-test
     SUBDIR += imake-4
     SUBDIR += imake-6
     SUBDIR += inilib
     SUBDIR += initutil
     SUBDIR += invitation_to_ruby
     SUBDIR += ipython
     SUBDIR += itext
     SUBDIR += ixlib
     SUBDIR += jakelib2
     SUBDIR += jam
     SUBDIR += java-util-concurrent
     SUBDIR += jclassinfo
     SUBDIR += jep
     SUBDIR += jrtplib
     SUBDIR += jsap
     SUBDIR += jude-community
     SUBDIR += judy
     SUBDIR += kaptain
     SUBDIR += kcachegrind
     SUBDIR += kdbg
     SUBDIR += kdesdk3
     SUBDIR += kdevelop
     SUBDIR += kimwitu
     SUBDIR += kimwitu++
     SUBDIR += klassmodeler
     SUBDIR += kodos
     SUBDIR += korelib
     SUBDIR += kprof
     SUBDIR += kscope
     SUBDIR += kyra
     SUBDIR += lbpp
     SUBDIR += leaktracer
     SUBDIR += lemon
     SUBDIR += leoarg
     SUBDIR += libIDL
     SUBDIR += libPropList
     SUBDIR += libU77
     SUBDIR += libafterbase
     SUBDIR += libassa
     SUBDIR += libassetml
     SUBDIR += libast
     SUBDIR += libavl
     SUBDIR += libbfd
     SUBDIR += libbinio
     SUBDIR += libbnr
     SUBDIR += libbonobo
     SUBDIR += libbonobomm
     SUBDIR += libcapsinetwork
     SUBDIR += libccid
     SUBDIR += libcheck
     SUBDIR += libchipcard
     SUBDIR += libchipcard-kde
     SUBDIR += libcii
     SUBDIR += libconfuse
     SUBDIR += libcoro
     SUBDIR += libcwd
     SUBDIR += libdict
     SUBDIR += libdlmalloc
     SUBDIR += libds
     SUBDIR += libdsp
     SUBDIR += libdwarf
     SUBDIR += libedit
     SUBDIR += libelf
     SUBDIR += libevent
     SUBDIR += libexecinfo
     SUBDIR += libffi
     SUBDIR += libformat
     SUBDIR += libfs++
     SUBDIR += libg++
     SUBDIR += libgconf-java
     SUBDIR += libgetline
     SUBDIR += libghthash
     SUBDIR += libgii
     SUBDIR += libgiigic
     SUBDIR += libglade
     SUBDIR += libglade-java
     SUBDIR += libglade2
     SUBDIR += libglademm
     SUBDIR += libglademm24
     SUBDIR += libgnugetopt
     SUBDIR += libgsf
     SUBDIR += libgsf-gnome
     SUBDIR += libgtop2
     SUBDIR += libgutenfetch
     SUBDIR += libhash
     SUBDIR += libhoard
     SUBDIR += libical
     SUBDIR += libidn
     SUBDIR += libltdl15
     SUBDIR += libmatheval
     SUBDIR += libmba
     SUBDIR += libmcve
     SUBDIR += libmimedir
     SUBDIR += libmtrie
     SUBDIR += libmusclecard
     SUBDIR += libnaji
     SUBDIR += liboil
     SUBDIR += libol
     SUBDIR += libole2
     SUBDIR += liboop
     SUBDIR += libopendaap
     SUBDIR += libowfat
     SUBDIR += libpci
     SUBDIR += libpdel
     SUBDIR += libpeak
     SUBDIR += libpreps
     SUBDIR += libpreps-devel
     SUBDIR += libredblack
     SUBDIR += libshbuf
     SUBDIR += libshhmsg
     SUBDIR += libshhopt
     SUBDIR += libsigc++
     SUBDIR += libsigc++12
     SUBDIR += libsigc++20
     SUBDIR += libsigcx
     SUBDIR += libsigsegv
     SUBDIR += libslang
     SUBDIR += libslang2
     SUBDIR += libsoup
     SUBDIR += libstatgrab
     SUBDIR += libstrfunc
     SUBDIR += libstroke
     SUBDIR += libtai
     SUBDIR += libtap
     SUBDIR += libtar
     SUBDIR += libtecla
     SUBDIR += libticalcs
     SUBDIR += libtifiles
     SUBDIR += libtool13
     SUBDIR += libtool15
     SUBDIR += libukcprog
     SUBDIR += libunicode
     SUBDIR += libusb
     SUBDIR += libvanessa_adt
     SUBDIR += libvanessa_logger
     SUBDIR += libvanessa_socket
     SUBDIR += libvc
     SUBDIR += libxalloc
     SUBDIR += libzt
     SUBDIR += libzvbi
     SUBDIR += lightning
     SUBDIR += lincvs
     SUBDIR += linux-allegro
     SUBDIR += linux-glib2
     SUBDIR += linux-libglade
     SUBDIR += linux-runrev
     SUBDIR += linux-sdl12
     SUBDIR += linux-understand_ada
     SUBDIR += linux-understand_c
     SUBDIR += linux-understand_java
     SUBDIR += linux_devtools
     SUBDIR += linux_devtools-6
     SUBDIR += linux_devtools-7
     SUBDIR += linux_kdump
     SUBDIR += linuxthreads
     SUBDIR += log4c
     SUBDIR += log4cplus
     SUBDIR += log4cpp
     SUBDIR += log4cxx
     SUBDIR += log4j
     SUBDIR += log4sh
     SUBDIR += lwp
     SUBDIR += m17n-db
     SUBDIR += m17n-docs
     SUBDIR += m17n-lib
     SUBDIR += m4
     SUBDIR += m6811-binutils
     SUBDIR += m6811-gcc
     SUBDIR += m68k-rtems-binutils
     SUBDIR += m68k-rtems-g77
     SUBDIR += m68k-rtems-gcc
     SUBDIR += m68k-rtems-gdb
     SUBDIR += m68k-rtems-objc
     SUBDIR += make++
     SUBDIR += makedepend
     SUBDIR += makeplus
     SUBDIR += maketool
     SUBDIR += maven
     SUBDIR += memcheck
     SUBDIR += mercator
     SUBDIR += meta-cvs
     SUBDIR += mico
     SUBDIR += mime
     SUBDIR += mingw
     SUBDIR += mingw-bin-msvcrt
     SUBDIR += mingw-binutils
     SUBDIR += mingw-gcc
     SUBDIR += mingw-opengl-headers
     SUBDIR += mingw32-bin-msvcrt
     SUBDIR += mingw32-binutils
     SUBDIR += mingw32-gcc
     SUBDIR += mips-rtems-binutils
     SUBDIR += mips-rtems-g77
     SUBDIR += mips-rtems-gcc
     SUBDIR += mips-rtems-gdb
     SUBDIR += mips-rtems-objc
     SUBDIR += mipsel-linux-binutils
     SUBDIR += mipsel-linux-gcc
     SUBDIR += mipsel-linux-kernel-headers
     SUBDIR += mk
     SUBDIR += mkcmd
     SUBDIR += mkmf
     SUBDIR += mm
     SUBDIR += mob
     SUBDIR += monodoc
     SUBDIR += monotone
     SUBDIR += motor
     SUBDIR += mpatrol
     SUBDIR += mprof
     SUBDIR += msp430-binutils
     SUBDIR += msp430-gcc
     SUBDIR += msp430-gdb
     SUBDIR += msp430-libc
     SUBDIR += msrc0
     SUBDIR += nana
     SUBDIR += nasm
     SUBDIR += naturaldocs
     SUBDIR += ncnf
     SUBDIR += ncurses
     SUBDIR += newfile
     SUBDIR += newt
     SUBDIR += ngpt
     SUBDIR += noweb
     SUBDIR += nspr
     SUBDIR += nx
     SUBDIR += oaf
     SUBDIR += ocaml-camomile
     SUBDIR += ocaml-classes
     SUBDIR += ocaml-equeue
     SUBDIR += ocaml-extlib
     SUBDIR += ocaml-findlib
     SUBDIR += ocaml-pcre
     SUBDIR += ocaml-sdl
     SUBDIR += ocaml-sem
     SUBDIR += ocaml-ulex
     SUBDIR += ocamlweb
     SUBDIR += ode
     SUBDIR += omniNotify
     SUBDIR += omniORB
     SUBDIR += oniguruma
     SUBDIR += openorb
     SUBDIR += openthreads
     SUBDIR += opentop
     SUBDIR += openzz
     SUBDIR += orbitcpp
     SUBDIR += oskit
     SUBDIR += ossp-al
     SUBDIR += ossp-cfg
     SUBDIR += ossp-ex
     SUBDIR += ossp-l2
     SUBDIR += ossp-val
     SUBDIR += ossp-var
     SUBDIR += ossp-xds
     SUBDIR += p4.el
     SUBDIR += p4api
     SUBDIR += p4db
     SUBDIR += p4delta
     SUBDIR += p4genpatch
     SUBDIR += p4v
     SUBDIR += p5-AI-Pathfinding-AStar
     SUBDIR += p5-Agent
     SUBDIR += p5-Algorithm-Accounting
     SUBDIR += p5-Algorithm-Annotate
     SUBDIR += p5-Algorithm-ChooseSubsets
     SUBDIR += p5-Algorithm-Cluster
     SUBDIR += p5-Algorithm-Diff
     SUBDIR += p5-Algorithm-Evolutionary
     SUBDIR += p5-Algorithm-Interval2Prefix
     SUBDIR += p5-Algorithm-MDiff
     SUBDIR += p5-Algorithm-MarkovChain
     SUBDIR += p5-Algorithm-MinMax
     SUBDIR += p5-Algorithm-NaiveBayes
     SUBDIR += p5-Algorithm-Networksort
     SUBDIR += p5-Algorithm-Numerical-Shuffle
     SUBDIR += p5-Algorithm-Permute
     SUBDIR += p5-Algorithm-SVM
     SUBDIR += p5-Alias
     SUBDIR += p5-Alzabo
     SUBDIR += p5-Alzabo-GUI-Mason
     SUBDIR += p5-App-Info
     SUBDIR += p5-AppConfig
     SUBDIR += p5-AppConfig-Std
     SUBDIR += p5-Array-Iterator
     SUBDIR += p5-Array-Window
     SUBDIR += p5-AtExit
     SUBDIR += p5-Attribute-Handlers
     SUBDIR += p5-Attribute-Handlers-Prospective
     SUBDIR += p5-Attribute-Persistent
     SUBDIR += p5-B-Deobfuscate
     SUBDIR += p5-B-Graph
     SUBDIR += p5-B-Keywords
     SUBDIR += p5-B-Size
     SUBDIR += p5-BFD
     SUBDIR += p5-BSD-Resource
     SUBDIR += p5-BSD-stat
     SUBDIR += p5-C-Scan
     SUBDIR += p5-CPAN-DistnameInfo
     SUBDIR += p5-CPAN-Mini
     SUBDIR += p5-CPAN-YACSmoke
     SUBDIR += p5-CPANPLUS
     SUBDIR += p5-Cache
     SUBDIR += p5-Cache-Cache
     SUBDIR += p5-Cache-FastMmap
     SUBDIR += p5-Cache-Mmap
     SUBDIR += p5-Cache-Simple-TimedExpiry
     SUBDIR += p5-Calendar-Simple
     SUBDIR += p5-Carp-Assert
     SUBDIR += p5-Carp-Clan
     SUBDIR += p5-Carp-Datum
     SUBDIR += p5-Cdk
     SUBDIR += p5-Class-Accessor
     SUBDIR += p5-Class-Accessor-Chained
     SUBDIR += p5-Class-Accessor-Lvalue
     SUBDIR += p5-Class-AlzaboWrapper
     SUBDIR += p5-Class-ArrayObjects
     SUBDIR += p5-Class-AutoClass
     SUBDIR += p5-Class-Autouse
     SUBDIR += p5-Class-Base
     SUBDIR += p5-Class-BlackHole
     SUBDIR += p5-Class-Container
     SUBDIR += p5-Class-Contract
     SUBDIR += p5-Class-Data-Inheritable
     SUBDIR += p5-Class-Date
     SUBDIR += p5-Class-Default
     SUBDIR += p5-Class-Delegation
     SUBDIR += p5-Class-Factory
     SUBDIR += p5-Class-Factory-Util
     SUBDIR += p5-Class-Fields
     SUBDIR += p5-Class-Generate
     SUBDIR += p5-Class-Gomor-Hash
     SUBDIR += p5-Class-Handle
     SUBDIR += p5-Class-Hook
     SUBDIR += p5-Class-ISA
     SUBDIR += p5-Class-Inner
     SUBDIR += p5-Class-Inspector
     SUBDIR += p5-Class-Loader
     SUBDIR += p5-Class-MakeMethods
     SUBDIR += p5-Class-MethodMaker
     SUBDIR += p5-Class-MethodMapper
     SUBDIR += p5-Class-NamedParms
     SUBDIR += p5-Class-ObjectTemplate
     SUBDIR += p5-Class-ObjectTemplate-DB
     SUBDIR += p5-Class-Observable
     SUBDIR += p5-Class-ParmList
     SUBDIR += p5-Class-ReturnValue
     SUBDIR += p5-Class-Roles
     SUBDIR += p5-Class-Singleton
     SUBDIR += p5-Class-Tangram
     SUBDIR += p5-Class-Tom
     SUBDIR += p5-Class-Trigger
     SUBDIR += p5-Class-Virtual
     SUBDIR += p5-Class-WhiteHole
     SUBDIR += p5-Class-XPath
     SUBDIR += p5-Clone
     SUBDIR += p5-Commands-Guarded
     SUBDIR += p5-Config-Auto
     SUBDIR += p5-Config-Fast
     SUBDIR += p5-Config-General
     SUBDIR += p5-Config-Ini
     SUBDIR += p5-Config-IniFiles
     SUBDIR += p5-Config-Objective
     SUBDIR += p5-Config-Setting
     SUBDIR += p5-Config-Simple
     SUBDIR += p5-Config-Tiny
     SUBDIR += p5-ConfigReader
     SUBDIR += p5-ConfigReader-Simple
     SUBDIR += p5-Coro
     SUBDIR += p5-Curses
     SUBDIR += p5-Curses-Application
     SUBDIR += p5-Curses-Forms
     SUBDIR += p5-Curses-UI
     SUBDIR += p5-Curses-Widgets
     SUBDIR += p5-DB_File-Lock
     SUBDIR += p5-Data-Compare
     SUBDIR += p5-Data-Dump
     SUBDIR += p5-Data-Dump-Streamer
     SUBDIR += p5-Data-DumpXML
     SUBDIR += p5-Data-Dumper
     SUBDIR += p5-Data-Dumper-Simple
     SUBDIR += p5-Data-Flow
     SUBDIR += p5-Data-HexDump
     SUBDIR += p5-Data-Hexdumper
     SUBDIR += p5-Data-Hierarchy
     SUBDIR += p5-Data-Properties
     SUBDIR += p5-Data-Random
     SUBDIR += p5-Data-Serializer
     SUBDIR += p5-Data-ShowTable
     SUBDIR += p5-Data-Stag
     SUBDIR += p5-Data-Table
     SUBDIR += p5-Data-TemporaryBag
     SUBDIR += p5-Data-TreeDumper
     SUBDIR += p5-Data-UUID
     SUBDIR += p5-Date-Calc
     SUBDIR += p5-Date-DayOfWeek
     SUBDIR += p5-Date-Easter
     SUBDIR += p5-Date-ICal
     SUBDIR += p5-Date-ISO
     SUBDIR += p5-Date-Leapyear
     SUBDIR += p5-Date-Manip
     SUBDIR += p5-Date-Pcalc
     SUBDIR += p5-Date-Roman
     SUBDIR += p5-Date-Set
     SUBDIR += p5-Date-Simple
     SUBDIR += p5-DateConvert
     SUBDIR += p5-DateTime
     SUBDIR += p5-DateTime-Calendar-Christian
     SUBDIR += p5-DateTime-Calendar-FrenchRevolutionary
     SUBDIR += p5-DateTime-Calendar-Hebrew
     SUBDIR += p5-DateTime-Calendar-Julian
     SUBDIR += p5-DateTime-Calendar-Mayan
     SUBDIR += p5-DateTime-Calendar-Pataphysical
     SUBDIR += p5-DateTime-Event-Cron
     SUBDIR += p5-DateTime-Event-Easter
     SUBDIR += p5-DateTime-Event-ICal
     SUBDIR += p5-DateTime-Event-NameDay
     SUBDIR += p5-DateTime-Event-Random
     SUBDIR += p5-DateTime-Event-Recurrence
     SUBDIR += p5-DateTime-Event-Sunrise
     SUBDIR += p5-DateTime-Fiscal-Year
     SUBDIR += p5-DateTime-Format-Baby
     SUBDIR += p5-DateTime-Format-Bork
     SUBDIR += p5-DateTime-Format-Builder
     SUBDIR += p5-DateTime-Format-DBI
     SUBDIR += p5-DateTime-Format-DateManip
     SUBDIR += p5-DateTime-Format-Duration
     SUBDIR += p5-DateTime-Format-Epoch
     SUBDIR += p5-DateTime-Format-Excel
     SUBDIR += p5-DateTime-Format-HTTP
     SUBDIR += p5-DateTime-Format-IBeat
     SUBDIR += p5-DateTime-Format-ICal
     SUBDIR += p5-DateTime-Format-ISO8601
     SUBDIR += p5-DateTime-Format-Mail
     SUBDIR += p5-DateTime-Format-MySQL
     SUBDIR += p5-DateTime-Format-Pg
     SUBDIR += p5-DateTime-Format-Roman
     SUBDIR += p5-DateTime-Format-Strptime
     SUBDIR += p5-DateTime-Format-W3CDTF
     SUBDIR += p5-DateTime-Functions
     SUBDIR += p5-DateTime-HiRes
     SUBDIR += p5-DateTime-Incomplete
     SUBDIR += p5-DateTime-Locale
     SUBDIR += p5-DateTime-Precise
     SUBDIR += p5-DateTime-Set
     SUBDIR += p5-DateTime-TimeZone
     SUBDIR += p5-DateTime-TimeZone-Alias
     SUBDIR += p5-DateTime-TimeZone-LMT
     SUBDIR += p5-Decision-ACL
     SUBDIR += p5-Devel-Arena
     SUBDIR += p5-Devel-Constants
     SUBDIR += p5-Devel-Cover
     SUBDIR += p5-Devel-Cycle
     SUBDIR += p5-Devel-DProf
     SUBDIR += p5-Devel-DProfPP
     SUBDIR += p5-Devel-Diagram
     SUBDIR += p5-Devel-Leak
     SUBDIR += p5-Devel-LeakTrace
     SUBDIR += p5-Devel-Modlist
     SUBDIR += p5-Devel-ObjectTracker
     SUBDIR += p5-Devel-PPPort
     SUBDIR += p5-Devel-Peek
     SUBDIR += p5-Devel-Pointer
     SUBDIR += p5-Devel-Profile
     SUBDIR += p5-Devel-Profiler
     SUBDIR += p5-Devel-Size
     SUBDIR += p5-Devel-SmallProf
     SUBDIR += p5-Devel-StackTrace
     SUBDIR += p5-Devel-StealthDebug
     SUBDIR += p5-Devel-Symdump
     SUBDIR += p5-Devel-Trace
     SUBDIR += p5-Devel-ptkdb
     SUBDIR += p5-Dialog
     SUBDIR += p5-Encode-compat
     SUBDIR += p5-Env-PS1
     SUBDIR += p5-Errno
     SUBDIR += p5-Event
     SUBDIR += p5-Exception-Class
     SUBDIR += p5-Exporter-Lite
     SUBDIR += p5-Exporter-Tidy
     SUBDIR += p5-ExtUtils-CBuilder
     SUBDIR += p5-ExtUtils-Constant
     SUBDIR += p5-ExtUtils-Depends
     SUBDIR += p5-ExtUtils-MakeMaker
     SUBDIR += p5-ExtUtils-ParseXS
     SUBDIR += p5-ExtUtils-PkgConfig
     SUBDIR += p5-ExtUtils-XSBuilder
     SUBDIR += p5-File-BaseDir
     SUBDIR += p5-File-BasicFlock
     SUBDIR += p5-File-Binary
     SUBDIR += p5-File-Cache
     SUBDIR += p5-File-DirSync
     SUBDIR += p5-File-FTS
     SUBDIR += p5-File-Find-Rule
     SUBDIR += p5-File-Flat
     SUBDIR += p5-File-Flock
     SUBDIR += p5-File-Grep
     SUBDIR += p5-File-HomeDir
     SUBDIR += p5-File-Lock
     SUBDIR += p5-File-MMagic
     SUBDIR += p5-File-MimeInfo
     SUBDIR += p5-File-Modified
     SUBDIR += p5-File-NCopy
     SUBDIR += p5-File-NFSLock
     SUBDIR += p5-File-Path-Expand
     SUBDIR += p5-File-PathConvert
     SUBDIR += p5-File-ReadBackwards
     SUBDIR += p5-File-Remove
     SUBDIR += p5-File-Slurp
-    SUBDIR += p5-File-Spec
     SUBDIR += p5-File-Sync
     SUBDIR += p5-File-Tail
     SUBDIR += p5-File-Temp
     SUBDIR += p5-File-Type
     SUBDIR += p5-File-chdir
     SUBDIR += p5-FileHandle-Unget
     SUBDIR += p5-Filesys-Statvfs_Df
     SUBDIR += p5-Filesys-Virtual
     SUBDIR += p5-Filesys-Virtual-Plain
     SUBDIR += p5-Filter
     SUBDIR += p5-FreezeThaw
     SUBDIR += p5-Getargs-Long
     SUBDIR += p5-Getopt-ArgvFile
     SUBDIR += p5-Getopt-Declare
     SUBDIR += p5-Getopt-Long
     SUBDIR += p5-Getopt-Mixed
     SUBDIR += p5-Getopt-Popt
     SUBDIR += p5-Glib2
     SUBDIR += p5-Gnome2-GConf
     SUBDIR += p5-Heap
     SUBDIR += p5-Heap-Simple
     SUBDIR += p5-Heap-Simple-Perl
     SUBDIR += p5-Heap-Simple-XS
     SUBDIR += p5-Hook-LexWrap
     SUBDIR += p5-IO
     SUBDIR += p5-IO-All
     SUBDIR += p5-IO-Capture
     SUBDIR += p5-IO-CaptureOutput
     SUBDIR += p5-IO-Digest
     SUBDIR += p5-IO-Multiplex
     SUBDIR += p5-IO-Pager
     SUBDIR += p5-IO-String
     SUBDIR += p5-IO-Stty
     SUBDIR += p5-IO-Tee
     SUBDIR += p5-IO-Tty
     SUBDIR += p5-IO-Util
     SUBDIR += p5-IO-stringy
     SUBDIR += p5-IPC-Cache
     SUBDIR += p5-IPC-Cmd
     SUBDIR += p5-IPC-Locker
     SUBDIR += p5-IPC-MM
     SUBDIR += p5-IPC-Run
     SUBDIR += p5-IPC-Run3
     SUBDIR += p5-IPC-ShareLite
     SUBDIR += p5-IPC-Shareable
     SUBDIR += p5-IPC-SharedCache
     SUBDIR += p5-Include
     SUBDIR += p5-Inline
     SUBDIR += p5-Inline-ASM
     SUBDIR += p5-Inline-CPP
     SUBDIR += p5-Inline-Filters
     SUBDIR += p5-Inline-Java
     SUBDIR += p5-Inline-Tcl
     SUBDIR += p5-Ioctl
     SUBDIR += p5-List-Group
     SUBDIR += p5-Locale-Maketext
     SUBDIR += p5-Locale-Maketext-Fuzzy
     SUBDIR += p5-Locale-Maketext-Gettext
     SUBDIR += p5-Locale-Maketext-Lexicon
     SUBDIR += p5-Locale-Maketext-Simple
     SUBDIR += p5-Locale-PGetText
     SUBDIR += p5-Locale-gettext
     SUBDIR += p5-Locale-libintl
     SUBDIR += p5-LockFile-Simple
     SUBDIR += p5-Log-Accounting-SVK
     SUBDIR += p5-Log-Agent
     SUBDIR += p5-Log-Agent-Logger
     SUBDIR += p5-Log-Dispatch
     SUBDIR += p5-Log-Dispatch-Config
     SUBDIR += p5-Log-Dispatch-FileRotate
     SUBDIR += p5-Log-Dispatch-Perl
     SUBDIR += p5-Log-Log4perl
     SUBDIR += p5-Log-TraceMessages
     SUBDIR += p5-Mac-FileSpec-Unixish
     SUBDIR += p5-Make
     SUBDIR += p5-Memoize
     SUBDIR += p5-Memoize-ExpireLRU
     SUBDIR += p5-Mknod
     SUBDIR += p5-Module-Build
     SUBDIR += p5-Module-CoreList
     SUBDIR += p5-Module-Info
     SUBDIR += p5-Module-Info-File
     SUBDIR += p5-Module-Install
     SUBDIR += p5-Module-Load
     SUBDIR += p5-Module-Load-Conditional
     SUBDIR += p5-Module-Pluggable
     SUBDIR += p5-Module-Pluggable-Fast
     SUBDIR += p5-Module-Pluggable-Ordered
     SUBDIR += p5-Module-Refresh
     SUBDIR += p5-Module-Reload
     SUBDIR += p5-Module-ScanDeps
     SUBDIR += p5-Module-Starter
     SUBDIR += p5-Module-Versions-Report
     SUBDIR += p5-NEXT
     SUBDIR += p5-Net-LibIDN
     SUBDIR += p5-OLE-Storage_Lite
     SUBDIR += p5-OOTools
     SUBDIR += p5-ORBit
     SUBDIR += p5-Object-MultiType
     SUBDIR += p5-Object-Realize-Later
     SUBDIR += p5-P4
     SUBDIR += p5-P4-Client
     SUBDIR += p5-PAR
     SUBDIR += p5-PAR-Dist
     SUBDIR += p5-PCSC-Card
     SUBDIR += p5-POE
     SUBDIR += p5-POE-API-Hooks
     SUBDIR += p5-POE-API-Peek
     SUBDIR += p5-POE-Component-Child
     SUBDIR += p5-POE-Component-DebugShell
     SUBDIR += p5-POE-Component-DirWatch
     SUBDIR += p5-POE-Component-IKC
     SUBDIR += p5-POE-Component-JobQueue
     SUBDIR += p5-POE-Component-Logger
     SUBDIR += p5-POE-Component-RSS
     SUBDIR += p5-POE-Component-Server-XMLRPC
     SUBDIR += p5-POE-Component-TSTP
     SUBDIR += p5-POE-Devel-Profiler
     SUBDIR += p5-POE-Exceptions
     SUBDIR += p5-POE-Session-MultiDispatch
     SUBDIR += p5-PPerl
     SUBDIR += p5-PV
     SUBDIR += p5-Parallel-ForkManager
     SUBDIR += p5-Params-CallbackRequest
     SUBDIR += p5-Params-Check
     SUBDIR += p5-Params-Validate
     SUBDIR += p5-Parse-CPAN-Packages
     SUBDIR += p5-Parse-PerlConfig
     SUBDIR += p5-Parse-RecDescent
     SUBDIR += p5-Parse-Yapp
     SUBDIR += p5-ParseLex
     SUBDIR += p5-PatchReader
+    SUBDIR += p5-PathTools
     SUBDIR += p5-Path-Class
     SUBDIR += p5-Penguin
     SUBDIR += p5-Penguin-Easy
     SUBDIR += p5-Perl6-Export
     SUBDIR += p5-Perl6-Form
     SUBDIR += p5-PerlIO-eol
     SUBDIR += p5-PerlIO-via-MD5
     SUBDIR += p5-PerlIO-via-dynamic
     SUBDIR += p5-PerlIO-via-symlink
     SUBDIR += p5-PerlMenu
     SUBDIR += p5-Pod-Coverage
     SUBDIR += p5-Proc-Background
     SUBDIR += p5-Proc-Daemon
     SUBDIR += p5-Proc-PID-File
     SUBDIR += p5-Proc-PIDFile
     SUBDIR += p5-Proc-ProcessTable
     SUBDIR += p5-Proc-Reliable
     SUBDIR += p5-Proc-Simple
     SUBDIR += p5-Project-Gantt
     SUBDIR += p5-Rcs
     SUBDIR += p5-Rcs-Agent
     SUBDIR += p5-ReadLine-Gnu
     SUBDIR += p5-ReadLine-Perl
     SUBDIR += p5-Regexp-Assemble
     SUBDIR += p5-Regexp-Shellish
     SUBDIR += p5-Religion
     SUBDIR += p5-ResourcePool
     SUBDIR += p5-Resources
     SUBDIR += p5-SDL
     SUBDIR += p5-SPOPS
     SUBDIR += p5-SVN-Mirror
     SUBDIR += p5-SVN-Notify
     SUBDIR += p5-SVN-Simple
     SUBDIR += p5-SVN-Web
     SUBDIR += p5-Search-Binary
     SUBDIR += p5-Set-Array
     SUBDIR += p5-Set-Crontab
     SUBDIR += p5-Set-Infinite
     SUBDIR += p5-Set-NestedGroups
     SUBDIR += p5-Set-Object
     SUBDIR += p5-Set-Scalar
     SUBDIR += p5-Shape
     SUBDIR += p5-Shell-Base
     SUBDIR += p5-Shell-Parser
     SUBDIR += p5-Smart-Comments
     SUBDIR += p5-Sort-ArrayOfArrays
     SUBDIR += p5-Sort-Tree
     SUBDIR += p5-Sort-Versions
     SUBDIR += p5-Spiffy
     SUBDIR += p5-Spoon
     SUBDIR += p5-Storable
     SUBDIR += p5-String-Approx
     SUBDIR += p5-String-CRC32
     SUBDIR += p5-String-Checker
     SUBDIR += p5-String-Ediff
     SUBDIR += p5-String-LRC
     SUBDIR += p5-String-Parity
     SUBDIR += p5-String-Random
     SUBDIR += p5-String-RexxParse
     SUBDIR += p5-String-Similarity
     SUBDIR += p5-Sub-Override
     SUBDIR += p5-Sub-Uplevel
     SUBDIR += p5-Sys-Mmap
     SUBDIR += p5-System2
     SUBDIR += p5-Term-ANSIColor
     SUBDIR += p5-Term-ANSIScreen
     SUBDIR += p5-Term-ProgressBar
     SUBDIR += p5-Term-Prompt
     SUBDIR += p5-Term-Query
     SUBDIR += p5-Term-ReadKey
     SUBDIR += p5-Term-ReadLine-Zoid
     SUBDIR += p5-Term-Screen
     SUBDIR += p5-Term-Shell
     SUBDIR += p5-Term-Size
     SUBDIR += p5-Test-Builder-Tester
     SUBDIR += p5-Test-Class
     SUBDIR += p5-Test-ClassAPI
     SUBDIR += p5-Test-Cmd
     SUBDIR += p5-Test-Deep
     SUBDIR += p5-Test-Differences
     SUBDIR += p5-Test-Exception
     SUBDIR += p5-Test-File
     SUBDIR += p5-Test-Harness
     SUBDIR += p5-Test-Inline
     SUBDIR += p5-Test-LectroTest
     SUBDIR += p5-Test-LongString
     SUBDIR += p5-Test-Manifest
     SUBDIR += p5-Test-MockModule
     SUBDIR += p5-Test-MockObject
     SUBDIR += p5-Test-NoWarnings
     SUBDIR += p5-Test-Pod
     SUBDIR += p5-Test-Pod-Coverage
     SUBDIR += p5-Test-Reporter
     SUBDIR += p5-Test-Simple
     SUBDIR += p5-Test-Tester
     SUBDIR += p5-Test-Unit
     SUBDIR += p5-Test-WWW-Mechanize
     SUBDIR += p5-Text-vFile-asData
     SUBDIR += p5-Tie-Array-Sorted
     SUBDIR += p5-Tie-Cache
     SUBDIR += p5-Tie-DB_File-SplitHash
     SUBDIR += p5-Tie-DB_FileLock
     SUBDIR += p5-Tie-File
     SUBDIR += p5-Tie-FileLRUCache
     SUBDIR += p5-Tie-IxHash
     SUBDIR += p5-Time-Duration
     SUBDIR += p5-Time-HiRes
     SUBDIR += p5-Time-Local
     SUBDIR += p5-Time-Object
     SUBDIR += p5-Time-Period
     SUBDIR += p5-Time-Piece
     SUBDIR += p5-Time-modules
     SUBDIR += p5-TimeDate
     SUBDIR += p5-TraceFuncs
     SUBDIR += p5-Tree-Binary
     SUBDIR += p5-Tree-DAG_Node
     SUBDIR += p5-Tree-Parser
     SUBDIR += p5-Tree-Simple
     SUBDIR += p5-Tree-Simple-View
     SUBDIR += p5-Tree-Simple-VisitorFactory
     SUBDIR += p5-UNIVERSAL-exports
     SUBDIR += p5-UNIVERSAL-moniker
     SUBDIR += p5-Unix-Statgrab
     SUBDIR += p5-VCP
     SUBDIR += p5-VCP-Dest-svk
     SUBDIR += p5-VCP-Source-cvsbk
     SUBDIR += p5-VCP-autrijus
     SUBDIR += p5-VCS
     SUBDIR += p5-VCS-CVS
     SUBDIR += p5-Want
     SUBDIR += p5-base
     SUBDIR += p5-enum
     SUBDIR += p5-iCal-Parser
     SUBDIR += p5-mixin
     SUBDIR += p5-prefork
     SUBDIR += p5-release
     SUBDIR += p5-version
     SUBDIR += p65
     SUBDIR += parrot
     SUBDIR += patch
     SUBDIR += pccts
     SUBDIR += pcl-cvs-emacs
     SUBDIR += pcl-cvs-emacs20
     SUBDIR += pcre
     SUBDIR += pcre++
     SUBDIR += pcre-utf8
     SUBDIR += pcsc-lite
     SUBDIR += pear-Config
     SUBDIR += pear-Console_Getargs
     SUBDIR += pear-Console_Getopt
     SUBDIR += pear-Console_Table
     SUBDIR += pear-Date
     SUBDIR += pear-Event_Dispatcher
     SUBDIR += pear-FSM
     SUBDIR += pear-HTML_BBCodeParser
     SUBDIR += pear-HTML_CSS
     SUBDIR += pear-HTML_Common
     SUBDIR += pear-HTML_Form
     SUBDIR += pear-HTML_Javascript
     SUBDIR += pear-HTML_Page2
     SUBDIR += pear-HTML_QuickForm
     SUBDIR += pear-HTML_QuickForm_Controller
     SUBDIR += pear-HTML_QuickForm_SelectFilter
     SUBDIR += pear-HTML_Select
     SUBDIR += pear-HTML_Select_Common
     SUBDIR += pear-HTML_Table
     SUBDIR += pear-HTML_Template_Flexy
     SUBDIR += pear-HTML_Template_IT
     SUBDIR += pear-HTML_Template_PHPLIB
     SUBDIR += pear-HTML_TreeMenu
     SUBDIR += pear-I18N
     SUBDIR += pear-OLE
     SUBDIR += pear-PEAR
     SUBDIR += pear-PEAR_PackageFileManager
     SUBDIR += pear-PHPUnit
     SUBDIR += pear-PHPUnit2
     SUBDIR += pear-PHP_Beautifier
     SUBDIR += pear-PHP_Compat
     SUBDIR += pear-PHP_CompatInfo
     SUBDIR += pear-Pager
     SUBDIR += pear-Structures_DataGrid
     SUBDIR += pear-System_Command
     SUBDIR += pear-Text_Diff
     SUBDIR += pear-VFS
     SUBDIR += pear-Validate
     SUBDIR += pear-Var_Dump
     SUBDIR += pear-XML_NITF
     SUBDIR += pear-XML_Parser
     SUBDIR += pear-XML_RPC
     SUBDIR += pear-XML_RSS
     SUBDIR += pear-XML_SVG
     SUBDIR += pear-XML_Serializer
     SUBDIR += pear-XML_Transformer
     SUBDIR += pear-XML_Tree
     SUBDIR += pear-XML_Util
     SUBDIR += pear-XML_XPath
     SUBDIR += pear-apd
     SUBDIR += pecl-statgrab
     SUBDIR += pedisassem
     SUBDIR += perforce
     SUBDIR += perltidy
     SUBDIR += pharmacy
     SUBDIR += php-dbg
     SUBDIR += php-xdebug
     SUBDIR += php4-dio
     SUBDIR += php4-gettext
     SUBDIR += php4-mcve
     SUBDIR += php4-ncurses
     SUBDIR += php4-pcntl
     SUBDIR += php4-pcre
     SUBDIR += php4-pear
     SUBDIR += php4-readline
     SUBDIR += php4-shmop
     SUBDIR += php4-sysvmsg
     SUBDIR += php4-sysvsem
     SUBDIR += php4-sysvshm
     SUBDIR += php4-tokenizer
     SUBDIR += php5-dio
     SUBDIR += php5-gettext
     SUBDIR += php5-mcve
     SUBDIR += php5-ncurses
     SUBDIR += php5-pcntl
     SUBDIR += php5-pcre
     SUBDIR += php5-pear
     SUBDIR += php5-readline
     SUBDIR += php5-shmop
     SUBDIR += php5-sysvmsg
     SUBDIR += php5-sysvsem
     SUBDIR += php5-sysvshm
     SUBDIR += php5-tokenizer
     SUBDIR += phpbt
     SUBDIR += phptags
     SUBDIR += physfs
     SUBDIR += picasm
     SUBDIR += picp
     SUBDIR += picprog
     SUBDIR += pinstall
     SUBDIR += pkgconfig
     SUBDIR += ply
     SUBDIR += pmake
     SUBDIR += pmk
     SUBDIR += popt
     SUBDIR += portcheckout
     SUBDIR += portlint
     SUBDIR += portmk
     SUBDIR += porttools
     SUBDIR += poslib
     SUBDIR += powerpc-rtems-binutils
     SUBDIR += powerpc-rtems-g77
     SUBDIR += powerpc-rtems-gcc
     SUBDIR += powerpc-rtems-gdb
     SUBDIR += powerpc-rtems-objc
     SUBDIR += ppl
     SUBDIR += prcs
     SUBDIR += premake
     SUBDIR += preps-gui
     SUBDIR += privman
     SUBDIR += projectcenter.app
     SUBDIR += prototype
     SUBDIR += psvn
     SUBDIR += pth
     SUBDIR += ptmalloc
     SUBDIR += ptypes
     SUBDIR += publib
     SUBDIR += pwlib
     SUBDIR += py-anonfunc
     SUBDIR += py-ansistyle
     SUBDIR += py-bison
     SUBDIR += py-cheetah
     SUBDIR += py-ciphon
     SUBDIR += py-clientcookie
     SUBDIR += py-coro
     SUBDIR += py-ctypes
     SUBDIR += py-cxx
     SUBDIR += py-dateutil
     SUBDIR += py-dbus
     SUBDIR += py-dialog
     SUBDIR += py-elementtree
     SUBDIR += py-fam
     SUBDIR += py-fileutils
     SUBDIR += py-fortran
     SUBDIR += py-freebsd
     SUBDIR += py-game
     SUBDIR += py-gamin
     SUBDIR += py-getargs
     SUBDIR += py-grouch
     SUBDIR += py-icalendar
     SUBDIR += py-istring
     SUBDIR += py-kjbuckets
     SUBDIR += py-kqueue
     SUBDIR += py-log4py
     SUBDIR += py-logging
     SUBDIR += py-logilab-common
     SUBDIR += py-mx-experimental
     SUBDIR += py-ncurses
     SUBDIR += py-omniorb
     SUBDIR += py-optik
     SUBDIR += py-orbit2
     SUBDIR += py-parsing
     SUBDIR += py-period
     SUBDIR += py-plex
     SUBDIR += py-pmock
     SUBDIR += py-pqueue
     SUBDIR += py-psyco
     SUBDIR += py-px
     SUBDIR += py-repl
     SUBDIR += py-resourcepackage
     SUBDIR += py-reverse
     SUBDIR += py-rlcompleter2
     SUBDIR += py-ro
     SUBDIR += py-roxlib
     SUBDIR += py-sendfile
     SUBDIR += py-simpleparse
     SUBDIR += py-simpy
     SUBDIR += py-sip
     SUBDIR += py-spark
     SUBDIR += py-statgrab
     SUBDIR += py-tables
     SUBDIR += py-tconfpy
     SUBDIR += py-twisted
     SUBDIR += py-twistedCore
     SUBDIR += py-twistedFlow
     SUBDIR += py-twistedRunner
     SUBDIR += py-twistedXish
     SUBDIR += py-ui
     SUBDIR += py-unit
     SUBDIR += py-urwid
     SUBDIR += py-vmaps
     SUBDIR += py-wsdllib
     SUBDIR += py-xdg
     SUBDIR += py-xoltar-toolkit
     SUBDIR += py-yaml
     SUBDIR += py-zopeInterface
     SUBDIR += py_otp_interface
     SUBDIR += pychecker
     SUBDIR += pylint
     SUBDIR += pyobfuscate
     SUBDIR += pyrex
     SUBDIR += pyumlgraph
     SUBDIR += qca
     SUBDIR += qextmdi
     SUBDIR += qmake
     SUBDIR += qsa
     SUBDIR += qssl
     SUBDIR += qtk
     SUBDIR += ragel
     SUBDIR += rapidsvn
     SUBDIR += re2c
     SUBDIR += readline
     SUBDIR += regexx
     SUBDIR += regexxer
     SUBDIR += replay
     SUBDIR += rhtvision
     SUBDIR += rinfo
     SUBDIR += rlwrap
     SUBDIR += robodoc
     SUBDIR += root
     SUBDIR += root-doc
     SUBDIR += rote
     SUBDIR += rpc2
     SUBDIR += rtplib
     SUBDIR += ruby-amstd
     SUBDIR += ruby-aspectr
     SUBDIR += ruby-avl
     SUBDIR += ruby-bsearch
     SUBDIR += ruby-byaccr
     SUBDIR += ruby-cache
     SUBDIR += ruby-calendar
     SUBDIR += ruby-cvs
     SUBDIR += ruby-date2
     SUBDIR += ruby-dialogs
     SUBDIR += ruby-fam
     SUBDIR += ruby-filelock
     SUBDIR += ruby-filemagic
     SUBDIR += ruby-gconf2
     SUBDIR += ruby-gemfinder
     SUBDIR += ruby-gems
     SUBDIR += ruby-gettext
     SUBDIR += ruby-glib2
     SUBDIR += ruby-gnomevfs
     SUBDIR += ruby-gnustep
     SUBDIR += ruby-inline
     SUBDIR += ruby-intl
     SUBDIR += ruby-io-reactor
     SUBDIR += ruby-jttui
     SUBDIR += ruby-libglade
     SUBDIR += ruby-libglade2
     SUBDIR += ruby-locale
     SUBDIR += ruby-metaruby
     SUBDIR += ruby-mmap
     SUBDIR += ruby-mock
     SUBDIR += ruby-ncurses
     SUBDIR += ruby-nodedump
     SUBDIR += ruby-p4
     SUBDIR += ruby-pcsc-lite
     SUBDIR += ruby-poll
     SUBDIR += ruby-property
     SUBDIR += ruby-racc
     SUBDIR += ruby-rbbr
     SUBDIR += ruby-rbison
     SUBDIR += ruby-rbprof
     SUBDIR += ruby-rbtree
     SUBDIR += ruby-rjudy
     SUBDIR += ruby-robjectteam
     SUBDIR += ruby-rrb
     SUBDIR += ruby-rreadline
     SUBDIR += ruby-rudl
     SUBDIR += ruby-sdl
     SUBDIR += ruby-setup.rb
     SUBDIR += ruby-slang
     SUBDIR += ruby-strongtyping
     SUBDIR += ruby-sysvipc
     SUBDIR += ruby-textbuf
     SUBDIR += ruby-tzfile
     SUBDIR += rudiments
     SUBDIR += rvi
     SUBDIR += rvm
     SUBDIR += safestr
     SUBDIR += scandoc
     SUBDIR += scons
     SUBDIR += scsh-install-lib
     SUBDIR += sdl12
     SUBDIR += sdl_ldbad
     SUBDIR += sdlmm
     SUBDIR += sdts++
     SUBDIR += sedsed
     SUBDIR += semantic
     SUBDIR += semantic-emacs20
     SUBDIR += sfio
     SUBDIR += sgb
     SUBDIR += sgl
     SUBDIR += sh-rtems-binutils
     SUBDIR += sh-rtems-g77
     SUBDIR += sh-rtems-gcc
     SUBDIR += sh-rtems-gdb
     SUBDIR += sh-rtems-objc
     SUBDIR += shapelib
     SUBDIR += shmap
     SUBDIR += showgrammar
     SUBDIR += shtool
     SUBDIR += sigslot
     SUBDIR += silc-toolkit
     SUBDIR += simgear
     SUBDIR += simpletest
     SUBDIR += simulavr
     SUBDIR += skalibs
     SUBDIR += smake
     SUBDIR += smc
     SUBDIR += smv
     SUBDIR += soup
     SUBDIR += sourcenav
     SUBDIR += sparc-rtems-binutils
     SUBDIR += sparc-rtems-g77
     SUBDIR += sparc-rtems-gcc
     SUBDIR += sparc-rtems-gdb
     SUBDIR += sparc-rtems-objc
     SUBDIR += spin
     SUBDIR += splint
     SUBDIR += st
     SUBDIR += stlfilt
     SUBDIR += stlport
     SUBDIR += stlport-icc
     SUBDIR += str
     SUBDIR += strace
     SUBDIR += styx
     SUBDIR += subversion
     SUBDIR += subversion-perl
     SUBDIR += subversion-python
     SUBDIR += sunterlib
     SUBDIR += svk
     SUBDIR += swarm
     SUBDIR += swig11
     SUBDIR += swig13
     SUBDIR += swig13-doc
     SUBDIR += swigruby
     SUBDIR += sysconftool
     SUBDIR += t1lib
     SUBDIR += tavrasm
     SUBDIR += tcl-memchan
     SUBDIR += tcl-neo
     SUBDIR += tcl-trf
     SUBDIR += tclcheck
     SUBDIR += tclcl
     SUBDIR += tclgetopts
     SUBDIR += tcllib
     SUBDIR += tclreadline
     SUBDIR += tcltls
     SUBDIR += tclxml
     SUBDIR += tdl
     SUBDIR += templ
     SUBDIR += terminality
     SUBDIR += tide
     SUBDIR += tigcc
     SUBDIR += tinyq
     SUBDIR += titano
     SUBDIR += tkcon
     SUBDIR += tkcvs
     SUBDIR += tkinspect
     SUBDIR += tkmerge
     SUBDIR += tkp4
     SUBDIR += tkref
     SUBDIR += tla
     SUBDIR += tmake
     SUBDIR += tnt
     SUBDIR += towitoko
     SUBDIR += tpasm
     SUBDIR += tpg
     SUBDIR += trio
     SUBDIR += tvision
     SUBDIR += uclmmbase
     SUBDIR += ucpp
     SUBDIR += upnp
     SUBDIR += ups-debug
     SUBDIR += ustl
     SUBDIR += valgrind
     SUBDIR += valgrind-snapshot
     SUBDIR += varconf
     SUBDIR += vb2c
     SUBDIR += viewcvs
     SUBDIR += vstr
     SUBDIR += vtcl
     SUBDIR += websvn
     SUBDIR += wftk
     SUBDIR += wininfo
     SUBDIR += wizard
     SUBDIR += wxGlade
     SUBDIR += xfc
     SUBDIR += xmake
     SUBDIR += xparam
     SUBDIR += xtl
     SUBDIR += xtla
     SUBDIR += xwpe
     SUBDIR += xxgdb
     SUBDIR += xxl
     SUBDIR += yacl
     SUBDIR += yasm
     SUBDIR += z80-asm
     SUBDIR += zendstudio
     SUBDIR += zthread
     SUBDIR += zziplib
 
 .include <bsd.port.subdir.mk>
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,125 +1,126 @@
 # New ports collection makefile for:	bugzilla
 # Date created:				28 September 2001
 # Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18.1
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
 MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
 		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
 		LDAP "Enable LDAP support" off
 
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
 		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
 CONFLICTS?=	ja-bugzilla-2.*
 
 USE_REINPLACE=	yes
 
 BINMODE=	700
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .ifndef BUGZILLADIR
 .ifdef APACHE_DATADIR
 BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
 .else
 BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 .endif
 .endif
 
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
 
 .include <bsd.port.pre.mk>
 
 .ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
 .ifdef WITH_GRAPHVIZ
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 .endif
 
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
 .ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
 .ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
 .ifdef WITH_LDAP
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
 		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
 do-build:
 	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
 		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
 .for D in css js skins/standard
 	@${MKDIR} ${BUGZILLADIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
 .ifndef NOPORTDOCS
 .for D in html images/callouts images pdf txt xml ""
 	${MKDIR} ${DOCSDIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
 .endfor
 .endif
 .ifdef WITH_CONTRIB
 	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
 		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
 .ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
 	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
 .endif
 .endif
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -1,125 +1,126 @@
 # New ports collection makefile for:	bugzilla
 # Date created:				28 September 2001
 # Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18.1
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
 MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
 		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
 		LDAP "Enable LDAP support" off
 
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
 		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
 CONFLICTS?=	ja-bugzilla-2.*
 
 USE_REINPLACE=	yes
 
 BINMODE=	700
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .ifndef BUGZILLADIR
 .ifdef APACHE_DATADIR
 BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
 .else
 BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 .endif
 .endif
 
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
 
 .include <bsd.port.pre.mk>
 
 .ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
 .ifdef WITH_GRAPHVIZ
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 .endif
 
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
 .ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
 .ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
 .ifdef WITH_LDAP
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
 		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
 do-build:
 	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
 		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
 .for D in css js skins/standard
 	@${MKDIR} ${BUGZILLADIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
 .ifndef NOPORTDOCS
 .for D in html images/callouts images pdf txt xml ""
 	${MKDIR} ${DOCSDIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
 .endfor
 .endif
 .ifdef WITH_CONTRIB
 	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
 		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
 .ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
 	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
 .endif
 .endif
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -1,125 +1,126 @@
 # New ports collection makefile for:	bugzilla
 # Date created:				28 September 2001
 # Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18.1
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
 MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
 		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
 		LDAP "Enable LDAP support" off
 
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
 		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
 CONFLICTS?=	ja-bugzilla-2.*
 
 USE_REINPLACE=	yes
 
 BINMODE=	700
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .ifndef BUGZILLADIR
 .ifdef APACHE_DATADIR
 BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
 .else
 BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 .endif
 .endif
 
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
 
 .include <bsd.port.pre.mk>
 
 .ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
 .ifdef WITH_GRAPHVIZ
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 .endif
 
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
 .ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
 .ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
 .ifdef WITH_LDAP
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
 		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
 do-build:
 	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
 		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
 .for D in css js skins/standard
 	@${MKDIR} ${BUGZILLADIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
 .ifndef NOPORTDOCS
 .for D in html images/callouts images pdf txt xml ""
 	${MKDIR} ${DOCSDIR}/${D}
 	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
 .endfor
 .endif
 .ifdef WITH_CONTRIB
 	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
 		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
 		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
 .ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
 	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
 .endif
 .endif
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index bce6de76c757..8cad572e4112 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -1,103 +1,103 @@
 # New ports collection makefile for:	cvsmonitor
 # Date created:    18 May 2003
 # Whom:		   Sergey Skvortsov <skv@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cvsmonitor
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Monitor activity on a CVS Repository
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Time/Duration.pm:${PORTSDIR}/devel/p5-Time-Duration \
 		${SITE_PERL}/Class/Autouse.pm:${PORTSDIR}/devel/p5-Class-Autouse \
 		${SITE_PERL}/Class/Default.pm:${PORTSDIR}/devel/p5-Class-Default \
 		${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector \
 		${SITE_PERL}/Class/Handle.pm:${PORTSDIR}/devel/p5-Class-Handle \
 		${SITE_PERL}/Sort/Versions.pm:${PORTSDIR}/devel/p5-Sort-Versions \
 		${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
 		${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
 		${SITE_PERL}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
 		${SITE_PERL}/Validate/Net.pm:${PORTSDIR}/net/p5-Validate-Net \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/Chart/Math/Axis.pm:${PORTSDIR}/math/p5-Chart-Math-Axis \
 		${SITE_PERL}/File/NCopy.pm:${PORTSDIR}/devel/p5-File-NCopy \
 		${SITE_PERL}/File/Remove.pm:${PORTSDIR}/devel/p5-File-Remove \
 		${SITE_PERL}/File/Flat.pm:${PORTSDIR}/devel/p5-File-Flat \
 		${SITE_PERL}/File/Find/Rule.pm:${PORTSDIR}/devel/p5-File-Find-Rule \
 		${SITE_PERL}/File/Which.pm:${PORTSDIR}/sysutils/p5-File-Which \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/${PERL_ARCH}/Clone.pm:${PORTSDIR}/devel/p5-Clone \
 		${SITE_PERL}/Config/Tiny.pm:${PORTSDIR}/devel/p5-Config-Tiny \
 		${SITE_PERL}/Array/Window.pm:${PORTSDIR}/devel/p5-Array-Window \
 		${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		${SITE_PERL}/Number/Compare.pm:${PORTSDIR}/math/p5-Number-Compare \
 		${SITE_PERL}/Text/Glob.pm:${PORTSDIR}/textproc/p5-Text-Glob \
 		${SITE_PERL}/XML/Generator.pm:${PORTSDIR}/textproc/p5-XML-Generator \
 		${SITE_PERL}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
 
 USE_PERL5=	yes
 
 # stolen from cvsweb
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
 CGIDIR?=	share/apache/cgi-bin
 .else
 CGIDIR?=	www/cgi-bin
 .endif
 
 PLIST_SUB=	CVSMON="${CGIDIR}/cvsmonitor"
 
 DIRS_DATA=	html html/Admin html/Browse html/Error html/Search \
 		modules modules/AppLib modules/AppLib/Interface \
 		modules/CVSMonitor modules/CVSMonitor/Graph \
 		modules/CVSMonitor/Backend modules/CVSMonitor/HTML \
 		modules/CVSMonitor/Range modules/CVSMonitor/MetaData \
 		modules/CVSMonitor/MetaData/Abstract setup \
 		setup/html static/style static/images
 FILES_SCRIPT=	cvsexec.pl cvsmonitor.pl setup.pl
 FILES_DATA=	README setup.conf
 
 CVSMONITOR_ROOT=	${PREFIX}/${CGIDIR}/cvsmonitor
 
 post-patch:
 	@${PERL} -pi -e '$$_=q{	my $$solaris=1;} if $$.==270' \
 		${WRKSRC}/modules/CVSMonitor/MetaData/Module.pm
 
 do-install:
 	${MKDIR} ${PREFIX}/${CGIDIR}
 .for d in ${DIRS_DATA}
 	${MKDIR} ${CVSMONITOR_ROOT}/${d}
 	${INSTALL_DATA} ${WRKSRC}/${d}/*.* ${CVSMONITOR_ROOT}/${d}
 .endfor
 .for f in ${FILES_SCRIPT}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${CVSMONITOR_ROOT}
 .endfor
 .for f in ${FILES_DATA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${CVSMONITOR_ROOT}
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-Info/Makefile b/devel/p5-App-Info/Makefile
index b1411116d104..929bcb52ffab 100644
--- a/devel/p5-App-Info/Makefile
+++ b/devel/p5-App-Info/Makefile
@@ -1,35 +1,31 @@
 # New ports collection makefile for:    p5-App-Info
 # Date created:				19 May 2003
 # Whom:	      				Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	App-Info
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	App
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Interface for providing metadata about installed software packages
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_MODBUILD=	YES
 
 MAN3=		App::Info::HTTPD.3 App::Info::Lib::Iconv.3 \
 		App::Info::HTTPD::Apache.3 App::Info::Lib.3 App::Info::RDBMS.3 \
 		App::Info::Lib::Expat.3 App::Info::Request.3 \
 		App::Info::Handler::Print.3 App::Info::RDBMS::PostgreSQL.3 \
 		App::Info::Util.3 App::Info::Handler.3 App::Info.3 \
 		App::Info::Handler::Prompt.3 App::Info::Handler::Carp.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index b0da6e8c7523..72e9798f64e7 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -1,30 +1,31 @@
 # New ports collection makefile for:   p5-AppConfig-Std
 # Date created:                20 July 2002
 # Whom:                        Kimura Fuyuki <fuyuki@hadaly.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	AppConfig-Std
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	AppConfig
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A subclass of AppConfig that provides standard options
 
 BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		AppConfig::Std.3
 
 post-patch:
 	${PERL} -pi -e 's|(VERSION_FROM\s+=>\s+)(.*)(,.*)$$|$$1$$2$$3\nMAN3PODS=>{$$2=>q!\\\$$(INST_MAN3DIR)/${MAN3}!},|;' \
 		${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 66f46ccaa354..6cc3d68de9f8 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -1,31 +1,27 @@
 # New ports collection makefile for:	Array-Window
 # Date created:	   18 May 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Array-Window
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Array
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Calculate windows/subsets/pages of arrays
 
-BUILD_DEPENDS=	${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Array::Window.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 7c93b0bb5ac8..6280f29b1a1a 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	AtExit
 # Date created:	   28 August 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	AtExit
 PORTVERSION=	2.01
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/B/BR/BRADAPP
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	AtExit - Perform exit processing for a program or object
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		AtExit.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index c505b0440880..abcc12934b7d 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -1,59 +1,50 @@
 # New ports collection makefile for:	devel/p5-Cache-Cache
 # Date created:				29 April 2001
 # Whom:					Anton Berezin <tobez@tobez.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Cache-Cache
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Cache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cache::Cache -- Perl Cache interface
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	Cache::BaseCache.3 \
 	Cache::BaseCacheTester.3 \
 	Cache::Cache.3 \
 	Cache::CacheMetaData.3 \
 	Cache::CacheSizer.3 \
 	Cache::CacheTester.3 \
 	Cache::CacheUtils.3 \
 	Cache::FileBackend.3 \
 	Cache::FileCache.3 \
 	Cache::MemoryBackend.3 \
 	Cache::MemoryCache.3 \
 	Cache::NullCache.3 \
 	Cache::Object.3 \
 	Cache::SharedMemoryBackend.3 \
 	Cache::SharedMemoryCache.3 \
 	Cache::SizeAwareCache.3 \
 	Cache::SizeAwareCacheTester.3 \
 	Cache::SizeAwareFileCache.3 \
 	Cache::SizeAwareMemoryCache.3 \
 	Cache::SizeAwareSharedMemoryCache.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-.endif
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 60169d9171d5..cdac581e0af7 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	Class-Autouse
 # Date created:	   10 December 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Class-Autouse
-PORTVERSION=	1.16
+PORTVERSION=	1.17
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Defer loading of one or more classes
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/prefork.pm:${PORTSDIR}/devel/p5-prefork
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Class::Autouse.3
 
 post-patch:
 	@${PERL} -pi -e 's/^auto_install.*$$//' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Autouse/distinfo b/devel/p5-Class-Autouse/distinfo
index d79be49a09ab..b44637cfbfe8 100644
--- a/devel/p5-Class-Autouse/distinfo
+++ b/devel/p5-Class-Autouse/distinfo
@@ -1,2 +1,2 @@
-MD5 (Class-Autouse-1.16.tar.gz) = 7258938f734b3a308b7b6bd389ae61f8
-SIZE (Class-Autouse-1.16.tar.gz) = 27144
+MD5 (Class-Autouse-1.17.tar.gz) = 075c0d92df6ccc8628fd46ad46923fad
+SIZE (Class-Autouse-1.17.tar.gz) = 32625
diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile
index 427f092b95b2..6be14f8eab5b 100644
--- a/devel/p5-Class-Fields/Makefile
+++ b/devel/p5-Class-Fields/Makefile
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	Class-Fields
 # Date created:		15 Dec 2001
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Class-Fields
 PORTVERSION=	0.201
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Set of modules to operate with class fields and members access
 
 BUILD_DEPENDS=	${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \
 		${SITE_PERL}/base.pm:${PORTSDIR}/devel/p5-base
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS='site'
 
 MAN3=		Class::Fields.3 Class::Fields::Attribs.3 \
 		Class::Fields::Fuxor.3 Class::Fields::Inherit.3 private.3 \
 		protected.3 public.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Inspector/Makefile b/devel/p5-Class-Inspector/Makefile
index 83fc75555ce7..9050f9c551cb 100644
--- a/devel/p5-Class-Inspector/Makefile
+++ b/devel/p5-Class-Inspector/Makefile
@@ -1,25 +1,26 @@
 # New ports collection makefile for:	Class-Inspector
 # Date created:	   10 December 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Class-Inspector
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Provides information about classes
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Class::Inspector.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index da8396feca49..6effdb005b7a 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -1,43 +1,43 @@
 # New ports collection makefile for:	p5-Config-Auto
 # Date created:				August 29 2003
 # Whom:					Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 
 PORTNAME=	Config-Auto
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Config
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Magical config file parser
 
-BUILD_DEPENDS=	${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	XMLSIMPLE "Support for XML config files" off
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_XMLSIMPLE)
 BUILD_DEPENDS+=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
 RUN_DEPENDS+=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
 .endif
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Config::Auto.3
 
 .if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-
 post-patch:
 	@${PERL} -pi -e 's/^our (\$$\w+)/use vars qw($$1); $$1/;' \
 		     -e '$$_ = "" if (/5.006/);' \
 		     -e '$$_ = "" if (/use warnings/);' \
 		 ${WRKSRC}/lib/Config/Auto.pm
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index e655738a3136..9753d443f10b 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -1,33 +1,34 @@
 # New ports collection makefile for:	p5-Config-General
 # Date created:				August 27 2002
 # Whom:	      				Sheldon Hearn <sheldonh@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Config-General
 PORTVERSION=	2.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Config
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module for handling Apache-style configuration files
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	YES
 
 MAN3=		Config::General::Extended.3 Config::General::Interpolated.3 \
 		Config::General.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|::Heavy||' ${WRKSRC}/General.pm
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 7fd2706fdeea..88c94290d8d7 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -1,52 +1,48 @@
 # New ports collection makefile for:	p5-DateTime-Format-Builder
 # Date created:	   2 july 2003
 # Whom:		   Mathieu Arnold <m@absolight.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	DateTime-Format-Builder
 PORTVERSION=	0.78.06
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DateTime
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Create DateTime parser classes and objects
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
 		${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime
 
 PERL_MODBUILD=	yes
 
 MAN3=		DateTime::Format::Builder.3 DateTime::Format::Builder::Parser.3 \
 		DateTime::Format::Builder::Parser::Dispatch.3 \
 		DateTime::Format::Builder::Parser::Regex.3 \
 		DateTime::Format::Builder::Parser::Quick.3 \
 		DateTime::Format::Builder::Parser::Strptime.3 \
 		DateTime::Format::Builder::Parser::generic.3 \
 		DateTime::Format::Builder::Tutorial.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	CREDITS Changes README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index 0fe946321a6a..674022908ad7 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -1,38 +1,37 @@
 # New ports collection makefile for:	p5-DateTime-Format-HTTP
 # Date created:	   7 july 2003
 # Whom:		   Mathieu Arnold <mat@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	DateTime-Format-HTTP
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DateTime
 PKGNAMEPREFIX=	p5-
 #DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	HTTP date conversion routines
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww
 
 PERL_MODBUILD=	yes
 
 MAN3=		DateTime::Format::HTTP.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} <= 500600
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
 .if ${PERL_LEVEL} < 500600
 post-patch:
 	@${PERL} -pi -e '$$_ = "" if /use warnings/;' \
 		 ${WRKSRC}/lib/DateTime/Format/HTTP.pm
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile
index f63f7e63ee85..da75e5970a59 100644
--- a/devel/p5-Devel-Cycle/Makefile
+++ b/devel/p5-Devel-Cycle/Makefile
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	Devel-Cycle
 # Date created:	   16 January 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-Cycle
 PORTVERSION=	1.04
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Find memory cycles in objects
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Devel::Cycle.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile
index 7f054dab9ba9..fdf5226ce2bf 100644
--- a/devel/p5-Devel-DProfPP/Makefile
+++ b/devel/p5-Devel-DProfPP/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	Devel-DProfPP
 # Date created:	   25 June 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-DProfPP
 PORTVERSION=	1.3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Parse Devel::DProf output
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Devel::DProfPP.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index eefc9ec49754..9962785fc00c 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -1,33 +1,33 @@
 # New ports collection makefile for:	Devel-LeakTrace
 # Date created:	   19 January 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-LeakTrace
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Indicate where leaked variables are coming from
 
 PERL_MODBUILD=	yes
 USE_GNOME=	glib12
 
 MAN3=		Devel::LeakTrace.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .if ${PERL_LEVEL} < 500702
 BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile
index d7dd7720c294..86111d559b97 100644
--- a/devel/p5-Devel-PPPort/Makefile
+++ b/devel/p5-Devel-PPPort/Makefile
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	p5-Devel-PPPort
 # Date created:				8 Aug 2004
 # Whom:	      				mat
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-PPPort
 PORTVERSION=	3.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 #DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/_\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Perl/Pollution/Portability
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		Devel::PPPort.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README HACKERS TODO
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile
index 29660ae81880..bf4fcf7c5c3d 100644
--- a/devel/p5-Devel-Pointer/Makefile
+++ b/devel/p5-Devel-Pointer/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	Devel-Pointer
 # Date created:	   19 January 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-Pointer
 PORTVERSION=	1.00
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Fiddle around with pointers
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Devel::Pointer.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 24e6d26c77cd..040863f8bde2 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	Devel-Profiler
 # Date created:	   09 September 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-Profiler
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A Perl profiler compatible with dprofpp
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Devel::Profiler.3 Devel::Profiler::Apache.3 \
 		Devel::Profiler::Test.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 630657d9a863..20bacb8ddbe8 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	Devel-SmallProf
 # Date created:	   11 August 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-SmallProf
 PORTVERSION=	2.00.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SALVA
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([0-9]+)$/_\1/}
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Per-line Perl profiler
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Devel::SmallProf.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.6 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 74c66b95ef25..45d8ec526ab1 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -1,25 +1,24 @@
 # New ports collection makefile for:	p5-Devel-ptkdb
 # Date created:				May 9th 2002
 # Whom:					Alex Kapranoff <kappa@freebsd.org.ua>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Devel-ptkdb
 PORTVERSION=	1.1086
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kappa@freebsd.org.ua
 COMMENT=	Tk debugger for Perl
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS='site'
 
 MAN3=		Devel::ptkdb.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-CBuilder/Makefile b/devel/p5-ExtUtils-CBuilder/Makefile
index 049eb62bdc23..3871a9dec4a5 100644
--- a/devel/p5-ExtUtils-CBuilder/Makefile
+++ b/devel/p5-ExtUtils-CBuilder/Makefile
@@ -1,38 +1,35 @@
 # New ports collection makefile for:	ExtUtils::CBuilder
 # Date created:				20 Feb 2004
 # Whom:                			Mathieu Arnold <mat@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-CBuilder
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Compile and link C code for Perl modules
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
 MAN3=		ExtUtils::CBuilder.3 ExtUtils::CBuilder::Platform::Windows.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile
index 3985219990b8..bb92af781395 100644
--- a/devel/p5-ExtUtils-Constant/Makefile
+++ b/devel/p5-ExtUtils-Constant/Makefile
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	ExtUtils-Constant
 # Date created:	   03 February 2005
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-Constant
 PORTVERSION=	0.16
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Generate XS code to import C header constants
 
 PERL_CONFIGURE=	yes
 
 MAN3=		ExtUtils::Constant.3 ExtUtils::Constant::Base.3 \
 		ExtUtils::Constant::Utils.3 ExtUtils::Constant::XS.3
 
 post-patch:
-	@${PERL} -pi -e 's!^(\s+INSTALLDIRS\s+=>\s+).*$$!$$1"site",!' \
-		${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index 49c12802c729..ccbc45d89703 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	ExtUtils-Depends
 # Date created:	   18 October 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-Depends
 PORTVERSION=	0.205
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Easily build XS extensions that depend on XS extensions
 
 PERL_CONFIGURE=	yes
 
 MAN3=		ExtUtils::Depends.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index ec88729f0c42..30c9c6399aef 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,54 +1,53 @@
 # New ports collection makefile for:    ExtUtils-MakeMaker
 # Date created:                         Mon Feb 23 00:13:01 EST 2004
 # Whom:                                 Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-MakeMaker
 PORTVERSION=	6.30
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Designed to write a Makefile for an extension module
 
 PERL_CONFIGURE=	YES
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN1=	instmodsh.1
 MAN3=	ExtUtils::Installed.3 ExtUtils::MM_OS2.3 ExtUtils::MakeMaker.3 \
 	ExtUtils::Install.3 ExtUtils::Manifest.3 ExtUtils::Command.3 \
 	ExtUtils::MM_Unix.3 ExtUtils::Mksymlists.3 ExtUtils::MM.3 \
 	ExtUtils::MM_Win32.3 ExtUtils::MM_UWIN.3 ExtUtils::testlib.3 \
 	ExtUtils::MakeMaker::vmsish.3 ExtUtils::MY.3 ExtUtils::MM_DOS.3 \
 	ExtUtils::MM_Cygwin.3 ExtUtils::MM_MacOS.3 ExtUtils::MM_Win95.3 \
 	ExtUtils::MM_VMS.3 ExtUtils::MM_BeOS.3 ExtUtils::Liblist.3 \
 	ExtUtils::MakeMaker::Tutorial.3 ExtUtils::Packlist.3 \
 	ExtUtils::Mkbootstrap.3 ExtUtils::MakeMaker::FAQ.3 \
 	ExtUtils::Command::MM.3 ExtUtils::MakeMaker::bytes.3 \
 	ExtUtils::MM_NW5.3 ExtUtils::MM_Any.3 ExtUtils::MM_VOS.3 \
 	ExtUtils::MM_QNX.3 ExtUtils::MM_AIX.3 ExtUtils::MakeMaker::Config.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
 IGNORE=		This port requires perl 5.6.x or later. Install lang/perl5 then try again
 .endif
 
 .if ${PERL_LEVEL} >= 500800
 .undef MAN1
 PLIST_SUB+=	EXE_FILES="@comment "
 .else
 PLIST_SUB+=	EXE_FILES=""
 .endif
 
 post-patch:
 .if ${PERL_LEVEL} >= 500800
 	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-ExtUtils-ParseXS/Makefile b/devel/p5-ExtUtils-ParseXS/Makefile
index 5c892eb6c190..b76a01b04455 100644
--- a/devel/p5-ExtUtils-ParseXS/Makefile
+++ b/devel/p5-ExtUtils-ParseXS/Makefile
@@ -1,32 +1,31 @@
 # New ports collection makefile for:	ExtUtils::ParseXS
 # Date created:				29 June 2003
 # Whom:                			Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-ParseXS
 PORTVERSION=	2.07
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts Perl XS code into C code
 
 BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		ExtUtils::ParseXS.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500600
 IGNORE=		Needs perl 5.6 or higher because of "/??{}/" in regexes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index 7d608203e1d7..1b8fb555d930 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	ExtUtils::XSBuilder
 # Date created:				11 Sep 2003
 # Whom:                			vanilla
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ExtUtils-XSBuilder
 PORTVERSION=	0.27
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Autogenerating XS-glue Code
 
 RUN_DEPENDS=	${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		ExtUtils::XSBuilder.3 ExtUtils::XSBuilder::PODTemplate.3 \
 		ExtUtils::xsbuilder.osc2002.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index 5ff768c90392..3419e25ec347 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -1,39 +1,36 @@
 # New ports collection makefile for:	File-Find-Rule
 # Date created:	   19 May 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	File-Find-Rule
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Alternative interface to File::Find
 
 BUILD_DEPENDS=	${SITE_PERL}/Number/Compare.pm:${PORTSDIR}/math/p5-Number-Compare \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Text/Glob.pm:${PORTSDIR}/textproc/p5-Text-Glob
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN1=		findrule.1
 MAN3=		File::Find::Rule.3 File::Find::Rule::Extending.3 \
 		File::Find::Rule::Procedural.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 .if ${PERL_LEVEL} < 500702
 BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 5785d6e6cd29..85e02c0bb985 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -1,29 +1,26 @@
 # New ports collection makefile for:	File-NCopy
 # Date created:	   18 May 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	File-NCopy
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/M/MZ/MZSANFORD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Copy file(s) to directories/file
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
 MAN3=		File::NCopy.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-File-Spec/Makefile b/devel/p5-File-Spec/Makefile
deleted file mode 100644
index 310e58e5793e..000000000000
--- a/devel/p5-File-Spec/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	p5-File-Spec
-# Date created:				November 22, 2000
-# Whom:	      				Donald Burr <dburr@FreeBSD.ORG>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	File-Spec
-PORTVERSION=	0.90
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	File
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	A Perl module for portably manipulating file specifications
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	INSTALLDIRS='site'
-
-MAN3=		File::Spec.3 \
-		File::Spec::Cygwin.3 \
-		File::Spec::Epoc.3 \
-		File::Spec::Functions.3 \
-		File::Spec::Mac.3 \
-		File::Spec::OS2.3 \
-		File::Spec::Unix.3 \
-		File::Spec::VMS.3 \
-		File::Spec::Win32.3
-
-.include <bsd.port.mk>
diff --git a/devel/p5-File-Spec/distinfo b/devel/p5-File-Spec/distinfo
deleted file mode 100644
index 8f8e7e29e368..000000000000
--- a/devel/p5-File-Spec/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909
-SIZE (File-Spec-0.90.tar.gz) = 33064
diff --git a/devel/p5-File-Spec/pkg-descr b/devel/p5-File-Spec/pkg-descr
deleted file mode 100644
index 3dd8fae8a883..000000000000
--- a/devel/p5-File-Spec/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This module is designed to support operations commonly performed on file
-specifications (usually called "file names", but not to be confused with
-the contents of a file, or Perl's file handles), such as concatenating
-several directory and file names into a single path, or determining
-whether a path is rooted.
-
-WWW: http://search.cpan.org/dist/File-Spec/
diff --git a/devel/p5-File-Spec/pkg-plist b/devel/p5-File-Spec/pkg-plist
deleted file mode 100644
index b17a359e3dbe..000000000000
--- a/devel/p5-File-Spec/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%SITE_PERL%%/File/Spec.pm
-%%SITE_PERL%%/File/Spec/Cygwin.pm
-%%SITE_PERL%%/File/Spec/Epoc.pm
-%%SITE_PERL%%/File/Spec/Functions.pm
-%%SITE_PERL%%/File/Spec/Mac.pm
-%%SITE_PERL%%/File/Spec/OS2.pm
-%%SITE_PERL%%/File/Spec/Unix.pm
-%%SITE_PERL%%/File/Spec/VMS.pm
-%%SITE_PERL%%/File/Spec/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@dirrm %%SITE_PERL%%/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 924b3846e14b..5a715677d525 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,28 +1,27 @@
 # New ports collection makefile for:	p5-File-Temp
 # Date created:		13 March 2001
 # Whom:	      		Johann Visagie <johann@egenetics.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	File-Temp
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Perl5 module to generate temporary files or directories safely
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		File::Temp.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 5cd45d95a7c6..c448bac94ed1 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -1,52 +1,53 @@
 # New ports collection makefile for:	p5-Locale-Maketext-Lexicon
 # Date created:				February 23, 2003
 # Whom:					Mathieu Arnold <m@absolight.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Locale-Maketext-Lexicon
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Locale
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Use other catalog formats in Locale::Maketext
 
 BUILD_DEPENDS=	${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
 MAN3=		Locale::Maketext::Extract.3 \
 		Locale::Maketext::Lexicon::Auto.3 \
 		Locale::Maketext::Lexicon::Gettext.3 \
 		Locale::Maketext::Lexicon::Msgcat.3 \
 		Locale::Maketext::Lexicon::Tie.3 \
 		Locale::Maketext::Lexicon.3
 
 MAN1=		xgettext.pl.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	AUTHORS Changes README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 post-patch:
 	@${PERL} -pi -e '$$_ = "" if /no warnings/;' \
 		-e 's/^our (\S+);/use vars qw{$$1};/;' \
 		${WRKSRC}/lib/Locale/Maketext/Lexicon.pm
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index 8a941e8f1c02..edcc1ff7889b 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	p5-Locale-Maketext
 # Date created:			March 13, 2000
 # Whom:				Frank Mayhar <frank@exit.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Locale-Maketext
 PORTVERSION=	1.09
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Locale
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	A framework for software localization and inheritance-based lexicons
 
 BUILD_DEPENDS=	${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		Locale::Maketext.3 Locale::Maketext::TPJ13.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index e2eba4ecf6be..e375a0b5ea7d 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -1,176 +1,173 @@
 # New ports collection makefile for:	p5-Locale-libintl
 # Date created:			April 20th, 2004
 # Whom:				Erwin Lansing <erwin@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Locale-libintl
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Locale
 PKGNAMEPREFIX=	p5-
 DISTNAME=	libintl-perl-${PORTVERSION}
 
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Internationalization library for Perl
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 USE_GETTEXT=	yes
 
 MAN3=	Locale::RecodeData::IBM862.3 \
 	Locale::RecodeData::IBM284.3 \
 	Locale::RecodeData::IBM278.3 \
 	Locale::RecodeData::ISO_8859_5.3 \
 	Locale::RecodeData::ISO_5427.3 \
 	Locale::RecodeData::ISO_8859_11.3 \
 	Locale::RecodeData::MACCYRILLIC.3 \
 	Locale::RecodeData::IBM273.3 \
 	Locale::RecodeData::LATIN_GREEK_1.3 \
 	Locale::RecodeData::IBM851.3 \
 	Locale::RecodeData::EBCDIC_IT.3 \
 	Locale::RecodeData::IBM871.3 \
 	Locale::RecodeData::IBM891.3 \
 	Locale::RecodeData::IBM865.3 \
 	Locale::RecodeData::CP1250.3 \
 	Locale::RecodeData::ISO_8859_8.3 \
 	Locale::RecodeData::EBCDIC_FI_SE.3 \
 	Locale::RecodeData::EBCDIC_DK_NO.3 \
 	Locale::Recode::_Aliases.3 \
 	Locale::gettext_pp.3 \
 	Locale::RecodeData::MAC_IS.3 \
 	Locale::RecodeData::KOI8_R.3 \
 	Locale::RecodeData::ISO_8859_14.3 \
 	Locale::Recode.3 \
 	Locale::RecodeData::ISO_5427_EXT.3 \
 	Locale::RecodeData::INIS_CYRILLIC.3 \
 	Locale::RecodeData::US_ASCII.3 \
 	Locale::RecodeData::MAC_UK.3 \
 	Locale::TextDomain.3 \
 	Locale::RecodeData::IBM424.3 \
 	Locale::RecodeData::IBM256.3 \
 	Locale::RecodeData::IBM860.3 \
 	Locale::RecodeData::IBM880.3 \
 	Locale::RecodeData::ISO_8859_3.3 \
 	Locale::RecodeData::IBM874.3 \
 	Locale::RecodeData::IBM868.3 \
 	Locale::RecodeData::CP1253.3 \
 	Locale::RecodeData::MACGREEK.3 \
 	Locale::RecodeData::MACICELAND.3 \
 	Locale::RecodeData::EBCDIC_ES_S.3 \
 	Locale::RecodeData::SAMI_WS2.3 \
 	Locale::RecodeData::ISO_2033_1983.3 \
 	Locale::RecodeData::TIS_620.3 \
 	Locale::RecodeData::HP_ROMAN8.3 \
 	Locale::RecodeData::IBM500.3 \
 	Locale::RecodeData::GEORGIAN_PS.3 \
 	Locale::RecodeData::KOI8_U.3 \
 	Locale::RecodeData::ASMO_449.3 \
 	Locale::RecodeData.3 \
 	Locale::RecodeData::IBM037.3 \
 	Locale::RecodeData::IBM904.3 \
 	Locale::RecodeData::NATS_DANO.3 \
 	Locale::RecodeData::MACTHAI.3 \
 	Locale::Messages.3 \
 	Locale::RecodeData::ATARI_ST.3 \
 	Locale::RecodeData::IBM285.3 \
 	Locale::RecodeData::IBM863.3 \
 	Locale::RecodeData::IBM918.3 \
 	Locale::RecodeData::EBCDIC_IS_FRISS.3 \
 	Locale::RecodeData::IBM857.3 \
 	Locale::RecodeData::ISO_8859_6.3 \
 	Locale::RecodeData::ISO_5428.3 \
 	Locale::RecodeData::GEORGIAN_ACADEMY.3 \
 	Locale::RecodeData::EBCDIC_FI_SE_A.3 \
 	Locale::RecodeData::MACUKRAINE.3 \
 	Locale::RecodeData::CP1256.3 \
 	Locale::RecodeData::IBM1026.3 \
 	Locale::RecodeData::MACCROATIAN.3 \
 	Locale::RecodeData::GREEK_CCITT.3 \
 	Locale::RecodeData::LATIN_GREEK.3 \
 	Locale::RecodeData::UTF_8.3 \
 	Locale::RecodeData::INIS_8.3 \
 	Locale::RecodeData::DEC_MCS.3 \
 	Locale::RecodeData::EBCDIC_ES_A.3 \
 	Locale::RecodeData::IBM280.3 \
 	Locale::RecodeData::IBM274.3 \
 	Locale::RecodeData::EBCDIC_AT_DE.3 \
 	Locale::RecodeData::EBCDIC_AT_DE_A.3 \
 	Locale::RecodeData::IBM852.3 \
 	Locale::RecodeData::ISO_8859_1.3 \
 	Locale::RecodeData::CSN_369103.3 \
 	Locale::RecodeData::IEC_P27_1.3 \
 	Locale::RecodeData::MACTURKISH.3 \
 	Locale::RecodeData::CP1251.3 \
 	Locale::RecodeData::IBM866.3 \
 	Locale::RecodeData::ISO_8859_9.3 \
 	Locale::RecodeData::GREEK7_OLD.3 \
 	Locale::RecodeData::MACINTOSH.3 \
 	Locale::RecodeData::_Encode.3 \
 	Locale::RecodeData::ISO_8859_15.3 \
 	Locale::RecodeData::MACHEBREW.3 \
 	Locale::RecodeData::INIS.3 \
 	Locale::RecodeData::MACARABIC.3 \
 	Locale::RecodeData::GOST_19768_74.3 \
 	Locale::RecodeData::IBM861.3 \
 	Locale::RecodeData::IBM277.3 \
 	Locale::RecodeData::IBM297.3 \
 	Locale::RecodeData::IBM855.3 \
 	Locale::RecodeData::NEXTSTEP.3 \
 	Locale::RecodeData::ISO_8859_4.3 \
 	Locale::RecodeData::IBM875.3 \
 	Locale::RecodeData::EBCDIC_PT.3 \
 	Locale::RecodeData::IBM1004.3 \
 	Locale::RecodeData::CP1254.3 \
 	Locale::RecodeData::IBM869.3 \
 	Locale::RecodeData::EBCDIC_DK_NO_A.3 \
 	Locale::RecodeData::GREEK7.3 \
 	Locale::RecodeData::ISO_8859_10.3 \
 	Locale::RecodeData::CP10007.3 \
 	Locale::RecodeData::IBM420.3 \
 	Locale::RecodeData::EBCDIC_ES.3 \
 	Locale::RecodeData::IBM038.3 \
 	Locale::RecodeData::ISO_10367_BOX.3 \
 	Locale::RecodeData::IBM850.3 \
 	Locale::RecodeData::IBM905.3 \
 	Locale::RecodeData::IBM870.3 \
 	Locale::RecodeData::MACROMANIA.3 \
 	Locale::RecodeData::EBCDIC_UK.3 \
 	Locale::RecodeData::IBM864.3 \
 	Locale::RecodeData::KOI_8.3 \
 	Locale::RecodeData::ISO_8859_7.3 \
 	Locale::RecodeData::EBCDIC_US.3 \
 	Locale::RecodeData::CP1257.3 \
 	Locale::RecodeData::IBM1047.3 \
 	Locale::RecodeData::ISO_8859_13.3 \
 	Locale::RecodeData::ECMA_CYRILLIC.3 \
 	Locale::RecodeData::IBM423.3 \
 	Locale::RecodeData::EBCDIC_FR.3 \
 	Locale::RecodeData::IBM281.3 \
 	Locale::RecodeData::EBCDIC_CA_FR.3 \
 	Locale::RecodeData::IBM437.3 \
 	Locale::RecodeData::IBM275.3 \
 	Locale::RecodeData::ISO_8859_2.3 \
 	Locale::RecodeData::MAC_SAMI.3 \
 	Locale::gettext_xs.3 \
 	Locale::RecodeData::NATS_SEFI.3 \
 	Locale::RecodeData::CP1252.3 \
 	Locale::Recode::_Conversions.3 \
 	Locale::RecodeData::KOI8_RU.3 \
 	Locale::RecodeData::CWI.3 \
 	Locale::RecodeData::VISCII.3 \
 	Locale::RecodeData::ISO_8859_16.3 \
 	Locale::RecodeData::KOI8_T.3 \
 	Locale::RecodeData::ATARI_ST_EURO.3 \
 	Locale::RecodeData::IBM290.3 \
 	Locale::RecodeData::IBM903.3 \
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Log-Log4perl/Makefile b/devel/p5-Log-Log4perl/Makefile
index 899364ff3fa0..7a30e5839f89 100644
--- a/devel/p5-Log-Log4perl/Makefile
+++ b/devel/p5-Log-Log4perl/Makefile
@@ -1,73 +1,69 @@
 # New ports collection makefile for:	p5-Log-Log4perl
 # Date created:				Sat Oct 19 11:22:09 CEST 2002
 # Whom:					Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Log-Log4perl
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Log
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Log4j implementation for Perl
 
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Log::Log4perl.3 \
 		Log::Log4perl::Appender.3 \
 		Log::Log4perl::Appender::Buffer.3 \
 		Log::Log4perl::Appender::DBI.3 \
 		Log::Log4perl::Appender::File.3 \
 		Log::Log4perl::Appender::Limit.3 \
 		Log::Log4perl::Appender::RRDs.3 \
 		Log::Log4perl::Appender::Screen.3 \
 		Log::Log4perl::Appender::ScreenColoredLevels.3 \
 		Log::Log4perl::Appender::Socket.3 \
 		Log::Log4perl::Appender::Synchronized.3 \
 		Log::Log4perl::Appender::TestArrayBuffer.3 \
 		Log::Log4perl::Appender::TestBuffer.3 \
 		Log::Log4perl::Appender::TestFileCreeper.3 \
 		Log::Log4perl::Config.3 \
 		Log::Log4perl::Config::BaseConfigurator.3 \
 		Log::Log4perl::Config::DOMConfigurator.3 \
 		Log::Log4perl::Config::PropertyConfigurator.3 \
 		Log::Log4perl::Config::Watch.3 \
 		Log::Log4perl::DateFormat.3 \
 		Log::Log4perl::FAQ.3 \
 		Log::Log4perl::Filter.3 \
 		Log::Log4perl::Filter::Boolean.3 \
 		Log::Log4perl::Filter::LevelMatch.3 \
 		Log::Log4perl::Filter::LevelRange.3 \
 		Log::Log4perl::Filter::StringMatch.3 \
 		Log::Log4perl::JavaMap.3 \
 		Log::Log4perl::JavaMap::ConsoleAppender.3 \
 		Log::Log4perl::JavaMap::FileAppender.3 \
 		Log::Log4perl::JavaMap::JDBCAppender.3 \
 		Log::Log4perl::JavaMap::NTEventLogAppender.3 \
 		Log::Log4perl::JavaMap::RollingFileAppender.3 \
 		Log::Log4perl::JavaMap::SyslogAppender.3 \
 		Log::Log4perl::JavaMap::TestBuffer.3 \
 		Log::Log4perl::Layout.3 \
 		Log::Log4perl::Layout::NoopLayout.3 \
 		Log::Log4perl::Layout::PatternLayout.3 \
 		Log::Log4perl::Layout::SimpleLayout.3 \
 		Log::Log4perl::Level.3 \
 		Log::Log4perl::Logger.3 \
 		Log::Log4perl::MDC.3 \
 		Log::Log4perl::NDC.3 \
 		Log::Log4perl::Util.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index 8102f0dfd170..1bf1c3a6b953 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -1,70 +1,69 @@
 # New ports collection makefile for:	Module::Build
 # Date created:				29 June 2003
 # Whom:                			Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Module-Build
 PORTVERSION=	0.26.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Module/KWILLIAMS
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Build and install Perl modules
 
-BUILD_DEPENDS=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
 		${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN3=		Module::Build.3 \
 		Module::Build::Base.3 \
 		Module::Build::Compat.3 \
 		Module::Build::ConfigData.3 \
 		Module::Build::Cookbook.3 \
 		Module::Build::PPMMaker.3 \
 		Module::Build::Platform::Amiga.3 \
 		Module::Build::Platform::Default.3 \
 		Module::Build::Platform::EBCDIC.3 \
 		Module::Build::Platform::MPEiX.3 \
 		Module::Build::Platform::MacOS.3 \
 		Module::Build::Platform::RiscOS.3 \
 		Module::Build::Platform::Unix.3 \
 		Module::Build::Platform::VMS.3 \
 		Module::Build::Platform::VOS.3 \
 		Module::Build::Platform::Windows.3 \
 		Module::Build::Platform::aix.3 \
 		Module::Build::Platform::cygwin.3 \
 		Module::Build::Platform::darwin.3 \
 		Module::Build::Platform::os2.3
 
 MAN1=		config_data.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes INSTALL README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} > 500600
 BUILD_DEPENDS+=	${SITE_PERL}/ExtUtils/ParseXS.pm:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
 .endif
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
 .if ${PERL_LEVEL} < 500805
 BUILD_DEPENDS+=	${SITE_PERL}/Pod/Man.pm:${PORTSDIR}/textproc/p5-podlators
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index 435d375bf4ba..03f3b5aada89 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -1,29 +1,27 @@
 # New ports collection makefile for:	Module::Info
 # Date created:				29 June 2003
 # Whom:                			Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Module-Info
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Module
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Provides information about Perl modules
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
+
 MAN1=		module_info.1 pfunc.1
 MAN3=		B::Utils.3 Module::Info.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile
index 5b53a4eb2093..0d36112f735a 100644
--- a/devel/p5-Module-Load-Conditional/Makefile
+++ b/devel/p5-Module-Load-Conditional/Makefile
@@ -1,44 +1,39 @@
 # New ports collection makefile for:	devel/p5-Module-Load-Conditional
 # Date created:				15 December 2004
 # Whom:					Anton Berezin <tobez@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Module-Load-Conditional
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Module
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Looking up Perl modules information/loading at runtime
 
 BUILD_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${RUN_DEPENDS}
-RUN_DEPENDS=	${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \
 		${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
 		${SITE_PERL}/Params/Check.pm:${PORTSDIR}/devel/p5-Params-Check
 
 PERL_CONFIGURE=	yes
 
 MAN3=	Module::Load::Conditional.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile
index f6a21322f00e..14d0cf689ad7 100644
--- a/devel/p5-Module-Pluggable/Makefile
+++ b/devel/p5-Module-Pluggable/Makefile
@@ -1,30 +1,31 @@
 # New ports collection makefile for:	p5-Module-Pluggable
 # Date created:		2004-07-26
 # Whom:			Lars Thegler <lth@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Module-Pluggable
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Module
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Automatically give your module the ability to have plugins
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN3=		Module::Pluggable.3
 
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} <= 500503
 post-patch:
 	@${PERL} -pi -e '$$_ = qq(    local \$$^W;\n) if /no warnings/' ${WRKSRC}/lib/Module/Pluggable.pm
 .endif
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index 76a6052f334c..d486243b16b2 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -1,33 +1,34 @@
 # New ports collection makefile for:	release
 # Date created:	   14 Mart 2005
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	release
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/B/BD/BDFOY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Upload files to CPAN and SourceForge
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/ConfigReader/Simple.pm:${PORTSDIR}/devel/p5-ConfigReader-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.24
 
 MAN1=		release.1
 MAN3=		Module::Release.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile
index 58747cedfa8d..8f0846b144ea 100644
--- a/devel/p5-NEXT/Makefile
+++ b/devel/p5-NEXT/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	p5-NEXT
 # Date created:				3 october 2003
 # Whom:					mat
 #
 # $FreeBSD$
 #
 
 PORTNAME=	NEXT
 PORTVERSION=	0.60
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	NEXT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Provide a pseudo-class NEXT (et al) that allows method redispatch
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		NEXT.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index 796f63eb04d2..c60a220d1afc 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -1,40 +1,39 @@
 # New ports collection makefile for:	p5-PCSC-Card
 # Date created:		12 September 2002
 # Whom:			Bruce M Simpson
 #
 # $FreeBSD$
 #
 
 PORTNAME=	PCSC-Card
 PORTVERSION=	1.4.2
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	pcsc-perl-${PORTVERSION}
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	Perl bindings for the PC/SC Lite Framework
 
 LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		Requires perl-5.6.0 or better to build correctly
 .endif
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 MAKE_ENV=	"LOCALBASE=$(LOCALBASE)"
 
 MAN3=		Chipcard::PCSC::Card.3 Chipcard::PCSC.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-patch:
 	${REINPLACE_CMD} -e "s,-I/usr/local/pcsc/include,${LOCALBASE}/include/PCSC," \
 		${WRKSRC}/Makefile.PL
 
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 118cff152b73..c31672e6e985 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	POE-API-Hooks
 # Date created:	   17 October 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-API-Hooks
-PORTVERSION=	1.0443
+PORTVERSION=	1.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SU/SUNGO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Implement lightweight hooks into POE
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::API::Hooks.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-API-Hooks/distinfo b/devel/p5-POE-API-Hooks/distinfo
index 7c5d28e523c2..80525c78fb36 100644
--- a/devel/p5-POE-API-Hooks/distinfo
+++ b/devel/p5-POE-API-Hooks/distinfo
@@ -1,2 +1,2 @@
-MD5 (POE-API-Hooks-1.0443.tar.gz) = f25e086c70aa14dc3523822cdea6041d
-SIZE (POE-API-Hooks-1.0443.tar.gz) = 4773
+MD5 (POE-API-Hooks-1.05.tar.gz) = b48a6ddf120639af44dad25ce0a76ea2
+SIZE (POE-API-Hooks-1.05.tar.gz) = 5013
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 4b7d1d964aaf..6352797c83a4 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	POE-API-Peek
 # Date created:	   11 November 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-API-Peek
 PORTVERSION=	1.0465
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SU/SUNGO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Peek into the internals of a running POE environment
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::API::Peek.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index aa88849dfb5f..97ec213242fd 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -1,36 +1,36 @@
 # New ports collection makefile for:	POE-Component-DebugShell
 # Date created:	   28 February 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Component-DebugShell
 PORTVERSION=	1.18
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Interactive peeking into a running POE application
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/POE/API/Peek.pm:${PORTSDIR}/devel/p5-POE-API-Peek
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
 MAN3=		POE::Component::DebugShell.3
 
 post-patch:
 	${RM} ${WRKSRC}/inc/Module/Install/AutoInstall.pm
 	${PERL} -pi -e 's/^auto_install.*//;' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index ae70eb4fd512..85909cf4f51d 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	POE-Devel-Profiler
 # Date created:	   19 October 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Devel-Profiler
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Profiles POE programs
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		poepp.1
 MAN3=		POE::Devel::Profiler.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again"
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 3ee3a919c9cf..6e4e1d244730 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -1,62 +1,63 @@
 # New ports collection makefile for:	POE
 # Date created:		29 Apr 2001
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE
 PORTVERSION=	0.3101
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Multitasking and networking framework for perl
 
 BUILD_DEPENDS=	\
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
 		${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	--default
 
 MAN3=		POE.3 POE::API::Ctl.3 POE::API::ResLoader.3 POE::Component.3 \
 		POE::Component::Client::TCP.3 POE::Component::Server::TCP.3 \
 		POE::Driver.3 POE::Driver::SysRW.3 POE::Filter.3 \
 		POE::Filter::Block.3 POE::Filter::Grep.3 POE::Filter::HTTPD.3 \
 		POE::Filter::Line.3 POE::Filter::Map.3 \
 		POE::Filter::RecordBlock.3 POE::Filter::Reference.3 \
 		POE::Filter::Stackable.3 POE::Filter::Stream.3 POE::Kernel.3 \
 		POE::Loop.3 POE::Loop::Event.3 POE::Loop::Gtk.3 \
 		POE::Loop::IO_Poll.3 POE::Loop::PerlSignals.3 \
 		POE::Loop::Select.3 POE::Loop::Tk.3 POE::Loop::TkActiveState.3 \
 		POE::Loop::TkCommon.3 POE::NFA.3 POE::Pipe.3 \
 		POE::Pipe::OneWay.3 POE::Pipe::TwoWay.3 POE::Preprocessor.3 \
 		POE::Queue.3 POE::Queue::Array.3 POE::Resource.3 \
 		POE::Resource::Aliases.3 POE::Resource::Controls.3 \
 		POE::Resource::Events.3 POE::Resource::Extrefs.3 \
 		POE::Resource::FileHandles.3 POE::Resource::SIDs.3 \
 		POE::Resource::Sessions.3 POE::Resource::Signals.3 \
 		POE::Resource::Statistics.3 POE::Session.3 POE::Wheel.3 \
 		POE::Wheel::Curses.3 POE::Wheel::FollowTail.3 \
 		POE::Wheel::ListenAccept.3 POE::Wheel::ReadLine.3 \
 		POE::Wheel::ReadWrite.3 POE::Wheel::Run.3 \
 		POE::Wheel::SocketFactory.3
 
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/samples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index cecbc12eb5cd..2cf9fc279633 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -1,42 +1,42 @@
 # New ports collection makefile for:	Path::Class
 # Date created:		2004-07-25
 # Whom:			Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Path-Class
 PORTVERSION=	0.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/K/KW/KWILLIAMS/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cross-platform path specification manipulation
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_MODBUILD=	yes
 
 MAN3=		Path::Class.3 \
 		Path::Class::File.3 \
 		Path::Class::Dir.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-EXTRA_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-BUILD_DEPENDS=	${EXTRA_DEPENDS}
-RUN_DEPENDS=	${EXTRA_DEPENDS}
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index 310e58e5793e..052ca3a34253 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -1,31 +1,27 @@
 # New ports collection makefile for:	p5-File-Spec
 # Date created:				November 22, 2000
 # Whom:	      				Donald Burr <dburr@FreeBSD.ORG>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	File-Spec
-PORTVERSION=	0.90
+PORTNAME=	PathTools
+PORTVERSION=	3.08
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Perl module for portably manipulating file specifications
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	INSTALLDIRS='site'
 
-MAN3=		File::Spec.3 \
-		File::Spec::Cygwin.3 \
-		File::Spec::Epoc.3 \
-		File::Spec::Functions.3 \
-		File::Spec::Mac.3 \
-		File::Spec::OS2.3 \
-		File::Spec::Unix.3 \
-		File::Spec::VMS.3 \
-		File::Spec::Win32.3
+MAN3=		Cwd.3 File::Spec.3 File::Spec::Cygwin.3 File::Spec::Epoc.3 \
+		File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
+		File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-PathTools/distinfo b/devel/p5-PathTools/distinfo
index 8f8e7e29e368..ed569267fffb 100644
--- a/devel/p5-PathTools/distinfo
+++ b/devel/p5-PathTools/distinfo
@@ -1,2 +1,2 @@
-MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909
-SIZE (File-Spec-0.90.tar.gz) = 33064
+MD5 (PathTools-3.08.tar.gz) = 6648d4f94a656b16f4f7393da082ceaa
+SIZE (PathTools-3.08.tar.gz) = 110666
diff --git a/devel/p5-PathTools/pkg-descr b/devel/p5-PathTools/pkg-descr
index 3dd8fae8a883..539a02f00b86 100644
--- a/devel/p5-PathTools/pkg-descr
+++ b/devel/p5-PathTools/pkg-descr
@@ -1,7 +1,7 @@
 This module is designed to support operations commonly performed on file
 specifications (usually called "file names", but not to be confused with
 the contents of a file, or Perl's file handles), such as concatenating
 several directory and file names into a single path, or determining
 whether a path is rooted.
 
-WWW: http://search.cpan.org/dist/File-Spec/
+WWW: http://search.cpan.org/dist/PathTools/
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index b17a359e3dbe..fd64d5b4b89b 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -1,14 +1,16 @@
-%%SITE_PERL%%/File/Spec.pm
-%%SITE_PERL%%/File/Spec/Cygwin.pm
-%%SITE_PERL%%/File/Spec/Epoc.pm
-%%SITE_PERL%%/File/Spec/Functions.pm
-%%SITE_PERL%%/File/Spec/Mac.pm
-%%SITE_PERL%%/File/Spec/OS2.pm
-%%SITE_PERL%%/File/Spec/Unix.pm
-%%SITE_PERL%%/File/Spec/VMS.pm
-%%SITE_PERL%%/File/Spec/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@dirrm %%SITE_PERL%%/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Cwd.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Cygwin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Epoc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Functions.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Mac.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/OS2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Unix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/VMS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Win32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index c4d6cc454253..c9b322840aa9 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -1,42 +1,43 @@
 # New ports collection makefile for:	p5-Pod-Coverage
 # Date created:	   10 octobre 2003
 # Whom:		   mat
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Pod-Coverage
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Checks if the documentation of a module is comprehensive
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
 
 PERL_MODBUILD=	yes
 
 MAN3=		Pod::Coverage.3 \
 		Pod::Coverage::CountParents.3 \
 		Pod::Coverage::ExportOnly.3 \
 		Pod::Coverage::Overloader.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 EXAMPLES=	examples/check_installed examples/script-covered
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 94e1e2f714a3..50c009663f5e 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	p5-Storable
 # Date created:				July 7th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Storable
 PORTVERSION=	2.15
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Storable
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Persistency for perl data structures
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS= INSTALLDIRS=site
 
 MAN3=		Storable.3
 
 post-patch:
 	@${PERL} -pi -e '$$_="" if /MAN3PODS|INSTALLDIRS/' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 6f0356652fd1..adc80e79f7b9 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -1,45 +1,46 @@
 # New ports collection makefile for:	p5-Test-Harness
 # Date Created:				13 Aug 2001
 # Whom:					Shell Hung <shell@shellhung.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Test-Harness
 PORTVERSION=	2.42
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Run perl standard test scripts with statistics
 
 PERL_CONFIGURE=	yes
 INSTALL_TARGET=	pure_install
 
 MAN1=		prove.1
 MAN3=		Test::Harness.3 Test::Harness::Assert.3 \
 		Test::Harness::Iterator.3 Test::Harness::Straps.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
 .if ${PERL_LEVEL} >= 500800
 .undef MAN1
 PLIST_SUB+=	PL_FILES="@comment "
 .else
 PLIST_SUB+=	PL_FILES=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
 .if ${PERL_LEVEL} >= 500800
 	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index d8b4705f03cc..8ad846643df9 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -1,38 +1,29 @@
 # New ports collection makefile for:	p5-Test-Inline
 # Date created:				Mon Sep 12
 # Whom:					Erwin Lansing <erwin@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Test-Inline
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Test::Inline - Inlining your tests next to the code being tested
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		pod2test.1
 MAN3=		Pod::Tests.3 Pod::Tests::Tutorial.3 Test::Inline.3 Test::Inline::Tutorial.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 3a999a462456..447f76a62d1f 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -1,41 +1,32 @@
 # New ports collection makefile for:	p5-Test-Reporter
 # Date created:				Sat Dec 20 23:11:45 CET 2003
 # Whom:					Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Test-Reporter
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Sends test results to cpan-testers@perl.org
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		cpantest.1
 MAN3=		Test::Reporter.3 \
 		Test::Reporter::Date::Format.3 \
 		Test::Reporter::Mail::Util.3 \
 		Test::Reporter::Time::Zone.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.if ${PERL_LEVEL} <= 500503
-EXTRA_PATCHES=	${FILESDIR}/500503-Test::Reporter.pm
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile
index 3f9c3194d34d..a7e72eb2f633 100644
--- a/devel/p5-Test-Tester/Makefile
+++ b/devel/p5-Test-Tester/Makefile
@@ -1,47 +1,46 @@
 # New ports collection makefile for:    p5-Test-Tester
 # Date created:				May 12th 2004
 # Whom:	      				Alex Kapranoff <alex@kapranoff.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Test-Tester
 PORTVERSION=	0.10.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Helps to test various Test::Builder derivatives
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 INSTALL_TARGET=	pure_install
 
 MAN3=		Test::Tester.3 Test::Tester::Capture.3 \
 		Test::Tester::CaptureRunner.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	CHANGES
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/Test/Builder.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 .if ${PERL_LEVEL} < 500601
 post-patch:
 	@${PERL} -pi -e '$$_ = "" if /(use|no) warnings/g;' \
 		${WRKSRC}/lib/Test/Tester.pm ${WRKSRC}/lib/Test/Tester/Delegate.pm
 .endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 4cb8c04ac0f6..686f5742bc9a 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:	p5-Time-HiRes
 # Date created:			13 June 1999
 # Whom:				Stephen J. Roznowski <sjr@home.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Time-HiRes
 PORTVERSION=	1.68
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Time
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A perl5 module implementing High resolution time, sleep, and alarm
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS= INSTALLDIRS=site
 
 MAN3=		Time::HiRes.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile
index a1c696a6bcdb..27e431b1d4ea 100644
--- a/devel/p5-Time-Local/Makefile
+++ b/devel/p5-Time-Local/Makefile
@@ -1,32 +1,31 @@
 # New ports collection makefile for:	p5-Time-Local
 # Date created:	   1 july 2003
 # Whom:		   Mathieu Arnold <m@absolight.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Time-Local
 PORTVERSION=	1.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Time
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Efficiently compute time from local and GMT time
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS='site'
 
 MAN3=		Time::Local.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 37b7d0d200a0..04406064b1b4 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -1,34 +1,30 @@
 # New ports collection makefile for:   p5-VCS
 # Date created:                27 February 2002
 # Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	VCS
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	VCS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for generic Version Control System access in Perl
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Sort/Versions.pm:${PORTSDIR}/devel/p5-Sort-Versions
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		diff-hist.1
 MAN3=		VCS.3 VCS::Cvs.3 VCS::Dir.3 VCS::File.3 \
 		VCS::Rcs.3 VCS::Version.3 VCS_dev.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index 37bd0e0f5aad..2bd7c4d9ab93 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	Want
 # Date created:	   19 June 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Want
 PORTVERSION=	0.08
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/R/RO/ROBIN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A generalisation of wantarray
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Want.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 236b4b8977b0..97df9c049de6 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	base
 # Date created:	   31 August 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	base
 PORTVERSION=	2.03
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/M/MS/MSCHWERN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Set of modules to operate with inheritance and class fields at runtime
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS='site'
 
 MAN3=		base.3 fields.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-release/Makefile b/devel/p5-release/Makefile
index 76a6052f334c..d486243b16b2 100644
--- a/devel/p5-release/Makefile
+++ b/devel/p5-release/Makefile
@@ -1,33 +1,34 @@
 # New ports collection makefile for:	release
 # Date created:	   14 Mart 2005
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	release
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/B/BD/BDFOY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Upload files to CPAN and SourceForge
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/ConfigReader/Simple.pm:${PORTSDIR}/devel/p5-ConfigReader-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.24
 
 MAN1=		release.1
 MAN3=		Module::Release.3
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index f94df2d92b64..efc8feed3d34 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -1,199 +1,194 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.1.18
-#PORTREVISION=	0
+PORTVERSION=	2.1.18
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 		http://home.jp.FreeBSD.org/~ume/ipv6/
 PATCHFILES=	${PORTNAME}-2.1.16-ipv6-20031121.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
-CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].*
-
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
+CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].*
+
 LATEST_LINK=	${PORTNAME}2
 
 USE_RC_SUBR=	imapd.sh
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-auth=unix \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
 .elif ${USE_BDB_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 .elif ${USE_BDB_VER} == 41
 LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .else
 BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
 		--with-bdb=db${USE_BDB_VER}
 
 .if defined(WITH_SKIPLIST)
 WITH_SKIPLIST_MBOX=	YES
 WITH_SKIPLIST_SEEN=	YES
 .endif
 .if defined(WITH_SKIPLIST_MBOX)
 CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
 .endif
 .if defined(WITH_SKIPLIST_SEEN)
 CONFIGURE_ARGS+=--with-seen-db=skiplist
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SNMP)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
 		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
 		mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
 		install-upgrade mailing-list man notes os overview questions \
 		readme sieve sieve-protocol specs
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
 pre-everything::
 .if !defined(WITH_BDB_VER)
 	@if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \
 		${ECHO_MSG} ""; \
 		${ECHO_MSG} "It seems you have installed newer db than db3.  If"; \
 		${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \
 		${ECHO_MSG} "specify same version by WITH_BDB_VER.  For"; \
 		${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \
 		${ECHO_MSG} ""; \
 	fi
 .endif
 
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 		@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 			${PREFIX}/etc/imapd.conf.dist
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
 			${PREFIX}/etc/cyrus.conf.dist
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 1ea20cd1067d..d137aefb38fe 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,337 +1,332 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.12
-#PORTREVISION=	0
+PORTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
 LATEST_LINK=	${PORTNAME}22
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 OPTIONS=	AUTH_KRB5	"Use Kerberos5 authorization module"	off
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on
 .else
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41, 42 or 43"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLE_IDLED	"Enable IMAP IDLE method idled"		off \
 		IDLE_POLL	"Enable IMAP IDLE method idle-polling"	on
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader (experimantal)"	off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 BDB_VER=	3
 BDB_MAJOR=	3
 .elif defined(WITH_BDB_4)
 BDB_VER=	4
 BDB_MAJOR=	0
 .elif defined(WITH_BDB_41)
 BDB_VER=	41
 BDB_MAJOR=	1
 .elif defined(WITH_BDB_42)
 BDB_VER=	42
 BDB_SUFFIX=	-4.2
 BDB_MAJOR=	2
 .elif defined(WITH_BDB_43)
 BDB_VER=	43
 BDB_SUFFIX=	-4.3
 BDB_MAJOR=	0
 .endif
 BDB_SUFFIX?=	${BDB_VER}
 LIB_DEPENDS+=	db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
 		--with-bdb=db${BDB_SUFFIX}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
 BROKEN=		"Multiple IDLE methods selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_IDLE_IDLED)
 CONFIGURE_ARGS+=--with-idle=idled
 PLIST_SUB+=	IDLED=""
 .elif defined(WITH_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=poll
 PLIST_SUB+=	IDLED="@comment "
 .elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=no
 PLIST_SUB+=	IDLED="@comment "
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOCONF_VER=259
 USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER)
 BROKEN=		"AUTH_KRB5 and LDAP_PTLOADER are exclusive.  Run 'make config' again!"
 .endif
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .elif defined(WITH_AUTH_KRB5)
 CONFIGURE_ARGS+=--with-auth=krb5
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .else
 CONFIGURE_ARGS+=--with-auth=unix
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-sieve install-snmpmon \
 		install-testing install-upgrade install-virtdomains \
 		mailing-list man notes os overview questions readme sieve \
 		sieve-protocol specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 1ea20cd1067d..d137aefb38fe 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,337 +1,332 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.12
-#PORTREVISION=	0
+PORTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
 LATEST_LINK=	${PORTNAME}22
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 OPTIONS=	AUTH_KRB5	"Use Kerberos5 authorization module"	off
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on
 .else
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41, 42 or 43"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLE_IDLED	"Enable IMAP IDLE method idled"		off \
 		IDLE_POLL	"Enable IMAP IDLE method idle-polling"	on
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader (experimantal)"	off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 BDB_VER=	3
 BDB_MAJOR=	3
 .elif defined(WITH_BDB_4)
 BDB_VER=	4
 BDB_MAJOR=	0
 .elif defined(WITH_BDB_41)
 BDB_VER=	41
 BDB_MAJOR=	1
 .elif defined(WITH_BDB_42)
 BDB_VER=	42
 BDB_SUFFIX=	-4.2
 BDB_MAJOR=	2
 .elif defined(WITH_BDB_43)
 BDB_VER=	43
 BDB_SUFFIX=	-4.3
 BDB_MAJOR=	0
 .endif
 BDB_SUFFIX?=	${BDB_VER}
 LIB_DEPENDS+=	db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
 		--with-bdb=db${BDB_SUFFIX}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
 BROKEN=		"Multiple IDLE methods selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_IDLE_IDLED)
 CONFIGURE_ARGS+=--with-idle=idled
 PLIST_SUB+=	IDLED=""
 .elif defined(WITH_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=poll
 PLIST_SUB+=	IDLED="@comment "
 .elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=no
 PLIST_SUB+=	IDLED="@comment "
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOCONF_VER=259
 USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER)
 BROKEN=		"AUTH_KRB5 and LDAP_PTLOADER are exclusive.  Run 'make config' again!"
 .endif
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .elif defined(WITH_AUTH_KRB5)
 CONFIGURE_ARGS+=--with-auth=krb5
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .else
 CONFIGURE_ARGS+=--with-auth=unix
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-sieve install-snmpmon \
 		install-testing install-upgrade install-virtdomains \
 		mailing-list man notes os overview questions readme sieve \
 		sieve-protocol specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 1ea20cd1067d..d137aefb38fe 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,337 +1,332 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.12
-#PORTREVISION=	0
+PORTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
 LATEST_LINK=	${PORTNAME}22
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 OPTIONS=	AUTH_KRB5	"Use Kerberos5 authorization module"	off
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on
 .else
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41, 42 or 43"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLE_IDLED	"Enable IMAP IDLE method idled"		off \
 		IDLE_POLL	"Enable IMAP IDLE method idle-polling"	on
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader (experimantal)"	off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 BDB_VER=	3
 BDB_MAJOR=	3
 .elif defined(WITH_BDB_4)
 BDB_VER=	4
 BDB_MAJOR=	0
 .elif defined(WITH_BDB_41)
 BDB_VER=	41
 BDB_MAJOR=	1
 .elif defined(WITH_BDB_42)
 BDB_VER=	42
 BDB_SUFFIX=	-4.2
 BDB_MAJOR=	2
 .elif defined(WITH_BDB_43)
 BDB_VER=	43
 BDB_SUFFIX=	-4.3
 BDB_MAJOR=	0
 .endif
 BDB_SUFFIX?=	${BDB_VER}
 LIB_DEPENDS+=	db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER}
 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \
 		--with-bdb=db${BDB_SUFFIX}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
 BROKEN=		"Multiple IDLE methods selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_IDLE_IDLED)
 CONFIGURE_ARGS+=--with-idle=idled
 PLIST_SUB+=	IDLED=""
 .elif defined(WITH_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=poll
 PLIST_SUB+=	IDLED="@comment "
 .elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=no
 PLIST_SUB+=	IDLED="@comment "
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOCONF_VER=259
 USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER)
 BROKEN=		"AUTH_KRB5 and LDAP_PTLOADER are exclusive.  Run 'make config' again!"
 .endif
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .elif defined(WITH_AUTH_KRB5)
 CONFIGURE_ARGS+=--with-auth=krb5
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .else
 CONFIGURE_ARGS+=--with-auth=unix
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-sieve install-snmpmon \
 		install-testing install-upgrade install-virtdomains \
 		mailing-list man notes os overview questions readme sieve \
 		sieve-protocol specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 2a355c20d7e5..0b18a6cfdb59 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -1,264 +1,259 @@
 # New ports collection makefile for:	MailScanner
 # Date created:				17 March 2003
 # Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.42.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	j.koopmann@seceidos.de
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
 
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
 	${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
 
 CONFLICTS=	MailScanner-[0-9]*
 
 PATCHLEVEL=	1
 
 USE_PERL5=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
 SUB_FILES=	pkg-message
 
 MAN8=		MailScanner.8
 MAN5=		MailScanner.conf.5
 MLINKS=		MailScanner.8 mailscanner.8 \
 		MailScanner.conf.5 mailscanner.conf.5
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
 DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
 ETC_FILES=	MailScanner.conf filename.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf \
 		phishing.safe.sites.conf
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
 		10_example.cf
 USRLOCAL_FILES_LIB=	\
 		bitdefender-autoupdate f-prot-autoupdate \
 		f-secure-wrapper inoculan-autoupdate \
 		kavdaemonclient-wrapper mcafee-autoupdate \
 		nod32-autoupdate rav-autoupdate \
 		rav-wrapper sophos-autoupdate
 
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
 
 do-build:
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/MailScanner
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
 		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
 		s,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g; \
 		s,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g;' \
 		${WRKSRC}/etc/MailScanner.conf
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
 		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/update_virus_scanners
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
 	${PERL} -pi -e \
 		's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
 	${PERL} -pi -e \
 		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
 		${WRKSRC}/lib/clamav-wrapper
 	${PERL} -pi -e \
 		's,/usr/bin/wget,${LOCALBASE}/bin/wget,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
 	${PERL} -pi -e \
 		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
 .for FILE in ${USRLOCAL_FILES_LIB}
 	${PERL} -pi -e \
 		's,/usr/local,${LOCALBASE},g;' \
 		${WRKSRC}/lib/${FILE}
 .endfor
 
 do-install:
 	# Step 1: Install libexec files
 	#
 	${MKDIR} ${PREFIX}/libexec/MailScanner
 	${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
 		${PREFIX}/libexec/MailScanner/update_virus_scanners
 	#
 	# Step 2: Install etc files
 	#
 	${MKDIR} ${PREFIX}/etc/MailScanner
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
 .for FILE in ${ETC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
 		${PREFIX}/etc/MailScanner/${FILE}.sample
 .endfor
 	${MKDIR} ${PREFIX}/etc/MailScanner/rules
 	cd ${WRKSRC}/etc/rules && \
 		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
 	${MKDIR} ${PREFIX}/etc/MailScanner/mcp
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
 .for FILE in ${MCP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
 		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
 	#
 	# Step 3: Install files in share
 	#
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
 		${MKDIR} ${DATADIR}/{} \;
 	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
 		${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
 	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
 	#
 	# Step 4: Install lib
 	#
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
 		${PREFIX}/lib/MailScanner/MailScanner.pm
 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/lib/MailScanner/MailScanner/{} \;
 	#
 	# Step 5: Install Start/Stop scripts
 	#
 	${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
 		${PREFIX}/etc/rc.d/mailscanner.sh.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
 	#
 	# Step 6: Docs & Manpages
 	#
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
 	cd ${WRKSRC}/docs && \
 		${FIND} * -type d -exec ${MKDIR} ${DOCSDIR}/{} \; && \
 		${FIND} * -type f ! -name "*.orig" -exec \
 			${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .endif
 	cd ${WRKSRC}/docs/man && \
 		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
 		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
 	${PERL} -pi -e \
 		's,%%LOCALBASE%%,${LOCALBASE},g; \
 		s,%%PREFIX%%,${PREFIX},g;' \
 		${DOCSDIR}/Sophos.install.freebsd
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
 	@${WRKSRC}/bin/upgrade_MailScanner_conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} \
 		2> /dev/null
 	# Diff the files. If the files do not differ, delete the new file
 	@if diff -b -B -q ${PREFIX}/etc/MailScanner/MailScanner.conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
 	   then ${ECHO} "No changes in MailScanner.conf options found" ; \
 		${RM} ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
 	else \
 	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
 	fi
 .endif
 	# Languages.conf update
 	@for LANG_DIR in ${DATADIR}/reports/*; do \
 		if [ -f $${LANG_DIR}/languages.conf ]; then \
 			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
 			${WRKSRC}/bin/upgrade_languages_conf \
 				$${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.sample > \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} \
 				2> /dev/null ; \
 			if diff -b -B -q $${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
 			  then	${ECHO} " no changes"; \
 				${RM} $${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
 			  else	${ECHO} " done"; \
 				${CP} $${LANG_DIR}/languages.conf.new.${PORTVERSION} $${LANG_DIR}/languages.conf ; \
 			fi; \
 		fi; \
 	done
 	@${CAT} ${PKGMESSAGE}
 
 renew-wrapper: install
 	# Renew virus wrapper scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-wrapper ${PREFIX}/libexec/MailScanner
 
 renew-autoupdate: install
 	# Renew autoupdate scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-autoupdate ${PREFIX}/libexec/MailScanner
 
 renew-reports: install
 	# Renew reports
 	cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{}  \;
 
 initial-config: renew-wrapper renew-autoupdate renew-reports
 	cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
 		${PREFIX}/etc/MailScanner
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
 	@${ECHO} "******************************************************************************"
 	@${ECHO} "The provided default configuration requires several directories to be created:"
 	@${ECHO} "/var/spool/MailScanner/incoming"
 	@${ECHO} "/var/spool/MailScanner/quarantine"
 	@${ECHO} "/var/spool/mqueue"
 	@${ECHO} "Either create those directories or change the configuration."
 	@${ECHO} "******************************************************************************"
 
 .include <bsd.port.post.mk>
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 3a40c659e9c2..e89b12cac408 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,267 +1,262 @@
 # New ports collection makefile for:	MailScanner
 # Date created:				17 March 2003
 # Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.42.9
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	j.koopmann@seceidos.de
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
 
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
 	${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
 		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \
 		${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
 		${LOCALBASE}/bin/unace:${PORTSDIR}/archivers/unace \
 		${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
 PATCHLEVEL=	1
 
 USE_PERL5=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
 SUB_FILES=	pkg-message
 
 MAN8=		MailScanner.8
 MAN5=		MailScanner.conf.5
 MLINKS=		MailScanner.8 mailscanner.8 \
 		MailScanner.conf.5 mailscanner.conf.5
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
 DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
 ETC_FILES=	MailScanner.conf filename.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf \
 		phishing.safe.sites.conf
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
 		10_example.cf
 USRLOCAL_FILES_LIB=	\
 		bitdefender-autoupdate f-prot-autoupdate \
 		f-secure-wrapper inoculan-autoupdate \
 		kavdaemonclient-wrapper mcafee-autoupdate \
 		nod32-autoupdate rav-autoupdate \
 		rav-wrapper sophos-autoupdate
 
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
 
 do-build:
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/MailScanner
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
 		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
 		s,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g; \
 		s,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g;' \
 		${WRKSRC}/etc/MailScanner.conf
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
 		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/update_virus_scanners
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
 	${PERL} -pi -e \
 		's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
 	${PERL} -pi -e \
 		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
 		${WRKSRC}/lib/clamav-wrapper
 	${PERL} -pi -e \
 		's,/usr/bin/wget,${LOCALBASE}/bin/wget,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
 	${PERL} -pi -e \
 		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
 .for FILE in ${USRLOCAL_FILES_LIB}
 	${PERL} -pi -e \
 		's,/usr/local,${LOCALBASE},g;' \
 		${WRKSRC}/lib/${FILE}
 .endfor
 
 do-install:
 	# Step 1: Install libexec files
 	#
 	${MKDIR} ${PREFIX}/libexec/MailScanner
 	${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
 		${PREFIX}/libexec/MailScanner/update_virus_scanners
 	#
 	# Step 2: Install etc files
 	#
 	${MKDIR} ${PREFIX}/etc/MailScanner
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
 .for FILE in ${ETC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
 		${PREFIX}/etc/MailScanner/${FILE}.sample
 .endfor
 	${MKDIR} ${PREFIX}/etc/MailScanner/rules
 	cd ${WRKSRC}/etc/rules && \
 		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
 	${MKDIR} ${PREFIX}/etc/MailScanner/mcp
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
 .for FILE in ${MCP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
 		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
 	#
 	# Step 3: Install files in share
 	#
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
 		${MKDIR} ${DATADIR}/{} \;
 	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
 		${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
 	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
 	#
 	# Step 4: Install lib
 	#
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
 		${PREFIX}/lib/MailScanner/MailScanner.pm
 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/lib/MailScanner/MailScanner/{} \;
 	#
 	# Step 5: Install Start/Stop scripts
 	#
 	${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
 		${PREFIX}/etc/rc.d/mailscanner.sh.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
 	#
 	# Step 6: Docs & Manpages
 	#
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
 	cd ${WRKSRC}/docs && \
 		${FIND} * -type d -exec ${MKDIR} ${DOCSDIR}/{} \; && \
 		${FIND} * -type f ! -name "*.orig" -exec \
 			${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .endif
 	cd ${WRKSRC}/docs/man && \
 		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
 		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
 	${PERL} -pi -e \
 		's,%%LOCALBASE%%,${LOCALBASE},g; \
 		s,%%PREFIX%%,${PREFIX},g;' \
 		${DOCSDIR}/Sophos.install.freebsd
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
 	@${WRKSRC}/bin/upgrade_MailScanner_conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} \
 		2> /dev/null
 	# Diff the files. If the files do not differ, delete the new file
 	@if diff -b -B -q ${PREFIX}/etc/MailScanner/MailScanner.conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
 	   then ${ECHO} "No changes in MailScanner.conf options found" ; \
 		${RM} ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
 	else \
 	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
 	fi
 .endif
 	# Languages.conf update
 	@for LANG_DIR in ${DATADIR}/reports/*; do \
 		if [ -f $${LANG_DIR}/languages.conf ]; then \
 			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
 			${WRKSRC}/bin/upgrade_languages_conf \
 				$${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.sample > \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} \
 				2> /dev/null ; \
 			if diff -b -B -q $${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
 			  then	${ECHO} " no changes"; \
 				${RM} $${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
 			  else	${ECHO} " done"; \
 				${CP} $${LANG_DIR}/languages.conf.new.${PORTVERSION} $${LANG_DIR}/languages.conf ; \
 			fi; \
 		fi; \
 	done
 	@${CAT} ${PKGMESSAGE}
 
 renew-wrapper: install
 	# Renew virus wrapper scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-wrapper ${PREFIX}/libexec/MailScanner
 
 renew-autoupdate: install
 	# Renew autoupdate scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-autoupdate ${PREFIX}/libexec/MailScanner
 
 renew-reports: install
 	# Renew reports
 	cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{}  \;
 
 initial-config: renew-wrapper renew-autoupdate renew-reports
 	cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
 		${PREFIX}/etc/MailScanner
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
 	@${ECHO} "******************************************************************************"
 	@${ECHO} "The provided default configuration requires several directories to be created:"
 	@${ECHO} "/var/spool/MailScanner/incoming"
 	@${ECHO} "/var/spool/MailScanner/quarantine"
 	@${ECHO} "/var/spool/mqueue"
 	@${ECHO} "Either create those directories or change the configuration."
 	@${ECHO} "******************************************************************************"
 
 .include <bsd.port.post.mk>
diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile
index 3d0907cbef44..ca7f90b58307 100644
--- a/mail/msgconvert/Makefile
+++ b/mail/msgconvert/Makefile
@@ -1,40 +1,35 @@
 # New ports collection makefile for:	msgconvert
 # Date created:				12 Jan 2003
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	msgconvert
 PORTVERSION=	20040531
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://www.webonaut.com/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.pl
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	Convert .MSG files to multipart MIME messages (mbox)
 
 RUN_DEPENDS=	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
 		${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}.pl
 	${LN} -s ${PREFIX}/bin/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-RUN_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index 830f76dfc24a..fa1694de18ed 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -1,34 +1,34 @@
 # New ports collection makefile for:	MIME-Fast
 # Date created:	   08 December 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	MIME-Fast
 PORTVERSION=	1.6
 PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MIME
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Create, edit and parse MIME messages (via gmime2 C library)
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
 LIB_DEPENDS=	gmime-2.0:${PORTSDIR}/mail/gmime2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV=	PREFIX="${PREFIX}" CCFLAGS="${CCFLAGS} ${PTHREAD_CFLAGS}"
 
 MAN3=		MIME::Fast.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Perl 5.8 or newer required. Install lang/perl5.8 and try again."
+IGNORE=	Perl 5.8 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile
index 661367ca1bca..198d49d80436 100644
--- a/mail/p5-Mail-Box1/Makefile
+++ b/mail/p5-Mail-Box1/Makefile
@@ -1,52 +1,46 @@
 # New ports collection makefile for:	Mail-Box
 # Date created:				Wed Jan  3 12:54:59 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Mail-Box
 PORTVERSION=	1.324
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module implementing a modern mail-folder managerat
 
 BUILD_DEPENDS=	${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_LATEST_LINK=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		Mail::Box.3 \
 		Mail::Box::Index.3 \
 		Mail::Box::Locker.3 \
 		Mail::Box::MH.3 \
 		Mail::Box::MH::Message.3 \
 		Mail::Box::Manager.3 \
 		Mail::Box::Mbox.3 \
 		Mail::Box::Mbox::Message.3 \
 		Mail::Box::Message.3 \
 		Mail::Box::Threads.3 \
 		Mail::Box::Tie.3 \
 		Mail::Box::Tie::ARRAY.3 \
 		Mail::Box::Tie::HASH.3 \
 		Mail::Message.3
 
 post-patch:
 	${PERL} -pi -e 's/^our\s+([\$$\@]\w+)/use vars qw($$1);$$1/' \
 		${WRKSRC}/Message.pm
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 7cf8312c4787..4d4a5fbac3e9 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -1,88 +1,88 @@
 # New ports collection makefile for:    sqlgrey
 # Date created:				17 Feb 2005
 # Whom:					mat
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sqlgrey
 PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Greylisting policy server for Postfix using an SQL backend
 
 RUN_DEPENDS=	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
 		${SITE_PERL}/IO/Multiplex.pm:${PORTSDIR}/devel/p5-IO-Multiplex \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .elif defined(WITH_MYSQL)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .elif defined(WITH_SQLITE)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
 USE_PERL5_RUN=	yes
 USE_RC_SUBR=	sqlgrey.sh
 USE_BZIP2=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
 ETCFILES=	clients_fqdn_whitelist clients_ip_whitelist sqlgrey.conf
 SGY_USERNAME?=	sqlgrey
 SGY_GROUPNAME?=	${SGY_USERNAME}
 ETCDIR?=	etc/sqlgrey
 
 SUB_FILES=	pkg-install
 MY_SUB_LIST=	ETCDIR=${ETCDIR} ETCFILES="${ETCFILES}" USER=${SGY_USERNAME} GROUP=${SGY_GROUPNAME} PERL=${PERL}
 SUB_LIST=	${MY_SUB_LIST}
 PLIST_SUB=	TOUCH=${TOUCH} ${MY_SUB_LIST}
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
 MAN1=	sqlgrey.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changelog FAQ HOWTO README TODO db_performance_reports
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "You can choose which database to depend on by using"
 	@${ECHO_MSG} "  WITH_PGSQL, WITH_MYSQL, or WITH_SQLITE"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's-#!/usr/bin/perl-#!${PERL}-' -e 's!/etc/sqlgrey!${PREFIX}/${ETCDIR}!g' ${WRKSRC}/sqlgrey
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${PREFIX}/sbin
 	@${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_whitelists ${PREFIX}/sbin
 	@${INSTALL_SCRIPT} ${WRKDIR}/sqlgrey.sh ${PREFIX}/etc/rc.d
 	@cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${MANPREFIX}/man/man1/sqlgrey.1
 	@${MKDIR} ${PREFIX}/${ETCDIR}
 .for i in ${ETCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/${ETCDIR}/${i}.dist
 	@[ "${i}" = "sqlgrey.conf" ] || ${TOUCH} ${PREFIX}/${ETCDIR}/${i}.local
 	@[ -f ${PREFIX}/${ETCDIR}/${i} ] || ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/${ETCDIR}/${i}
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 RUN_DEPENDS+=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 652095479ab3..d3986d5455be 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	sympa
 # Date created:				29 November 2003
 # Whom:					Autrijus Tang <autrijus@autrijus.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sympa
 PORTVERSION?=	4.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES?=	http://www.sympa.org/distribution/old/
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT?=	Sympa is an electronic mailing list manager
 
 BUILD_DEPENDS+=	${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		${SITE_PERL}/Crypt/CipherSaber.pm:${PORTSDIR}/security/p5-Crypt-CipherSaber \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/${PERL_ARCH}/Locale/Msgcat.pm:${PORTSDIR}/misc/p5-Locale-Msgcat \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 DB_TYPE=
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
 .endif
 
 .if ${DB_TYPE} == "Oracle"
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Oracle.pm:${PORTSDIR}/databases/p5-DBD-Oracle
 .else
 .if ${DB_TYPE} == "Pg"
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 .else
 .if ${DB_TYPE} == "Sybase"
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Sybase.pm:${PORTSDIR}/databases/p5-DBD-Sybase
 .else
 .if ${DB_TYPE} == "mysql"
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 .endif
 .endif
 .endif
 
 HAS_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}/sympa \
 		--with-confdir=${PREFIX}/etc \
 		--with-initdir=${PREFIX}/etc/rc.d \
 		--with-etcdir=${PREFIX}/sympa/bin/etc \
 		--with-iconsdir=${PREFIX}/www/icons \
 		${CONFIGURE_TARGET}
 CONFIGURE_ENV+=	lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
 MAKE_ENV?=	PERL_EXTUTILS_AUTOINSTALL=--skip
 
 MAN8=		alias_manager.8 archived.8 bounced.8 sympa.8
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "      DB_TYPE=type                    Optional: mysql, Oracle, Pg or Sybase"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of plain CGI"
 	@${ECHO} ""
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-patch:
 	${MV} ${WRKSRC}/src/etc/script/sympa ${WRKSRC}/src/etc/script/sympa.sh
 	@${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \;
 
 post-install:
 	@PKG_PREFIX=${PREFIX} DB_TYPE=${DB_TYPE} WITH_FASTCGI=${WITH_FASTCGI} \
 	 ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 post-deinstall:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 
 .if ${ARCH} == "amd64"
 BROKEN=		"Configure fails on amd64"
 .endif
 
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index 35f7edde3188..266fe6de9bd9 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	math/p5-Math-BigInt
 # Date created:				12 October 2001
 # Whom:					tobez
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Math-BigInt
 PORTVERSION=	1.77
 CATEGORIES=	math perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Math
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Math::BigInt - Arbitrary size integer math package
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS='site'
 
 MAN3=		Math::BigFloat.3 \
 		Math::BigInt.3 \
 		Math::BigInt::Calc.3 \
 		Math::BigInt::CalcEmu.3
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-BigRat/Makefile b/math/p5-Math-BigRat/Makefile
index 03bdc4328855..5c1738688628 100644
--- a/math/p5-Math-BigRat/Makefile
+++ b/math/p5-Math-BigRat/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	Math-BigRat
 # Date created:	   03 March 2005
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Math-BigRat
 PORTVERSION=	0.15
 CATEGORIES=	math perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Math
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Arbitrary big rational numbers
 
 BUILD_DEPENDS=	${SITE_PERL}/Math/BigInt.pm:${PORTSDIR}/math/p5-Math-BigInt
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Math::BigRat.3
 
 post-patch:
-	@${PERL} -pi -e '$$_="" if m/INSTALLDIRS/;' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/misc/gpt/Makefile b/misc/gpt/Makefile
index b62103e456a7..55ef47ea8192 100644
--- a/misc/gpt/Makefile
+++ b/misc/gpt/Makefile
@@ -1,62 +1,63 @@
 # Ports collection makefile for:	gpt
 # Date created:				January 16, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gpt
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	misc archivers devel parallel
 MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/aces/gpt/releases/gpt-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Grid Packaging Tools (used to install Globus)
 
 CONFLICTS=	gpt-3.1
 
 RUN_DEPENDS+=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \
-		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \
 		${LOCALBASE}/bin/makepatch:${PORTSDIR}/textproc/makepatch
 
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 PLIST_SUB+=	PERL=${PERL}
 
 MAN1=		gpt-build.1 gpt-bundle.1 gpt-config.1 gpt-deps.1 \
 		gpt-flavor-configuration.1 gpt-install.1 \
 		gpt-pkg.1 gpt-postinstall.1 gpt-query.1 gpt-setup.1 \
 		gpt-undefines.1 gpt-uninstall.1 gpt-verify.1 \
 		gpt-virtual-pkg.1 gpt_build_config.1 \
 		gpt_extract_data.1 gpt_generate_bin_pkg_data.1 \
 		gpt_save_flavor.1
 
 FIX_VAR_FILES=	${WRKSRC}/packaging_tools/perl/GPT/Localize.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/Archive.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm \
 		${WRKSRC}/packaging_tools/perl/scripts/gpt-bundle \
 		${WRKSRC}/packaging_tools/perl/scripts/gpt-config \
 		${WRKSRC}/tools/testArchiveTar
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|@@PERL@@|${PERL}|g" ${WRKSRC}/build_gpt
 	@${REINPLACE_CMD} -e 's|$$gpath/var/lib/perl|/var/db/gpt|g' ${FIX_VAR_FILES}
 	@${MKDIR} ${WRKSRC}/packaging_tools/etc/gpt
 
 do-install:
 	@cd ${WRKSRC}; \
 	GPT_LOCATION=${PREFIX} ./build_gpt --with-perl=${PERL}
 
 .include <bsd.port.mk>
diff --git a/misc/gpt31/Makefile b/misc/gpt31/Makefile
index bf43512e8590..fcc34baa15b6 100644
--- a/misc/gpt31/Makefile
+++ b/misc/gpt31/Makefile
@@ -1,64 +1,64 @@
 # Ports collection makefile for:	gpt
 # Date created:				January 16, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gpt
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc archivers devel parallel
 MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/aces/gpt/releases/gpt-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Grid Packaging Tools (used to install Globus)
 
 CONFLICTS=	gpt-*
 NO_LATEST_LINK=	YES
 
 RUN_DEPENDS+=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \
-		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \
 		${LOCALBASE}/bin/makepatch:${PORTSDIR}/textproc/makepatch
 
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 PLIST_SUB+=	PERL=${PERL}
 
 MAN1=		gpt-build.1 gpt-bundle.1 gpt-config.1 gpt-deps.1 \
 		gpt-flavor-configuration.1 gpt-install.1 \
 		gpt-pkg.1 gpt-postinstall.1 gpt-query.1 gpt-setup.1 \
 		gpt-undefines.1 gpt-uninstall.1 gpt-verify.1 \
 		gpt-virtual-pkg.1 gpt_build_config.1 \
 		gpt_extract_data.1 gpt_generate_bin_pkg_data.1 \
 		gpt_save_flavor.1
 
 FIX_VAR_FILES=	${WRKSRC}/packaging_tools/perl/GPT/Localize.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/Archive.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm \
 		${WRKSRC}/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm \
 		${WRKSRC}/packaging_tools/perl/scripts/gpt-bundle \
 		${WRKSRC}/packaging_tools/perl/scripts/gpt-config \
 		${WRKSRC}/tools/testArchiveTar
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|@@PERL@@|${PERL}|g" ${WRKSRC}/build_gpt
 	@${REINPLACE_CMD} -e 's|$$gpath/var/lib/perl|/var/db/gpt|g' ${FIX_VAR_FILES}
 	@${MKDIR} ${WRKSRC}/packaging_tools/etc/gpt
 
 do-install:
 	@cd ${WRKSRC}; \
 	GPT_LOCATION=${PREFIX} ./build_gpt --with-perl=${PERL}
 
 .include <bsd.port.mk>
diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile
index 8c61d5a55ea2..364a967f9733 100644
--- a/misc/p5-I18N-LangTags/Makefile
+++ b/misc/p5-I18N-LangTags/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:    p5-I18N-LangTags
 # Date created:			26 December 1999
 # Whom:	      			Dmitry Sivachenko <dima@Chg.RU>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	I18N-LangTags
 PORTVERSION=	0.35
 CATEGORIES=	misc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	I18N
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Functions for dealing with RFC-1766-style language tags
 
 PERL_CONFIGURE=	YES
-CONFIGURE_ARGS+=INSTALLDIRS=site
 
 MAN3=		I18N::LangTags.3 I18N::LangTags::Detect.3 I18N::LangTags::List.3
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 607210c9198a..d93fbadc1e82 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -1,75 +1,76 @@
 # New ports collection makefile for:	MRTG
 # Date created:				April 18th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mrtg
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ \
 		${MASTER_SITE_RINGSERVER} \
 		ftp://ftp.nstu.ru/pub/sources/nettools/monitoring/ \
 		ftp://ftp.po.opole.pl/pub/unix/net/tools/mrtg/ \
 		ftp://ftp.ujf-grenoble.fr/mirror/networking/mrtg/
 MASTER_SITE_SUBDIR=	net/mrtg
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
 
 USE_PERL5=	YES
 MAKE_ENV+=	PERL=${PERL}
 
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV=	PERL=${PERL}
 
 MAN1=		cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \
 		mrtg-ipv6.1 mrtg-logfile.1 mrtg-mibhelp.1 mrtg-nt-guide.1 \
 		mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \
 		mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
 
 do-install:
 		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
 		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${DOCSDIR}
 		for file in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \
 			doc/*.html doc/*.pod doc/*.txt doc/*wml doc/*.png ; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
 		done
 .endif
 		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/
 		for file in mrtg cfgmaker indexmaker; do \
 			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
 		done
 
 post-install:
 .if !defined(BATCH)
 	@${ECHO} ""
 	@${ECHO} "############################################################################"
 	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                  #"
 	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "############################################################################"
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 169f92ecdf4b..612d062fb21e 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -1,201 +1,202 @@
 # New ports collection makefile for:	SmokePing
 # Date created:				Tue Feb 12 22:17:40 CET 2002
 # Whom:                                 Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	smokeping
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 		${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 
 IGNORE=	only works with old versions (1.0.x) of net/rrdtool
 
 OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
 OPTIONS+=	CURL "Support for Curl probes" off
 OPTIONS+=	LDAP "Support for LDAP probes" off
 OPTIONS+=	RADIUS "Support for Radius probes" off
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_FPING)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 .endif
 
 .ifdef(WITH_ECHOPING)
 RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 .endif
 
 .ifdef(WITH_CURL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
 .ifdef(WITH_LDAP)
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
 .if defined(WITH_LDAP) || defined(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 MAN1=		ParseConfig.pm.1 \
 		Smokeping.pm.1 \
 		smokeping.1 \
 		smokeping.cgi.1 \
 		smokeping_config.1 \
 		smokeping_install.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 USER=		smokeping
 GROUP=		smokeping
 WWW_USER=	www
 WWW_UID=	80
 WWW_GROUP=	www
 WWW_GID=	80
 
 FILES_SUB=	USER=${USER} GROUP=${GROUP} \
 		WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \
 		WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \
 		PERL=${PERL} PREFIX=${PREFIX}
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		ParseConfig.pm \
 		Smokeping.pm \
 		matchers/avgratio.pm \
 		matchers/base.pm \
 		matchers/median.pm \
 		probes/AnotherDNS.pm \
 		probes/AnotherSSH.pm \
 		probes/CiscoRTTMonDNS.pm \
 		probes/CiscoRTTMonEchoICMP.pm \
 		probes/CiscoRTTMonTcpConnect.pm \
 		probes/Curl.pm \
 		probes/DNS.pm \
 		probes/EchoPing.pm \
 		probes/EchoPingChargen.pm \
 		probes/EchoPingDiscard.pm \
 		probes/EchoPingHttp.pm \
 		probes/EchoPingHttps.pm \
 		probes/EchoPingIcp.pm \
 		probes/EchoPingSmtp.pm \
 		probes/FPing.pm \
 		probes/FPing6.pm \
 		probes/IOSPing.pm \
 		probes/LDAP.pm \
 		probes/Radius.pm \
 		probes/RemoteFPing.pm \
 		probes/SSH.pm \
 		probes/base.pm \
 		probes/basefork.pm \
 		probes/basevars.pm \
 		probes/passwordchecker.pm \
 		probes/telnetIOSPing.pm \
 		smokeping.cgi \
 		smokeping \
 		smokeping_config \
 		smokeping_install
 ETC1=		basepage.html config smokemail config-echoping
 
 # Things that shouldn't have been in the tarball in the first place
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
 	@${RM} ${WRKSRC}/lib/ISG/.#ParseConfig.pm.1.26
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 pre-configure:
 	@${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/bin/smokeping.dist \
 		${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${WRKSRC}/etc/config.dist \
 		${WRKSRC}/etc/config-echoping.dist \
 		${WRKSRC}/lib/probes/*.pm
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-install > ${PKGINSTALL}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping
 	@${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi
 
 # work around  a bug in bsd.port.mk, see PR 63293 - remove when resolved
 do-build:
 	@${DO_NADA}
 
 pre-su-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 .for FILE in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/doc/man/man1/${FILE} ${PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/matchers
 	@${MKDIR} ${DOCSDIR}/probes
 .for FILE in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
 .endfor
 .for FILE in ${DOC2}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}/${FILE}.txt
 .endfor
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for FILE in ${ETC1}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping
 	@if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \
 		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \
 	fi
 .endfor
 	@${MKDIR} ${PREFIX}/smokeping/htdocs
 	@${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi
 	@${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/
 	@${MKDIR} ${PREFIX}/var/smokeping
 	@${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping
 	@${MKDIR} ${PREFIX}/smokeping/htdocs/img
 	@${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img
 	@if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \
 	fi
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 post-deinstall:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 
 .include <bsd.port.post.mk>
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 6580cf0fe111..6dbce55798c8 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -1,52 +1,53 @@
 # New ports collection makefile for:	ldapsh
 # Date created:				Jul 28 2004
 # Whom:					Florent Thoumie <flz@xbsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ldapsh
 PORTVERSION=	2.00
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/L/LO/LOOSIFER/
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Interactive shell used to administer ldap directories
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/Parse/Lex.pm:${PORTSDIR}/devel/p5-ParseLex
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
 
 MAN1=		ldapsh.1
 MAN3=		Net::LDAP::Shell.3 \
 		Net::LDAP::Shell::Parse.3 Net::LDAP::Shell::Util.3
 
 USE_REINPLACE=	yes
 PERL_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} > 500600
 MAN3+=		Net::LDAP::Config.3
 .else
-BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh
 
 post-install:
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${EXAMPLESDIR}/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 7c12f69244c0..37981b63e196 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,36 +1,36 @@
 # New ports collection makefile for:	p5-Net
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	p5-Net
 PORTVERSION=	1.19
 PORTEPOCH=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 DISTNAME=	libnet-${PORTVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Perl5 modules to access and use network protocols
 
 RUN_DEPENDS=	${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site < /dev/null
+CONFIGURE_ARGS=	< /dev/null
 
 MAN3=		Net::Cmd.3 \
 		Net::Config.3 \
 		Net::Domain.3 \
 		Net::FTP.3 \
 		Net::NNTP.3 \
 		Net::Netrc.3 \
 		Net::POP3.3 \
 		Net::SMTP.3 \
 		Net::Time.3 \
 		Net::libnetFAQ.3
 
 .include <bsd.port.mk>
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index 2ec83a721517..45665481394a 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -1,42 +1,38 @@
 # New ports collection makefile for:	p5-XML-RPC
 # Date created:				6 Sep 2001
 # Whom:					Dominic Mitchell <dom@happygiraffe.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	RPC-XML
 PORTVERSION=	0.57
+PORTREVISION=	1
 CATEGORIES=	net www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RPC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	martin@matuska.org
 COMMENT=	XML-RPC client and server library for Perl
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 MAN1=		make_method.1
 MAN3=		Apache::RPC::Server.3 \
 		Apache::RPC::Status.3 \
 		RPC::XML.3 \
 		RPC::XML::Client.3 \
 		RPC::XML::Function.3 \
 		RPC::XML::Method.3 \
 		RPC::XML::Parser.3 \
 		RPC::XML::Procedure.3 \
 		RPC::XML::Server.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_LEVEL} < 500601
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 169f92ecdf4b..612d062fb21e 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,201 +1,202 @@
 # New ports collection makefile for:	SmokePing
 # Date created:				Tue Feb 12 22:17:40 CET 2002
 # Whom:                                 Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	smokeping
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 		${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 
 IGNORE=	only works with old versions (1.0.x) of net/rrdtool
 
 OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
 OPTIONS+=	CURL "Support for Curl probes" off
 OPTIONS+=	LDAP "Support for LDAP probes" off
 OPTIONS+=	RADIUS "Support for Radius probes" off
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_FPING)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 .endif
 
 .ifdef(WITH_ECHOPING)
 RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 .endif
 
 .ifdef(WITH_CURL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
 .ifdef(WITH_LDAP)
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
 .if defined(WITH_LDAP) || defined(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 MAN1=		ParseConfig.pm.1 \
 		Smokeping.pm.1 \
 		smokeping.1 \
 		smokeping.cgi.1 \
 		smokeping_config.1 \
 		smokeping_install.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 USER=		smokeping
 GROUP=		smokeping
 WWW_USER=	www
 WWW_UID=	80
 WWW_GROUP=	www
 WWW_GID=	80
 
 FILES_SUB=	USER=${USER} GROUP=${GROUP} \
 		WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \
 		WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \
 		PERL=${PERL} PREFIX=${PREFIX}
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		ParseConfig.pm \
 		Smokeping.pm \
 		matchers/avgratio.pm \
 		matchers/base.pm \
 		matchers/median.pm \
 		probes/AnotherDNS.pm \
 		probes/AnotherSSH.pm \
 		probes/CiscoRTTMonDNS.pm \
 		probes/CiscoRTTMonEchoICMP.pm \
 		probes/CiscoRTTMonTcpConnect.pm \
 		probes/Curl.pm \
 		probes/DNS.pm \
 		probes/EchoPing.pm \
 		probes/EchoPingChargen.pm \
 		probes/EchoPingDiscard.pm \
 		probes/EchoPingHttp.pm \
 		probes/EchoPingHttps.pm \
 		probes/EchoPingIcp.pm \
 		probes/EchoPingSmtp.pm \
 		probes/FPing.pm \
 		probes/FPing6.pm \
 		probes/IOSPing.pm \
 		probes/LDAP.pm \
 		probes/Radius.pm \
 		probes/RemoteFPing.pm \
 		probes/SSH.pm \
 		probes/base.pm \
 		probes/basefork.pm \
 		probes/basevars.pm \
 		probes/passwordchecker.pm \
 		probes/telnetIOSPing.pm \
 		smokeping.cgi \
 		smokeping \
 		smokeping_config \
 		smokeping_install
 ETC1=		basepage.html config smokemail config-echoping
 
 # Things that shouldn't have been in the tarball in the first place
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
 	@${RM} ${WRKSRC}/lib/ISG/.#ParseConfig.pm.1.26
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 pre-configure:
 	@${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/bin/smokeping.dist \
 		${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${WRKSRC}/etc/config.dist \
 		${WRKSRC}/etc/config-echoping.dist \
 		${WRKSRC}/lib/probes/*.pm
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-install > ${PKGINSTALL}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping
 	@${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi
 
 # work around  a bug in bsd.port.mk, see PR 63293 - remove when resolved
 do-build:
 	@${DO_NADA}
 
 pre-su-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 .for FILE in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/doc/man/man1/${FILE} ${PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/matchers
 	@${MKDIR} ${DOCSDIR}/probes
 .for FILE in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
 .endfor
 .for FILE in ${DOC2}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}/${FILE}.txt
 .endfor
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for FILE in ${ETC1}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping
 	@if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \
 		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \
 	fi
 .endfor
 	@${MKDIR} ${PREFIX}/smokeping/htdocs
 	@${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi
 	@${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/
 	@${MKDIR} ${PREFIX}/var/smokeping
 	@${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping
 	@${MKDIR} ${PREFIX}/smokeping/htdocs/img
 	@${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img
 	@if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \
 	fi
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 post-deinstall:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index 27068e071512..da3e4a1577d1 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -1,36 +1,28 @@
 # New ports collection makefile for:	Authen-Captcha
 # Date created:				Mon May 10 13:27:28 CEST 2004
 # Whom:					tobez@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Authen-Captcha
 PORTVERSION=	1.023
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Authen
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to verify the human element in transactions
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	Authen::Captcha.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-.endif
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 1871f1e375ff..14c612f1fea1 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -1,28 +1,26 @@
 # New ports collection makefile for:	Crypt-Twofish
 # Date created:				Wed Jan  3 16:29:03 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Crypt-Twofish
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Perl module implementing the Twofish cipher
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
 MAN3=		Crypt::Twofish.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile
index 4bfbdbe61a78..a91a99395727 100644
--- a/security/p5-Digest-MD4/Makefile
+++ b/security/p5-Digest-MD4/Makefile
@@ -1,33 +1,32 @@
 # ex:ts=8
 # Ports collection makefile for:	p5-Digest-MD4
 # Date created:			Feb 9, 2003
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Digest-MD4
 PORTVERSION=	1.5
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Perl5 interface to the MD4 message digest algorithm
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		Digest::MD4.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes rfc1320.txt
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index 98b976206483..f9e43b4e7197 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -1,38 +1,37 @@
 # New ports collection makefile for:	p5-Digest-MD5-M4p
 # Date created:        27 June 2004
 # Whom:                Lars Thegler <lth@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Digest-MD5-M4p
 PORTVERSION=	0.01
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl interface to a variant of the MD5 algorithm
 
 BUILD_DEPENDS=	${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		Digest::MD5::M4p.3
 
 post-extract:
 	@${PERL} -pi -e 's/\r//g' ${WRKSRC}/M4p.xs
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500503
 post-configure:
 	@${PERL} -pi -e '$$_="" if /use warnings/' ${WRKSRC}/M4p.pm
 	# make PREFIX-clean under perl 5.005_03
 	@${PERL} -pi -e 's,/usr/local/,\$${PREFIX}/,g' ${WRKSRC}/Makefile
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index b62d9dac0795..3073e87f0a08 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    p5-Digest-MD5
 # Date created:				1999/04/07
 # Whom:					ache
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Digest-MD5
 PORTVERSION=	2.33
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Perl5 interface to the MD5 algorithm
 
 BUILD_DEPENDS=	${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=	Digest::MD5.3
 
 .include <bsd.port.mk>
diff --git a/security/p5-Digest-SHA2/Makefile b/security/p5-Digest-SHA2/Makefile
index 4ded06990d2c..ca3b71188b64 100644
--- a/security/p5-Digest-SHA2/Makefile
+++ b/security/p5-Digest-SHA2/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	Digest-SHA2
 # Date created:	   06 August 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Digest-SHA2
 PORTVERSION=	1.1.0
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Perl interface to the SHA-2 algorithms
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/Digest/base.pm:${PORTSDIR}/security/p5-Digest
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Digest::SHA2.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 46ff2753c1de..9f95c03a805d 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	Digest
 # Date created:	   28 May 2002
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Digest
 PORTVERSION=	1.10
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Modules that calculate message digests
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	INSTALLDIRS="site"
 
 MAN3=		Digest.3 Digest::base.3 Digest::file.3
 
 .include <bsd.port.mk>
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index 9abd792c3043..f2d4a1321d85 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -1,35 +1,35 @@
 # New ports collection makefile for:	Filter-Crypto
 # Date created:	   04 November 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Filter-Crypto
 PORTVERSION=	1.14
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Filter
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Create runnable Perl files encrypted with OpenSSL libcrypto
 
 BUILD_DEPENDS=	${SITE_PERL}/PAR/Filter.pm:${PORTSDIR}/devel/p5-PAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--prefix-dir=${OPENSSLBASE} --defaults
 
 MAN1=		crypt_file.1
 MAN3=		Filter::Crypto.3 Filter::Crypto::CryptFile.3 \
 		Filter::Crypto::Decrypt.3 PAR::Filter::Crypto.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again."
+IGNORE=	Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/pmap/Makefile b/sysutils/pmap/Makefile
index 1c768b443ed5..3fed12f01100 100644
--- a/sysutils/pmap/Makefile
+++ b/sysutils/pmap/Makefile
@@ -1,42 +1,42 @@
 # New ports collection makefile for:	pmap
 # Date created:		14 Oct 2002
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pmap
 PORTVERSION=	20040420
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/pmap/
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Detailed process memory display
 
 NO_PACKAGE=	Depends on kernel
 
 PLIST_SUB=	KMODDIR=${KMODDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN8=		pmap.8
 MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
 BROKEN=		"Currently does not support -CURRENT"
 .endif
 
 .if ${OSVERSION} <  450000
-IGNORE=		"Not supported on systems prior to 4.5"
+IGNORE=		Not supported on systems prior to 4.5
 .endif
 
 pre-fetch:
 .if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		"This port requires kernel sources"
+IGNORE=		This port requires kernel sources
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/Makefile b/textproc/Makefile
index cb920a76ae51..0dd3ea7c90ad 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,754 +1,754 @@
 # $FreeBSD$
 #
 
     COMMENT = Text processing utilities (does not include desktop publishing)
 
     SUBDIR += 2bsd-diff
     SUBDIR += Ebnf2ps
     SUBDIR += add-css-links
     SUBDIR += af-aspell
     SUBDIR += aft
     SUBDIR += agrep
     SUBDIR += aiksaurus
     SUBDIR += aiksaurus-gtk
     SUBDIR += align
     SUBDIR += am-aspell
     SUBDIR += ant-xinclude-task
     SUBDIR += antiword
     SUBDIR += archmage
     SUBDIR += ascii2pdf
     SUBDIR += asm2html
     SUBDIR += aspell
     SUBDIR += az-aspell
     SUBDIR += bar
     SUBDIR += be-aspell
     SUBDIR += bedic-data
     SUBDIR += bg-aspell
     SUBDIR += bib2html
     SUBDIR += bibtex2html
     SUBDIR += bidiv
     SUBDIR += bn-aspell
     SUBDIR += br-aspell
     SUBDIR += british-ispell
     SUBDIR += c2html
     SUBDIR += ca-aspell
     SUBDIR += carthage
     SUBDIR += catdoc
     SUBDIR += cbedic
     SUBDIR += cdif
     SUBDIR += cdiff
     SUBDIR += cdsware
     SUBDIR += chpp
     SUBDIR += cl-meta
     SUBDIR += cl-meta-clisp
     SUBDIR += cl-meta-cmucl
     SUBDIR += cl-meta-sbcl
     SUBDIR += cl-ppcre
     SUBDIR += cl-ppcre-clisp
     SUBDIR += cl-ppcre-cmucl
     SUBDIR += cl-ppcre-sbcl
     SUBDIR += clit
     SUBDIR += coco
     SUBDIR += code2html
     SUBDIR += cole
     SUBDIR += cost
     SUBDIR += crimson
     SUBDIR += cs-aspell
     SUBDIR += csb-aspell
     SUBDIR += csv2latex
     SUBDIR += csv2xml
     SUBDIR += ctpp
     SUBDIR += cwtext
     SUBDIR += cy-aspell
     SUBDIR += da-aspell
     SUBDIR += dadadodo
     SUBDIR += db2latex
     SUBDIR += dbacl
     SUBDIR += denature
     SUBDIR += dict
     SUBDIR += dictfmt
     SUBDIR += dictionary
     SUBDIR += diff-mode.el
     SUBDIR += diffsplit
     SUBDIR += diffstat
     SUBDIR += diffutils
     SUBDIR += docbook
     SUBDIR += docbook-241
     SUBDIR += docbook-300
     SUBDIR += docbook-310
     SUBDIR += docbook-400
     SUBDIR += docbook-410
     SUBDIR += docbook-420
     SUBDIR += docbook-430
     SUBDIR += docbook-sk
     SUBDIR += docbook-tdg
     SUBDIR += docbook-to-man
     SUBDIR += docbook-xml
     SUBDIR += docbook-xml-430
     SUBDIR += docbook-xml-440
     SUBDIR += docbook-xsd
     SUBDIR += docbook-xsl
     SUBDIR += docbookide.el
     SUBDIR += doclifter
     SUBDIR += docproj
     SUBDIR += docproj-jadetex
     SUBDIR += docproj-nojadetex
     SUBDIR += domc
     SUBDIR += dsssl-docbook-cygnus
     SUBDIR += dsssl-docbook-modular
     SUBDIR += dtd-catalogs
     SUBDIR += dtd2relax
     SUBDIR += dtdinst
     SUBDIR += dtdparse
     SUBDIR += easydiff
     SUBDIR += el-aspell
     SUBDIR += emacs-wiki
     SUBDIR += enchant
     SUBDIR += eo-aspell
     SUBDIR += eruby
     SUBDIR += es-aspell
     SUBDIR += estraier
     SUBDIR += et-aspell
     SUBDIR += expat2
     SUBDIR += exslt
     SUBDIR += fa-aspell
     SUBDIR += fdp-tools
     SUBDIR += fi-aspell
     SUBDIR += filepp
     SUBDIR += fist
     SUBDIR += fo-aspell
     SUBDIR += foiltex
     SUBDIR += fop
     SUBDIR += freegrep
     SUBDIR += ga-aspell
     SUBDIR += galax
     SUBDIR += gauche-sxml
     SUBDIR += gd-aspell
     SUBDIR += gdict
     SUBDIR += gdome2
     SUBDIR += gl-aspell
     SUBDIR += glark
     SUBDIR += glimpse
     SUBDIR += gmat
     SUBDIR += gmetadom
     SUBDIR += gnome-translate
     SUBDIR += gnomedocutils
     SUBDIR += gnomespell
     SUBDIR += gpp
     SUBDIR += grap
     SUBDIR += gsed
     SUBDIR += gtk-doc
     SUBDIR += gtkdiff
     SUBDIR += gtkspell2
     SUBDIR += gutenmark
     SUBDIR += gv-aspell
     SUBDIR += gxditview
     SUBDIR += gxmlviewer
     SUBDIR += hevea
     SUBDIR += hgrep
     SUBDIR += hhm
     SUBDIR += hi-aspell
     SUBDIR += highlight
     SUBDIR += hil-aspell
     SUBDIR += hr-aspell
     SUBDIR += hs-haxml
     SUBDIR += hsb-aspell
     SUBDIR += htdig
     SUBDIR += html
     SUBDIR += html-pretty
     SUBDIR += html2fo
     SUBDIR += html2text
     SUBDIR += htmldoc
     SUBDIR += htmlize.el
     SUBDIR += htmlsection
     SUBDIR += htmltolatex
     SUBDIR += ia-aspell
     SUBDIR += id-aspell
     SUBDIR += idnits
     SUBDIR += iiimf-client-lib
     SUBDIR += iiimf-csconv
     SUBDIR += iiimf-gnome-im-switcher
     SUBDIR += iiimf-gtk
     SUBDIR += iiimf-headers
     SUBDIR += iiimf-le-unit
     SUBDIR += iiimf-protocol-lib
     SUBDIR += iiimf-server
     SUBDIR += iiimf-x
     SUBDIR += iiimf-x-lib
     SUBDIR += info2html
     SUBDIR += info2man
     SUBDIR += info_to_html
     SUBDIR += intltool
     SUBDIR += ipdf
     SUBDIR += is-aspell
     SUBDIR += isearch
     SUBDIR += iso12083
     SUBDIR += iso8879
     SUBDIR += ispell
     SUBDIR += it-aspell
     SUBDIR += jade
     SUBDIR += jakarta-commons-digester
     SUBDIR += jakarta-poi
     SUBDIR += java2html
     SUBDIR += javacc
     SUBDIR += jaxup
     SUBDIR += jdictionary
     SUBDIR += jdictionary-int-eng
     SUBDIR += jing
     SUBDIR += jrefentry
     SUBDIR += kbedic
     SUBDIR += kdiff3
     SUBDIR += l2a
     SUBDIR += la-aspell
     SUBDIR += lacheck
     SUBDIR += latex2html
     SUBDIR += latte
     SUBDIR += lemmatizer
     SUBDIR += libcroco
     SUBDIR += libebml
     SUBDIR += libextractor
     SUBDIR += libhtmlparse
     SUBDIR += liblingoteach
     SUBDIR += liblrdf
     SUBDIR += libparsifal
     SUBDIR += libpathan
     SUBDIR += libtranslate
     SUBDIR += libtre
     SUBDIR += libuninameslist
     SUBDIR += libwpd
     SUBDIR += libxdiff
     SUBDIR += libxml
     SUBDIR += libxml++
     SUBDIR += libxml++26
     SUBDIR += libxml2
     SUBDIR += libxode
     SUBDIR += libxslt
     SUBDIR += link-grammar
     SUBDIR += linux-aspell
     SUBDIR += linux-expat
     SUBDIR += linux-libxml
     SUBDIR += linuxdoc
     SUBDIR += lt-aspell
     SUBDIR += ltxml
     SUBDIR += lv-aspell
     SUBDIR += makefaq
     SUBDIR += makepatch
     SUBDIR += maketeidtd
     SUBDIR += man2html
     SUBDIR += manued.el
     SUBDIR += mathml-xsd
     SUBDIR += meld
     SUBDIR += mgdiff
     SUBDIR += mguesser
     SUBDIR += mi-aspell
     SUBDIR += mifluz
     SUBDIR += mini-xml
     SUBDIR += minidom
     SUBDIR += mk-aspell
     SUBDIR += mkcatalog
     SUBDIR += mn-aspell
     SUBDIR += modlogan
     SUBDIR += mr-aspell
     SUBDIR += ms-aspell
     SUBDIR += mt-aspell
     SUBDIR += nb-aspell
     SUBDIR += nds-aspell
     SUBDIR += nfbtrans
     SUBDIR += nicetext
     SUBDIR += nl-aspell
     SUBDIR += nl-ispell
     SUBDIR += nltk
     SUBDIR += nn-aspell
     SUBDIR += nunnimcax
     SUBDIR += nux
     SUBDIR += ny-aspell
     SUBDIR += ocaml-expat
     SUBDIR += ocaml-pxp
     SUBDIR += ocaml-yaxi
     SUBDIR += ocaml-yaxpo
     SUBDIR += openfts
     SUBDIR += openjade
     SUBDIR += opensched
     SUBDIR += opensp
     SUBDIR += or-aspell
     SUBDIR += p5-Apache-ParseLog
     SUBDIR += p5-Apache-XBEL
     SUBDIR += p5-Bloom-Filter
     SUBDIR += p5-CSS-SAC
     SUBDIR += p5-CSS-Tiny
     SUBDIR += p5-Data-FormValidator
     SUBDIR += p5-DelimMatch
     SUBDIR += p5-Filter-Simple
     SUBDIR += p5-FreeBSD-Ports
     SUBDIR += p5-HTML-Format
     SUBDIR += p5-HTML-Tidy
     SUBDIR += p5-Hash-Merge
     SUBDIR += p5-IDNA-Punycode
     SUBDIR += p5-IO-CSVHeaderFile
     SUBDIR += p5-LJ-SpellCheck
     SUBDIR += p5-Lingua-Conjunction
     SUBDIR += p5-Lingua-EN-AddressParse
     SUBDIR += p5-Lingua-EN-Gender
     SUBDIR += p5-Lingua-EN-Infinitive
     SUBDIR += p5-Lingua-EN-Inflect
     SUBDIR += p5-Lingua-EN-Inflect-Number
     SUBDIR += p5-Lingua-EN-MatchNames
     SUBDIR += p5-Lingua-EN-NameCase
     SUBDIR += p5-Lingua-EN-NameParse
     SUBDIR += p5-Lingua-EN-Nickname
     SUBDIR += p5-Lingua-EN-Numbers
     SUBDIR += p5-Lingua-EN-Numbers-Easy
     SUBDIR += p5-Lingua-EN-Numbers-Ordinate
     SUBDIR += p5-Lingua-EN-Sentence
     SUBDIR += p5-Lingua-EN-Squeeze
     SUBDIR += p5-Lingua-EN-Summarize
     SUBDIR += p5-Lingua-EN-Syllable
     SUBDIR += p5-Lingua-EN-Tagger
     SUBDIR += p5-Lingua-Ident
     SUBDIR += p5-Lingua-Ispell
     SUBDIR += p5-Lingua-PT-Stemmer
     SUBDIR += p5-Lingua-Preferred
     SUBDIR += p5-Lingua-Stem
     SUBDIR += p5-Lingua-Stem-Fr
     SUBDIR += p5-Lingua-Stem-It
     SUBDIR += p5-Lingua-Stem-Ru
     SUBDIR += p5-Lingua-Stem-Snowball
     SUBDIR += p5-Lingua-Stem-Snowball-Da
     SUBDIR += p5-Lingua-Stem-Snowball-No
     SUBDIR += p5-Lingua-Stem-Snowball-Se
     SUBDIR += p5-Lingua-StopWords
     SUBDIR += p5-MARC
     SUBDIR += p5-MARC-Record
     SUBDIR += p5-NetAddr-IP-Find
     SUBDIR += p5-Number-Format
     SUBDIR += p5-PDF-API2
     SUBDIR += p5-PDF-Create
     SUBDIR += p5-POE-Filter-XML
     SUBDIR += p5-PPI
     SUBDIR += p5-PPI-HTML
     SUBDIR += p5-Parse-Syslog
     SUBDIR += p5-PerlPoint-Converters
     SUBDIR += p5-PerlPoint-Package
     SUBDIR += p5-Plucene
     SUBDIR += p5-Plucene-Plugin-Analyzer-SnowballAnalyzer
     SUBDIR += p5-Pod-Constants
     SUBDIR += p5-Pod-DocBook
     SUBDIR += p5-Pod-Escapes
     SUBDIR += p5-Pod-POM
+    SUBDIR += p5-Pod-Parser
     SUBDIR += p5-Pod-Simple
     SUBDIR += p5-Pod-Stripper
     SUBDIR += p5-Pod-Tree
-    SUBDIR += p5-PodParser
     SUBDIR += p5-RADIUS-UserFile
     SUBDIR += p5-RDF-Core
     SUBDIR += p5-RDF-Notation3
     SUBDIR += p5-RDF-Simple
     SUBDIR += p5-RDFStore
     SUBDIR += p5-RTF-Parser
     SUBDIR += p5-RTF-Tokenizer
     SUBDIR += p5-RTF-Writer
     SUBDIR += p5-Regex-PreSuf
     SUBDIR += p5-Regexp-Common
     SUBDIR += p5-Regexp-Log
     SUBDIR += p5-Regexp-Log-Common
     SUBDIR += p5-SVG
     SUBDIR += p5-Search-Saryer
     SUBDIR += p5-Sort-ArbBiLex
     SUBDIR += p5-Sort-Fields
     SUBDIR += p5-Sort-Naturally
     SUBDIR += p5-Spork
     SUBDIR += p5-Spreadsheet-ParseExcel
     SUBDIR += p5-Spreadsheet-WriteExcel
     SUBDIR += p5-Spreadsheet-WriteExcel-FromXML
     SUBDIR += p5-Spreadsheet-WriteExcelXML
     SUBDIR += p5-String-Format
     SUBDIR += p5-String-Scanf
     SUBDIR += p5-String-ShellQuote
     SUBDIR += p5-String-ShowDiff
     SUBDIR += p5-String-Strip
     SUBDIR += p5-TeX-Hyphen
     SUBDIR += p5-Template-Magic
     SUBDIR += p5-Text-ASCIITable
     SUBDIR += p5-Text-Affixes
     SUBDIR += p5-Text-Aligner
     SUBDIR += p5-Text-Aspell
     SUBDIR += p5-Text-Autoformat
     SUBDIR += p5-Text-Balanced
     SUBDIR += p5-Text-BibTeX
     SUBDIR += p5-Text-Bind
     SUBDIR += p5-Text-CSV
     SUBDIR += p5-Text-CSV_XS
     SUBDIR += p5-Text-Diff
     SUBDIR += p5-Text-DoubleMetaphone
     SUBDIR += p5-Text-EtText
     SUBDIR += p5-Text-ExtractWords
     SUBDIR += p5-Text-FillIn
     SUBDIR += p5-Text-Filter
     SUBDIR += p5-Text-Filter-Chain
     SUBDIR += p5-Text-FixedLength
     SUBDIR += p5-Text-FixedLength-Extra
     SUBDIR += p5-Text-Flowchart
     SUBDIR += p5-Text-Format
     SUBDIR += p5-Text-FormatTable
     SUBDIR += p5-Text-German
     SUBDIR += p5-Text-Glob
     SUBDIR += p5-Text-Graphics
     SUBDIR += p5-Text-MagicTemplate
     SUBDIR += p5-Text-Metaphone
     SUBDIR += p5-Text-Netstring
     SUBDIR += p5-Text-Ngram
     SUBDIR += p5-Text-Ngrams
     SUBDIR += p5-Text-Original
     SUBDIR += p5-Text-ParagraphDiff
     SUBDIR += p5-Text-Query
     SUBDIR += p5-Text-Quoted
     SUBDIR += p5-Text-RecordParser
     SUBDIR += p5-Text-Reflow
     SUBDIR += p5-Text-Reform
     SUBDIR += p5-Text-Repository
     SUBDIR += p5-Text-Shellwords
     SUBDIR += p5-Text-Similarity
     SUBDIR += p5-Text-SimpleTemplate
     SUBDIR += p5-Text-Striphigh
     SUBDIR += p5-Text-Table
     SUBDIR += p5-Text-Tabs+Wrap
     SUBDIR += p5-Text-TabularDisplay
     SUBDIR += p5-Text-Template
     SUBDIR += p5-Text-Textile
     SUBDIR += p5-Text-Tmpl
     SUBDIR += p5-Text-VimColor
     SUBDIR += p5-Text-WikiFormat
     SUBDIR += p5-Text-Wrapper
     SUBDIR += p5-Time-Human
     SUBDIR += p5-Tk-XMLViewer
     SUBDIR += p5-Tree-Nary
     SUBDIR += p5-UML-Sequence
     SUBDIR += p5-UML-State
     SUBDIR += p5-URI-Find
     SUBDIR += p5-WDDX
     SUBDIR += p5-WordNet-QueryData
     SUBDIR += p5-WordNet-Similarity
     SUBDIR += p5-XML-Atom
     SUBDIR += p5-XML-Atom-Syndication
     SUBDIR += p5-XML-AutoWriter
     SUBDIR += p5-XML-Catalog
     SUBDIR += p5-XML-Clean
     SUBDIR += p5-XML-DBMS
     SUBDIR += p5-XML-DOM
     SUBDIR += p5-XML-DT
     SUBDIR += p5-XML-DTDParser
     SUBDIR += p5-XML-DifferenceMarkup
     SUBDIR += p5-XML-Directory
     SUBDIR += p5-XML-Dumper
     SUBDIR += p5-XML-Elemental
     SUBDIR += p5-XML-Encoding
     SUBDIR += p5-XML-Feed
     SUBDIR += p5-XML-Filter-BufferText
     SUBDIR += p5-XML-Filter-DetectWS
     SUBDIR += p5-XML-Filter-GenericChunk
     SUBDIR += p5-XML-Filter-Reindent
     SUBDIR += p5-XML-Filter-SAX1toSAX2
     SUBDIR += p5-XML-Filter-SAXT
     SUBDIR += p5-XML-Filter-XInclude
     SUBDIR += p5-XML-Filter-XSLT
     SUBDIR += p5-XML-GDOME
     SUBDIR += p5-XML-Generator
     SUBDIR += p5-XML-Generator-DBI
     SUBDIR += p5-XML-Generator-PerlData
     SUBDIR += p5-XML-Grove
     SUBDIR += p5-XML-Hadler-HTMLWriter
     SUBDIR += p5-XML-Handler-Trees
     SUBDIR += p5-XML-Handler-YAWriter
     SUBDIR += p5-XML-LibRSVG
     SUBDIR += p5-XML-LibXML
     SUBDIR += p5-XML-LibXML-Common
     SUBDIR += p5-XML-LibXML-Iterator
     SUBDIR += p5-XML-LibXML-XPathContext
     SUBDIR += p5-XML-LibXSLT
     SUBDIR += p5-XML-NamespaceSupport
     SUBDIR += p5-XML-Node
     SUBDIR += p5-XML-NodeFilter
     SUBDIR += p5-XML-Parser
     SUBDIR += p5-XML-Parser-EasyTree
     SUBDIR += p5-XML-Parser-Lite-Tree
     SUBDIR += p5-XML-Parser-Style-Elemental
     SUBDIR += p5-XML-Quote
     SUBDIR += p5-XML-RAI
     SUBDIR += p5-XML-RSS
     SUBDIR += p5-XML-RSS-JavaScript
     SUBDIR += p5-XML-RegExp
     SUBDIR += p5-XML-SAX
     SUBDIR += p5-XML-SAX-Base
     SUBDIR += p5-XML-SAX-Expat
     SUBDIR += p5-XML-SAX-ExpatXS
     SUBDIR += p5-XML-SAX-Machines
     SUBDIR += p5-XML-SAX-Simple
     SUBDIR += p5-XML-SAX-Writer
     SUBDIR += p5-XML-SAXDriver-Sablotron
     SUBDIR += p5-XML-STX
     SUBDIR += p5-XML-Sablotron
     SUBDIR += p5-XML-Schematron
     SUBDIR += p5-XML-Simple
     SUBDIR += p5-XML-SimpleObject
     SUBDIR += p5-XML-SimpleObject-LibXML
     SUBDIR += p5-XML-Smart
     SUBDIR += p5-XML-Stream
     SUBDIR += p5-XML-TreeBuilder
     SUBDIR += p5-XML-Twig
     SUBDIR += p5-XML-Validator-Schema
     SUBDIR += p5-XML-Writer
     SUBDIR += p5-XML-XBEL
     SUBDIR += p5-XML-XPath
     SUBDIR += p5-XML-XQL
     SUBDIR += p5-XML-XSH
     SUBDIR += p5-XML-XSLT
     SUBDIR += p5-XML-XUpdate-LibXML
     SUBDIR += p5-YAML
     SUBDIR += p5-YAPE-HTML
     SUBDIR += p5-YAPE-Regex
     SUBDIR += p5-YAPE-Regex-Explain
     SUBDIR += p5-dTemplate
     SUBDIR += p5-libxml
     SUBDIR += p5-podlators
     SUBDIR += p5-xmltv
     SUBDIR += pa-aspell
     SUBDIR += par
     SUBDIR += pardiff
     SUBDIR += pdftohtml
     SUBDIR += pear-Numbers_Roman
     SUBDIR += pear-Spreadsheet_Excel_Writer
     SUBDIR += pear-XML_Beautifier
     SUBDIR += pear-XML_HTMLSax
     SUBDIR += pear-XML_Wddx
     SUBDIR += perl2html
     SUBDIR += php4-ctype
     SUBDIR += php4-domxml
     SUBDIR += php4-pspell
     SUBDIR += php4-wddx
     SUBDIR += php4-xml
     SUBDIR += php4-xslt
     SUBDIR += php5-ctype
     SUBDIR += php5-dom
     SUBDIR += php5-pspell
     SUBDIR += php5-simplexml
     SUBDIR += php5-wddx
     SUBDIR += php5-xml
     SUBDIR += php5-xsl
     SUBDIR += pocketreader
     SUBDIR += ppower4
     SUBDIR += print-n-times
     SUBDIR += prosper
     SUBDIR += py-4suite
     SUBDIR += py-HyperText
     SUBDIR += py-asv
     SUBDIR += py-csv
     SUBDIR += py-docutils
     SUBDIR += py-dsv
     SUBDIR += py-excelerator
     SUBDIR += py-expat
     SUBDIR += py-feedparser
     SUBDIR += py-jaxml
     SUBDIR += py-libxml2
     SUBDIR += py-libxslt
     SUBDIR += py-ltxml
     SUBDIR += py-pyx12
     SUBDIR += py-rdflib
     SUBDIR += py-rss2gen
     SUBDIR += py-rxp
     SUBDIR += py-sgrep
     SUBDIR += py-syck
     SUBDIR += py-tvgrab
     SUBDIR += py-twistedLore
     SUBDIR += py-wordnet
     SUBDIR += py-xlwriter
     SUBDIR += py-xml
     SUBDIR += py-xmltools
     SUBDIR += py-xmltv
     SUBDIR += py-zpt
     SUBDIR += py2html
     SUBDIR += pybook
     SUBDIR += pychm
     SUBDIR += qu-aspell
     SUBDIR += queequeg
     SUBDIR += rand
     SUBDIR += raptor
     SUBDIR += re_graph
     SUBDIR += redland
     SUBDIR += redland-bindings
     SUBDIR += refdb
     SUBDIR += replaceit
     SUBDIR += resume
     SUBDIR += resume-extensions
     SUBDIR += rfcdiff
     SUBDIR += rl
     SUBDIR += rman
     SUBDIR += ro-aspell
     SUBDIR += roap
     SUBDIR += rot
     SUBDIR += rotix
     SUBDIR += rtfreader
     SUBDIR += rtfx
     SUBDIR += rubber
     SUBDIR += ruby-amatch
     SUBDIR += ruby-amrita
     SUBDIR += ruby-csv
     SUBDIR += ruby-diff
     SUBDIR += ruby-format
     SUBDIR += ruby-formvalidator
     SUBDIR += ruby-gdome
     SUBDIR += ruby-html-fillinform
     SUBDIR += ruby-html-parser
     SUBDIR += ruby-html-template
     SUBDIR += ruby-htmlcompact
     SUBDIR += ruby-htmlrepair
     SUBDIR += ruby-htmlsplit
     SUBDIR += ruby-htmltools
     SUBDIR += ruby-htree
     SUBDIR += ruby-libxml
     SUBDIR += ruby-libxslt
     SUBDIR += ruby-mwdom
     SUBDIR += ruby-nqxml
     SUBDIR += ruby-quixml
     SUBDIR += ruby-raspell
     SUBDIR += ruby-rd-mode.el
     SUBDIR += ruby-rdtool
     SUBDIR += ruby-rss
     SUBDIR += ruby-rss.alt
     SUBDIR += ruby-rwv2
     SUBDIR += ruby-sablot
     SUBDIR += ruby-sary
     SUBDIR += ruby-spreadsheet-excel
     SUBDIR += ruby-tempura
     SUBDIR += ruby-text-format
     SUBDIR += ruby-xml-script
     SUBDIR += ruby-xmlconfigfile
     SUBDIR += ruby-xmlparser
     SUBDIR += ruby-xmlscan
     SUBDIR += ruby-xmlscan-old
     SUBDIR += ruby-xslt
     SUBDIR += ruby-xtemplate
     SUBDIR += rw-aspell
     SUBDIR += rxp
     SUBDIR += sablotron
     SUBDIR += sagasu
     SUBDIR += sarep
     SUBDIR += sary
     SUBDIR += saxon
     SUBDIR += saxon-devel
     SUBDIR += sc-aspell
     SUBDIR += scim
     SUBDIR += scim-input-pad
     SUBDIR += scim-table-imengine
     SUBDIR += scr2txt
     SUBDIR += scrollkeeper
     SUBDIR += sdf
     SUBDIR += sdocbook-xml
     SUBDIR += sed_inplace
     SUBDIR += senna
     SUBDIR += sgmlformat
     SUBDIR += sgmls
     SUBDIR += sgmltools-lite
     SUBDIR += sgrep
     SUBDIR += sgrep2
     SUBDIR += silvercity
     SUBDIR += sk-aspell
     SUBDIR += skim
     SUBDIR += skribe
     SUBDIR += sl-aspell
     SUBDIR += slides
     SUBDIR += smartdoc
     SUBDIR += smartdoc-devel
     SUBDIR += source-highlight
     SUBDIR += sp
     SUBDIR += spellutils
     SUBDIR += srilm
     SUBDIR += stardict2
     SUBDIR += stardict2-dictd_mova
     SUBDIR += stardict2-quick
     SUBDIR += stardict2-rptts
     SUBDIR += sv-aspell
     SUBDIR += sw-aspell
     SUBDIR += syck
     SUBDIR += ta-aspell
     SUBDIR += tclExpat
     SUBDIR += tdtd.el
     SUBDIR += tei-guidelines-p3
     SUBDIR += tei-guidelines-p4
     SUBDIR += tei-lite
     SUBDIR += tei-p3
     SUBDIR += tei-p4
     SUBDIR += tei-xlite
     SUBDIR += tet-aspell
     SUBDIR += tex2im
     SUBDIR += texi2db
     SUBDIR += texi2html
     SUBDIR += tinyxml
     SUBDIR += tkdiff
     SUBDIR += tkxmlive
     SUBDIR += tl-aspell
     SUBDIR += tn-aspell
     SUBDIR += tnef2txt
     SUBDIR += tr-aspell
     SUBDIR += trang
     SUBDIR += tth
     SUBDIR += txt2html
     SUBDIR += txt2man
     SUBDIR += txt2tags
     SUBDIR += ua-ispell
     SUBDIR += unroff
     SUBDIR += unrtf
     SUBDIR += urlview
     SUBDIR += uz-aspell
     SUBDIR += wa-aspell
     SUBDIR += wdiff
     SUBDIR += webcpp
     SUBDIR += website
     SUBDIR += word2x
     SUBDIR += wordnet
     SUBDIR += words
     SUBDIR += wv
     SUBDIR += wv2
     SUBDIR += xalan-c
     SUBDIR += xalan-j
     SUBDIR += xerces-c
     SUBDIR += xerces-c2
     SUBDIR += xerces-j
     SUBDIR += xhtml
     SUBDIR += xhtml-11
     SUBDIR += xhtml-basic
     SUBDIR += xhtml-modularization
     SUBDIR += xhtml1-xsd
     SUBDIR += xincluder
     SUBDIR += xlhtml
     SUBDIR += xls2xml
     SUBDIR += xml-i18n-tools
     SUBDIR += xml-lite.el
     SUBDIR += xml-parse.el
     SUBDIR += xml2rfc
     SUBDIR += xml4j
     SUBDIR += xmlada
     SUBDIR += xmlcatmgr
     SUBDIR += xmlcharent
     SUBDIR += xmlenc
     SUBDIR += xmlformat
     SUBDIR += xmlindent
     SUBDIR += xmlpp
     SUBDIR += xmlppm
     SUBDIR += xmlpull
     SUBDIR += xmlroff
     SUBDIR += xmlstarlet
     SUBDIR += xmlto
     SUBDIR += xmlwrapp
     SUBDIR += xom
     SUBDIR += xp
     SUBDIR += xpp3
     SUBDIR += xslide.el
     SUBDIR += xslint
     SUBDIR += xt
     SUBDIR += xxdiff
     SUBDIR += y2l
     SUBDIR += yi-aspell
     SUBDIR += yodl
     SUBDIR += zu-aspell
 
 .include <bsd.port.subdir.mk>
diff --git a/textproc/p5-Apache-XBEL/Makefile b/textproc/p5-Apache-XBEL/Makefile
index 13d14df4d79c..d4f3a7fd482b 100644
--- a/textproc/p5-Apache-XBEL/Makefile
+++ b/textproc/p5-Apache-XBEL/Makefile
@@ -1,40 +1,40 @@
 # New ports collection makefile for: p5-Apache-XBEL
 # Date created: August 03 2004
 # Whom: Aaron Straup Cope <ascope@cpan.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Apache-XBEL
 PORTVERSION=	1.3
-# PORTREVISION=
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ascope@cpan.org
 COMMENT=	Apache mod_perl handler to render an XBEL file as an HTML tree
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Apache::XBEL.3
 
 .if defined(NOXSL)
 PLIST_SUB+=	XSL="@Comment "
 .else
 PLIST_SUB+=	XSL=""
 post-install:
 	@${ECHO} "Installing ${DATADIR}/apache-xbel.xsl"
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/xsl/apache-xbel.xsl ${DATADIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-CSS-Tiny/Makefile b/textproc/p5-CSS-Tiny/Makefile
index 3de781f9deaf..742f5a9c385a 100644
--- a/textproc/p5-CSS-Tiny/Makefile
+++ b/textproc/p5-CSS-Tiny/Makefile
@@ -1,40 +1,39 @@
 # New ports collection makefile for:	p5-CSS-Tiny
 # Date created:		2003-10-31
 # Whom:			Hansjoerg Pehofer <hansjoerg.pehofer@uibk.ac.at>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	CSS-Tiny
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CSS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hansjoerg.pehofer@uibk.ac.at
 COMMENT=	Read/Write .css files with as little code as possible
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 MAN3=		CSS::Tiny.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500503
 EXTRA_PATCHES=	${PATCHDIR}/500503-lib::CSS::Tiny.pm
 .endif
 
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/inc/Module/Install/AutoInstall.pm
 	@${PERL} -pi -e '$$_="" if /AutoInstall/' ${WRKSRC}/MANIFEST
 	@${PERL} -pi -e '$$_="" if /Test::More|auto_install/' ${WRKSRC}/Makefile.PL
 .if ${PERL_LEVEL} <= 500503
 	@${RM} ${WRKSRC}/lib/CSS/Tiny.pm.orig
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 5eeec7e2ad50..1bbb985c0618 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -1,56 +1,49 @@
 # New ports collection makefile for:	p5-PerlPoint-Package
 # Date created:		8 Jun 2004
 # Whom:	      		mat
 #
 # $FreeBSD$
 #
 
 PORTNAME=	PerlPoint-Package
 PORTVERSION=	0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PerlPoint
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	PerlPoint is both a presentation and a documentation toolset
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
 MAN1=		pp2sdf.1
 MAN3=		PerlPoint::Anchors.3 \
 		PerlPoint::Backend.3 \
 		PerlPoint::Constants.3 \
 		PerlPoint::Parser.3 \
 		PerlPoint::Tags.3 \
 		PerlPoint::Tags::Basic.3 \
 		PerlPoint::Tags::CPPP.3 \
 		PerlPoint::Tags::SDF.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	# suck all DOCSDIR
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc; ${FIND} . | ${CPIO} -padm ${DOCSDIR}
 	@cd ${WRKSRC}; ${FIND} utilities | ${CPIO} -padm ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/demo; ${FIND} . | ${CPIO} -padm ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index 59493d097dd0..98f791d24753 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -1,110 +1,111 @@
 # New ports collection makefile for:	textproc/p5-Plucene
 # Date created:				29 July 2004
 # Whom:					Anton Berezin <tobez@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Plucene
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TM/TMTM
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl port of the Java Lucene search engine
 
 BUILD_DEPENDS=	${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
 		${SITE_PERL}/Tie/Array/Sorted.pm:${PORTSDIR}/devel/p5-Tie-Array-Sorted \
-		${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat \
 		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \
 		${SITE_PERL}/Class/Virtual.pm:${PORTSDIR}/devel/p5-Class-Virtual \
 		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
 		${SITE_PERL}/${PERL_ARCH}/Time/Piece.pm:${PORTSDIR}/devel/p5-Time-Piece \
 		${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness \
 		${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		${SITE_PERL}/Lingua/Stem/En.pm:${PORTSDIR}/textproc/p5-Lingua-Stem \
 		${SITE_PERL}/Bit/Vector/Minimal.pm:${PORTSDIR}/math/p5-Bit-Vector-Minimal \
 		${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
 		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	Plucene.3 \
 	Plucene::Analysis::Analyzer.3 \
 	Plucene::Analysis::CharTokenizer.3 \
 	Plucene::Analysis::LetterTokenizer.3 \
 	Plucene::Analysis::LowerCaseFilter.3 \
 	Plucene::Analysis::LowerCaseTokenizer.3 \
 	Plucene::Analysis::PorterStemFilter.3 \
 	Plucene::Analysis::SimpleAnalyzer.3 \
 	Plucene::Analysis::Standard::StandardAnalyzer.3 \
 	Plucene::Analysis::Standard::StandardTokenizer.3 \
 	Plucene::Analysis::StopAnalyzer.3 \
 	Plucene::Analysis::StopFilter.3 \
 	Plucene::Analysis::Token.3 \
 	Plucene::Analysis::TokenFilter.3 \
 	Plucene::Analysis::Tokenizer.3 \
 	Plucene::Analysis::WhitespaceAnalyzer.3 \
 	Plucene::Analysis::WhitespaceTokenizer.3 \
 	Plucene::Bitvector.3 \
 	Plucene::Document.3 \
 	Plucene::Document::DateSerializer.3 \
 	Plucene::Document::Field.3 \
 	Plucene::Index::DocumentWriter.3 \
 	Plucene::Index::FieldInfo.3 \
 	Plucene::Index::FieldInfos.3 \
 	Plucene::Index::FieldsReader.3 \
 	Plucene::Index::FieldsWriter.3 \
 	Plucene::Index::Reader.3 \
 	Plucene::Index::SegmentInfo.3 \
 	Plucene::Index::SegmentInfos.3 \
 	Plucene::Index::SegmentMergeInfo.3 \
 	Plucene::Index::SegmentMerger.3 \
 	Plucene::Index::SegmentReader.3 \
 	Plucene::Index::SegmentTermDocs.3 \
 	Plucene::Index::SegmentTermEnum.3 \
 	Plucene::Index::SegmentTermPositions.3 \
 	Plucene::Index::SegmentsReader.3 \
 	Plucene::Index::Term.3 \
 	Plucene::Index::TermInfo.3 \
 	Plucene::Index::TermInfosReader.3 \
 	Plucene::Index::TermInfosWriter.3 \
 	Plucene::Index::Writer.3 \
 	Plucene::QueryParser.3 \
 	Plucene::Search::BooleanClause.3 \
 	Plucene::Search::BooleanQuery.3 \
 	Plucene::Search::BooleanScorer.3 \
 	Plucene::Search::DateFilter.3 \
 	Plucene::Search::Filter.3 \
 	Plucene::Search::HitCollector.3 \
 	Plucene::Search::Hits.3 \
 	Plucene::Search::IndexSearcher.3 \
 	Plucene::Search::PhrasePositions.3 \
 	Plucene::Search::PhraseQuery.3 \
 	Plucene::Search::PhraseScorer.3 \
 	Plucene::Search::PhraseScorer::Exact.3 \
 	Plucene::Search::PhraseScorer::Sloppy.3 \
 	Plucene::Search::PrefixQuery.3 \
 	Plucene::Search::Query.3 \
 	Plucene::Search::Scorer.3 \
 	Plucene::Search::Searcher.3 \
 	Plucene::Search::Similarity.3 \
 	Plucene::Search::TermQuery.3 \
 	Plucene::Search::TermScorer.3 \
 	Plucene::Search::TopDocs.3 \
 	Plucene::Store::InputStream.3 \
 	Plucene::Store::OutputStream.3 \
 	Plucene::TestCase.3 \
 	Plucene::Utils.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"This port requires perl 5.6 or above."
+IGNORE=	This port requires perl 5.6 or above.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index 795683ef71c2..ec206f798379 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -1,26 +1,26 @@
 # New ports collection makefile for:	Pod-Constants
 # Date created:	   08 April 2002
 # Whom:		   Sergey Skvortsov <skv@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Pod-Constants
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SAMV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Include constants from POD
 
-BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Pod::Constants.3
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index 17b07ca7e8b9..6ea03575f506 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	Pod-DocBook
 # Date created:	   29 July 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Pod-DocBook
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/N/NA/NANDU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Convert Pod data to DocBook SGML
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Pod/ParseLink.pm:${PORTSDIR}/textproc/p5-podlators \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		pod2docbook.1
 MAN3=		Pod::DocBook.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile
index f1d062ba1825..be4680bcaef4 100644
--- a/textproc/p5-Pod-Parser/Makefile
+++ b/textproc/p5-Pod-Parser/Makefile
@@ -1,45 +1,43 @@
 # New ports collection makefile for:	Pod::Parser
 # Date created:		18 Dec 2001
 # Whom:			Sergey Skvortsov <skv@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	PodParser
-PORTVERSION=	1.28
-PORTREVISION=	2
+PORTNAME=	Pod-Parser
+PORTVERSION=	1.31
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Modules to work with POD (Plain Old Documentation)
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
 
 MAN1=		pod2usage.1 podchecker.1 podselect.1
 MAN3=		Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \
 		Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \
 		Pod::Usage.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 PLIST_SUB+=	PL_FILES=""
 .else
 .undef		MAN1
 PLIST_SUB+=	PL_FILES="@comment "
 .endif
 
 post-patch:
 .if ${PERL_LEVEL} >= 500600
 	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
 .endif
 	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Parser/distinfo b/textproc/p5-Pod-Parser/distinfo
index 6eb9a734dd67..775d0195b462 100644
--- a/textproc/p5-Pod-Parser/distinfo
+++ b/textproc/p5-Pod-Parser/distinfo
@@ -1,2 +1,2 @@
-MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382
-SIZE (PodParser-1.28.tar.gz) = 91327
+MD5 (Pod-Parser-1.31.tar.gz) = 9239f922617f805bc9da2f71d717061c
+SIZE (Pod-Parser-1.31.tar.gz) = 94086
diff --git a/textproc/p5-Pod-Parser/pkg-descr b/textproc/p5-Pod-Parser/pkg-descr
index 52476fcb8f2b..2242df2ea619 100644
--- a/textproc/p5-Pod-Parser/pkg-descr
+++ b/textproc/p5-Pod-Parser/pkg-descr
@@ -1,12 +1,12 @@
 Set of modules:
 
 * Pod::Parser - base class for creating POD filters and translators
 * Pod::Select - extract selected sections of POD from input
 * Pod::Usage - print a usage message from embedded pod documentation
 * Pod::PlainText - convert POD data to formatted ASCII text
 * Pod::InputObjects - objects representing POD input paragraphs, commands, etc.
 * Pod::Checker - check pod documents for syntax errors
 * Pod::ParseUtils - helpers for POD parsing and conversion
 * Pod::Find - find POD documents in directory trees
 
-WWW: http://search.cpan.org/dist/PodParser/
+WWW: http://search.cpan.org/dist/Pod-Parser/
diff --git a/textproc/p5-Pod-Stripper/Makefile b/textproc/p5-Pod-Stripper/Makefile
index cca5d55dc9ce..75ca01d894ae 100644
--- a/textproc/p5-Pod-Stripper/Makefile
+++ b/textproc/p5-Pod-Stripper/Makefile
@@ -1,31 +1,30 @@
 # New ports collection makefile for:	Pod-Stripper
 # Date created:	   18 November 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Pod-Stripper
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Strip all pod, and output what's left
 
-BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
 
 MAN1=		podstrip.1
 MAN3=		Pod::Stripper.3
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f|${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//;'
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PodParser/Makefile b/textproc/p5-PodParser/Makefile
deleted file mode 100644
index f1d062ba1825..000000000000
--- a/textproc/p5-PodParser/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	Pod::Parser
-# Date created:		18 Dec 2001
-# Whom:			Sergey Skvortsov <skv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	PodParser
-PORTVERSION=	1.28
-PORTREVISION=	2
-CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pod
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Modules to work with POD (Plain Old Documentation)
-
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
-
-MAN1=		pod2usage.1 podchecker.1 podselect.1
-MAN3=		Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \
-		Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \
-		Pod::Usage.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-PLIST_SUB+=	PL_FILES=""
-.else
-.undef		MAN1
-PLIST_SUB+=	PL_FILES="@comment "
-.endif
-
-post-patch:
-.if ${PERL_LEVEL} >= 500600
-	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
-.endif
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
-.include <bsd.port.post.mk>
diff --git a/textproc/p5-PodParser/distinfo b/textproc/p5-PodParser/distinfo
deleted file mode 100644
index 6eb9a734dd67..000000000000
--- a/textproc/p5-PodParser/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382
-SIZE (PodParser-1.28.tar.gz) = 91327
diff --git a/textproc/p5-PodParser/pkg-descr b/textproc/p5-PodParser/pkg-descr
deleted file mode 100644
index 52476fcb8f2b..000000000000
--- a/textproc/p5-PodParser/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Set of modules:
-
-* Pod::Parser - base class for creating POD filters and translators
-* Pod::Select - extract selected sections of POD from input
-* Pod::Usage - print a usage message from embedded pod documentation
-* Pod::PlainText - convert POD data to formatted ASCII text
-* Pod::InputObjects - objects representing POD input paragraphs, commands, etc.
-* Pod::Checker - check pod documents for syntax errors
-* Pod::ParseUtils - helpers for POD parsing and conversion
-* Pod::Find - find POD documents in directory trees
-
-WWW: http://search.cpan.org/dist/PodParser/
diff --git a/textproc/p5-PodParser/pkg-plist b/textproc/p5-PodParser/pkg-plist
deleted file mode 100644
index 767ad94ec02d..000000000000
--- a/textproc/p5-PodParser/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-%%PL_FILES%%bin/pod2usage
-%%PL_FILES%%bin/podchecker
-%%PL_FILES%%bin/podselect
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
-%%SITE_PERL%%/Pod/Checker.pm
-%%SITE_PERL%%/Pod/Find.pm
-%%SITE_PERL%%/Pod/InputObjects.pm
-%%SITE_PERL%%/Pod/ParseUtils.pm
-%%SITE_PERL%%/Pod/Parser.pm
-%%SITE_PERL%%/Pod/PlainText.pm
-%%SITE_PERL%%/Pod/Select.pm
-%%SITE_PERL%%/Pod/Usage.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 02e424d7791e..203b213aa0ff 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -1,43 +1,39 @@
 # New ports collection makefile for:	RDF::Notation3
 # Date created:		21 Nov 2001
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	RDF-Notation3
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RDF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	RDF Notation3 parser
 
 BUILD_DEPENDS=	${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
 		${SITE_PERL}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		RDF::Notation3.3 RDF::Notation3::PrefTriples.3 \
 		RDF::Notation3::RDFCore.3 RDF::Notation3::RDFStore.3 \
 		RDF::Notation3::ReaderFile.3 RDF::Notation3::ReaderString.3 \
 		RDF::Notation3::SAX.3 RDF::Notation3::Template::TReader.3 \
 		RDF::Notation3::Template::TTriples.3 \
 		RDF::Notation3::Template::TXML.3 RDF::Notation3::Triples.3 \
 		RDF::Notation3::XML.3
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 	${XARGS} ${PERL} -pi -e 's!^require 5.005_62;!!'
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index b40b3feb2f6e..eb39f78d4779 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -1,33 +1,29 @@
 # New ports collection makefile for:	XML::Directory
 # Date created:		4 Sep 2001
 # Whom:			Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	XML-Directory
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Returns a content of directory as XML
 
 BUILD_DEPENDS=	${SITE_PERL}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		XML::Directory.3 XML::Directory::Apache.3 \
 		XML::Directory::SAX.3 XML::Directory::String.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index a3f318f7cfa5..87a8b6763eb1 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -1,45 +1,44 @@
 # New ports collection makefile for:	podlators
 # Date created:	   08 April 2002
 # Whom:		   Sergey Skvortsov <skv@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	podlators
 PORTVERSION=	1.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Modules to convert and parse POD (Plain Old Documentation)
 
-RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN1=		pod2man.1 pod2text.1
 MAN3=		Pod::Man.3 Pod::ParseLink.3 Pod::Text.3 Pod::Text::Color.3 \
 		Pod::Text::Overstrike.3 Pod::Text::Termcap.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 500600
 .undef MAN1
 PLIST_SUB=	PL_FILES="@comment "
 .else
 RUN_DEPENDS+=	${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
 PLIST_SUB=	PL_FILES=""
 .endif
 
 post-patch:
 .if ${PERL_LEVEL} >= 500600
 	@${REINPLACE_CMD} -Ee '/(pod2man|pod2text)/d' ${WRKSRC}/Makefile.PL
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/MT/Makefile b/www/MT/Makefile
index c81a37d4953b..fa8e642739d4 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -1,146 +1,146 @@
 # New ports collection makefile for:	MT
 # Date created:			Fri Jun 13 16:39:20 CST 2003
 # Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	MT
 PORTVERSION=	2.661
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.movabletype.org/downloads/
 .if defined(WITH_OLD_DISTFILE)
 DISTNAME=	${PORTNAME}-${PORTVERSION}-full-lib
 .endif
 DISTFILES=	nofollow.tar.gz ${DISTNAME}.tar.gz
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A web-based personal publishing system for weblogs
 
 RUN_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
 		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
 
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 RUN_DEPENDS+=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
 	${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 DATADIR=		www/data/mt
 CGIDIR=			www/cgi-bin/mt
 
 .if defined(WITH_MYSQL)
 DB_DIR?=		/var/db/mysql/blog
 USE_MYSQL=		yes
 .elif defined(WITH_POSTGRES)
 DB_DIR?=		${PREFIX}/pgsql/data/blog
 # Or somewhere defined in $PGDATA
 USE_PGSQL=		yes
 .elif defined(WITH_SQLITE)
 DB_DIR?=	${PREFIX}/${CGIDIR}/db
 RUN_DEPENDS+=\
 	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
 .else
 DB_DIR?=	${PREFIX}/${CGIDIR}/db
 WITH_DEFAULTDB=	yes
 .endif
 
 PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR}
 
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 RESTRICTED=	License does not permit distribution
 
 .if defined(WITH_OLD_DISTFILE)
 PLIST_SUB+=	OLD=""
 .else
 WRKSRC=		${WRKDIR}/MT-${PORTVERSION}-full-lib
 PLIST_SUB+=	OLD="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	\
 : Because of licensing restrictions, you must fetch the source distribution\
 manually. Goto http://www.movabletype.org/ register as if you are going\
 to download 3.x, and then choosing 2.661 from the list after you log on.\
 Download the file into ${DISTDIR}/, and then run make again
 ECHO_MSG=${ECHO_CMD}
 .endif
 
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 .endif
 .if ${PERL_LEVEL} < 500601
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 .endif
 
 pre-everything::
 	@${ECHO_CMD} "Available switches:"
 	@${ECHO_CMD} "-------------------"
 	@${ECHO_CMD} "DB_DIR"
 	@${ECHO_CMD} "		- Override the default database directory"
 	@${ECHO_CMD} "		  (${DB_DIR})"
 .if !defined(WITH_OLD_DISTFILE)
 	@${ECHO_CMD} "WITH_OLD_DISTFILE"
 	@${ECHO_CMD} "		- Use the pre 3.x distfile, which was available under"
 	@${ECHO_CMD} "		  a less restrictive license"
 .endif
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 	@${ECHO_CMD} "WITHOUT_OPTIONAL_MODULES"
 	@${ECHO_CMD} "		- Don't install optional perl modules, needed for"
 	@${ECHO_CMD} "		  Trackbacks, XML-RPC and thumbnails"
 .endif
 .if !defined(WITH_MYSQL)
 	@${ECHO_CMD} "WITH_MYSQL"
 	@${ECHO_CMD} "		- Use MySQL instead of Berkeley DB as database backend"
 .endif
 .if !defined(WITH_MYSQL)
 	@${ECHO_CMD} "WITH_POSTGRES"
 	@${ECHO_CMD} "		- Use PostgreSQL instead of Berkeley DB as database backend"
 .endif
 .if !defined(WITH_SQLITE)
 	@${ECHO_CMD} "WITH_POSTGRES"
 	@${ECHO_CMD} "		- Use SQLite instead of Berkeley DB as database backend"
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} * -name "*.orig" -delete
 	@${ECHO_MSG} "Installing cgi under ${PREFIX}/${CGIDIR}"
 	@${MKDIR} ${PREFIX}/${CGIDIR}
 	@cd ${WRKSRC} && ${CP} -R *.cgi lib extlib plugins search_templates \
 	  tmpl ${PREFIX}/${CGIDIR}
 	@${SED} -e 's#WWW.YOUR-SITE.COM/PATH/TO/MT/#${HOST}/cgi-bin/mt/#g' \
 	  -e 's/# StaticWebPath/StaticWebPath/g' \
 	  -e 's#path/to/static-files#mt#g' \
 	  -e 's/# NoHTMLEntities 1/NoHTMLEntities 1/g' \
 	  ${WRKSRC}/mt.cfg > ${PREFIX}/${CGIDIR}/mt.cfg.dist
 	[ -e ${PREFIX}/${CGIDIR}/mt.cfg ] || ${CP} ${PREFIX}/${CGIDIR}/mt.cfg.dist ${PREFIX}/${CGIDIR}/mt.cfg
 	${SED} -e 's#$$MT_DIR, .schemas.#"${PREFIX}/${DATADIR}/schemas"#' \
 	  ${WRKSRC}/mt-load.cgi > ${PREFIX}/${CGIDIR}/mt-load.cgi
 	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}"
 	@${MKDIR} ${PREFIX}/${DATADIR}
 	@cd ${WRKSRC} && ${CP} -R docs images \
 	  index.html schemas styles.css \
 	  ${PREFIX}/${DATADIR}
 .if defined(WITH_OLD_DISTFILE)
 	@cd ${WRKSRC}; ${INSTALL_DATA} LICENSE LICENSE-COMMERCIAL \
 		${PREFIX}/${DATADIR}
 .endif
 	${MKDIR} ${PREFIX}/${CGIDIR}/plugins
 	${INSTALL_DATA} ${WRKDIR}/nofollow/plugins/nofollow.pl ${PREFIX}/${CGIDIR}/plugins
 .if defined(WITH_DEFAULTDB)
 	@${MKDIR} -m 755 ${DB_DIR}
 	@${CHOWN} -R www:www ${DB_DIR}
 .endif
 	@${CHOWN} -R www:www ${PREFIX}/${CGIDIR} ${PREFIX}/${DATADIR}
 
 post-install:
 	@${ECHO_MSG} "Please read the documentation about initializing a blog DB in ${DB_DIR}"
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Apache-DebugInfo/Makefile b/www/p5-Apache-DebugInfo/Makefile
index fbb38d6c3f2e..296163794497 100644
--- a/www/p5-Apache-DebugInfo/Makefile
+++ b/www/p5-Apache-DebugInfo/Makefile
@@ -1,29 +1,29 @@
 # New ports collection makefile for:	Apache-DebugInfo
 # Date created:	   19 April 2004
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Apache-DebugInfo
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Log various bits of per-request data
 
 .if defined(WITH_MODPERL2)
-IGNORE=		"This port does not support mod_perl2"
+IGNORE=		This port does not support mod_perl2
 .else
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 BUILD_DEPENDS=	${RUN_DEPENDS}
 .endif
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Apache::DebugInfo.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Test/Makefile b/www/p5-Apache-Test/Makefile
index 6fe596a3d9e7..1563fba4b666 100644
--- a/www/p5-Apache-Test/Makefile
+++ b/www/p5-Apache-Test/Makefile
@@ -1,59 +1,57 @@
 # New ports collection makefile for:	Apache-Test
 # Date created:	   05 July 2003
 # Whom:		   Sergey Skvortsov <skv@protey.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Apache-Test
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Test.pm wrapper with helpers for testing Apache
 
 .if defined(WITH_MODPERL2)
-IGNORE=		"This port is already included in mod_perl2"
+IGNORE=		This port is already included in mod_perl2
 .else
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 BUILD_DEPENDS=	${RUN_DEPENDS}
 .endif
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Apache::Test.3 Apache::TestConfig.3 Apache::TestConfigData.3 \
 		Apache::TestMB.3 Apache::TestMM.3 Apache::TestReport.3 \
 		Apache::TestRequest.3 Apache::TestRun.3 Apache::TestRunPHP.3 \
 		Apache::TestRunPerl.3 Apache::TestSmoke.3 Apache::TestTrace.3 \
 		Apache::TestUtil.3 Bundle::ApacheTest.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 .if ${PERL_LEVEL} < 500800
 EXTRA_PATCHES=	${PATCHDIR}/500503-Makefile.PL
 .endif
 
 post-patch:
 	@${PERL} -pi.bak -e 's/^/#/ if $$.==26;' ${WRKSRC}/Makefile.PL
 	@${PERL} -pi -e '$$_="" if $$.==11;' ${WRKSRC}/lib/Apache/Test5005compat.pm
 .if ${PERL_LEVEL} < 500800
 	@${PERL} -pi.bak -e 's/PERLRUN/PERL/;' ${WRKSRC}/install-pl
 .endif
 .if ${PERL_LEVEL} < 500600
 	@${PERL} -pi -e 's/\b(?:use|no) warnings[^;]*;//g' \
 	${WRKSRC}/lib/Apache/*.pm ${WRKSRC}/Makefile.PL ${WRKSRC}/install-pl
 	${PERL} -pi -e '$$_="" if $$. == 24' \
 		${WRKSRC}/lib/Apache/Test5005compat.pm
 .endif
 
 post-configure:
 	@${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile
index 67d136cf97bf..ccd4e1403c1f 100644
--- a/www/p5-Bundle-Slash/Makefile
+++ b/www/p5-Bundle-Slash/Makefile
@@ -1,68 +1,64 @@
 # New ports collection makefile for:	p5-Bundle-Slash
 # Date created:				March 17th 2002
 # Whom:	      				Autrijus Tang <autrijus@autrijus.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Bundle-Slash
 PORTVERSION=	2.32
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Bundle
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	A bundle to install all modules used for Slash
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/HTML/CalendarMonthSimple.pm:${PORTSDIR}/www/p5-HTML-CalendarMonthSimple \
 		${SITE_PERL}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM \
 		${SITE_PERL}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
 		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
 		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
 		${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
 		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/Schedule/Cron.pm:${PORTSDIR}/sysutils/p5-Schedule-Cron \
 		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \
 		${SITE_PERL}/DBIx/Password.pm:${PORTSDIR}/databases/p5-DBIx-Password
 
 .if !defined(WITH_APACHE2)
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Cookie.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
 .endif
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Bundle::Slash.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile
index 8949b4e4e0c7..b7b170895ca1 100644
--- a/www/p5-Bundle-Sledge/Makefile
+++ b/www/p5-Bundle-Sledge/Makefile
@@ -1,61 +1,54 @@
 # New ports collection makefile for:	p5-Bundle-Sledge
 # Date created:		26 February 2003
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Bundle-Sledge
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Bundle
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A bundle to install all modules used for Sledge
 
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
+PM_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 PM_DEPENDS+=	${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload
 PM_DEPENDS+=	${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline
 PM_DEPENDS+=	${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert
 PM_DEPENDS+=	${SITE_PERL}/Class/Fields.pm:${PORTSDIR}/devel/p5-Class-Fields
 PM_DEPENDS+=	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
 PM_DEPENDS+=	${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable
 PM_DEPENDS+=	${SITE_PERL}/Class/Singleton.pm:${PORTSDIR}/devel/p5-Class-Singleton
 PM_DEPENDS+=	${SITE_PERL}/Class/Trigger.pm:${PORTSDIR}/devel/p5-Class-Trigger
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 PM_DEPENDS+=	${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm
 PM_DEPENDS+=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
 PM_DEPENDS+=	${SITE_PERL}/HTML/StickyQuery.pm:${PORTSDIR}/www/p5-HTML-StickyQuery
 PM_DEPENDS+=	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 PM_DEPENDS+=	${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
 PM_DEPENDS+=	${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 PM_DEPENDS+=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 #PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Errno.pm:${PORTSDIR}/devel/Errno.pm
 PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
 PM_DEPENDS+=	${SITE_PERL}/Data/Properties.pm:${PORTSDIR}/devel/p5-Data-Properties
 PM_DEPENDS+=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 PM_DEPENDS+=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Bundle::Sledge.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-PM_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-PM_DEPENDS+=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-PM_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile
index 1b37bcc24959..2699bc8e5532 100644
--- a/www/p5-CGI-Cache/Makefile
+++ b/www/p5-CGI-Cache/Makefile
@@ -1,34 +1,29 @@
 # New ports collection makefile for:	CGI-Cache
 # Date created:				Mon Jan  1 11:26:17 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	CGI-Cache
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Perl extension to cache output of time-intensive CGI scripts
 
 BUILD_DEPENDS=	${SITE_PERL}/File/Cache.pm:${PORTSDIR}/devel/p5-File-Cache \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Cache.3
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index be42504e0837..7cc84f46ca97 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -1,55 +1,50 @@
 # New ports collection makefile for:	www/p5-CGI.pm
 # Date created:				12 July 2001
 # Whom:					Anton Berezin <tobez@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	CGI.pm
 PORTVERSION=	3.10
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple Common Gateway Interface Class for Perl
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN3=		CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \
 		CGI::Fast.3 CGI::Pretty.3 CGI::Push.3 CGI::Switch.3 \
 		CGI::Util.3
 
 .if !defined(NOPORTDOCS)
 EXAMPLES=	examples/caution.xbm examples/clickable_image.cgi \
 		examples/cookie.cgi examples/crash.cgi examples/customize.cgi \
 		examples/diff_upload.cgi examples/dna.small.gif \
 		examples/file_upload.cgi examples/frameset.cgi \
 		examples/index.html examples/internal_links.cgi \
 		examples/javascript.cgi examples/make_links.pl \
 		examples/monty.cgi examples/multiple_forms.cgi \
 		examples/nph-clock.cgi examples/nph-multipart.cgi \
 		examples/popup.cgi examples/save_state.cgi \
 		examples/tryit.cgi examples/wilogo.gif
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-
 post-patch:
-	@${PERL} -i -pe '$$_ = "" if /require 5\.6/' ${WRKSRC}/Makefile.PL
-
-.endif
+	@${REINPLACE_CMD} -e '/require 5\.6/d; /INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 6b1dd059aa37..43156ca94c3c 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -1,55 +1,53 @@
 # New ports collection makefile for:	p5-HTML-Embperl
 # Date created:				March 13, 2000
 # Whom:	      				Frank Mayhar <frank@exit.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	HTML-Embperl
 PORTVERSION=	1.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	A module to allow embedded perl in HTML documents
 
 .if !defined(WITHOUT_APACHE)
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
 #		${SITE_PERL}/Apache/SessionX.pm:${PORTSDIR}/www/p5-Apache-SessionX
 .endif
 
 PERL_CONFIGURE=	yes
 
 .if !defined(WITHOUT_APACHE)
 CONFIGURE_ENV=	EPHTTPD="${LOCALBASE}/sbin/httpd" EPMODDIR="${LOCALBASE}/libexec/apache"
 CONFIGURE_ARGS=	${LOCALBASE}/include/apache
 .else
 CONFIGURE_ENV=	NOAPACHE=true
 .endif
 
 INSTALL_TARGET=	pure_install
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		HTML::Embperl.3 HTML::Embperl::Faq.3 HTML::Embperl::Changes.3 \
 		HTML::Embperl::FeaturesD.3 HTML::Embperl::TipsAndTricks.3 \
 		HTML::Embperl::Intro.3 HTML::Embperl::Session.3 HTML::Embperl::Mail.3 \
 		HTML::Embperl::INSTALL.3 HTML::Embperl::NEWS.3 HTML::EmbperlObject.3 \
 		HTML::Embperl::IntroD.3 HTML::EmbperlD.3 HTML::Embperl::Features.3 \
 		HTML::Embperl::IntroEmbperlObject.3 HTML::Embperl::CVS.3
 
 MAN1=		embpexec.pl.1
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BROKEN=		Incorrect pkg-plist
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 3a4d6ed7925d..9f5d0fa1f4fe 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,76 +1,73 @@
 # New ports collection makefile for:	HTML-Mason
 # Date created:				31 May 2000
 # Whom:					Denis Shaposhnikov <dsh@vlink.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	HTML-Mason
 PORTVERSION=	1.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	High-performance, dynamic web site authoring system
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
 		${SITE_PERL}/Class/Container.pm:${PORTSDIR}/devel/p5-Class-Container \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--no-prompts
 
 MAN3=		Bundle::HTML::Mason.3 \
 		HTML::Mason.3 \
 		HTML::Mason::Admin.3 \
 		HTML::Mason::ApacheHandler.3 \
 		HTML::Mason::Buffer.3 \
 		HTML::Mason::Cache::BaseCache.3 \
 		HTML::Mason::CGIHandler.3 \
 		HTML::Mason::Compiler.3 \
 		HTML::Mason::Compiler::ToObject.3 \
 		HTML::Mason::Component.3 \
 		HTML::Mason::Component::FileBased.3 \
 		HTML::Mason::Component::Subcomponent.3 \
 		HTML::Mason::ComponentSource.3 \
 		HTML::Mason::Devel.3 \
 		HTML::Mason::Escapes.3 \
 		HTML::Mason::Exceptions.3 \
 		HTML::Mason::FakeApache.3 \
 		HTML::Mason::Interp.3 \
 		HTML::Mason::Lexer.3 \
 		HTML::Mason::MethodMaker.3 \
 		HTML::Mason::Params.3 \
 		HTML::Mason::Parser.3 \
 		HTML::Mason::Request.3 \
 		HTML::Mason::Resolver.3 \
 		HTML::Mason::Resolver::File.3 \
 		HTML::Mason::Resolver::Null.3 \
 		HTML::Mason::Subclassing.3 \
 		HTML::Mason::Tests.3 \
 		HTML::Mason::Tools.3 \
 		HTML::Mason::Utils.3
 
 OPTIONS=	MOD_PERL "with mod_perl dependency" off
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 .if defined(WITH_MOD_PERL)
 .if defined(WITH_APACHE2)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq2
 .else
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq
 .endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 4d63a202e1c3..34564b7ec28a 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -1,36 +1,27 @@
 # New ports collection makefile for:	p5-HTML-Template
 # Date Created:				26 Oct, 2000
 # Whom:					Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	HTML-Template
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to use HTML Templates from CGI scripts
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
 MAN3=		HTML::Template.3
 
-post-patch:
-	${PERL} -i -pe 's@%%PERL_INC%%@${SITE_PERL}@' ${WRKSRC}/Template.pm
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600 && !exists(${SITE_PERL}/File/Spec.pm)
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.if ${PERL_LEVEL} < 500800 && !exists(${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTML-Template/files/patch-Template.pm b/www/p5-HTML-Template/files/patch-Template.pm
deleted file mode 100644
index 6c4d3879d1f3..000000000000
--- a/www/p5-HTML-Template/files/patch-Template.pm
+++ /dev/null
@@ -1,12 +0,0 @@
---- Template.pm.orig	Fri Jun 18 21:42:06 2004
-+++ Template.pm	Fri Jun 25 13:33:50 2004
-@@ -890,7 +890,9 @@
- use strict; # and no funny business, either.
- 
- use Carp; # generate better errors with more context
-+BEGIN { unshift(@INC, "%%PERL_INC%%"); }
- use File::Spec; # generate paths that work on all platforms
-+shift(@INC);
- use Digest::MD5 qw(md5_hex); # generate cache keys
- 
- # define accessor constants used to improve readability of array
diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile
index 8f20ea7a4c4b..9cda220e37a1 100644
--- a/www/p5-POE-Component-Server-HTTP/Makefile
+++ b/www/p5-POE-Component-Server-HTTP/Makefile
@@ -1,30 +1,31 @@
 # New ports collection makefile for:	POE-Component-Server-HTTP
 # Date created:		03 Apr 2004
 # Whom:			Zach Thompson <lin-chi@lastamericanempire.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	POE-Component-Server-HTTP
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	www devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
 COMMENT=	POE Component to create HTTP Servers
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
 		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/POE/API/Peek.pm:${PORTSDIR}/devel/p5-POE-API-Peek \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
 		${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::Server::HTTP.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index 0a826d07301c..e5458afbe251 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -1,28 +1,29 @@
 # New ports collection makefile for:   p5-PodToHTML
 # Date created:                27 February 2004
 # Whom:                        hrs@FreeBSD.org
 #
 # $FreeBSD$
 
 PORTNAME=	PodToHTML
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Generating HTML from several files containg POD documentation
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/HTML/FormatPS.pm:${PORTSDIR}/textproc/p5-HTML-Format
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		podtohtml.1
 MAN3=		Pod::HTML_Elements.3
 
 .include <bsd.port.mk>
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 3b193d6a0de4..ceb9f2a8d986 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,203 +1,199 @@
 # New ports collection makefile for:	p5-Template-Toolkit
 # Date Created:				3 Mar, 2001
 # Whom:					clive
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Template-Toolkit
 PORTVERSION=	2.14
+PORTREVISION=	2
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Template
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensive Toolkit for template processing
 
-BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=TEXT_AUTOFORMAT "With Text::Autoformat Plugin"		off \
 	GD		"With GD Plugin (needs perl5.6)"	off \
 	GD_TEXT		"With GD::Text Plugin (needs GD)"	off \
 	GD_GRAPH	"With GD::Graph Plugin (needs GD)"	off \
 	GD_GRAPH3D	"With GD::Graph3d Plugin (needs GD)"	off \
 	IMAGE_INFO	"With Image::Info Plugin"		off \
 	IMAGE_SIZE	"With Image::Size Plugin"		off \
 	DATE_CALC	"With Date::Calc Plugin"		off \
 	POD_POM		"With Pod::POM Plugin"			off \
 	TIE_DBI		"With Tie::DBI Plugin"			off \
 	XML_DOM		"With XML::DOM Plugin"			off \
 	XML_RSS		"With XML::RSS Plugin (needs perl5.6)"	off \
 	XML_XPATH	"With XML::XPath Plugin"		off \
 	DBI		"With DBI Plugin"			off
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=	TT_DBI=n TT_ACCEPT=y
 
 MASTER_SITE_BACKUP+=	http://www.template-toolkit.org/download/
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
 .if defined(WITH_TEXT_AUTOFORMAT)
 BUILD_DEPENDS+=${SITE_PERL}/Text/Autoformat.pm:${PORTSDIR}/textproc/p5-Text-Autoformat
 .endif
 .if defined(WITH_IMAGE_INFO)
 BUILD_DEPENDS+=${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info
 .endif
 .if defined(WITH_IMAGE_SIZE)
 BUILD_DEPENDS+=${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size
 .endif
 .if defined(WITH_DATE_CALC)
 BUILD_DEPENDS+=${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
 .endif
 .if defined(WITH_POD_POM)
 BUILD_DEPENDS+=${SITE_PERL}/Pod/POM.pm:${PORTSDIR}/textproc/p5-Pod-POM
 .endif
 .if defined(WITH_TIE_DBI)
 BUILD_DEPENDS+=${SITE_PERL}/Tie/DBI.pm:${PORTSDIR}/databases/p5-Tie-DBI
 .endif
 .if defined(WITH_XML_DOM)
 BUILD_DEPENDS+=${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 .endif
 .if defined(WITH_XML_XPATH)
 BUILD_DEPENDS+=${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
 .endif
 
 .if defined(WITH_DBI)
 .if ${PERL_LEVEL} > 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 .endif
 .endif
 
 .if ${PERL_LEVEL} > 500600
 .if defined(WITH_GD)
 BUILD_DEPENDS+=${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 .endif
 .if defined(WITH_GD_TEXT)
 BUILD_DEPENDS+=${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 .if defined(WITH_GD_GRAPH)
 BUILD_DEPENDS+=${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
 .endif
 .if defined(WITH_GD_GRAPH3D)
 BUILD_DEPENDS+=${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d
 .endif
 .if defined(WITH_XML_RSS)
 BUILD_DEPENDS+=${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS
 .endif
 .endif
 
 .if defined(BATCH)
 CONFIGURE_ENV=	|
 .endif
 
 MAN1=	tpage.1 ttree.1
 MAN3=	Template.3 \
 	Template::Base.3 \
 	Template::Constants.3 \
 	Template::Context.3 \
 	Template::Document.3 \
 	Template::Exception.3 \
 	Template::FAQ.3 \
 	Template::Filters.3 \
 	Template::Iterator.3 \
 	Template::Library::HTML.3 \
 	Template::Library::PostScript.3 \
 	Template::Library::Splash.3 \
 	Template::Manual.3 \
 	Template::Manual::Config.3 \
 	Template::Manual::Credits.3 \
 	Template::Manual::Directives.3 \
 	Template::Manual::Filters.3 \
 	Template::Manual::Internals.3 \
 	Template::Manual::Intro.3 \
 	Template::Manual::Plugins.3 \
 	Template::Manual::Refs.3 \
 	Template::Manual::Syntax.3 \
 	Template::Manual::VMethods.3 \
 	Template::Manual::Variables.3 \
 	Template::Manual::Views.3 \
 	Template::Modules.3 \
 	Template::Namespace::Constants.3 \
 	Template::Parser.3 \
 	Template::Plugin.3 \
 	Template::Plugin::Autoformat.3 \
 	Template::Plugin::CGI.3 \
 	Template::Plugin::DBI.3 \
 	Template::Plugin::Datafile.3 \
 	Template::Plugin::Date.3 \
 	Template::Plugin::Directory.3 \
 	Template::Plugin::Dumper.3 \
 	Template::Plugin::File.3 \
 	Template::Plugin::Filter.3 \
 	Template::Plugin::Format.3 \
 	Template::Plugin::GD::Constants.3 \
 	Template::Plugin::GD::Graph::area.3 \
 	Template::Plugin::GD::Graph::bars.3 \
 	Template::Plugin::GD::Graph::bars3d.3 \
 	Template::Plugin::GD::Graph::lines.3 \
 	Template::Plugin::GD::Graph::lines3d.3 \
 	Template::Plugin::GD::Graph::linespoints.3 \
 	Template::Plugin::GD::Graph::mixed.3 \
 	Template::Plugin::GD::Graph::pie.3 \
 	Template::Plugin::GD::Graph::pie3d.3 \
 	Template::Plugin::GD::Graph::points.3 \
 	Template::Plugin::GD::Image.3 \
 	Template::Plugin::GD::Polygon.3 \
 	Template::Plugin::GD::Text.3 \
 	Template::Plugin::GD::Text::Align.3 \
 	Template::Plugin::GD::Text::Wrap.3 \
 	Template::Plugin::HTML.3 \
 	Template::Plugin::Image.3 \
 	Template::Plugin::Iterator.3 \
 	Template::Plugin::Pod.3 \
 	Template::Plugin::Procedural.3 \
 	Template::Plugin::String.3 \
 	Template::Plugin::Table.3 \
 	Template::Plugin::URL.3 \
 	Template::Plugin::View.3 \
 	Template::Plugin::Wrap.3 \
 	Template::Plugin::XML::DOM.3 \
 	Template::Plugin::XML::RSS.3 \
 	Template::Plugin::XML::Simple.3 \
 	Template::Plugin::XML::Style.3 \
 	Template::Plugin::XML::XPath.3 \
 	Template::Plugins.3 \
 	Template::Provider.3 \
 	Template::Service.3 \
 	Template::Stash.3 \
 	Template::Stash::Context.3 \
 	Template::Stash::XS.3 \
 	Template::Test.3 \
 	Template::Tools::tpage.3 \
 	Template::Tools::ttree.3 \
 	Template::Tutorial.3 \
 	Template::Tutorial::Datafile.3 \
 	Template::Tutorial::Web.3 \
 	Template::View.3
 
 post-patch:
 	${PERL} -pi -e 's,/usr/local/tt2,${PREFIX}/share/tt2,g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .if ${PERL_LEVEL} < 500601
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
 EXTRA_PATCHES=	${PATCHDIR}/5.005-lib-Template-Document.pm
 .endif
 
 .if ${PERL_LEVEL} >= 500800
 MAN3+=	Template::Config.3
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile
index 75981599a266..d8834f976b01 100644
--- a/www/p5-WWW-Mechanize/Makefile
+++ b/www/p5-WWW-Mechanize/Makefile
@@ -1,49 +1,50 @@
 # New ports collection makefile for:	www/p5-WWW-Mechanize
 # Date created:				02 April 2003
 # Whom:					Anton Berezin <tobez@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	WWW-Mechanize
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	This module is to help you automate interaction with a website
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		WWW::Mechanize.3 WWW::Mechanize::Cookbook.3 \
 		WWW::Mechanize::Examples.3 WWW::Mechanize::FAQ.3 \
 		WWW::Mechanize::Link.3 WWW::Mechanize::Image.3
 MAN1=		mech-dump.1
 
 .if !defined(NOPORTDOCS)
 MYPORTDOCS=	Changes etc/www-mechanize-logo.png
 PORTDOCS=	Changes www-mechanize-logo.png
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${MYPORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 .if ${PERL_LEVEL} < 500601
 IGNORE=		requires perl 5.6.x or later. Install lang/perl5.8 then try again
 .endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index fd3d87689987..cda1a3d019a7 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,54 +1,48 @@
 # New ports collection makefile for:    p5-WWW-Search
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	WWW-Search
 PORTVERSION=	2.46
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A perl5 module for WWW searches
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
 		${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline \
 		${SITE_PERL}/User.pm:${PORTSDIR}/sysutils/p5-User \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		AutoSearch.1 \
 		WebSearch.1
 MAN3=		WWW::Search.3 \
 		WWW::SearchResult.3 \
 		WWW::Search::Null.3 \
 		WWW::Search::Null::Count.3 \
 		WWW::Search::Null::Empty.3 \
 		WWW::Search::Null::Error.3 \
 		WWW::Search::Simple.3 \
 		WWW::Search::Test.3
 
 post-patch:
 	@${RM} ${WRKSRC}/lib/WWW/Search/Test.pm.orig
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 3cbc0eb39bef..528b1de6c9fa 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,50 +1,50 @@
 # New ports collection makefile for:	p5-libapreq
 # Date created:				March 13, 2000
 # Whom:	      				Frank Mayhar <frank@exit.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libapreq
 PORTVERSION=	1.33
 CATEGORIES=	www perl5 devel
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=     Apache
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Generic Apache Request Library
 
 .if defined(WITH_MODPERL2)
-IGNORE=		"This port does not support mod_perl2"
+IGNORE=		This port does not support mod_perl2
 .else
 RUN_DEPENDS?=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
 .endif
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Apache::Cookie.3 Apache::Request.3 Apache::libapreq.3 \
 		libapreq.3
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${PERL} -pi~ -e '$$_="" if ($$.>37 && $$.<63) || /PREREQ_PM/' \
 		${WRKSRC}/Makefile.PL
 .if ${PERL_LEVEL} < 500600
 	@${PERL} -pi~ -e '$$_="#define aTHX_\n" if $$. == 155' \
 		${WRKSRC}/c/apache_request.h
 .endif
 
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}/c/testapreq
 	@${MKDIR} ${EXAMPLESDIR}/perl
 	${INSTALL_DATA} ${WRKSRC}/eg/c/testapreq/* ${EXAMPLESDIR}/c/testapreq
 	${INSTALL_SCRIPT} ${WRKSRC}/eg/perl/* ${EXAMPLESDIR}/perl
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index e6666738a1f4..51125eca4449 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -1,167 +1,162 @@
 # New ports collection makefile for:   RT2
 # Date created:        12 August 2002
 # Whom:                plasma
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rt2
 PORTVERSION=	2.0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.fsck.com/pub/rt/release/
 DISTNAME=	rt-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RT is an industrial-grade ticketing system written in Perl
 
 BUILD_DEPENDS=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Cookie.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/DBIx/DataSource.pm:${PORTSDIR}/databases/p5-DBIx-DataSource \
 		${SITE_PERL}/DBIx/SearchBuilder.pm:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \
 		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
 		${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
 		${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper \
 		${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash \
 		${SITE_PERL}/CGI/Cookie.pm:${PORTSDIR}/www/p5-CGI.pm
 
 WRKSRC=		${WRKDIR}/rt-${RT_VERSION}
 RT_VERSION=	${PORTVERSION:C/\./-/g}
 DB_TYPE?=	mysql
 
 .include <bsd.port.pre.mk>
 
 .if ${DB_TYPE} == "Pg"
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 .else
 DB_TYPE=	mysql
 BUILD_DEPENDS+=	${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server
 .endif
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 RT_PATH?=	${PREFIX}/rt2
 DB_DBA_PASSWORDD?=
 DB_HOST?=	localhost
 DB_RT_PASS=	rt_pass
 
 MAN3=		RT::Links.3 \
 		RT::Watchers.3 \
 		RT::Group.3 \
 		RT::Keyword.3 \
 		RT::Record.3 \
 		RT::ScripConditions.3 \
 		RT::Action::Generic.3 \
 		RT::Transaction.3 \
 		RT::Interface::Email.3 \
 		RT::Link.3 \
 		RT.3 \
 		RT::Watcher.3 \
 		RT::ObjectKeywords.3 \
 		RT::EasySearch.3 \
 		RT::ScripActions.3 \
 		RT::Scrip.3 \
 		RT::GroupMembers.3 \
 		RT::Action::SendPasswordEmail.3 \
 		RT::Transactions.3 \
 		RT::Scrips.3 \
 		RT::Action::SendEmail.3 \
 		RT::User.3 \
 		RT::ScripCondition.3 \
 		RT::Users.3 \
 		RT::Ticket.3 \
 		RT::ACE.3 \
 		RT::Queue.3 \
 		RT::Interface::CLI.3 \
 		RT::Tickets.3 \
 		RT::GroupMember.3 \
 		RT::Template.3 \
 		RT::Templates.3 \
 		RT::Queues.3 \
 		RT::Date.3 \
 		RT::CurrentUser.3 \
 		RT::ScripAction.3 \
 		RT::Keywords.3 \
 		RT::ObjectKeyword.3 \
 		RT::Attachment.3 \
 		RT::Groups.3 \
 		RT::KeywordSelect.3 \
 		RT::Condition::Generic.3 \
 		RT::Handle.3 \
 		RT::ACL.3 \
 		RT::Attachments.3
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	DB_DBA_PASSWORD=password	Your password of MySQL root ();"
 	@${ECHO_MSG} "	DB_HOST=hostname		Where MySQL resident (localhost);"
 	@${ECHO_MSG} "	DB_RT_PASS=password		Your password of MySQL RT user (rt_pass);"
 	@${ECHO_MSG} "	DB_TYPE=type			Pg for postgresql, mysql for MySQL (mysql);"
 	@${ECHO_MSG} "	INSTALL_NEW			Install a fresh port, otherwise just upgrade;"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "IMPORTANT!!! If you want to install a fresh new port, define INSTALL_NEW to do so, otherwise this port just do a upgrade."
 	@${ECHO_MSG} ""
 
 post-patch:
 .for _FILE in tools/testdeps
 	${REINPLACE_CMD} 's,/usr/bin/perl,${PERL},' ${WRKSRC}/${_FILE}
 	${CHMOD} +x ${WRKSRC}/${_FILE}
 .endfor
 
 do-build:
 .for _NAME in RT_PATH DB_DBA_PASSWORD DB_HOST DB_RT_PASS DB_TYPE
 	@${REINPLACE_CMD} "s!%%${_NAME}%%!${${_NAME}}!g" ${WRKSRC}/Makefile
 .endfor
 	@cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile testdeps
 	@cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile fixdeps
 
 do-install:
 	@${MKDIR} /var/log/rt2
 .if defined(INSTALL_NEW)
 	-@cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile dropdb
 	@cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile install
 .else
 	@cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile upgrade
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/rt2/README
 	@${CHOWN} -R www /var/log/rt2
 
 post-install:
 	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
 
 .if ${OSVERSION} >= 502000
 BROKEN=		"Broken pkg-plist"
 .endif
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/www/slash/Makefile b/www/slash/Makefile
index f46fe02419e1..80a5bcd47f3f 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -1,55 +1,51 @@
 # New ports collection makefile for:	slash
 # Date created:				18 March 2002
 # Whom:					Autrijus Tang
 #
 # $FreeBSD$
 #
 
 PORTNAME=	slash
 PORTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	slashcode
 DISTNAME=	slash-${PORTVERSION}
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	Slash-Like Automatic Storytelling Homepage system
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Bundle/Slash.pm:${PORTSDIR}/www/p5-Bundle-Slash
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
 MAKE_ARGS+=	SLASH_PREFIX=${PREFIX}/slash
 
 DOCS=		README INSTALL
 
 CONFLICTS=	metalist
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \
 		Slash::Apache::Log.3 Slash::Apache::User.3 \
 		Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \
 		Slash::DB::Oracle.3 Slash::DB::PostgreSQL.3 \
 		Slash::DB::Static::MySQL.3 Slash::DB::Static::Oracle.3 \
 		Slash::DB::Static::PostgreSQL.3 Slash::DB::Utility.3 \
 		Slash::Display.3 Slash::Display::Plugin.3 \
 		Slash::Display::Provider.3 Slash::Install.3 Slash::Journal.3 \
 		Slash::Messages.3 Slash::Messages::DB::MySQL.3 \
 		Slash::Search.3 Slash::Test.3 Slash::Utility.3 \
 		Slash::Utility::Access.3 Slash::Utility::Anchor.3 \
 		Slash::Utility::Data.3 Slash::Utility::Display.3 \
 		Slash::Utility::Environment.3 Slash::Utility::System.3 \
 		Slash::XML.3 Slash::XML::RSS.3
 
 post-install:
 	@${FIND} ${PREFIX}/slash -name "*.orig" -delete
 	@${SED} s!%%LOCALBASE%%!${LOCALBASE}!g ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>