Index: head/MOVED
===================================================================
--- head/MOVED	(revision 150327)
+++ head/MOVED	(revision 150328)
@@ -1,1988 +1,1989 @@
 #
 # 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
 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/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
 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|2005-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
 graphics/ruby-evas|graphics/ruby-evas|2005-06-16|out of date, and not compatible with new evas
 arabic/openoffice-1.1||2005-06-29|localized version should be built via knob
 chinese/openoffice-1.0-zh_CN||2005-06-29|no longer maintained
 chinese/openoffice-1.0-zh_TW||2005-06-29|no longer maintained
 chinese/openoffice-1.1-zh_CN||2005-06-29|localized version should be built via knob
 chinese/openoffice-1.1-zh_TW||2005-06-29|localized version should be built via knob
 editors/openoffice-1.0-ar||2005-06-29|no longer maintained
 editors/openoffice-1.0-dk||2005-06-29|no longer maintained
 editors/openoffice-1.0-es||2005-06-29|no longer maintained
 editors/openoffice-1.0-gr||2005-06-29|no longer maintained
 editors/openoffice-1.0-it||2005-06-29|no longer maintained
 editors/openoffice-1.0-nl||2005-06-29|no longer maintained
 editors/openoffice-1.0-se||2005-06-29|no longer maintained
 editors/openoffice-1.0-tr||2005-06-29|no longer maintained
 editors/openoffice-1.1-ca||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-cs||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-dk||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-el||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-es||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-et||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-fi||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-it||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-nl||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-se||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-sk||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-sl_SI||2005-06-29|localized version should be built via knob
 editors/openoffice-1.1-tr||2005-06-29|localized version should be built via knob
 french/openoffice-1.0||2005-06-29|no longer maintained
 french/openoffice-1.1||2005-06-29|localized version should be built via knob
 german/openoffice-1.0||2005-06-29|no longer maintained
 german/openoffice-1.1||2005-06-29|localized version should be built via knob
 hungarian/openoffice-1.1||2005-06-29|localized version should be built via knob
 japanese/openoffice-1.0||2005-06-29|no longer maintained
 japanese/openoffice-1.1||2005-06-29|localized version should be built via knob
 korean/openoffice-1.0||2005-06-29|no longer maintained
 korean/openoffice-1.1||2005-06-29|localized version should be built via knob
 polish/openoffice-1.0||2005-06-29|no longer maintained
 polish/openoffice-1.1||2005-06-29|localized version should be built via knob
 portuguese/openoffice-1.0||2005-06-29|no longer maintained
 portuguese/openoffice-1.1-pt_BR||2005-06-29|localized version should be built via knob
 portuguese/openoffice-1.1-pt_PT||2005-06-29|localized version should be built via knob
 russian/openoffice-1.0||2005-06-29|no longer maintained
 russian/openoffice-1.1||2005-06-29|localized version should be built via knob
 astro/gdesklets-weather||2005-07-03|does not work for a long time
 net/gdesklets-rssgrab||2005-07-03|dissapeared
 misc/44bsd-more|sysutils/44bsd-more|2005-07-10|moved to better category
 misc/less|sysutils/less|2005-07-10|moved to better category
 misc/most|sysutils/most|2005-07-10|moved to better category
 misc/reed|sysutils/reed|2005-07-10|moved to better category
 misc/wmcp|x11-wm/wmcp|2005-07-10|moved to better category
 x11/kde31-apireference|x11/kde3-apireference|2005-07-10|renamed in order to carry the latest kde3-apireference
 www/wmnetselect||2005-07-13|removed
 korean/mplayer-fonts||2005-07-14|no longer needed
 net/openldap21-client|net/openldap22-client|2005-07-17|removed EOL version of OpenLDAP
 net/openldap21-sasl-client|net/openldap22-sasl-client|2005-07-17|removed EOL version of OpenLDAP
 net/openldap21-sasl-server|net/openldap22-sasl-server|2005-07-17|removed EOL version of OpenLDAP
 net/openldap21-server|net/openldap22-server|2005-07-17|removed EOL version of OpenLDAP
 devel/aegis||2005-07-18|install problems; upstream authors did not respond
 devel/linux-understand_ada||2005-07-18|unfetchable; new version requires support contract
 devel/linux-understand_c||2005-07-18|unfetchable; new version requires support contract
 devel/linux-understand_java||2005-07-18|unfetchable; new version requires support contract
 devel/p5-Config-Ini||2005-07-18|disappeared from CPAN
 devel/parrot||2005-07-18|obsolete and unmaintained
 devel/swarm||2005-07-18|failed to compile
 lang/gcc27|lang/gcc295|2005-07-18|long obsolete
 net/tramp-emacs20|net/tramp-emacs|2005-07-18|expired
 www/junkbuster||2005-07-18|security problems
 x11/eweather||2005-07-18|did not work with update wmweather
 sysutils/sge|sysutils/sge53|2005-07-28|SGE 6 is being imported and is incompatable with 5.3
 sysutils/sgeee|sysutils/sgeee53|2005-07-28|SGE 6 is being imported and is incompatable with 5.3
 lang/stackless_python||2005-07-29|outdated and unmaintained
 x11-wm/rox-pager||2005-07-30|libwnck incompatibility; no new version available
 lang/gcc31|lang/gcc32|2005-07-31|outdated and unmaintained, and gcc32 is basically the same (plus one ABI change and many fixes)
 math/linux-dislin|math/dislin|2005-07-31|switch to native FreeBSD binaries
 games/gnocatan|games/pioneers|2005-07-31|project changed name
 www/akregator|deskutils/kdepim3|2005-08-13|akregator was integrated into the kdepim3 port
 devel/ogre||2005-08-17|port was committed without maintainer
 editors/openoffice-1.0|editors/openoffice.org-1.0|2005-08-29|port should have a correct PORTNAME
 editors/openoffice-1.1|editors/openoffice.org-1.1|2005-08-29|port should have a correct PORTNAME
 editors/openoffice-1.1-devel|editors/openoffice.org-1.1-devel|2005-08-29|port should have a correct PORTNAME
 editors/openoffice-2.0-devel|editors/openoffice.org-2.0-devel|2005-08-29|port should have a correct PORTNAME
 shells/zsh-devel|shells/zsh|2005-08-29|Development version of Zsh is no longer being released
 russian/nagios||2005-08-30|Obsoleted; new version is not planned
 security/gnutls-devel|security/gnutls|2005-08-30|Development version of GnuTLS is no longer being released
 www/py-websvcs|net/py-soappy|2005-08-30|duplicate port
 x11-toolkits/wxgtk26-contrib-utils||2005-08-31|Deprecated
 deskutils/gdesklets-psi_displaypackage||2005-08-31|removed; broken with recent gdesklets
 deskutils/gdesklets-sensor-psi_externalinterval||2005-08-31|removed; broken with recent gdesklets
 deskutils/gdesklets-sensor-psi_memo||2005-08-31|removed; broken with recent gdesklets
 deskutils/gdesklets-sensor-psi_memoover||2005-08-31|removed; broken with recent gdesklets
 sysutils/gdesklets-sensor-psi_memory||2005-08-31|removed; broken with recent gdesklets
 sysutils/gdesklets-sensor-psi_cpu||2005-08-31|removed; broken with recent gdesklets
 sysutils/gdesklets-sensor-psi_disk||2005-08-31|removed; broken with recent gdesklets
 net/gdesklets-sensor-psi_ping||2005-08-31|removed; broken with recent gdesklets
 mail/gdesklets-sensor-psi_popmail||2005-08-31|removed; broken with recent gdesklets
 deskutils/gdesklets-sensor-psi_variableborder||2005-08-31|removed; broken with recent gdesklets
 mail/py-mimelib|mail/py-email|2005-09-04|renamed
 cad/fig2sxd|graphics/fig2sxd|2005-09-08|accurate category
 comms/cdce||2005-09-10|Obsolete; imported into the src tree in 5.4 release
 multimedia/ldvd9to5|multimedia/ldvd|2005-09-10|project renamed
 japanese/mendexk-sjis|japanese/mendexk-euc|2005-09-11|obsolete
 lang/ghc6-doc|lang/ghc-doc|2005-09-12|relocated
 textproc/gauche-sxml|lang/gauche|2005-09-14|sxml now comes with gauche
 graphics/mgp-gallery||2005-09-15|disappeared from web
 security/pf||2005-09-15|included in base system since 5.3
 security/authpf||2005-09-15|included in base system since 5.3
 net/openldap23-sasl-server||2005-09-15|Is no longer needed as separated port
 audio/py-libtunepimp||2005-09-21|audio/libtunepimp rolled back to version 0.3.0 and the bindings do not work at that version
 devel/libunrar|archivers/libunrar|2005-09-23|corrected category
 www/gecko-sharp|www/gecko-sharp10|2005-09-25|renamed to reflect API version
 x11-toolkits/gtk-sharp|x11-toolkits/gtk-sharp10|2005-09-28|renamed to reflect API version
 x11-toolkits/gtk-sharp-devel|x11-toolkits/gtk-sharp20|2005-09-28|renamed to reflect API version
 print/preview-latex|print/auctex|2005-09-30|integrated into print/auctex
 lang/pyperl||2005-09-30|New port added without a maintainer
 mail/exim-monitor||2005-10-01|obsolete
 devel/beagle|devel/open-beagle|2005-10-02|renamed to reflect project's name
 games/pmars-doc||2005-10-04|Obsolete, merged with games/pmars
 russian/bogofilter||2005-10-04|obsoleted by utf-8 support in mail/bogofilter
 graphics/hs-HOpenGL||2005-10-05|Obsolete, now part of lang/ghc
 dns/ddup||2005-10-06|Project no longer exists
 x11-themes/fluxbox-fluxmod||2005-10-07|Project has gone
 sysutils/rdiff-backup-devel|sysutils/rdiff-backup|2005-10-08|obsolete
 games/py-balazar|games/balazar|2005-10-09|renamed to reflect right name
 multimedia/gpac-libm4systems|multimedia/gpac-libgpac|2005-10-09|Library renamed
 games/marbles|games/lmarbles|2005-10-10|renamed to reflect right name
 games/py-slune|games/slune|2005-10-10|renamed to reflect right name
 games/kxl|devel/kxl|2005-10-12|accurate category
 devel/libpreps-devel||2005-10-13|obsolete
 devel/libpreps|devel/prepstools|2005-10-13|project was renamed
 games/q3-paks|games/quake3-data|2005-10-16|sync name with other data ports
 games/linux-q3ademo|games/linux-quake3-demo|2005-10-16|sync name with other Quake ports
 net/evaq|net/eva|2005-10-16|project was renamed
 audio/replay||2005-10-17|no longer on sunsite, home page gone
 devel/hs-uni||2005-10-17|abandoned, didn't build with latest lang/ghc
 audio/mp3chew||2005-10-17|master site disappeared long ago
 converters/cn2jp||2005-10-17|no longer available from author's site
 devel/swig13-doc||2005-10-18|incorperated in devel/swig13
 palm/hdconv||2005-10-18|master site disappeared
 mail/stuphead||2005-10-18|master site disappeared
 japanese/libimg||2005-10-18|forbidden; no longer exists
 devel/korelib||2005-10-18|master site up but distfile not available, last release 2002
 devel/qtk||2005-10-18|master site disappeared
 devel/wizard||2005-10-18|master site disappeared, author stopped work 2002
 devel/yacl||2005-10-18|master site disappeared, author stopped work 2002
 sysutils/cfengine|sysutils/cfengine2|2005-10-20|removed - use cfengine-2.x
 editors/joe-devel|editors/joe|2005-10-21|moved
 games/ctetris|games/ctris|2005-10-21|moved
 security/opensc-esteid|security/opensc|2005-10-30|functionality folded into master port
 editors/ooodict-af_ZA||2005-11-01|localized version should be built via knob
 editors/ooodict-bg_BG||2005-11-01|localized version should be built via knob
 editors/ooodict-ca_ES||2005-11-01|localized version should be built via knob
 editors/ooodict-cs_CZ||2005-11-01|localized version should be built via knob
 editors/ooodict-cy_GB||2005-11-01|localized version should be built via knob
 editors/ooodict-da_DK||2005-11-01|localized version should be built via knob
 editors/ooodict-el_GR||2005-11-01|localized version should be built via knob
 editors/ooodict-en_AU||2005-11-01|localized version should be built via knob
 editors/ooodict-en_CA||2005-11-01|localized version should be built via knob
 editors/ooodict-en_GB||2005-11-01|localized version should be built via knob
 editors/ooodict-en_NZ||2005-11-01|localized version should be built via knob
 editors/ooodict-en_US||2005-11-01|localized version should be built via knob
 editors/ooodict-es_ES||2005-11-01|localized version should be built via knob
 editors/ooodict-es_MX||2005-11-01|localized version should be built via knob
 editors/ooodict-fo_FO||2005-11-01|localized version should be built via knob
 editors/ooodict-ga_IE||2005-11-01|localized version should be built via knob
 editors/ooodict-gd_GB||2005-11-01|localized version should be built via knob
 editors/ooodict-gl_ES||2005-11-01|localized version should be built via knob
 editors/ooodict-hr_HR||2005-11-01|localized version should be built via knob
 editors/ooodict-id_ID||2005-11-01|localized version should be built via knob
 editors/ooodict-it_IT||2005-11-01|localized version should be built via knob
 editors/ooodict-ku_TR||2005-11-01|localized version should be built via knob
 editors/ooodict-lt_LT||2005-11-01|localized version should be built via knob
 editors/ooodict-mg_MG||2005-11-01|localized version should be built via knob
 editors/ooodict-mi_NZ||2005-11-01|localized version should be built via knob
 editors/ooodict-ms_MY||2005-11-01|localized version should be built via knob
 editors/ooodict-nb_NO||2005-11-01|localized version should be built via knob
 editors/ooodict-nl_NL||2005-11-01|localized version should be built via knob
 editors/ooodict-nn_NO||2005-11-01|localized version should be built via knob
 editors/ooodict-ny_MW||2005-11-01|localized version should be built via knob
 editors/ooodict-ro_RO||2005-11-01|localized version should be built via knob
 editors/ooodict-rw_RW||2005-11-01|localized version should be built via knob
 editors/ooodict-sk_SK||2005-11-01|localized version should be built via knob
 editors/ooodict-sl_SI||2005-11-01|localized version should be built via knob
 editors/ooodict-sv_SE||2005-11-01|localized version should be built via knob
 editors/ooodict-sw_KE||2005-11-01|localized version should be built via knob
 editors/ooodict-tl_PH||2005-11-01|localized version should be built via knob
 editors/ooodict-tn_ZA||2005-11-01|localized version should be built via knob
 editors/ooodict-zu_ZA||2005-11-01|localized version should be built via knob
 french/ooodict-fr_BE||2005-11-01|localized version should be built via knob
 french/ooodict-fr_FR||2005-11-01|localized version should be built via knob
 german/ooodict-de_AT||2005-11-01|localized version should be built via knob
 german/ooodict-de_CH||2005-11-01|localized version should be built via knob
 german/ooodict-de_DE||2005-11-01|localized version should be built via knob
 hebrew/ooodict-he_IL||2005-11-01|localized version should be built via knob
 hungarian/ooodict||2005-11-01|localized version should be built via knob
 polish/ooodict_PL||2005-11-01|localized version should be built via knob
 portuguese/ooodict-pt_BR||2005-11-01|localized version should be built via knob
 portuguese/ooodict-pt_PT||2005-11-01|localized version should be built via knob
 russian/ooodict-ru_RU||2005-11-01|localized version should be built via knob
 ukrainian/ooodict-uk_UA||2005-11-01|localized version should be built via knob
 net/libicq0|net/libicq|2005-11-01|leaf port removed
 mail/ximian-connector|mail/evolution-exchange|2005-11-04|POOF! Now it's called evolution-exchange!
 editors/gedit-plugins||2005-11-04|This component is unmaintained, and has succumbed to code rot
 www/pyphany||2005-11-04|Has been merged into epiphany
 editors/abiword-devel|editors/abiword|2005-11-04|Has been merged into abiword
 editors/abiword-plugins-devel|editors/abiword-plugins|2005-11-04|Has been merged into abiword-plugins
 net/trafshow4|net/trafshow|2005-11-05|obsolete version, use net/trafshow instead
 games/p5-Games-Sequential|games/p5-Games-AlphaBeta|2005-11-05|has been merged into games/p5-Games-AlphaBeta
 misc/screen|sysutils/screen|2005-11-05|new category
 audio/musicbox||2005-11-05|Port passed expiry date and was removed.
 biology/nclever||2005-11-05|Port passed expiry date and was removed.
 cad/ziarc||2005-11-05|Port passed expiry date and was removed.
 chinese/chinput||2005-11-05|Port passed expiry date and was removed.
 chinese/metalist||2005-11-05|Port passed expiry date and was removed.
 databases/hs-hsql||2005-11-05|Port passed expiry date and was removed.
 databases/ruby-criteria||2005-11-05|Port passed expiry date and was removed.
 databases/tkgnats||2005-11-05|Port passed expiry date and was removed.
 devel/doc++||2005-11-05|Port passed expiry date and was removed.
 devel/ecb-emacs20||2005-11-05|Port passed expiry date and was removed.
 devel/linux_devtools-6||2005-11-05|Port passed expiry date and was removed.
 devel/linux_devtools-7||2005-11-05|Port passed expiry date and was removed.
 devel/m6811-gcc||2005-11-05|Port passed expiry date and was removed.
 devel/zendstudio||2005-11-05|Port passed expiry date and was removed.
 emulators/mips64emul||2005-11-05|Port passed expiry date and was removed.
 emulators/osf1_base||2005-11-05|Port passed expiry date and was removed.
 games/crossword||2005-11-05|Port passed expiry date and was removed.
 games/freebooters||2005-11-05|Port passed expiry date and was removed.
 games/gniffel||2005-11-05|Port passed expiry date and was removed.
 games/hlserver-action||2005-11-05|Port passed expiry date and was removed.
 games/pp||2005-11-05|Port passed expiry date and was removed.
 games/powerpak||2005-11-05|Port passed expiry date and was removed.
 games/pythoong||2005-11-05|Port passed expiry date and was removed.
 games/smacx||2005-11-05|Port passed expiry date and was removed.
 games/tictactoe3d||2005-11-05|Port passed expiry date and was removed.
 games/utserver-to||2005-11-05|Port passed expiry date and was removed.
 games/xchain||2005-11-05|Port passed expiry date and was removed.
 games/xjumpjump||2005-11-05|Port passed expiry date and was removed.
 games/xmj||2005-11-05|Port passed expiry date and was removed.
 games/xnibbles||2005-11-05|Port passed expiry date and was removed.
 games/xothello||2005-11-05|Port passed expiry date and was removed.
 games/xsol||2005-11-05|Port passed expiry date and was removed.
 graphics/diacanvas||2005-11-05|Port passed expiry date and was removed.
 graphics/fractorama||2005-11-05|Port passed expiry date and was removed.
 graphics/linux_mesa3||2005-11-05|Port passed expiry date and was removed.
 graphics/osgedit||2005-11-05|Port passed expiry date and was removed.
 graphics/py-imaging-handbook||2005-11-05|Port passed expiry date and was removed.
 graphics/xbarcode||2005-11-05|Port passed expiry date and was removed.
 graphics/xmms-xvs||2005-11-05|Port passed expiry date and was removed.
 japanese/dserver||2005-11-05|Port passed expiry date and was removed.
 japanese/ebw3||2005-11-05|Port passed expiry date and was removed.
 japanese/elisa10x8||2005-11-05|Port passed expiry date and was removed.
 japanese/iv||2005-11-05|Port passed expiry date and was removed.
 japanese/mozilla-jlp-devel||2005-11-05|Port passed expiry date and was removed.
 japanese/openoffice-templates||2005-11-05|Port passed expiry date and was removed.
 japanese/pgp.language||2005-11-05|Port passed expiry date and was removed.
 japanese/xemacs21-canna+freewnn||2005-11-05|Port passed expiry date and was removed.
 japanese/xemacs21-canna+wnn6||2005-11-05|Port passed expiry date and was removed.
 japanese/xemacs21-canna||2005-11-05|Port passed expiry date and was removed.
 japanese/xemacs21-freewnn||2005-11-05|Port passed expiry date and was removed.
 japanese/xemacs21-wnn6||2005-11-05|Port passed expiry date and was removed.
 japanese/zope-zmilocalizer||2005-11-05|Port passed expiry date and was removed.
 java/bugseeker-demo||2005-11-05|Port passed expiry date and was removed.
 java/bugseeker||2005-11-05|Port passed expiry date and was removed.
 java/forte||2005-11-05|Port passed expiry date and was removed.
 lang/generic-haskell||2005-11-05|Port passed expiry date and was removed.
 lang/helium||2005-11-05|Port passed expiry date and was removed.
 lang/o2c||2005-11-05|Port passed expiry date and was removed.
 misc/edonkey-tool-slist||2005-11-05|Port passed expiry date and was removed.
 misc/peq||2005-11-05|Port passed expiry date and was removed.
 multimedia/cupid||2005-11-05|Port passed expiry date and was removed.
 net/gnomba||2005-11-05|Port passed expiry date and was removed.
 net/jabber-xdb_ldap||2005-11-05|Port passed expiry date and was removed.
 news/t-gnus||2005-11-05|Port passed expiry date and was removed.
 print/p5-GnomePrint||2005-11-05|Port passed expiry date and was removed.
 russian/X.language||2005-11-05|Port passed expiry date and was removed.
 textproc/cdsware||2005-11-05|Port passed expiry date and was removed.
 textproc/p5-XML-SAX-Base||2005-11-05|Port passed expiry date and was removed.
 textproc/tei-xlite||2005-11-05|Port passed expiry date and was removed.
 ukrainian/iceb||2005-11-05|Port passed expiry date and was removed.
 www/linux-lesstif-ns||2005-11-05|Port passed expiry date and was removed.
 www/mod_pcgi2||2005-11-05|Port passed expiry date and was removed.
 www/netscape-remote||2005-11-05|Port passed expiry date and was removed.
 www/p5-GtkHTML||2005-11-05|Port passed expiry date and was removed.
 www/p5-MasonX-Apache2Handler||2005-11-05|Port passed expiry date and was removed.
 www/pgdriver||2005-11-05|Port passed expiry date and was removed.
 www/tasks||2005-11-05|Port passed expiry date and was removed.
 www/zope-soapmethod||2005-11-05|Port passed expiry date and was removed.
 www/zope-zpt||2005-11-05|Port passed expiry date and was removed.
 x11-toolkits/erlgtk||2005-11-05|Port passed expiry date and was removed.
 x11-toolkits/guis||2005-11-05|Port passed expiry date and was removed.
 x11-toolkits/hs-port||2005-11-05|Port passed expiry date and was removed.
 x11-toolkits/jx||2005-11-05|Port passed expiry date and was removed.
 x11-toolkits/qt145||2005-11-05|Port passed expiry date and was removed.
 x11/ruby-gnome||2005-11-05|Port passed expiry date and was removed.
 devel/linux_kdump||2005-11-05|Port depended on another that was removed.
 www/netscape-wrapper||2005-11-05|Port depended on another that was removed.
 x11-toolkits/hs-gio||2005-11-05|Port depended on another that was removed.
 x11/ruby-gnome-all||2005-11-05|Port depended on another that was removed.
 devel/ruby-libglade||2005-11-05|Port depended on another that was removed.
 sysutils/rlogview||2005-11-05|Port depended on another that was removed.
 deskutils/notebook||2005-11-05|Port depended on another that was removed.
 devel/codecrusader||2005-11-05|Port depended on another that was removed.
 x11-toolkits/libj2dplot||2005-11-05|Port depended on another that was removed.
 x11-toolkits/libjparser||2005-11-05|Port depended on another that was removed.
 x11-toolkits/libjsearch||2005-11-05|Port depended on another that was removed.
 x11-toolkits/libjtoolbar||2005-11-05|Port depended on another that was removed.
 x11-toolkits/libjtree||2005-11-05|Port depended on another that was removed.
 mail/arrow||2005-11-05|Port depended on another that was removed.
 math/glove||2005-11-05|Port depended on another that was removed.
 math/thx_1138||2005-11-05|Port depended on another that was removed.
 x11-fm/systemg||2005-11-05|Port depended on another that was removed.
 graphics/ruby-libart||2005-11-05|Port depended on another that was removed.
 graphics/ruby-gdk_imlib||2005-11-05|Port depended on another that was removed.
 graphics/ruby-gdk_pixbuf||2005-11-05|Port depended on another that was removed.
 news/t-gnus-emacs20||2005-11-05|Port depended on another that was removed.
 news/t-gnus-mule||2005-11-05|Port depended on another that was removed.
 news/t-gnus-xemacs21-mule||2005-11-05|Port depended on another that was removed.
 chinese/joe|chinese/joe2|2005-11-08|Move to joe2 in preparation to update to 3.x
 net/aim|net-im/aim|2005-11-09|Moved to a new net-im category
 net/amsn|net-im/amsn|2005-11-09|Moved to a new net-im category
 net/ari-yahoo|net-im/ari-yahoo|2005-11-09|Moved to a new net-im category
 net/ayttm|net-im/ayttm|2005-11-09|Moved to a new net-im category
 net/bsflite|net-im/bsflite|2005-11-09|Moved to a new net-im category
 net/ccmsn|net-im/ccmsn|2005-11-09|Moved to a new net-im category
 net/centericq|net-im/centericq|2005-11-09|Moved to a new net-im category
 net/cicquin|net-im/cicquin|2005-11-09|Moved to a new net-im category
 net/coccinella|net-im/coccinella|2005-11-09|Moved to a new net-im category
 net/convey|net-im/convey|2005-11-09|Moved to a new net-im category
 net/echat|net-im/echat|2005-11-09|Moved to a new net-im category
 net/ejabberd|net-im/ejabberd|2005-11-09|Moved to a new net-im category
 net/firetalk|net-im/firetalk|2005-11-09|Moved to a new net-im category
 net/fugu|net-im/fugu|2005-11-09|Moved to a new net-im category
 net/gajim|net-im/gajim|2005-11-09|Moved to a new net-im category
 net/gale|net-im/gale|2005-11-09|Moved to a new net-im category
 net/ginsu|net-im/ginsu|2005-11-09|Moved to a new net-im category
 net/gnome-jabber|net-im/gnome-jabber|2005-11-09|Moved to a new net-im category
 net/gtkyahoo|net-im/gtkyahoo|2005-11-09|Moved to a new net-im category
 net/gyach|net-im/gyach|2005-11-09|Moved to a new net-im category
 net/icb|net-im/icb|2005-11-09|Moved to a new net-im category
 net/icmpchat|net-im/icmpchat|2005-11-09|Moved to a new net-im category
 net/icqlib|net-im/icqlib|2005-11-09|Moved to a new net-im category
 net/imcom|net-im/imcom|2005-11-09|Moved to a new net-im category
 net/jabberd|net-im/jabberd|2005-11-09|Moved to a new net-im category
 net/jabber-pymsn|net-im/jabber-pymsn|2005-11-09|Moved to a new net-im category
 net/jit|net-im/jit|2005-11-09|Moved to a new net-im category
 net/kmerlin|net-im/kmerlin|2005-11-09|Moved to a new net-im category
 net/kmess|net-im/kmess|2005-11-09|Moved to a new net-im category
 net/konverse|net-im/konverse|2005-11-09|Moved to a new net-im category
 net/kpopup|net-im/kpopup|2005-11-09|Moved to a new net-im category
 net/libmsn|net-im/libmsn|2005-11-09|Moved to a new net-im category
 net/libyahoo2|net-im/libyahoo2|2005-11-09|Moved to a new net-im category
 net/linpopup|net-im/linpopup|2005-11-09|Moved to a new net-im category
 net/linux-ymessenger|net-im/linux-ymessenger|2005-11-09|Moved to a new net-im category
 net/mcabber|net-im/mcabber|2005-11-09|Moved to a new net-im category
 net/mercury|net-im/mercury|2005-11-09|Moved to a new net-im category
 net/micq|net-im/micq|2005-11-09|Moved to a new net-im category
 net/mu-conference|net-im/mu-conference|2005-11-09|Moved to a new net-im category
 net/naim|net-im/naim|2005-11-09|Moved to a new net-im category
 net/pebrot|net-im/pebrot|2005-11-09|Moved to a new net-im category
 net/pork|net-im/pork|2005-11-09|Moved to a new net-im category
 net/py-msnp|net-im/py-msnp|2005-11-09|Moved to a new net-im category
 net/py-pyxmpp|net-im/py-pyxmpp|2005-11-09|Moved to a new net-im category
 net/p5-Jabber-Connection|net-im/p5-Jabber-Connection|2005-11-09|Moved to a new net-im category
 net/p5-Net-AIM|net-im/p5-Net-AIM|2005-11-09|Moved to a new net-im category
 net/p5-Net-AOLIM|net-im/p5-Net-AOLIM|2005-11-09|Moved to a new net-im category
 net/p5-Net-ICQ2000|net-im/p5-Net-ICQ2000|2005-11-09|Moved to a new net-im category
 net/p5-Net-MSN|net-im/p5-Net-MSN|2005-11-09|Moved to a new net-im category
 net/p5-Net-NetSend|net-im/p5-Net-NetSend|2005-11-09|Moved to a new net-im category
 net/p5-Net-OSCAR|net-im/p5-Net-OSCAR|2005-11-09|Moved to a new net-im category
 net/simicq|net-im/simicq|2005-11-09|Moved to a new net-im category
 net/sulci|net-im/sulci|2005-11-09|Moved to a new net-im category
 net/tik|net-im/tik|2005-11-09|Moved to a new net-im category
 net/tkabber|net-im/tkabber|2005-11-09|Moved to a new net-im category
 net/tkabber-devel|net-im/tkabber-devel|2005-11-09|Moved to a new net-im category
 net/tmsnc|net-im/tmsnc|2005-11-09|Moved to a new net-im category
 net/vicq|net-im/vicq|2005-11-09|Moved to a new net-im category
 net/vqcc-gtk|net-im/vqcc-gtk|2005-11-09|Moved to a new net-im category
 net/xicq|net-im/xicq|2005-11-09|Moved to a new net-im category
 net/ymessenger|net-im/ymessenger|2005-11-09|Moved to a new net-im category
 net/ysm|net-im/ysm|2005-11-09|Moved to a new net-im category
 net/gaim|net-im/gaim|2005-11-09|Moved to a new net-im category
 net/gaim-latex|net-im/gaim-latex|2005-11-09|Moved to a new net-im category
 net/gaim-openq|net-im/gaim-openq|2005-11-09|Moved to a new net-im category
 net/gaim-rss-reader|net-im/gaim-rss-reader|2005-11-09|Moved to a new net-im category
 net/gicq|net-im/gicq|2005-11-09|Moved to a new net-im category
 net/gnomeicu2|net-im/gnomeicu2|2005-11-09|Moved to a new net-im category
 net/gossip|net-im/gossip|2005-11-09|Moved to a new net-im category
 net/ickle|net-im/ickle|2005-11-09|Moved to a new net-im category
 net/jabber|net-im/jabber|2005-11-09|Moved to a new net-im category
 net/jabber-aim|net-im/jabber-aim|2005-11-09|Moved to a new net-im category
 net/jabber-conference|net-im/jabber-conference|2005-11-09|Moved to a new net-im category
 net/jabber-jud|net-im/jabber-jud|2005-11-09|Moved to a new net-im category
 net/jabber-msn|net-im/jabber-msn|2005-11-09|Moved to a new net-im category
 net/jabber-users-agent|net-im/jabber-users-agent|2005-11-09|Moved to a new net-im category
 net/jabber-yahoo|net-im/jabber-yahoo|2005-11-09|Moved to a new net-im category
 net/jarl|net-im/jarl|2005-11-09|Moved to a new net-im category
 net/kf|net-im/kf|2005-11-09|Moved to a new net-im category
 net/libicq|net-im/libicq|2005-11-09|Moved to a new net-im category
 net/libicq2000|net-im/libicq2000|2005-11-09|Moved to a new net-im category
 net/loudmouth|net-im/loudmouth|2005-11-09|Moved to a new net-im category
 net/meanwhile|net-im/meanwhile|2005-11-09|Moved to a new net-im category
 net/meanwhile-gaim|net-im/meanwhile-gaim|2005-11-09|Moved to a new net-im category
 net/newsbot|net-im/newsbot|2005-11-09|Moved to a new net-im category
 net/ocaml-jabbr|net-im/ocaml-jabbr|2005-11-09|Moved to a new net-im category
 net/psi|net-im/psi|2005-11-09|Moved to a new net-im category
 net/py-jabber|net-im/py-jabber|2005-11-09|Moved to a new net-im category
 net/py-twistedWords|net-im/py-twistedWords|2005-11-09|Moved to a new net-im category
 net/p5-Net-Jabber|net-im/p5-Net-Jabber|2005-11-09|Moved to a new net-im category
 net/licq|net-im/licq|2005-11-09|Moved to a new net-im category
 net/licq-console|net-im/licq-console|2005-11-09|Moved to a new net-im category
 net/licq-osd|net-im/licq-osd|2005-11-09|Moved to a new net-im category
 net/licq-qt-gui|net-im/licq-qt-gui|2005-11-09|Moved to a new net-im category
 net/jabber-pyicq|net-im/jabber-pyicq|2005-11-09|Moved to a new net-im category
 net/p5-Net-XMPP|net-im/p5-Net-XMPP|2005-11-09|Moved to a new net-im category
 www/jwchat|net-im/jwchat|2005-11-09|Moved to a new net-im category
 misc/gaim-bangexec|net-im/gaim-bangexec|2005-11-10|Moved to a new net-im category
 misc/gaim-guifications|net-im/gaim-guifications|2005-11-10|Moved to a new net-im category
 misc/gaim-ignorance|net-im/gaim-ignorace|2005-11-10|Moved to a new net-im category
 net/eva|net-im/eva|2005-11-11|Moved to a new net-im category
 astro/gdesklets-goodweather-psi||2005-11-11|Deleted because of removed dependency
 deskutils/gdesklets-calendar||2005-11-11|Deleted because of removed dependency
 mail/gdesklets-enhallmail||2005-11-11|Deleted because of removed dependency
 mail/gdesklets-imapmail||2005-11-11|Deleted because of removed dependency
 deskutils/gdesklets-gnomebar||2005-11-11|Deleted because of removed dependency
 deskutils/gdesklets-sensor-psi_iconbutton||2005-11-11|Deleted; dead and unfetchable
 deskutils/gdesklets-sensor-psi_theme||2005-11-11|Deleted; dead and unfetchable
 deskutils/gdesklets-psi_themes||2005-11-11|Deleted; dead and unfetchable
 devel/libidn|dns/libidn|2005-11-12|Moved to a better category
 devel/p5-Net-LibIDN|dns/p5-Net-LibIDN|2005-11-12|Moved to a better category
 net/libnet|net/libnet10|2005-11-14|Moved
 net/libnet-devel/net/libnet|2005-11-14|Moved
 graphics/libpixman||2005-11-14|Project merged into cairo
 security/hping|net/hping|2005-11-15|Moved to a better category
 lang/dis||2005-11-15|Master site has vanished
 lang/malbolge||2005-11-15|Master site has vanished
 x11-themes/kde-icons-crystalcurve||2005-11-15|Distfile vanished
 x11-themes/kde-icons-crystalosx||2005-11-15|Distfile vanished
 net/gdesklets-sensor-psi_network||2005-11-16|Dead and unfetchable
 net/gdesklets-networkinfo||2005-11-16|Deleted because of removed dependency
 net/gdesklets-lt-network||2005-11-16|Deleted because of removed dependency
 deskutils/smeg|deskutils/alacarte|2005-11-16|Now project name is alacarte
 devel/bison1875||2005-11-16|No longer needed
 databases/postgresql-devel||2005-11-16|PostgreSQL 8.1 has landed
 editors/apel-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/flim113-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/psgml-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/semi113-xemacs21-mule||2005-11-17|Deleted from ports collection
 mail/mew-xemacs21-mule||2005-11-17|Deleted from ports collection
 mail/mew2-xemacs21-mule||2005-11-17|Deleted from ports collection
 mail/mew3-xemacs21-mule||2005-11-17|Deleted from ports collection
 security/racoon|security/ipsec-tools|2005-11-18|removed, successor is ipsec-tools
 x11-themes/metacity-theme-6nome||2005-11-18|Deleted; unfetchable
 x11-themes/metacity-theme-aero||2005-11-18|Deleted; unfetchable
 devel/bison-devel|devel/bison2|2005-11-18|Upgraded to 2.x
 security/prelude-nids|security/snort|2005-11-21|Deprecated in favor of using Snort
 net/pim6dd||2005-09-22|Deleted since it's succeeded by net/mcast-tools
 net/pim6sd||2005-09-22|Deleted since it's succeeded by net/mcast-tools
 games/q3server|games/linux-quake3|2005-11-22|Renamed
 games/q3server-excessive|games/quake3-excessive|2005-11-22|Renamed
 games/q3server-freezetag|games/quake3-freezetag|2005-11-22|Renamed
 games/q3server-osp|games/quake3-osp|2005-11-22|Renamed
 games/q3server-ra3|games/quake3-ra3|2005-11-22|Renamed
 games/q3server-ut|games/quake3-ut|2005-11-22|Renamed
 games/q3server-wfa|games/quake3-wfa|2005-11-22|Renamed
 print/lcdf-typetools|print/typetools|2005-11-24|Port has already existed
 x11/xscoop|x11-toolkits/xscoop|2005-11-24|Port readded in proper category
 misc/compat22||2005-11-25|Forbidden, unfetchable, unneeded
 net/doc|dns/doc|2005-11-25|Moved to a better category
 www/firefox-devel|www/firefox|2005-11-29|Firefox 1.5 is now stable
 japanese/uim|textproc/uim|2005-11-30|new category
 www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory
 devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package
+www/apache2|www/apache20|2005-12-03|renamed for consistency with other apache ports

Property changes on: head/MOVED
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.843
\ No newline at end of property
+1.844
\ No newline at end of property
Index: head/Mk/bsd.apache.mk
===================================================================
--- head/Mk/bsd.apache.mk	(revision 150327)
+++ head/Mk/bsd.apache.mk	(revision 150328)
@@ -1,365 +1,364 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
 #
 # bsd.apache.mk - Apache related macros.
 # Author: Clement Laforet <clement@FreeBSD.org>
 #
 # Please view me with 4 column tabs!
 
 ##########################################################################
 #
 # Variables definition
 # USE_APACHE:	Call this script. Values can be:
 #		<version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
 #		common*: common13, common20, common21 and common22
 #
 #
 #
 .if defined(APACHE_COMPAT)
 USE_APACHE=yes
 .endif
 
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.
 APACHE_SUPPORTED_VERSION=	13 20 21 22
 .if ${USE_APACHE:Mcommon*} != ""
 AP_PORT_IS_SERVER=	YES
 .elif ${USE_APACHE:L} == apr
 APR_DEPS=			YES
 .elif ${USE_APACHE:C/\.//:C/\+//:M[12][310]} != ""
 AP_PORT_IS_MODULE=	YES
 
 #### for backward compatibility
 .elif ${USE_APACHE:L} == yes
 .   if defined(WITH_APACHE2)
-APACHE_PORT?=	www/apache2
+APACHE_PORT?=	www/apache20
 .   else
 APACHE_PORT?=	www/apache13
 .   endif
 APXS?=			${LOCALBASE}/sbin/apxs
 .if !defined(APACHE_COMPAT)
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 #### End of backward compatibility
 
 .else
 IGNORE=		${_ERROR_MSG} Illegal use of USE_APACHE
 .endif
 
 .if defined(AP_PORT_IS_SERVER)
 # For slave ports:
 .if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
 IGNORE=	"Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync"
 .endif
 
 .if defined(SLAVE_PORT_MODULES)
 DEFAULT_MODULES_CATEGORIES+=	SLAVE_PORT
 ALL_MODULES_CATEGORIES+=		SLAVE_PORT
 .endif
 
 # Module selection
 .for category in ${DEFAULT_MODULES_CATEGORIES}
 DEFAULT_MODULES+=			${${category}_MODULES}
 WITH_${category}_MODULES= 	YES
 .endfor
 
 .for category in ${ALL_MODULES_CATEGORIES}
 AVAILABLE_MODULES+=			${${category}_MODULES}
 .endfor
 
 # Setting "@comment " as default.
 .for module in ${AVAILABLE_MODULES}
 ${module}_PLIST_SUB=		"@comment "
 .endfor
 
 # Configure
 # dirty hacks to make sure all modules are disabled before we select them
 .if ${USE_APACHE} == common13
 CONFIGURE_ARGS+=	--disable-module="all"
 .elif ${USE_APACHE} == common20
 CONFIGURE_ARGS+=	--disable-access --disable-auth \
 			--disable-charset-lite --disable-include \
 			--disable-log-config --disable-env --disable-setenvif \
 			--disable-mime --disable-status --disable-autoindex \
 			--disable-asis --disable-cgid --disable-cgi \
 			--disable-negotiation --disable-dir --disable-imap \
 			--disable-actions --disable-userdir --disable-alias
 .elif ${USE_APACHE} == common21
 CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
 			--disable-authz-host --disable-authz-groupfile \
 			--disable-authz-user --disable-authz-default \
 			--disable-auth-basic --disable-charset-lite \
 			--disable-include --disable-log-config --disable-env \
 			--disable-setenvif --disable-mime --disable-status \
 			--disable-autoindex --disable-asis --disable-cgid \
 			--disable-cgi --disable-negotiation --disable-dir \
 			--disable-imagemap --disable-actions --disable-userdir \
 			--disable-alias
 .elif ${USE_APACHE} == common22
 CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
 			--disable-authz-host --disable-authz-groupfile \
 			--disable-authz-user --disable-authz-default \
 			--disable-auth-basic --disable-charset-lite \
 			--disable-include --disable-log-config --disable-env \
 			--disable-setenvif --disable-mime --disable-status \
 			--disable-autoindex --disable-asis --disable-cgid \
 			--disable-cgi --disable-negotiation --disable-dir \
 			--disable-imagemap --disable-actions --disable-userdir \
 			--disable-alias
 .endif
 
 .if defined(WITH_MODULES)
 _APACHE_MODULES+=	${WITH_MODULES}
 .else
 .for category in ${ALL_MODULES_CATEGORIES}
 .if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category})
 .        if defined(WITH_${category}_MODULES})
 .        undef WITH_${category}_MODULES
 .        endif
 .    if defined (WITH_CUSTOM_${category})
 _APACHE_MODULES+=	${WITH_CUSTOM_${category}}
 .    endif
 .elif defined(WITH_${category}_MODULES)
 _APACHE_MODULES+=	${${category}_MODULES}
 .endif
 .endfor
 .    if defined(WITH_EXTRA_MODULES)
 _APACHE_MODULES+=	${WITH_EXTRA_MODULES}
 .    endif
 .endif
 
 .if !defined(WITH_STATIC_APACHE)
 .    if ${USE_APACHE:Mcommon2*} != ""
 # FYI
 #DYNAMIC_MODULES=	so
 CONFIGURE_ARGS+=	--enable-so
 .    endif
 .else
 .    if ${USE_APACHE:Mcommon2*} != ""
 CONFIGURE_ARGS+=	--disable-so
 .    endif
 WITH_ALL_STATIC_MODULES=	YES
 .endif
 
 .if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES)
 .if ${USE_APACHE} == common13
 SUEXEC_CONFARGS=	suexec
 CONFIGURE_ARGS+=	--enable-suexec
 .elif ${USE_APACHE:Mcommon2*} != ""
 SUEXEC_CONFARGS=	with-suexec
 .endif
 
 # From now we're defaulting to apache 2.*
 SUEXEC_DOCROOT?=		${PREFIX}/www/data
 SUEXEC_USERDIR?=		public_html
 SUEXEC_SAFEPATH?=		${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
 SUEXEC_LOGFILE?=		/var/log/httpd-suexec.log
 SUEXEC_UIDMIN?=			1000
 SUEXEC_GIDMIN?=			1000
 SUEXEC_CALLER?=			${WWWOWN}
 _APACHE_MODULES+=		${SUEXEC_MODULES}
 CONFIGURE_ARGS+=		--${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \
 				--${SUEXEC_CONFARGS}-uidmin=${SUEXEC_UIDMIN} \
 				--${SUEXEC_CONFARGS}-gidmin=${SUEXEC_GIDMIN} \
 				--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
 				--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
 				--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
 				--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \
 				--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
 .   if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=		--${SUEXEC_CONFARGS}-umask=${WITH_SUEXEC_UMASK}
 .   endif
 .endif
 
 .if !defined(WITHOUT_MODULES)
 APACHE_MODULES=		${_APACHE_MODULES}
 .else
 APACHE_MODULES!=	\
 			for module in ${_APACHE_MODULES}; do \
 				${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
 				${ECHO_CMD} $${module}; \
 			done
 .endif
 
 .if defined(WITH_STATIC_MODULES)
 .   if ${USE_APACHE} ==	common13
 STATIC_MODULE_CONFARG=	--enable-module=$${module}
 DSO_MODULE_CONFARG=		--enable-module=$${module} --enable-shared=$${module}
 .   else
 STATIC_MODULE_CONFARG=	--enable-$${module}
 DSO_MODULE_CONFARG=		--enable-$${module}=shared
 .endif
 _CONFIGURE_ARGS!=	\
 			for module in ${APACHE_MODULES} ; do \
 				${ECHO_CMD} ${WITH_STATIC_MODULES} | \
 					${GREP} -wq $${module} 2> /dev/null ; \
 				if [ "$${?}" = "0" ] ; then \
 						${ECHO_CMD} "${STATIC_MODULE_CONFARG}"; \
 					else \
 						${ECHO_CMD} "${DSO_MODULE_CONFARG}"; \
 					fi; done
 CONFIGURE_ARGS+=	${_CONFIGURE_ARGS}
 .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
 .    if ${USE_APACHE} == common13
 .      for module in ${APACHE_MODULES}
 CONFIGURE_ARGS+=	--enable-module=${module}
 .      endfor
 .    else
 CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES}"
 .    endif
 .else
 .    if ${USE_APACHE} == common13
 .      for module in ${APACHE_MODULES}
 CONFIGURE_ARGS+=	--enable-module=${module} --enable-shared=${module}
 .      endfor
 .    else
 CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES}"
 .    endif
 .endif
 
 .if defined(WITH_STATIC_MODULES)
 _SHARED_MODULES!=	\
 			for module in ${APACHE_MODULES} ; do \
 				${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
 				${ECHO_CMD} $${module}; \
 			done
 SHARED_MODULES=		${_SHARED_MODULES}
 .elif !defined(WITH_ALL_STATIC_MODULES)
 SHARED_MODULES=		${APACHE_MODULES}
 .endif
 
 .  for module in ${SHARED_MODULES}
 ${module}_PLIST_SUB=	""
 .  endfor
 
 .for module in ${AVAILABLE_MODULES}
 PLIST_SUB+=	MOD_${module:U}=${${module}_PLIST_SUB}
 .endfor
 ####End of PORT_IS_SERVER ####
 
 .elif defined(APR_DEPS)
 IGNORE=		${_ERROR_MSG} apr support is not yet implemented
 
 .elif defined(AP_PORT_IS_MODULE)
 AP_VERSION=	${USE_APACHE:C/\.//}
 
 APXS?=		${LOCALBASE}/sbin/apxs
 HTTPD?=		${LOCALBASE}/sbin/httpd
 
 MODULENAME?=	${PORTNAME}
 SHORTMODNAME?=	${MODULENAME:S/mod_//}
 SRC_FILE?=	${MODULENAME}.c
 OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 					PKGNAMESUFFIX
 
 .if exists(${HTTPD})
 AP_CUR_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
 .   if ${AP_CUR_VERSION} > 13
 APACHE_MPM!=		${APXS} -q MPM_NAME
 .   endif 	
 .elif defined(APACHE_PORT)
 AP_CUR_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
 .endif
 
 .if defined(AP_CUR_VERSION)
 VERSION_CHECK!=		eval `${ECHO_CMD} "[ ${AP_VERSION} -eq ${AP_CUR_VERSION} ]" | ${SED} -e 's/- -eq/ -ge/ ; s/+ -eq/ -le/' ` ; ${ECHO_CMD} $${?}
 .   if ${VERSION_CHECK} == 1
 IGNORE=		${_ERROR_MSG} apache${AP_CUR_VERSION} is installed (or APACHE_PORT is defined) and port requires ${USE_APACHE}
 .   endif
 APACHE_VERSION=	${AP_CUR_VERSION}
 .else
 AP_CUR_VERSION=	none
 .   if !defined(APACHE_PORT)
 #Fallback to smallest version...
 APACHE_VERSION=	${AP_VERSION:C/\+//}
 .   endif
 .endif
 
 .if exists(${APXS})
 APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
 .   if ${APXS_PREFIX} == NULL
 IGNORE=	: Your apache does not support DSO modules
 .   endif
 .   if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
 IGNORE?=	PREFIX must be egal to APXS_PREFIX.
 .   endif
 .endif
 
 .if ${APACHE_VERSION} == "20"
 AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache2" \
 			APACHEINCLUDEDIR="include/apache2"
-# XXX We postpone www/apache2 => www/apache20 migration
-#APACHE_PORT=	www/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= "21"
 AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache${APACHE_VERSION}" \
 			APACHEINCLUDEDIR="include/apache${APACHE_VERSION}"
 APACHE_PORT=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	so
 PLIST_SUB+=	APACHEMODDIR="libexec/apache" \
 			APACHEINCLUDEDIR="include/apache"
 APACHE_PORT?= www/apache13
 .endif
+
 .for VAR in ${OVERRIDABLE_VARS}
 .  if defined(AP${APACHE_VERSION}_${VAR})
 ${VAR} =${AP${APACHE_VERSION}_${VAR}}
 .  endif
 .endfor
 
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
 PLIST_SUB+=	AP_MODULE="${MODULENAME}.so"
 
 .if defined(AP_GENPLIST)
 PLIST?=		${WRKDIR}/ap-plist
 .endif
 
 .if defined(AP_INC)
 AP_EXTRAS+=	-I ${AP_INC}
 .endif
 .if defined(AP_LIB)
 AP_EXTRAS+=	-L ${AP_LIB}
 .endif
 
 .endif
 
 .if defined(AP_PORT_IS_SERVER)
 .elif defined(AP_PORT_IS_MODULE)
 
 .if defined(AP_FAST_BUILD)
 .if !target(ap-gen-plist)
 ap-gen-plist:
 .if defined(AP_GENPLIST)
 .   if !exists(${PLIST})
 	@${ECHO} "===>  Generating apache plist"
 	@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST}
 	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
 	@${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST}
 	@${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
 .   endif
 .else
 	@${DO_NADA}
 .endif
 .endif
 
 .if !target(do-build)
 do-build: ap-gen-plist
 	@cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}
 .endif
 
 .if !target(do-install)
 do-install:
 	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
 .endif
 
 .endif
 
 .endif

Property changes on: head/Mk/bsd.apache.mk
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/UPDATING
===================================================================
--- head/UPDATING	(revision 150327)
+++ head/UPDATING	(revision 150328)
@@ -1,2635 +1,2650 @@
 This file documents some of the problems you may encounter when
 upgrading your ports.  We try our best to minimize these disruptions,
 but sometimes they are unavoidable.
 
 You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20051203:
+  AFFECTS: users of www/apache2
+  AUTHOR: clement@FreeBSD.org
+
+  www/apache2 port directory was renamed to www/apache20 to keep
+  consistency with other apache ports.
+
+20051203:
+  AFFECTS: users of www/apache22 and any web apps porters
+  AUTHOR: clement@FreeBSD.org
+
+  www/apache22 stop supporting ${LOCALBASE}/www/(data|error|cgi)(|-dist)
+  directory layout in favor of ${LOCALBASE}/www/apache22/(data|error|cgi).
+  FYI, ports layout may change soon.
+
 20051202:
   AFFECTS: users of www/plone and cmf oriented zope modules
   AUTHOR: filippo.natali@gmail.com
 
   www/plone has been updated to the latest 2.1.1 version. Some
   zope modules are unfortunately incompatible with this version
   of plone.
 
 20051202:
   AFFECTS: users of security/racoon and security/ipsec-tools
   AUTHOR: lawrance@FreeBSD.org
 
   security/racoon has been removed.  You should migrate to its
   replacement, security/ipsec-tools.  No configuration changes will
   be required.
 
   The default configuration file location has changed for ipsec-tools.
   You will need to move your racoon configuration files to the new
   location /usr/local/etc/racoon.  Alternatively, add this line in
   rc.conf to continue using the old location:
 
   racoon_flags="-f /usr/local/etc"
 
 20051201:
   AFFECTS: users of lang/ocaml
   AUTHOR: burelle@lri.fr
 
   Upgrade to 3.09.0 will break binary compatibility at link time, so any
   librairy build with old versions should be rebuild in order to be
   usable (standalone binaries do not require rebuild since they are
   staticaly linked.)
 
 20051129:
   AFFECTS: users of devel/monotone
   AUTHOR: lapo@lapo.it
 
   Keys are now stored in ~/.monotone/keys/.
   You must run 'db migrate' against each of your databases;
   this will automatically migrate the keys.
   Command line syntax for 'serve' has changed; please adjust
   startup scripts accordingly.
   See /usr/local/share/doc/monotone/NEWS for details. 
 
 20051123:
   AFFECTS: users of www/lighttpd
   AUTHOR: delphij@FreeBSD.org
 
   A change has been committed against www/lighttpd, which flips the
   meaning of the IPV6 option to match other ports, along with the
   1.4.7 upgrade.  If you have previously saved configuration that
   checks the IPV6 option (meaning to disable IPv6), then you will
   have to rerun the configuration with ``make config''.
 
   The default setting for IPV6 build is kept, which was enabled by
   default.
 
 20051113:
   AFFECTS: users of x11/xterm, x11/xorg-clients, x11/XFree86-4-clients
   AUTHOR: x11@FreeBSD.org
 
   Xterm no longer installs with '-static' prefix. Users should upgrade
   XFree86-clients to 4.5.0_1 or xorg-clients to 6.8.2_1 or newer before
   attempting upgrade of xterm to 206_1 or newer. Previous versions remove
   xterm on deinstall so CONFLICTS have been set accordingly.
 
 20051105:
   AFFECTS: users of x11-toolkits/qt33
   AUTHOR: kde@FreeBSD.org
 
   If the compilation of qt fails due to uic segfaulting
 
   (example:
   /usr/ports/x11-toolkits/qt33/work/qt-x11-free-3.3.5/bin/uic -L
   /usr/ports/x11-toolkits/qt33/work/qt-x11-free-3.3.5/plugins
   listboxeditor.ui -i listboxeditor.h -o listboxeditor.cpp
   *** Signal 11)
 
   delete your old .qt directories:
 
   rm -r ~/.qt /root/.qt
 
 20051105:
   AFFECTS: all users of gnome/glib/gtk
   AUTHOR: gnome@FreeBSD.org
 
   GNOME has been updated to 2.12 and gtk/glib to 2.8.
   DO NOT USE portupgrade(1) to update your ports. Instead, use
   the gnome_upgrade.sh script from
   http://www.marcuscom.com/downloads/gnome_upgrade212.sh
 
 20051104:
   AFFECTS: users of www/trac
   AUTHOR: rui@ruilopes.com
 
   The Trac database schema was changed between versions 0.8 and 0.9. This
   port also started to use PySQLite 2 (SQLite 3).  Existing environments
   must be upgraded before they can be used with Trac 0.9.
 
   The canonical update procedure for existing trac environments is:
 
   $ export TRAC_ENV=/path/to/trac/env
   $ # backup existing trac environment
   $ cp -Rp $TRAC_ENV $TRAC_ENV.backup # backup existing trac env
   $ # convert database from sqlite 2 to sqlite 3 format
   $ mv $TRAC_ENV/db/trac.db $TRAC_ENV/db/trac2.db
   $ sqlite $TRAC_ENV/db/trac2.db .dump | sqlite3 $TRAC_ENV/db/trac.db
   $ # upgrade trac environment
   $ /usr/local/bin/trac-admin $TRAC_ENV upgrade
   $ /usr/local/bin/trac-admin $TRAC_ENV resync
   $ /usr/local/bin/trac-admin $TRAC_ENV wiki upgrade
 
   Consult the full upgrade instructions at:
 
           http://projects.edgewall.com/trac/wiki/TracUpgrade
 
 20051013:
   AFFECTS: users of www/mediawiki
   AUTHOR: garga@FreeBSD.org
 
   www/mediawiki has now version 1.5. 1.4 version was preserved on
   www/mediawiki14 port.
 
   If you want to preserve your 1.4 installation, run this:
 
   # portupgrade -o www/mediawiki14 -f mediawiki
 
 20051013:
   AFFECTS: users of mail/qmrtg
   AUTHOR: mij@bitchx.it
 
   Version 2.x marks a new generation for qmrtg and is no longer compatible
   with configuration files from old releases.
 
   Upgrading to 2.x version *requires* qmrtg (and possibly mrtg)
   configuration files to be adjusted manually starting from the .dist file
   included.
 
 20051011:
   AFFECTS: users of www/amphetadesk
   AUTHOR: lioux@FreeBSD.org
 
   www/amphetadesk can only be ran under a user with a valid home
   directory since it stores its configuration information there.
 
 20051010:
   AFFECTS: users of games/py-slune
   AUTHOR: mnag@FreeBSD.org
 
   games/py-slune has been removed to add in games/slune to
   reflect right name.
 
 20051010:
   AFFECTS: users of devel/apache-ant
   AUTHOR: hq@FreeBSD.org
 
   The Ant launcher script now uses javavmwrapper to pick a suitable JDK. Hence
   it is no longer needed to define JAVA_HOME for Ant to run. You may rather use
   and combination of JAVA_VERSION, JAVA_OS and JAVA_VENDOR. See javavm(1) for
   further information. However, you may still override this behavior using
   JAVACMD.
 
   The ANT_INCLUDE_SHARED_JARS variable used to be effective only when set to
   "YES" (case sensitive). It is now a defined/undefined switch and thus will be
   effective if defined, regardless of its value.
 
 20051009:
   AFFECTS: users of games/py-balazar
   AUTHOR: mnag@FreeBSD.org
 
   games/py-balazar has been removed to add in games/balazar to
   reflect right name.
 
 20051008:
   AFFECTS: users of sysutils/rdiff-backup, rdiff-backup-devel
   AUTHOR: lawrance@FreeBSD.org
 
   sysutils/rdiff-backup has been upgraded to version 1.0.1.  This
   version is incompatible with the previous version.  Users of
   rdiff-backup will need to redo their initial seed.
 
   rdiff-backup-devel has been removed.  Users of rdiff-backup-devel
   should now use rdiff-backup instead.  In this case there is no need
   to redo the initial seed.
 
 20051006:
   AFFECTS: users of net/smokeping
   AUTHOR: lth@FreeBSD.org
 
   Smokeping has undergone a major upgrade to version 2.0.3. If you
   are upgrading from versions 1.x, the manpage 'smokeping_upgrade'
   may be of help. To verify the configuration file syntax, run
   'smokeping --check'.
 
 20051005:
   AFFECTS: users of x11-wm/devilspie
   AUTHOR: jylefort@FreeBSD.org
 
   The configuration file format has changed. See
   /usr/X11R6/share/doc/devilspie/README for more details.
 
 20051002:
   AFFECTS: users of x11-toolkits/py-wxPython26
 
   wxPython 2.6 has been split into py-wxPython26, py-wxPython26-unicode
   and py-wxPython26-common. Everyone should update to the new structure.
 
   # remove previous installation
   1) pkg_delete 'py24-wxPython*2.6*'
 
   # update to new version
   2) cd /usr/ports/x11-toolkits/py-wxPython26
 
   3) make install clean
 
 20050927:
   AFFECTS: users of mail/dovecot
   AUTHOR: robin@isometry.net
 
   Dovecot has been upgraded to version 1.0a3 that breaks down
   backward compatibility with previous versions of dovecot.
   For information about upgrading existing dovecot installations
   one must consult with http://wiki.dovecot.org/moin.cgi/UpgradingDovecot
 
 20050923:
   AFFECTS: users of www/b2evo
   AUTHOR: chinsan.tw@gmail.com
 
   Database schema changed. Rerun the installation script, which can usually
   be found at http://your.site.com/b2evo/blogs/install
 
 20050911:
   AFFECTS: users of mail/libspf2, mail/postfix, mail/postfix21, mail/postfix-policyd-spf, mail/exim
   AUTHOR: marcus@corp.grupos.com.br
 
   Now version 1.0.4 of libspf2 has repo copied from mail/libspf2 to
   mail/libspf2-10 and mail/libspf2 has updated to 1.2.5.
   mail/exim depends on mail/libspf2 and mail/postfix, mail/postfix21
   and mail/postfix-policyd-spf depends on mail/libspf2-10.
 
 20050907:
   AFFECTS: users of databases/metakit
   AUTHOR: adamw@FreeBSD.org
 
   The metakit build now enables python support by default. Everybody who
   was happy with their python-less metakit should begin specifying
   METAKIT_WITHOUT_PYTHON=yes on build.
 
 20050904:
   AFFECTS: users of games/pvpgn
   AUTHOR: mek@mek.uz.ua
 
   sql_DB_layout.conf-sample: includes changes needed for the new "username" SQL
   field; if you update to 1.7.8 YOU MUST update this file too if you have your
   accounts on SQL
 
   bnetd.conf-sample: changed "servaddrs" directive to not be totally commented
   and be as ":" by default in bnetd.conf (if "servaddrs" is commented this
   means "bnetd" will not listen for b.net services at all)
 
 20050902:
   AFFECTS: users of www/jakarta-tomcat55
   AUTHOR: hq@FreeBSD.org
 
   The port installs a new RCng startup script which no longer uses tomcat55ctl to
   control the Tomcat daemon. Furthermore, the behavior of Tomcat may be
   configured through switches and variables from /etc/rc.conf. They are
   documented in the header of the RCng script:
 
     ${PREFIX}/etc/rc.d/jakarta-tomcat55.sh
 
 20050902:
   AFFECTS: users of mail/postfix-current
   AUTHOR: marcus@corp.grupos.com.br
 
   Now mail/postfix-current use OPTIONS menu instead of
   POSTFIX_OPTIONS batch. Please run "make config" and
   select your options in menu.
 
 20050828:
   AFFECTS: users of net/py-bittorrent-devel and net/py-bittorrent-core-devel
   AUTHOR: lioux@FreeBSD.org
 
   Developer renamed most BitTorrent command line scripts:
 
   * btdownloadgui.py -> bittorrent.py
   * btdownloadheadless.py -> bittorrent-console.py
   * btdownloadcurses.py -> bittorrent-curses.py
   * btmaketorrentgui.py -> maketorrent.py
   * btmaketorrent.py -> maketorrent-console.py
   * btlaunchmany.py -> launchmany-console.py
   * btlaunchmanycurses.py -> launchmany-curses.py
   * bttrack.py -> bittorrent-tracker.py
   * btreannounce.py -> changetracker-console.py
   * btrename.py has been REMOVED, use maketorrent*.py
   * btshowmetainfo.py -> torrentinfo-console.py
 
   Check http://www.bittorrent.com/bittorrent_versions.html
 
 20050804:
   AFFECTS: users of sysutils/kdeadmin3
   AUTHOR: kde@FreeBSD.org
 
   One data file has been moved from kdeadmin to kdelibs between
   KDE 3.4.1 and KDE 3.4.2.  This means that
 
   *********if you currently have the kdeadmin port installed*********
 
   you will have to take some precautions to update your KDE
   installation.
 
   We recommend sticking to the following procedure. This procedure requires you
   to have sysutils/portupgrade installed and to be the superuser (or using sudo).
 
   1.) Delete installed packages which conflict with the updated KDE
       ports.
 
         pkg_deinstall -f kdeadmin-\[0-9\]\*
 
   2.) Now update the remaining KDE ports.
 
         portupgrade -O arts\* kde\* \*kde-i18n\*
 
       or, if you want to update KDE along with other updated ports:
 
         portupgrade -a
 
   3.) Reinstall the KDE ports you deleted in step 1.
 
         portinstall -O kdeadmin
 
 20050728:
   AFFECTS: users of sysutils/sge and sysutils/sgeee
   AUTHOR: brooks@FreeBSD.org
 
   A port of SGE 6 has been installed in sysutils/sge.  SGE 6 is
   significantly different from SGE 5 and an upgrade is only possible
   by removing the SGE 5 install and replacing it.  The SGE vs SGEEE
   distinction has been removed in SGE 6 so the sgeee port was removed.
   The sge and sgeee ports were repo copied to sge53 and sgeee53
   respectively and existing installations may continue to use them.
 
 20050727:
   AFFECTS: users of databases/firebird-server
   AUTHOR: skv@FreeBSD.org
 
   Changes in layout:
   * database directory has changed from /usr/local/firebird to /var/db/firebird
   * configuration files are placed in /usr/local/etc/firebird
   * common utilities have been moved to /usr/local/bin
   * suid-ed binaries have been moved to /usr/local/sbin
 
   Update inetd.conf/xinetd.conf to reflect new location of "fb_inet_server".
 
 20050722:
   AFFECTS: All RELENG_6 and HEAD users of ports/packages, maintainers
 	   of ports that interact with the compat libraries.
   AUTHOR: kensmith@FreeBSD.org
 
   The shared library version number of all shared libraries built as
   part of the baseline system has been incremented in both RELENG_6
   and HEAD.  The overall goal is to make handling of the compat library
   infrastructure easier.  Each new release branch will have different
   version numbers for all of the shared libraries and the compat ports
   can simply include all of the shared libraries from the previous
   release.
 
   If you update your system using normal cvsup/rebuild/reinstall
   mechanisms the old versions of the libraries will still be on your
   system so your old ports executables will continue to work.
   But you definitely should plan on recompiling and reinstalling all
   of your installed ports so they get relinked against the new libraries.
   If you don't take this step as time goes on "normal" updates and
   installs run the risk of having executables relying on both the new
   and old versions of the libraries which would cause big problems.
 
   It will take some time for the pre-built packages available on the
   FTP mirror sites to be rebuilt against the new libraries.  If you
   want to update your ports using the pre-built packages watch the
   mailing lists for when the rebuilt packages become available.
 
 20050710:
   AFFECTS: users of x11-toolkits/qt33, x11/kdelibs3
   AUTHOR: kde@FreeBSD.org
 
   If you have compiled qt33 with the KDE_OPTIONS option checked (if your
   installed qt-package is called qt-copy-3.3.4 instead of qt-3.3.4, check
   with pkg_info), you should cvsup and recompile qt33 and everything
   depending on it:
 
   portupgrade -rf qt\*
 
   Previous versions of the qt33 port contained a patch that
   introduces binary incompatibility between unpatched qt33 and software
   compiled against a patched qt33.
 
   Symptoms of the binary incompatibility: Unresolved symbol warnings from
   various KDE/Qt applications (both during runtime or compiling/linking),
   "Could not start kdeinit" dialogs during KDE startup, kicker crashes during
   exiting KDE.
 
 20050630:
   AFFECTS: users of x11/nvidia-driver
   AUTHOR: danfe@FreeBSD.org
 
   Due to several complaints, new (unsupported) option had been added to port
   Makefile: WITH_LEGACY_GPU_SUPPORT.  Starting with version 7667, NVidia has
   dropped support for numerous "legacy" GPUs, while this option allows to go
   with previous version of driver (this does not apply to older versions of
   FreeBSD, since you have to use version 6113 of driver (if you did not yet
   upgraded to FreeBSD 5.3 or later) which has support for those GPUs).
 
   If you must use WITH_LEGACY_GPU_SUPPORT option, be sure to ``hold'' the
   package by making appropriate entry in your pkgtools.conf, otherwise
   portupgrade(1) will upgrade your port to latest NVidia release on the
   next run, which is probably not what you want.
 
   Refer to x11/nvidia-driver/Makefile for further details.
 
 20050625:
   AFFECTS: users of sysutils/nut
   AUTHOR: Joerg.Pulz@frm2.tum.de
 
   nut now installs a rcNG script for starting the Network UPS Tools daemons.
   To enable that at boot time, add the following into /etc/rc.conf[.local]:
 
   nut_enable="YES"
 
 20050624:
   AFFECTS: users of lang/perl5.8
   AUTHOR: tobez@FreeBSD.org
 
   lang/perl5.8 has been updated to 5.8.7.  You should update everything
   depending on perl.  The easiest way to do that is to use
   perl-after-upgrade script supplied with lang/perl5.8.  Please see
   its manual page for details.
 
 20050622:
   AFFECTS: users of ftp/proftpd-*
   AUTHOR: flz@FreeBSD.org
 
   ProFTPd binary moved from ${PREFIX}/libexec to ${PREFIX}/sbin. People
   using proftpd with inetd must use ${PREFIX}/sbin/in.proftpd (or
   ${PREFIX}/sbin/proftpd which is just the same). Read the commit log
   and diffs for more information.
 
 20050621:
   AFFECTS: users of net/cacti
   AUTHOR: sem@FreeBSD.org
 
   Because of users need to keep their DB configuration but config.php
   can't be saved on upgrading, I've moved DB settings in db-settings.php.
   So, you need to change db-settings.php and do not touch config.php
   anymore.
 
 20050618:
   AFFECTS: users of alternate linux_base ports
   AUTHOR: netchild@FreeBSD.org
 
   The Ports Collection now allows to override the default linux_base port.
   Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
   ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
   ${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
 
 20050610:
   AFFECTS: users of ftp/wget built with SSL (default)
   AUTHOR:  sf@FreeBSD.org
 
   wget 1.10 now authenticates certificate of remote host before making a
   SSL connection. To make it work, you should have working CA root
   certificates list in /etc/ssl/cert.pem.
 
   If you don't have it there are options:
   a) install security/ca-roots port and you have done.
   b) install ftp/curl port and symlink it to /etc/ssl/cert.pem.
       ln -s /usr/local/share/curl/curl-ca-bundle.crt /etc/ssl/cert.pem
   c) put your favorite one into certain place.
 
 20050601:
   AFFECTS: users of devel/perforce
   AUTHOR: lth@FreeBSD.org
 
   Upgrading to 2005.1 is straightforward, but it is highly recommended
   to follow the upgrading instructions in the release notes:
     http://www.perforce.com/perforce/doc.051/user/relnotes.txt
 
 20050526:
   AFFECTS: users of mail/sylpheed-claws
   AUTHOR: netchild@FreeBSD.org
 
   Sylpheed-claws is updated to the GTK2 version now. This results in a new
   configuration directory. To keep your configuration from the GTK1 version
   you can
       cp -rp ~/.sylpheed .sylpheed-gtk2
   before starting the GTK2 version for the first time, or
       cp -Rp ~/.sylpheed .sylpheed-gtk2/
   when you have run the GTK2 version already.
 
 20050524:
   AFFECTS: users of multimedia/mpeg4ip and multimedia/mpeg4ip-libmp4v2
   AUTHOR: ahze@FreeBSD.org
 
   Starting with version 1.3 mpeg4ip-libmp4v2 installs libmp4av that mpeg4ip
   previously installed. It is advised to de-install mpeg4ip-libmp4v2 and
   mpeg4ip before updating to mpeg4ip-1.3 or mpeg4ip-libmp4v2-1.3. If you
   have already updated mpeg4ip-libmp4v2 and mpeg4ip you should deinstall
   mpeg4ip and reinstall mpeg4ip-libmp4v2 before updating mpeg4ip.
 
   This does not affect users who just have mpeg4ip-libmp4v2 installed
   and not mpeg4ip.
 
 20050523:
   AFFECTS: users of games/pvpgn
   AUTHOR: mek@mek.uz.ua
 
   The following has been changed in the bnetd.conf file (starting with
   version 1.7.7):
     - The old config variable `servername' has been renamed to `hostname'.
     - A new `servername' config variable has been introduced for server
       identification.
 
 20050519:
   AFFECTS: users of www/squid
   AUTHOR: tmseck@netcologne.de
 
   Starting with 2.5.10, the cachemgr.cgi program uses a configuration file
   cachemgr.conf to control which hosts this program is allowed to manage.
   To prevent abuse, the configuration defaults to "localhost" only.
   Please see cachemgr.cgi(8) for further details.
 
 20050517:
   AFFECTS: users of www/mod_perl2 and all ports depending on it
   AUTHOR: lars.eggert@gmx.net.
 
   API changed for mod_perl2 - existing code will break!
   The mod_perl2 developers have significantly changed the API
   in release candidate 2.0.0-RC5. These changes include changed
   names for core packages, causing software that uses the old API
   to fail with the new version. You need to update your code as
   described in http://perl.apache.org/docs/2.0/rename.html
 
 20050517:
   AFFECTS: users of databases/firebird
   AUTHOR: freebsd@galle.com.br
 
   The port was split into a -server and -client parts.
   The -server contains server binary, UDFs, and install all in
   ${PREFIX}/firebird. The -client contains libs, includes,
   client binaries, docs and examples. For migration delete
   the firebird port and install the -server and/or -client port
   afterwards.
 
 20050512:
   AFFECTS: users of devel/svk
   AUTHOR: rafan@infor.org
 
   Since SVK 0.30, it is fast enough and PPerl causes some problems.
   Thus, the SVK port no longer supports WITH_PPERL knob.
   If you still want to use PPerl with it, please go and read:
   http://svk.elixus.org/?SVKAndPPerl for details.
 
 20050511:
   AFFECTS: users of multimedia/ffmpeg{,-devel}
   AUTHOR: lioux@FreeBSD.org
 
   The latest FreeBSD CVS snapshot has been committed under
   multimedia/ffmepg-devel. In order to build it, you need to deinstall
   any ffmpeg ports first.
 
   # pkg_deinstall multimedia/ffmpeg
 
   Furthermore, video capture is no longer working in the latest
   version. Work is been done to overcome this.
 
 20050511:
   AFFECTS: users of databases/postgresql??-(server|contrib)
   AUTHOR: girgen@FreeBSD.org
 
   The PostgreSQL ports have been updated to latest versions. A
   security problem in the template database requires a simple SQL
   command to be run on each database. because these problems are
   really incorrect system catalog entries. Updating to a new release
   will NOT by itself solve the problems in an existing
   installation.
 
   See http://www.postgresql.org/about/news.315 for details.
 
 20050501:
   AFFECTS: users of lang/ocaml based applications and libraries
   AUTHOR: lioux@FreeBSD.org
 
   With the recent update of ocaml to 3.08.3 some API compatibility
   has been broken. It is a bit subtle so that some users might not
   notice it. However, updating all ocaml based applications and
   libraries are advised using the new compiler/interpreter version.
   Issue the following command:
 
   	# portupgrade -rf 'ocaml*'
 
 20050426:
   AFFECTS: users of mail/courier-authlib
   AUTHOR: oliver@FreeBSD.org
 
   mail/courier-authlib has been moved to security/courier-authlib and is
   now only a meta-port. Installing the meta-port installs security/
   courier-authlib-base and no, one or more sub-ports regarding to what
   authentication methods you've chosen. Courier-authlib-base only
   provides you authentication via PAM. All ports depending on courier-
   authlib (at the time of writing, courier-imap, sqwebmail and maildrop)
   giving you the same choice the meta-port provides you.
 
 20050421:
   AFFECTS: users of www/opera-devel
   AUTHOR: avleeuwen@piwebs.com
 
   Opera 8.0 final has been released and can be installed by installing the
   www/opera port. The opera-devel port is now deprecated. If you want
   to continue using the personal settings you used with www/opera-devel,
   issue this command:
 
 	# mv ~/.opera-devel ~/.opera
 
 20050421:
   AFFECTS: users of www/opera
   AUTHOR: avleeuwen@piwebs.com
 
   Opera has been updated to 8.0. If are upgrading from version 7.x or
   below, it is recommend that you backup your personal "~/.opera"
   directory and remove it, like this:
 
         # cp -Rp ~/.opera ~/.opera-bak
         # rm -rf ~/.opera/*
 
   After that, you can put your bookmarks, email, contacts, etc. back in
   ~/.opera/. The most important files are your bookmarks
   (~/.opera/opera6.adr) and your emails (~/.opera/mail). It is not a good
   idea to put opera6.ini, userstyle.ini, search.ini, pluginpath.ini and other
   non-personal stuff back in ~/.opera/. If you need custom settings,
   reconfigure Opera from the preferences pane or edit the files by hand.
 
 20050420:
   AFFECTS: users of www/ipython
   AUTHOR: dryice@liu.com.cn
 
   This is backward-incompatible changes for pysh.
 
   1. You must update your pysh profile (~/.ipython/ipythonrc-pysh):
      a) Add to it the line:
         import_all IPython.Extensions.InterpreterExec
      b) Delete the line
         execfile pysh.py
   2. You must also delete from ~/.ipython/ the file pysh.py.
 
 20050419:
   AFFECTS: users of www/linux-opera
   AUTHOR: mezz@FreeBSD.org
 
   Opera has been updated to 8.0. If you are upgrade from version 7.x or
   below, it is recommend for you to backup your personal "~/.linux-opera"
   directory and remove it. It can be done following from the command line:
 
 	# cp -Rp ~/.linux-opera ~/.linux-opera-bak
 	# rm -rf ~/.linux-opera/*
 
   After that, you can put your bookmark, email, contacts and etc back in
   ~/.linux-opera/. The bookmark is ~/.linux-opera/opera6.adr and the email is
   ~/.linux-opera/mail as you can figure out by view in ~/.linux-opera/. It is
   probably not good idea to put opera6.ini, userstyle.ini, search.ini,
   pluginpath.ini and other non-personal stuff back in ~/.linux-opera/. The
   non-personal stuff should be re-configure on new stuff by either Opera
   preferences in GUI or hand (manual) in your editor.
 
 20050415:
   AFFECTS: users of net-mgmt/cricket
   AUTHOR: ijliao@FreeBSD.org
 
   As of 2004/11/09 cricket uses a separate user "wwwadm". If you
   upgrade your installation, make sure you chown your existing data.
 
 20050414:
   AFFECTS: users of databases/postgresql and any port that depends on it
   AUTHOR: girgen@FreeBSD.org
 
   The PostgreSQL ports are updated to 8.0.2. All shared libraries'
   versions have been bumped, so you will need to recompile all client
   applications that depend on libpq.so. The recommended way to
   upgrade from 8.0.x would be something like
 
   	portupgrade -rf postgresql-client
 
 20050413:
   AFFECTS: users of mail/spamd
   AUTHOR: delphij@FreeBSD.org
 
   spamd now installs a rcNG script for starting the OpenBSD pf spamd daemon.
   To enable that at boot time, add the following into /etc/rc.conf[.local]:
 
   pfspamd_enable="YES"
 
 20050413
   AFFECTS: users of www/quixote
   AUTHOR: dryice@liu.com.cn
 
   There are backward-incompatible changes upgrading from 1.2 to
   2.0. Including renaming quixote.form to quixote.form1 and
   quixote.form2 to quixote.form. Please refer to upgrading.txt in the
   docs dir for detail.
 
 20050411:
   AFFECTS: users of x11/gdm
   AUTHOR: kwm@FreeBSD.org
 
   GDM now installs a rcNG script for starting the gdm daemon.
   To enable that gdm starts a boot time, add the following to /etc/rc.conf:
 
   gdm_enable="YES"
 
 20050406:
   AFFECTS: users of databases/mysql50-server
   AUTHOR: ale@FreeBSD.org
 
   The base database directory can now be set and changed in rc.conf (default:
   /var/db/mysql). If you used to set DB_DIR to a different value during port
   compilation, you must specify it via the new "mysql_dbdir" rc variable.
   In addition, the "mysqllimits_enable" and "mysqllimits_args" variables
   have been replaced by "mysql_limits" for consistency.
 
 20050403:
   AFFECTS: users of net/tac_plus4
   AUTHOR: marcus@FreeBSD.org
 
   Tac_plus4 now installs an rcNG script for starting the tac_plus daemon.
   To enable tac_plus to start at boot time, add the following to /etc/rc.conf:
 
   tac_plus_enable="YES"
 
   You can also pass flags to tac_plus by setting the rc.conf variable
   tac_plus_flags.  The default flags are "-C ${PREFIX}/etc/tac_plus.conf".
 
   Additionally, the default version of IOS for tac_plus has been changed from
   11.x to 12.x.
 
 20050324:
   AFFECTS: users of net/mDNSResponder
   AUTHOR: brooks@FreeBSD.org
 
   In mDNSResponder 98_1, mdnsd is no longer started by default due to a
   switch to an rc.subr startup script.  To start it, you must add add
   mdnsd_enable="YES" to your /etc/rc.conf or other suitable
   configuration file.
 
 20050320:
   AFFECTS: users of x11/kde3, x11/kdelibs3, x11/kdebase3,
 	x11-themes/kdeartwork3, www/akregator, x11-themes/phase,
 	multimedia/kdemultimedia3
   AUTHOR: kde@freebsd.org
 
   In KDE 3.4, a number of files were moved between ports, some ports
   were added, one port has been removed and some applications formerly available
   in their own ports were incorporated into KDE. This means that you will have
   to take some precautions to update your KDE installation. A simple
   portupgrade -a will not work.
 
   Portupgrade -R kde can fail as well, depending on what parts of KDE you
   have currently installed. We therefore recommend sticking to the following
   procedure. The procedure requires you to have sysutils/portupgrade installed
   and you to be the superuser (or using sudo). We recommend not being logged in
   to a KDE session on the machine you're performing the upgrade on. If you
   choose to perform the update while being logged in to KDE, expect erratic
   behavior and crashes from applications launched until you log out and back
   in.
 
   1.) Delete installed packages which conflict with the updated KDE
       ports.
 
       	pkg_deinstall -f kdeartwork-\[0-9\]\* kdebase-\[0-9\]\* \
 	kdebase-konqueror-nsplugins-\[0-9\]\* kdewebdev-\[0-9\]\* \
 	kde-\[0-9\]\* akregator\* phase\*
 
   2.) Now update the remaining KDE ports.
 
       	portupgrade -O arts\* kde\* \*kde-i18n\*
 
       or, if you want to update KDE along with other updated ports:
 
       	portupgrade -a
 
   3.) Reinstall the KDE ports you deleted in step 1.
 
       	portinstall -O kdebase kdeartwork kdewebdev
 
    Changes in detail:
 
 	- www/akregator is now included into deskutils/kdepim3.
 	- x11-themes/phase is now included in x11-themes/kdeartwork3.
 	- www/konqueror-nsplugins has been removed and is now integrated into
           x11/kdebase3.
 	- Juk has been split out of multimedia/kdemultimedia3 and is now
           available as audio/juk.
 	- Akode has been split out of multimedia/kdemultimedia3 and is now
           available as audio/akode and audio/akode-plugins-*. Akode is also
 	  a default dependency of multimedia/kdemultimedia3 now.
 	- audio/mpeglib_artsplug has been demoted to legacy status and is no
           longer the default decoder backend for kdemultimedia3. It's also not
           depended on by kdemultimedia3 by default anymore.
 
   Known post-updating issues:
 
   - If you're missing acoustic notifications (system sounds) after the update:
 
     	rm ~/.kde/share/config/knotifyrc
 
     Then log out of KDE and back in again (also see
     http://freebsd.kde.org/faq.php#q16).
 
   - kdm users might get warnings from kdm about obsolete lines in kdmrc.
     You can migrate your configuration while preserving your customizations
     by running (as root or with sudo)
 
     	genkdmconf
 
     Make sure to backup your old kdm configuration (usually found in
     /usr/local/share/config/kdm) beforehand in case the merge produces an
     invalid configuration. Especially note that kdm does not use the Xservers
     file anymore. A genkdmconf run will merge its contents into kdmrc.
 
   Extensive information about changes and new features of KDE 3.4 can be found
   at http://developer.kde.org/development-versions/kde-3.4-features.html. Bugs
   can be reported at http://bugs.kde.org.
 
 20050320:
   AFFECTS: users of sysutils/portsnap
   AUTHOR: cperciva@FreeBSD.org
 
   As a result of shifting from SHA-1 to SHA-256, the structure of
   portsnap's configuration file and compressed snapshot have both
   changed.  After upgrading to portsnap 0.9, you will have to
   update your configuration file ($PREFIX/etc/portsnap.conf) and
   delete your existing portsnap compressed snapshot:
 
   	# cd /usr/local/etc && cp portsnap.conf.sample portsnap.conf
   	# rm -r /usr/local/portsnap/*
 
   In addition, be aware that the next runs of "portsnap fetch" and
   "portsnap update" will take far longer than usual, since they
   will need to download and extract a complete copy of the ports
   tree.
 
 20050319:
   AFFECTS: users of databases/postgresql7[34]-server
   AUTHOR: girgen@FreeBSD.org
 
   The startup script has been merged from 8.0 to 7.3 and 7.4. Hence,
   to start the PostgreSQL server at boot time (regardless of version),
   add the following to /etc/rc.conf:
 
   postgresql_enable=yes
 
 20050318:
   AFFECTS: users of x11-wm/blackbox, x11-wm/boxtools, x11-wm/bbkeys, and
 	x11-wm/bbpager
   AUTHOR: A.J.Caines@halplant.com
 
   The new blackbox ports include several changes to use and configuration.
   Please read the pkg-message files in the respective ports for details.
 
 20050315:
   AFFECTS: users of databases/mysql323-server
   AUTHOR: ale@FreeBSD.org
 
   The MySQL Daemon must now be enabled / disabled in rc.conf.
   The base database directory can now be set and changed in rc.conf (default:
   /var/db/mysql). If you used to set DB_DIR to a different value during port
   compilation, you must specify it via the new "mysql_dbdir" rc variable.
   See the script for details.
 
 20050314:
   AFFECTS: users of databases/mysql40-server
   AUTHOR: ale@FreeBSD.org
 
   The base database directory can now be set and changed in rc.conf (default:
   /var/db/mysql). If you used to set DB_DIR to a different value during port
   compilation, you must specify it via the new "mysql_dbdir" rc variable.
   In addition, the "mysqllimits_enable" and "mysqllimits_args" variables
   have been replaced by "mysql_limits" for consistency.
 
 20050313:
   AFFECTS: users of games/netpanzerdata, games/netpanzer
   AUTHOR: mad@madpilot.net
 
   The netpanzerdata port has changed it's name to netpanzer-data,
   so before installing the new one you will need to remove the old
   netpanzerdata-0.1.3 port.
 
 20050312:
   AFFECTS: all users who have glib/gtk/gnome libraries installed
   AUTHOR: ahze@FreeBSD.org and the FreeBSD gnome team
 
   Gnome has been upgraded to 2.10 and gtk/glib to 2.6.
   DO NOT USE portupgrade(1) to update any gnome or gtk
   or any port that depends on them. Using portupgrade
   will cause problems and you will have to manually
   upgrade ports.  Please use the gnome_upgrade.sh
   script from
     http://www.FreeBSD.org/gnome/gnome_upgrade.sh
 
 20050309:
   AFFECTS: users of mail/maildrop
   AUTHOR: sergei@FreeBSD.org
 
   maildrop has been recently upgraded to 1.8.0. This version
   has the following changes:
 
   - Maildir quota is now enabled by default.
     The following options were deleted:
     - WITH_MAILDIRQUOTA
     - WITH_TRASHQUOTA
   - New option WITH_AUTHLIB is added, which provides optional support for
     Courier Auth Library (mail/courier-authlib port).
   - Userdb authentication, LDAP and MySQL support are provided through
     courier-authlib now, thus the following options
     - WITH_USERDB
     - WITH_LDAP
     - WITH_MYSQL
     have been superseded by WITH_AUTHLIB.
 
 20050306:
   AFFECTS: users of math/ploticus
   AUTHOR: linimon@FreeBSD.org
 
   ploticus is now installed as bin/ploticus rather than bin/pl to
   avoid useless conflicts with other ports.
 
 20050303:
   AFFECTS: users of net/i2p
   AUTHOR: lioux@FreeBSD.org
 
   The newest i2p version 0.5.0.1 is incompatible with all previous
   versions. Follow these procedures if you are updating from a
   previous port version. You can ignore these if you are installing
   i2p for the first time.
 
   1) Update i2p port to the new one
   2) Use the i2prouter script to uninstall i2p from user account.
      You are going to lose all your configuration.
 
   $ i2prouter uninstall
 
   3) Install the new i2p version
 
   $ i2prouter install
 
 20050301:
   AFFECTS: users of sysutils/ganglia-monitor-core
   AUTHOR: brooks@FreeBSD.org
 
   With the move to Ganglia 3.0.0, the configuration file for gmond has
   changed completely.  The -r or --convert options may be used to
   emit a file in the new format given one in the old.
 
   Startup is now controlled by an RC_SUBR script so the gmond_enable and
   gmetad_enable variables will need to be set for gmond and gmetad to be
   started.  Existing gmond.sh and gmetad.sh scripts in PREFIX/etc/rc.d
   should be removed.
 
   Due to a bug in ganglia's build process, the previous version may need
   to be removed before ganglia can be upgraded.
 
 20050224:
   AFFECTS: users of lang/ruby18 and any apps that depend on ruby18
   AUTHOR: mezz@FreeBSD.org
 
   The theads support has been disabled again. It causes the more trouble, so
   it now builds with ${PTHREAD_CFLAGS} and ${PTHREAD_LIBS}. It is recommend
   you to rebuild any apps that depend on lang/ruby18. Do something like this:
 
   	portupgrade -rf ruby-1.8.2\*
 
 20050224:
   AFFECTS: users of www/apache21
   AUTHOR: clement@FreeBSD.org
 
   When upgrading from 2.1.2, you need to rebuild all apache modules.
 
 20050215:
   AFFECTS: users of databases/mysql41-server
   AUTHOR: ale@FreeBSD.org
 
   The base database directory can now be set and changed in rc.conf (default:
   /var/db/mysql). If you used to set DB_DIR to a different value during port
   compilation, you must specify it via the new "mysql_dbdir" rc variable.
   In addition, the "mysqllimits_enable" and "mysqllimits_args" variables
   have been replaced by "mysql_limits" for consistency.
 
 20050214:
   AFFECTS: users of net-mgmt/nagios
   AUTHOR: blaz@si.FreeBSD.org
 
   Nagios has been upgraded to 2.0.b2. Native support for storing various types
   of data (status, retention, comment, downtime, etc.) in MySQL and PostgreSQL
   has been dropped. There are also multiple changes to the format of
   configuration files. Carefully read
   http://nagios.sourceforge.net/docs/2_0/whatsnew.html before upgrading.
 
 20050213:
   AFFECTS: users of print/teTeX-*
   AUTHOR: hrs@FreeBSD.org
 
   print/teTeX-* are now based on teTeX 3.0.  Although some
   reliability fixes are also added, here are several common problems
   which you might fall on.
 
   1) $PREFIX/bin/pdftex is missing:
 
    Probably your system has old files included teTeX 2.x which can
    prevent the new version from working.  Please remove the old
    files first (see 20050206 in this file) and reinstall.
 
   2) Some formats are still corrupted (for example, "Fatal format file error;
      I'm stymied" is displayed) or not updated even after a clean install:
 
    You might have old or corrupted *.fmt and/or *.map files
    under /root/.texmf-* or $HOME/.texmf-* directories.  Typically
    these directories are generated when you invoke the updmap(1),
    texconfig(1), or fmtutil(1) utility manually.  However, for a period
    after the first revision of the teTeX-base port erroneously used
    fmtutil(1) to regenerate *.fmt files, you could have these directories
    without your intent.  In such a case, please remove these directories
    and reinstall the ports (it is not needed to rebuild ports/packages).
    Just for your information, $HOME/.texmf-config and $HOME/.texmf-var
    can be used for your personal configuration.
 
   If you have other problems, please contact hrs@FreeBSD.org.
 
 20050212:
   AFFECTS: users of x11-fonts/mkbold, x11-fonts/mkitalic, and
 	x11-fonts/mkbold-mkitalic
   AUTHOR: koma2@ms.u-tokyo.ac.jp
 
   The dependency on x11-fonts/mkbold and x11-fonts/mkitalic has been
   switched over to x11-fonts/mkbold-mkitalic, which is written in C
   and has far better performance than the old ones.  There is no
   functional difference between the two, but they will conflict with
   each other.  Since other ports which depend on x11-fonts/mkbold or
   x11-fonts/mkitalic will be updated to depend on x11-fonts/mkbold-mkitalic,
   you might get an error during upgrading such ports.  In such a case,
   please pkg_delete the old ones first.
 
 20050206:
   AFFECTS: users of print/teTeX and japanese/teTeX
   AUTHOR: hrs@FreeBSD.org
 
   print/teTeX is now based on a teTeX 3.0 release candidate
   (2.99.13.20050204) and the other related ports are also updated.
   Since upgrading from previous versions should be done at a time,
   you may want to use the portupgrade utility or reinstall
   print/teTeX after deinstalling all of the related ports.
 
   If your teTeX environment became broken during the upgrade,
   please see the following URL which explains how to fix it.
 
   http://people.freebsd.org/~hrs/tetex-upgrade.txt
 
   This file also includes notes for people who are familiar
   with the teTeX distribution to explain structure of the ports.
 
 20050205:
   AFFECTS: users of lang/ruby16_r, lang/ruby18_r, and lang/ruby18
   AUTHOR: knu@FreeBSD.org
 
   The slippery pthread support for systems prior to 502102 has been
   dropped and lang/ruby16_r and lang/ruby18_r ports have been removed,
   since no one seems to appreciate the partially working solution.
 
   Good news is that the pthread support of lang/ruby18 is now enabled
   by default for newer systems, which means the ruby interpreter is
   linked with libpthread.  This will allow threaded extension
   libraries to run and work properly on those systems.
 
 20050201:
   AFFECTS: users of lang/perl5 and lang/perl5.8
   AUTHOR: tobez@FreeBSD.org
 
   lang/perl5 has been updated to 5.6.2, and lang/perl5.8 has been
   updated to 5.8.6. you should update everything depending on perl, that
   is:
 
     * first, upgrade your perl installation (use either lang/perl5 or
       lang/perl5.8, the latter being recommended);
     * for FreeBSD 4.X, run "use.perl port", so that the system knows you
       have 5.8.6 or 5.6.2;  this step is not needed on FreeBSD 5.X and
       FreeBSD -CURRENT;
     * run some magic incantations to upgrade all ports depending on perl,
       that is run something like :
       portupgrade -f `(pkg_info -R perl-5\* |tail +4; \
         find /usr/local/lib/perl5/site_perl/5.[68].[1245] -type f -print0 \
         | xargs -0 pkg_which -fv | sed -e '/: ?/d' -e 's/.*: //')|sort -u`
       This is likely to fail for a few ports, you'll have to upgrade them
       afterwards by hand.
 
 20050130:
   AFFECTS: users of PostgreSQL
   AUTHOR: girgen@FreeBSD.org
 
   Each of the PostgreSQL ports have been split into a server and a
   client part. Please use postgresqlNN-server and/or
   postgresqlNN-client as needed. Versions currently supported are 7.3,
   7.4 and 8.0.
 
   To start the PostgreSQL server at boot time, add the following to
   /etc/rc.conf:
 
   postgresql_enable=yes
 
   The maintenance script is installed in etc/periodic/daily, and is
   controlled by a set of new knobs in periodic.conf. Use it for
   vacuuming your databases and get daily backups. Note that daily
   vacuuming is on by default. See the script for details.
 
 20050130:
   AFFECTS: users of net/howl
   AUTHOR: marcus@FreeBSD.org
 
   Howl now installs an rcNG script for starting mDNSResponder.  To enable
   mDNSResponder to start at boot time, add the following to /etc/rc.conf:
 
   mdnsresponder_enable="YES"
 
   You can also pass flags to mDNSResponder by setting the rc.conf variable
   mdnsresponder_flags to the appropriate value.  See the mDNSResponder(8)
   man page for the list of supported flags.  The default is not to pass
   any flags to mDNSResponder.
 
 20050126:
   AFFECTS: users of x11-wm/xfce4
   AUTHOR: oliver@FreeBSD.org
 
   If you use Xorg 6.8.1: Make shure there is an /tmp/.ICE-unix with propper
   rights. For further informations about that, please refer to 20041229
   Please update all your plugins as well when you update from 4.0.6 to 4.2
   They all need recompiling to link against the new xfce libraries
 
 20050122:
   AFFECTS: users of PostgreSQL
   AUTHOR: seanc@FreeBSD.org
 
   The -devel port has been updated to contain 8.0 release since
   postgresql80-server can not be updated until 4.11 is released and the
   changes in PR ports/75344 are committed.  Users who need 8.0 now can
   use the -devel port, however, once postgresql80-server has been
   committed, -devel will begin tracking 8.1.  Please be smart about
   tracking ports and if used in production, update to
   databases/postgresql80-server as soon as it becomes available.  No
   dump/reload will be required when changing from -devel to
   postgresql80-server.
 
 20050117:
   AFFECTS: users of mail/spambnc
   AUTHOR: thierry@FreeBSD.org
 
 The SpamBouncer has been upgraded from version 1.9 to 2.0-RC3, and you
 have to modify your ~/.procmailrc files. Please read upgrading.html in
 /usr/local/share/doc/spambnc.
 
 20050117:
   AFFECTS: users of cad/astk-client
   AUTHOR: thierry@FreeBSD.org
 
   ASTK has been moved; if there exists files $HOME/.astkrc/config_serveurs,
   you have to update the entry rep_serv from /usr/local/ASTK/ASTK_SERV/bin
   to /usr/local/aster/ASTK/ASTK_SERV/bin (or you can remove $HOME/.astkrc).
 
 20050114:
   AFFECTS: users of security/libgnomesu, esp. on FreeBSD 4.x.
   AUTHOR: adamw@FreeBSD.org
 
   If you installed libgnomesu the day it was added to the ports tree,
   you have a malformed PAM control file in /etc/pam.d/. All libgnomesu
   users should remove /etc/pam.d/gnomesu-pam, and 5.x users should
   replace it with the version in the updated libgnomesu port (ensure
   that you're using the most current revision of the libgnomesu port).
 
   4.x users: listen up! The presence of the /etc/pam.d/ directory (and
   anything in that directory) presents a Very Bad Thing. Unless you've
   manually tweaked your PAM settings, you must run:
 
   	# rm /etc/pam.d/gnomesu-pam
   	# rmdir /etc/pam.d/
 
   or all users will be locked out of your system!
 
 20050110:
   AFFECTS: users of irc/iip
   AUTHOR: lioux@FreeBSD.org
 
   iip has been updated to the new network servers. Therefore, both
   old configuration files and node reference keys no longer apply.
 
   Therefore, you need to update the configuration files for each
   user running the iip isproxy daemon:
 
   1) Backup configuration files
 
   cp ~/.iip/isproxy.ini ~/.iip/isproxy.ini.backup
   cp ~/.iip/node.ref ~/.iip/node.ref.backup
 
   2) Remove configuration files
 
   rm ~/.iip/isproxy.ini
   rm ~/.iip/node.ref
 
   3) Create new configuration. Fill information as requested. This
   creates the updated isproxy.ini file
 
   isproxy -C
 
   4) Start iip isproxy. This will initialize your updated node.ref
   file. This file will be automatically updated when you connect
   to the iip network
 
   isproxy
 
 20050110:
   AFFECTS: users of sysutils/nautilus-cd-burner
   AUTHOR: gnome@FreeBSD.org
 
   Nautilus-cd-burner now requires cdrtools built with UTF-8 encoding
   support.  The default sysutils/cdrtools port does not support this
   encoding, and that will cause nautilus-cd-burner to enter an infinite
   loop when trying to create CD images.  To workaround this, the cdrtools
   dependency was changed in nautilus-cd-burner to point to the
   sysutils/cdrtools-cjk port instead.
 
   Since sysutils/cdrtools and sysutils/cdrtools-cjk conflict, you must
   uninstall cdrtools so that the nautilus-cd-burner update can properly
   pull in cdrtools-cjk.
 
 20050108:
   AFFECTS: users of mail/courier-imap, mail/sqwebmail
   AUTHOR: oliver@FreeBSD.org
 
   Courier-imap and sqwebmail are now dependent on courier-authlib. If
   you've changed the default authentication config for courier-imap or
   sqwebmail, you will have to redo the changes for courier-authlib.
   You may wish to deinstall courier-imap and/or sqwebmail before you
   install courier-authlib. Since courier-authlib replaces parts of both
   ports, some of courier-authlib's files are listed as sqwebmail and
   courier-imap files and deinstalling old courier-imap and/or sqwebmail
   port may cause the deinstallation of the freshly installed
   courier-authlib files.
 
 20050108:
   AFFECTS: users of mail/sqwebmail
   AUTHOR: oliver@FreeBSD.org
 
   Sqwebmail now installs it's files directly under PREFIX. That means for
   instance that files that were formerly found under
   PREFIX/share/sqwebmail/etc/ are now located under PREFIX/etc/sqwebmail.
   Furthermore you need to set sqwebmaild_enable=YES in your rc.conf
   because the rc.d script has been migrated to use the rc.subr Subsystem
 
 20050108:
   AFFECTS: users of mail/courier-imap
   AUTHOR: oliver@FreeBSD.org
 
   The variable courier_imap_imapdssl_enable have been renamed to
   courier_imap_imapd_ssl_enable.
   The variable courier_imap_pop3dssl_enable have been renamed to
   courier_imap_pop3d_ssl_enable.
   userdb stuff is now located in LOCALBASE/etc/authlib instead of
   LOCALBASE/etc.
 
 20041231:
   AFFECTS: users of www/awstats
   AUTHOR: webmaster@lightningfire.net
 
   Location of awstats changed from /usr/local/www to /usr/local/www/awstats.
   Please update configuration according instructions in pkg-message.
 
 20041231:
   AFFECTS: users of the linux compatibility environment
   AUTHOR: netchild@FreeBSD.org
 
   The default linux_base was changed from v7 to v8. You need to update from
   v7 to v8 and rebuild every linux port. To update run:
 	portupgrade -rf -o emulators/linux_base-8 emulators/linux_base
 
   In case you already use linux_base-8 you have to run:
 	portupgrade -rf emulators/linux_base-8
 
 20041229:
   AFFECTS: users of x11/kdebase3, x11-servers/xorg-server
   AUTHOR: lofi@freebsd.org
 
   If KDE does not start anymore after upgrading Xorg to version 6.8.1
   (X restarts when the KDE splash screen has reached the third icon),
   please check whether the directory /tmp/.ICE-unix exists, is owned by root
   and has permissions 1777 (read/write/access for everybody + sticky bit).
 
   To make sure everything is in working order, do (as root):
   mkdir -p /tmp/.ICE-unix && chmod 1777 /tmp/.ICE-unix &&
   chown root:wheel /tmp/.ICE-unix
 
   Also, make sure you do NOT have clear_tmp_enable="YES" set in /etc/rc.conf,
   as it will remove the directory on every reboot and applications will re-
   create it with the wrong ownership.
 
   Users of daily_clean_tmps_enable in /etc/periodic.conf should make sure
   daily_clean_tmps_ignore contains /tmp/.ICE-unix.
 
 20041227:
   AFFECTS: users of lang/gambas
   AUTHOR: thierry@FreeBSD.org
 
   As of this update, the password of your databases connections are crypted.
   If you were using the database manager, please remove
   ~/.gambas/gambas-database-manager.conf before launching the new version.
 
 20041226:
   AFFECTS: users of Horde and the related ports (Turba, IMP, Nag, Kronolith,
            Mnemo, Chora)
   AUTHOR: thierry@FreeBSD.org
 
   As of this update, the configuration files are generated by the application,
   with no support for configuration files used in previous versions.
 
   All data saved in the database, LDAP or MCAL backends will be preserved,
   considering that you run specific scripts to migrate to this new scheme.
   Affected ports are www/horde, mail/turba, deskutils/nag, deskutils/kronolith,
   and deskutils/mnemo. See the UPGRADING documentation of the ports in question
   for more details.
 
   The filter system of IMP 3.x has been replaced by a separate application:
   check the port mail/ingo. Ingo provides a script to migrate the existing
   filter rules from IMP 3.x, see Ingo's documentation.
 
 20041224:
   AFFECTS: users of x11-servers/XFree86-4-Server and graphics/dri
   AUTHOR: lesi@FreeBSD.org
 
   As of version 4.4.0_6, XFree86-4-Server now depends on
   graphics/xfree86-dri.  This is due to incompatibilities between
   XFree86 and the new xorg 6.8.1 DRI.
 
   Users of XFree86-4-Server are strongly encouraged to switch to
   the xfree86-dri port as follows:
 
 	portupgrade -fo graphics/xfree86-dri graphics/dri
 
   which will also fix dependencies.
 
 20041224:
   AFFECTS: users of sysutils/portupgrade and lang/ruby18
   AUTHOR: knu@FreeBSD.org
 
   Please upgrade sysutils/portupgrade prior to lang/ruby18, or
   pkgdb(1) may coredump with a double free() problem from a misuse (or
   a "feature") of the DL module.
 
   In that case, you can reinstall sysutils/portupgrade manually.
 
 20041222:
   AFFECTS: users of security/clamav, security/clamav-devel
   AUTHOR: jylefort@brutele.be
 
   The ClamAV database path has changed from /usr/local/share/clamav to
   /var/db/clamav. You should update the DatabaseDirectory keyword in
   /usr/local/etc/clamd.conf and /usr/local/etc/freshclam.conf.
 
 20041221
   AFFECTS: users of security/gpgme03
   AUTHOR: clement@FreeBSD.org
 
   security/gpgme03 has been modified to not conflicts with gpgme 1.x
   After upgrade, you need to rebuild all ports that depend on it.
   You should upgrade security/gpgme (if installed) to avoid nasty
   compile time failures, due to original location of gpgme.h.
 
 20041219:
   AFFECTS: users of textproc/jdictionary
   AUTHOR: hq@FreeBSD.org
 
   The location for JDictionary port installed files has changed. This also
   affects the various plugins. Hence, users should upgrade all jdictionary
   related ports at once to avoid inconsistencies:
 
   $ portupgrade jdictionary\*
 
 20041214:
   AFFECTS: users of net/freenet6
   AUTHOR: edwin@FreeBSD.org
 
   The FreeNet6 Service must now be enabled / disabled in rc.conf:
     freenet6_enable="YES"
 
 20041213:
   AFFECTS: users of security/cryptplug, deskutils/kdepim3
   AUTHOR: lofi@freebsd.org
 
   The cryptplug port is not compatible with recent versions of gpgme
   and has been changed to depend on gpgme03 (the last version of gpg-
   me compatible with cryptplug).
   Users who have been using cryptplug in order to enable PGP/MIME support
   in KMail should DEINSTALL BOTH cryptplug and gpgme03 before updating
   KDE to version 3.3.2. Cryptplug is NOT necessary anymore to enable
   PGP/MIME support in KMail and will cause the kdepim3 build to fail due
   to conflicting dependencies.
 
 20041213:
   AFFECTS: users of databases/postgresql-relay
   AUTHOR: edwin@FreeBSD.org
 
   The PostgreSQL Relay must now be enabled / disabled in rc.conf:
     postgresqlrelay_enable="YES"
 
 20041212:
   AFFECTS: users of sysutils/bacula
   AUTHOR: lkoeller@FreeBSD.org
 
   The port was split into a -server and -client component.
   The -server part contains the storage and director daemon, the -client
   part the console, file daemon and the documentation.
 
   For migration delete the bacula port and install the -server and/or
   -client port afterwards.
 
 20041208:
   AFFECTS: users of mail/getmail
   AUTHOR: question+fbsdports@closedsrc.org
 
   There is a known quirk when using mail/getmail with Python 2.4
   where the DeprecationWarning is printed regarding the use of
   the 'strict' keyword when a message is being retrieved.
 
   You can redirect stdout/stderr to /dev/null to quelch the warning.
 
   The quirk may be fixed in a future version of getmail.
 
 20041205:
   AFFECTS: users of multimedia/ffmpeg
   AUTHOR: lioux@FreeBSD.org
 
   multimedia/ffmpeg will not work if previous versions of the port
   are installed. Also, there is a shared library version bump on
   this update. Therefore:
 
   1) Remove old ffmpeg
 
   pkg_delete -f /var/db/pkg/ffmpeg*
 
   2) Install updated ffmpeg
 
   3) Rebuild all ports that depend on ffmpeg due to the shared
   library version bump
 
   cd /var/db/pkg && portupgrade -rf ffmpeg* -x ffmpeg*
 
 20041202:
   AFFECTS: users of any ports which have dependency on lang/python
   AUTHOR: perky@FreeBSD.org
 
   After upgrading of lang/python, you must rebuild all its consumer
   ports to make them get ready to Python 2.4.
 
   To do this, you will need to:
     pkgdb -uf && cd /usr/ports/lang/python && make upgrade-site-packages
 
 20041128:
   AFFECTS: users of mail/dspam and mail/dspam-devel
   AUTHOR: itetcu@people.tecnik93.com
 
   When upgrading from previous version, read mail/dspam/files/UPDATING
   and adjust your options.
 
 20041121:
   AFFECTS: users of news/rawdog
   AUTHOR: tim@bishnet.net
 
   Rawdog 2.x changes the format of the state file used in 1.x. To
   upgrade from 1.x to 2.x the rawdog author recommends the following:
 
     cp -R ~/.rawdog ~/.rawdog-old
     rm ~/.rawdog/state
     rawdog -u
     rawdog --upgrade ~/.rawdog-old ~/.rawdog
     rawdog -w
 
   Once you're happy with the new version:
     rm -r ~/.rawdog-old
 
 20041118:
   AFFECTS: users of sysutils/portupgrade
   AUTHOR: lofi@freebsd.org
 
   portsdb(1) is part of the portupgrade suite and is used to convert a ports
   INDEX file to a binary INDEX.db database. By default, it uses the
   libc-builtin berkeley db to do so, which has a buggy btree implementation.
 
   If you see errors like "[BUG] Segmentation fault" while a portsdb update is
   in progress, adjust the PORTS_DBDRIVER variable (in your environment or in
   pkgtools.conf) to either bdb1_hash or dbm_hash.
 
   This problem was fixed in 5.3-RELEASE, but users of 4.10-RELEASE and
   5.2.1-RELEASE (and older releases) will find fixes by updating to the
   latest (at least after Sep 20) of RELENG_4 or RELENG_5.
 
 20041116:
   AFFECTS: users of www/bricolage
   AUTHOR: ports@rbt.ca
 
   Bricolage may now be run on mod_perl compiled as a DSO for Apache
   when following these guidelines:
 
   http://perl.apache.org/docs/1.0/guide/install.html#When_DSO_can_be_Used
 
   To do this, you will need to:
     pkg_delete -f apache-mod_perl
     pkg_delete -f p5-libapreq-static
     portupgrade -rR bricolage
 
   Bricolage will rebuild mod_perl, apache and libapreq using their standard
   versions.
 
 20041115:
   AFFECTS: users of sysutils/portupgrade
   AUTHOR: lofi@FreeBSD.org
 
   Due to the recent removal of INDEX and INDEX-5 from FreeBSD's CVS,
   portupgrade with default configuration will run 'make index' if started
   after cvsup'ing the ports-collection. This may take an undesirably long
   time.
 
   There are several ways to work around this, for example:
 
   - Run 'make fetchindex' after cvsup'ing ports.
 
   or
 
   - Adjust the PORTS_INDEX variable in your environment or in
     pkgtools.conf (see portupgrade(1) or the default pkgtools.conf) to
     a different value than the default.
 
   Also remember that 'make index' is only supported on _complete_
   ports-trees. If you are currently refusing whole categories by means
   of a cvsup refuse file, use 'make fetchindex' instead (or consider
   keeping an extra machine/jail with a complete ports-tree around to
   do INDEX builds on).
 
 20041111:
   AFFECTS: users of audio/faad, multimedia/mpeg4ip
   AUTHOR: lioux@FreeBSD.org
 
   mpeg4ip has been updated and broken down into 2 separate ports:
   mpeg4ip and mpeg4ip-libmp4v2. Furthermore, mpeg4ip now depends
   on faad. Moreover, faad now depends on mpeg4ip-libmp4v2 rather
   than on mpeg4ip which avoids a cyclic dependency (mpeg4ip depends
   on faad which depends on mpeg4ip).
 
   If any of the old ports are installed, mpeg4ip will not compile.
   Therefore,
 
   1) Remove old faad and mpeg4ip ports which conflict with new
   mpeg4ip
 
   pkg_delete -f /var/db/pkg/mpeg4ip*
   pkg_delete -f /var/db/pkg/faad*
 
   2) Install faad, mpeg4ip and mpeg4ip-libmp4v2 in the following
   order
 
   cd /usr/ports/multimedia/mpeg4ip-libmp4v2 && make install clean
   cd /usr/ports/audio/faad && make install clean
   cd /usr/ports/multimedia/mpeg4ip && make install clean
 
 20041111:
   AFFECTS: users of Java
   AUTHOR: glewis@FreeBSD.org
 
   javavmwrapper has been rewritten.  It now creates symbolic links for
   all executables of the Java VMs that have been registered with it.
   These symbolic links may impact which version of Java you are using,
   depending on your PATH, which may need to be adjusted.
 
   For example, if your path is:
 
 	${LOCALBASE}/bin:${LOCALBASE}/jdk1.4.2/bin
 
   then previously "java" would resolve to ${LOCALBASE}/jdk1.4.2/bin/java.
   With the new javavmwrapper it will resolve to ${LOCALBASE}/bin/java.
   Depending upon the Java VMs that are registered and various environment
   variables, it may or may not be ${LOCALBASE}/jdk1.4.2/bin/java that is
   run by javavmwrapper via the symbolic link ${LOCALBASE}/bin/java.
 
 20041107:
   AFFECTS: users of x11/kdebase3
   AUTHOR: kde@freebsd.org
 
   To use GMail in konqueror, you need to set the browser identification for
   gmail.google.com to 'Safari 1.2.3 on Mac OS X', otherwise you will not be
   able to click on any links in GMail after logging in.
 
   You can set site-specific browser identifications via the Settings menu in
   Konqueror (Configure Konqueror/Browser Identification) or in the KDE Control
   Center, Internet & Network/Web Browser/Browser Identification.
 
 20041107:
   AFFECTS: all users who have any GNOME libraries installed
   AUTHOR: adamw@FreeBSD.org and the rest of the FreeBSD/GNOME crew
 
   Hey, 2.6! You don't have to be 2.6 anymore!
   Do NOT use portupgrade(1) to update your GNOME 2.6 desktop to 2.8:
   it won't work, and you'll have to recompile bunches of ports by hand
   as a result. Use the gnome_upgrade.sh script to automate the upgrade
   process. The script is available from
     http://www.FreeBSD.org/gnome/gnome_upgrade.sh
 
 20041104:
   AFFECTS: users of security/clamav-devel
   AUTHOR: rob@debank.tv
 
   The configuration file was renamed from clamav.conf to clamd.conf,
   make sure to move your configuration before restarting the server.
 
 20041104:
   AFFECTS: users of japanese/rskkserv
   AUTHOR: rushani@FreeBSD.org
 
   The format of PREFIX/etc/rskkserv.conf has changed in version 2.95.
   Please update your configuration file before restarting the server
   using PREFIX/share/examples/rskkserv/conf-o2n.rb and referring to
   PREFIX/share/examples/rskkserv/rskkserv.conf.sample.
 
 20041031:
   AFFECTS: users of databases/mysql40-server
   AUTHOR: ale@FreeBSD.org
 
   The MySQL Daemon must now be enabled / disabled in rc.conf.
   See the script for details.
 
 20041028:
   AFFECTS: users of net/netatalk
   AUTHOR: marcus@FreeBSD.org
 
   Please note that the handling of the default type/creator has changed with
   2.0.1. As a side effect, users upgrading from earlier versions, including
   2.0.0, will have to remove the default type/creator from the
   AppleVolumes.System file. The install process will not modify this file
   automatically. Please remove the line starting with '.         "????"'
   manually.
 
   This text was taken from the Netatalk 2.0.1 release notes at
   https://sourceforge.net/project/shownotes.php?release_id=278320.
 
 20041027:
   AFFECTS: users of games/pcgen
   AUTHOR: hq@FreeBSD.org
 
   The launcher script for PCGen has been renamed to 'pcgen' (formerly
   'pcgen.sh').
 
 20041024:
   AFFECTS: users of databases/mysql50-server
   AUTHOR: ale@FreeBSD.org
 
   The MySQL Daemon must now be enabled / disabled in rc.conf.
   See the script for details.
 
 20041024:
   AFFECTS: users of mail/popfile
   AUTHOR: matusita@FreeBSD.org
 
   Since there is a known problem that popfile doesn't work with DBD::SQLite 1.x
   at this time, you'll be in trouble after upgrading databases/p5-DBD-SQLite
   to the latest one.  A workaround is committed to 0.22.0_1 which uses
   databases/p5-DBD-SQLite2 by default.  However, if already installed popfile,
   please check ${HOME}/.popfile/popfile.cfg, and change the line
   "bayes_dbconnect dbi:SQLite:dbname=$dbname" to
   "bayes_dbconnect dbi:SQLite2:dbname=$dbname" then restart popfile.
 
 20041023:
   AFFECTS: users of mail/dbmail
   AUTHOR: seanc@FreeBSD.org
 
   When upgrading from 1.X to 2.X, read the upgrading instructions.
   The structure of the database has changed, please use the migration
   scripts provided.  Many of the programs have been renamed and arguments
   have been changed as well.
 
 20041020:
   AFFECTS: users of security/antivir-milter
   AUTHOR: marius@FreeBSD.org
 
   When updating from previous versions of security/antivir-milter to
   antivir-milter-1.1 and you had changed PREFIX/etc/avmilter.conf you
   have to bring over your changes to PREFIX/etc/avmilter/avmilter.conf
   after installing the new version of this port. Note, however, that
   some variables have been renamed.
   If you used AntiVir Milter ignore, scan and/or warn files in /etc
   you can now move them to PREFIX/etc/avmilter.
 
 20041019:
   AFFECTS: users of databases/mysql41-server
   AUTHOR: ale@FreeBSD.org
 
   The MySQL Daemon must now be enabled / disabled in rc.conf.
   See the script for details.
 
 20041018:
   AFFECTS: users of mail/courier-imap
   AUTHOR: oliver@FreeBSD.org
 
   The courier-imap port must now be enabled / disabled in rc.conf.
   See the script for details.
 
 20041015
   AFFECTS: users of www/apache2 with devel/apr
   AUTHOR: clement@FreeBSD.org
 
   WITH_APR_FROM_PORTS knob is no longer supported, since apr > 1.0
   doesn't conflict with apache2's one. If you use apr 0.9.x you
   won't be able to upgrade apache2 anymore.
 
 20041014:
   AFFECTS: users of security/clamav
   AUTHOR: eik@FreeBSD.org
 
   The configuration file for the clamd daemon has changed from
   /usr/local/etc/clamav.conf to /usr/local/etc/clamd.conf.
 
 20041013:
   AFFECTS: users of mail/getmail
   AUTHOR: question+fbsdports@closedsrc.org
 
   If you are using a version of mail/getmail earlier than 4.x and
   are planning to upgrade to 4.2.2, please note that the configuration file
   syntax has changed and the existing configuration file(s) will not work.
   Please refer to the online documentation available at:
 
     (http://www.qcc.ca/~charlesc/software/getmail-4/documentation.html)
 
   If you already upgraded to the latest version of getmail, you can refer
   to the installed documentation under:
 
     ${PREFIX}/share/docs/getmail
 
   The 4.x branch of getmail also requires Python 2.3.3 or newer.
 
   Some mail delivery agents require that the unixfrom parameter to be set to
   either "true" or "false" in the configuration file.
 
   A "quick and dirty" guide on setting up, configuring and using getmail is
   available at:
 
     (http://www.qnd-guides.org/qnd-getmail.html)
 
 20041012:
   AFFECTS: users of devel/perforce
   AUTHOR: marshall@chezmarshall.com
 
   Upgrading from 2003.2 to 2004.2 is straightforward, it is highly
   recommended to checkpoint and backup your server as follows:
     p4 verify //...
     p4 verify -u //... # possibly redundant
     p4 admin checkpoint
     p4 admin stop
     <backup repository>
 
   If you are upgrading from a version earlier than 2003.2, you should
   consult the Perforce documentation
     (http://www.perforce.com/perforce/technical.html)
   before proceeding.
 
   Also, it looks as though Perforce has stopped updating the man pages,
   so they are no longer included in the port.
 
 20041012:
   AFFECTS: users of www/firefox
   AUTHOR: freebsd-gnome@FreeBSD.org
 
   After upgrading to firefox-1.0.1.p, certain things such as extension/theme
   [de]installation, and "Find On Page" may no longer work.  You may also
   notice an infinite loop when starting Firefox.  If this happens, backup
   ~/.mozilla/firefox/*/bookmarks.html, and remove ~/.mozilla/firefox.
   Afterward, Firefox should start up.  You can then restore the bookmarks.html
   file to the new ~/.mozilla/firefox/*.default directory.
 
 20041012:
   AFFECTS: users of net/netatalk
   AUTHOR: marcus@FreeBSD.org
 
   Netatalk has been upgraded to 2.0.0.  There are some important
   instructions for upgrading from 1.6.x.  Please see
   http://netatalk.sourceforge.net/2.0/htmldocs/upgrade.html on how
   to make the transition.
 
 20041011:
   AFFECTS: users of www/linuxpluginwrapper who are running FreeBSD
 	   5.3-BETA7 or later (including -current)
   AUTHOR: nork@freebsd.org
 
   According to UPDATING(20041001), /etc/libmap.conf should be fixed
   libm.so.2 to libm.so.3.
 
 20041001:
   AFFECTS: users of ports that require several base system libraries who
 	   are running FreeBSD 5.3-BETA7 or later (including -current)
   AUTHOR: kensmith@freebsd.org
 
   As part of the FreeBSD-5.3 release the following system libraries
   had their version number incremented:
 
 	/lib/libm.so.2 -> libm.so.3
 	/lib/libreadline.so.4 -> libreadline.so.5
 	/usr/lib/libhistory.so.4 -> libhistory.so.5
 	/usr/lib/libopie.so.2 -> libopie.so.3
 	/usr/lib/libpcap.so.2 -> libpcap.so.3
 
   This should have no effect unless you are using FreeBSD 5.3-BETA7 or
   higher, or if you are a -current user who upgraded after this date.
   Assuming you did a from-source upgrade new versions of these libraries
   will be created but the old versions will be left behind (for example
   /lib/libm.so.2 will be the old one, /lib/libm.so.3 will be the new one).
   Any ports or pre-built packages you have currently installed will
   continue to use the old library, any ports you install after the upgrade
   will begin to use the new library.  You will need to have all your
   ports recompiled before the old library goes away.  To help with the
   migration you could also use /etc/libmap.conf to map libm.so.2 to
   libm.so.3.
 
 20040903:
   AFFECTS: users of net/kdenetwork3
   AUTHOR: kde@freebsd.org
 
   The lanbrowsing facility of KDE has been removed from the main
   kdenetwork3 port and is now available via the net/lanbrowsing
   port.
 
 20040901:
   AFFECTS: users of www/squid
   AUTHOR: tmseck@netcologne.de
 
   www/squid now installs an rcNG script by default. This means you
   need to explicitly enable squid by setting squid_enable=yes in
   /etc/rc.conf.
   The squid.sh script uses the following variables:
   squid_chdir
   squid_flags
   squid_user
 
   Please see the squid.sh script for further details.
   If you want to install an old style rc-script, build the port with
   "WITHOUT_SQUID_RCNG=YES" or by rerunning "make config" and disabling this
   option.
 
 20040830:
   AFFECTS: users of x11/kde3, x11/kdelibs3, x11/kdebase3
   AUTHOR: kde@freebsd.org
 
   In KDE 3.3, a number of files were moved between ports and some ports
   were removed. This means that you will have to take some precautions
   to update your KDE installation. A simple portupgrade -a will not work.
   portupgrade -R kde can fail as well, depending on what parts of KDE you
   have currently installed. We therefore recommend sticking to the following
   procedure. The procedure requires you to have sysutils/portupgrade installed
   and you to be the superuser (or using sudo). We recommend not being logged in
   to a KDE session on the machine you're performing the upgrade on. If you
   choose to perform the update while being logged in to KDE, expect erratic
   behavior and crashes from applications launched during the update.
 
   1.) First, make sure your ports index is up to date.
 
       	cd /usr/ports && make index
 
       or, if you're using the sysutils/portindex port
 
       	portindex
 
   2.) Delete installed packages which conflict with the updated KDE
       ports.
 
       	pkg_deinstall -f kdeaddons-kontact-plugins-\* \
       	kdeaddons-kaddressbook-plugins-\* kdepim-\* kdeutils-\* \
       	kdeaddons-\[0-9\]\* kde-\[0-9\]\*
 
       kdegraphics now conflicts with the kolourpaint package and kdeedu now
       conflicts with the kwordquiz package. If you have kwordquiz and/or
       kolourpaint installed on your system and you want to use the kdegraphics/
       kdeedu ports, you should first deinstall the conflicting packages:
 
       	pkg_deinstall -f kolourpaint\* kwordquiz\*
 
 
   3.) Now update the remaining KDE ports.
 
       	portupgrade arts\* kde\* quanta\*
 
       or, if you want to update KDE along with other updated ports:
 
       	portupgrade -a
 
       Note that the quanta port has been renamed to kdewebdev. The commands
       above will automatically replace quanta with kdewebdev, if you have
       quanta installed.
 
   4.) Reinstall any KDE ports you deleted in step 2. Note that the kdeaddons-
       kontact-plugins (net/kontact-plugins), kdepim-kpilot (palm/kpilot) and
       quanta (www/quanta) ports/packages do not exist anymore and cannot be
       reinstalled.
 
   Known post-updating issues:
 
   - If you're missing acoustic notifications (system sounds) after the update:
 
     	rm ~/.kde/share/config/knotifyrc
 
     Then log out of KDE and back in again.
 
   - KMail has been heavily modified since KDE 3.2.x. Testing shows that KMail
     can display erratic behavior and crashes after the update. If you see any
     such behavior, it is recommended to simply close KMail and start it again
     until it resumes normal operation.
 
     The integration of GnuPG and KMail for signing, encrypting and verifying
     PGP/MIME mail has also changed. A quick howto is available at
     http://freebsd.kde.org/howtos/gnupg-kmail.php.
 
   - kdm users might get warnings from kdm about obsolete lines in kdmrc.
     You can migrate your configuration while preserving your customizations
     by running
 
     	genkdmconf
 
     Make sure to backup your old kdmrc (usually found in
     /usr/local/share/config/kdm) beforehand in case the merge produces an
     invalid configuration.
 
   - Extensive information about changes from KDE 3.2.x can be found at
     http://www.kde.org/announcements/changelogs/changelog3_2_3to3_3.php
 
 20040829:
   AFFECTS: users of mail/mutt-devel
   AUTHOR: udo.schweigert@siemens.com
 
   The defaults of the port have been changed from WITH_MUTT_NCURSES to
   WITH_MUTT_SLANG to be in sync with the mail/mutt port. If you really have
   problems with slang (which should be a very rare case) be sure to have set
   COLORTERM=yes and COLORFGBG="color1;color2" in your environment, or recompile
   the port with the WITH_MUTT_NCURSES knob set (e.g. by adding
   WITH_MUTT_NCURSES=yes to your /etc/make.conf).
 
 20040828:
   AFFECTS: users of security/samba-vscan
   AUTHOR: jmelo@freebsdbrasil.com.br
 
   The default location of the configuration files has been changed
   from /etc/ to /usr/local/etc and from /etc/samba/ to
   /usr/local/etc/samba-vscan/; the default location of the data files
   has been changed from /var/run/clamd to /var/run/clamav/clamd and
   from /var/opt/f-secure/fsav/databases to /var/db/fsav/databases.
 
 20040820:
   AFFECTS: users of japanese/ptex-tetex, japanese/xdvik, and japanese/dvipsk
   AUTHOR: hrs@FreeBSD.org
 
   japanese/ptex-tetex, japanese/xdvik, and japanese/dvipsk now
   look for the texmf.cnf file in $TEXMF/web2c-ptex/texmf.cnf first,
   while some utilities included in the original teTeX distribution
   such as kpsepath(1) look for the file in $TEXMF/web2c/texmf.cnf
   first.  This is for separating the pTeX's texmf.cnf and
   the original TeX's texmf.cnf, and you do not have to copy or
   link the file $TEXMF/web2c-ptex/texmf.cnf to $TEXMF/web2c/.
   To lookup pTeX path by using kpsepath(1) and so on, please
   set TEXMFCNF environment variable as described in
   $TEXMF/web2c-ptex/texmf.cnf.  For more detail, see
   $TEXMF/web2c-ptex/texmf.cnf and $TEXMF/web2c/texmf.cnf.
 
 20040820:
   AFFECTS: users of japanese/platex209-*
   AUTHOR: hrs@FreeBSD.org
 
   japanese/platex209-* are renamed to japanese/platex209 and
   now depend on japanese/ptex-tetex.  While EUC-JP and JIS
   encoding can be used by default, but Shift JIS is no longer
   supported because it makes very difficult to maintain other
   pTeX related ports.  However, "ptex --kanji=sjis" still works,
   so it can be used if all of macro files under share/texmf are
   converted to Shift JIS encoding manually.
 
 20040820:
   AFFECTS: users of japanese/dvipsk-vflib
   AUTHOR: hrs@FreeBSD.org
 
   japanese/dvipsk-vflib has been removed because it is not maintained
   for a long time.  While japanese/dvipsk itself has no support to
   rendering vector fonts, this and Ghostscript give almost the same
   functionality.
 
 20040820:
   AFFECTS: users of japanese/xdvik-vflib
   AUTHOR: hrs@FreeBSD.org
 
   japanese/xdvik-vflib has been renamed to japanese/xdvik because
   it has nothing to do with VFLib now.  It depends on and uses
   FreeType2 to render vector fonts.
 
 20040817:
   AFFECTS: users of www/apache2
   AUTHOR: clement@FreeBSD.org
 
   Summary of recent changes:
   - Access to filesystem is denied by default.
   - mod_proxy* are no longer built by default
   - Now ${PREFIX}/etc/apache2/Includes/*.conf can be used to store
     local configuration or sample configurations.
   - Makefile.modules.3rd contains modules selection for apache 2.x and 1.3.x
 
 20040815:
   AFFECTS: users of net/openldap22{,-sasl}-server
   AUTHOR: eik@FreeBSD.org
 
   The start/stop script has moved to ${PREFIX}/etc/rc.d. Users on 5.x
   who want to start the daemon early can set WITH_RCORDER=yes.
 
   Setting WITH_ODBC_TYPE is not sufficient to enable SQL backend
   support, WITH_ODBC=yes is required.
 
 20040813:
   AFFECTS: users of x11/kdebase3 (kdm)
   AUTHOR: kde@freebsd.org
 
   If you are unable to login to X via kdm after portupgrading to the latest
   kdebase port and you're getting these or similar messages on the console
 
   /kernel: Aug 13 17:12:10 kiste kdm: :0[447]: Can't execute
   "/usr/local/share/config/kdm/Xstartup": No such file or directory
   /kernel: Aug 13 17:12:10 kiste kdm: :0[432]: Cannot execute startup script
   "/usr/local/share/config/kdm/Xstartup"
   /kernel: Aug 13 17:12:10 kiste kdm: :0[448]: Can't execute
   "/usr/local/share/config/kdm/Xreset": No such file or directory
   /kernel: Aug 13 17:12:12 kiste kdm: :0[458]: Can't execute
   "/usr/local/share/config/kdm/Xsetup": No such file or directory
 
   please do the following:
 
   1.) Copy /usr/local/share/config/kdm/kdmrc away to a safe place, for example
   your home directory ( cp /usr/local/share/config/kdm/kdmrc ~/ )
 
   2.) Run, as root: genkdmconf --no-old
 
   3.) Put your copy of kdmrc back to /usr/local/share/config/kdm/kdmrc (cp
   ~/kdmrc /usr/local/share/config/kdm/ )
 
   Optional step 4.) Run, as root: genkdmconf (without any options) to update
   your kdmrc to the latest configfile format
 
   Note for advanced users: Substitute /usr/local with your custom PREFIX if
   you're using one.
 
 20040730:
   AFFECTS: users of lang/perl5.8
   AUTHOR: tobez@FreeBSD.org, mat@FreeBSD.org, marcus@FreeBSD.org
 
   lang/perl5.8 has been updated to 5.8.5. you should update everything
   depending on perl, that is:
     * first, upgrade your perl5.8 installation.
     * run "use.perl port", so that the system knows you have 5.8.5.
     * now, run some magic incantations to upgrade all ports depending on perl,
       that is run something like :
       portupgrade -f `(pkg_info -R perl-5.8.5 |tail +4; \
         find /usr/local/lib/perl5/site_perl/5.8.[124] -type f -print0 \
         | xargs -0 pkg_which -fv | sed -e '/: ?/d' -e 's/.*: //')|sort -u`
       This is likely to fail for a few ports, you'll have to upgrade them
       afterwards.
       Please note, that this last step is, strictly speaking, not necessary,
       if you are upgrading from 5.8.4.  But it is cleaner to do so anyway.
 
 20040726:
   AFFECTS: users of devel/apache-ant
   AUTHOR: glewis@FreeBSD.org
 
   The update to Ant 1.6.2 introduces the following changes which may break
   older environments, according to the 1.6.2 release notes:
 
   . The import task used the canonical version of a file path. This
     has been changed to use the absolute path. Bugzilla 28505.
   . ant-xalan2.jar has been removed since the only class contained
     in it didn't depend on Xalan-J 2 at all. Its sole dependency has
     always been TraX and so it has been merged into ant-trax.jar.
   . All exceptions thrown by tasks are now wrapped in a buildexception
     giving the location in the buildfile of the task.
   . Nested elements for namespaced tasks and types may belong to
     the Ant default namespace as well as the task's or type's namespace.
   . <junitreport> will very likely no longer work with Xalan-J 1.
 
 20040724:
   AFFECTS: users for xorg and GNOME
   AUTHOR: gnome@FreeBSD.org
 
   After migrating from XFree86 to X.Org, you must rebuild
   x11-toolkits/libwnck and x11/libxklavier for full GNOME functionality
   to be restored.
 
   If you receive an XKB initialization error when starting GNOME, edit
   your XF86Config or xorg.conf, and remove the line:
 
 Option "XkbRules" "xfree86"
 
 20040723:
   AFFECTS: users of FreeBSD-current, users of X.Org
   AUTHOR: anholt@FreeBSD.org
 
   The XFREE86_VERSION variable is deprecated and has been replaced by the
   X_WINDOW_SYSTEM variable. X_WINDOW_SYSTEM may be set to xorg, xfree86-4, or
   xfree86-3.  X_WINDOW_SYSTEM defaults to xorg on FreeBSD-current.  If you are
   switching to xorg, you should follow this set of commands to cleanly upgrade:
 
   pkg_delete -f /var/db/pkg/imake-4* /var/db/pkg/XFree86-*
   cd /usr/ports/x11/xorg && make install
   pkgdb -F
 
   Users of -stable or older -current can switch to X.Org by setting
   X_WINDOW_SYSTEM=xorg in make.conf and following the same process.
 
   Alternately, FreeBSD 5.x and later users can use portupgrade with packages:
     cd /var/db/pkg
     portupgrade -o devel/imake-6  imake-4*
     portupgrade -o x11/xorg-libraries  XFree86-libraries
     portupgrade -o x11/xorg-clients  XFree86-clients
     portupgrade -o x11/xorg-manpages  XFree86-manuals
     portupgrade -o x11/xorg-documents  XFree86-documents
     portupgrade -o x11-fonts/xorg-fonts-truetype  XFree86-fontScalable
     portupgrade -o x11-fonts/xorg-fonts-100dpi  XFree86-font100dpi
     portupgrade -o x11-fonts/xorg-fonts-75dpi  XFree86-font75dpi
     portupgrade -o x11-fonts/xorg-fonts-type1  XFree86-fontDefaultBitmaps
     portupgrade -o x11-fonts/xorg-fonts-cyrillic  XFree86-fontCyrillic
     portupgrade -o x11-fonts/xorg-fonts-encodings  XFree86-fontEncodings
     portupgrade -o x11-servers/xorg-server  XFree86-Server
     portupgrade -o x11/xorg -f XFree86
 
 20040719:
   AFFECTS: users of PHP
   AUTHOR: ale@FreeBSD.org
 
   The old lang/php4 and lang/php5 ports have been split into 'base' PHP,
   PEAR, and shared extensions to allow more flexibility and add new features.
   Upgrading your current PHP installation will result in a 'base' PHP
   installation (no PEAR and no extensions).
   PEAR can be found in the new devel/php4-pear and devel/php5-pear ports, while
   the set of PHP extensions to install can be chosen via the meta-ports
   lang/php4-extensions and lang/php5-extensions, or installing singular
   extensions individually.
   If you have a previous php.ini configuration file, be sure to comment out
   the extension_dir parameter, since the correct path is statically compiled
   into the PHP binary.
   For an overview of the modules used with the old PHP binary, use
   the command "php -m".
 
 20040717:
   AFFECTS: users of net/openldap21{,-sasl}-client
   AUTHOR: eik@FreeBSD.org
 
   OpenLDAP version 2.2 is now the default. To upgrade all ports do
     portupgrade -rfo net/openldap22-client openldap-client
   (or a similar command for the SASL variant). If you do not want to
   upgrade, add the line `WANT_OPENLDAP_VER?=21' to /etc/make.conf
 
   Note that when you want to upgrade openldap21{,sasl}-server, you have
   to use slapcat/slapadd to migrate the database, since the internal
   format is not binary compatible. Simply upgrading the server without
   doing a slapcat first can corrupt your database.
 
 20040717:
   AFFECTS: users of mail/exim on FreeBSD 5.x
   AUTHOR: eik@FreeBSD.org
 
   The default location of the startup script has been changed to
   ${PREFIX}/etc/rc.d. When you depend on the previous behavior,
   build the port with WITH_RCORDER=yes.
 
   Setting WITH_OPENLDAP_VER and WITH_MYSQL_VER do not automatically
   imply the corresponding WITH_ variable. The use of these options
   is discouraged, use the global settings (WANT_OPENLDAP_VER and
   DEFAULT_MYSQL_VER) to set system wide defaults.
 
 20040709:
   AFFECTS: users of mail/milter-sender
   AUTHOR: vs@FreeBSD.org
 
   Milter-sender version 0.58 released.
   When updating to version 0.58, beware if you have a personalized
   configuration file (milter-sender.cf).  The meaning of the
   MxAcceptsAllAction variable has changed and its default has changed
   from 4 to 6.  If this variable is not updated, greylisting might be
   more aggressive than expected.
 
 20040708:
   AFFECTS: users of www/opera
   AUTHOR: osa@FreeBSD.org
 
   Opera 7.52 released.
   The file search.ini has been changed to ensure correct default
   addresses for dictionary and encyclopedia searches.  Existing
   versions will be overwritten on upgrade.  Users who have a
   customized search.ini file that they would like to keep, should
   edit its version number to 4 before upgrading.  Note that you
   have to edit the search.ini file located in the /.opera folder.
 
   [Version]
   File Version=4
 
   Other changes you are may find in changelog, its
   available at http://www.opera.com/freebsd/changelogs/752/
 
 20040706:
   AFFECTS: users of Python bindings for textproc/lib{xml2,xslt} libraries
   AUTHOR: gnome@FreeBSD.org
 
   Python bindings for libxml2 and libxslt libraries were moved out into
   separate slave ports. Please install textproc/py-libxml2 and
   textproc/py-libxslt to get bindings back to your system.
 
 20040703:
   AFFECTS: users of net/netatalk-devel
   AUTHOR: marcus@FreeBSD.org
 
   Netatalk-devel has been converted to use RCng.  That means all of the
   netatalk daemons must be enabled in /etc/rc.conf before they will start
   (previously, all netatalk daemons would start by default).  The following
   variables are used by the new netatalk.sh script:
 
   atalkd_enable
   cnid_metad_enable
   papd_enable
   afpd_enable
   timelord_enable
 
   See the netatalk.sh script for more details.
 
 20040701:
   AFFECTS: users of security/portaudit
   AUTHOR: eik@FreeBSD.org
 
   The preference file format, as well as the periodic(8)
   names have changed. If you use the default settings,
   no modifications are necessary.
 
   new settings in /usr/local/etc/portaudit.conf:
     portaudit_fetch_env="HTTP_PROXY="
     portaudit_fetch_cmd="fetch -1amp"
     portaudit_sites="http://www.FreeBSD.org/ports/"
 
   new settings in periodic.conf(5):
     daily_status_security_portaudit_enable="YES"
     daily_status_security_portaudit_expiry="2"
     daily_status_security_portaudit_user="nobody"
 
 20040629:
   AFFECTS: users of audio/daapd
   AUTHOR: lth@FreeBSD.org
 
   Daapd must now be enabled in rc.conf. Add this to your /etc/rc.conf:
   daapd_enable="YES"
 
 20040626:
   AFFECTS: users of lang/php4 and lang/php5 with the PDFlib extension
   AUTHOR: ale@FreeBSD.org
 
   The PDFlib extension has been removed from the archive and moved to PECL.
   Consequently to enable it you have to install print/pecl-pdflib.
   Alternatively you may want to try the experimental print/pecl-panda.
 
 20040625:
   AFFECTS: users of ftp/pure-ftpd
   AUTHOR: pav@FreeBSD.org
 
   Pure-ftpd must be enabled in rc.conf now. Add this to your /etc/rc.conf:
   pureftpd_enable="YES"
 
 20040622:
   AFFECTS: users of net/openslp
   AUTHOR: kuriyama@FreeBSD.org
 
   The openslp port must now be enabled / disabled and configured in
   rc.conf.  See the script for details.
 
 20040619:
   AFFECTS: users of sysutils/webmin and sysutils/usermin
   AUTHOR: olgeni@FreeBSD.org
 
   The webmin and usermin ports must now be enabled in rc.conf.
   See the pkg-message or script for details.
 
 20040618:
   AFFECTS: users of japanese/ptex-tetex
   AUTHOR: hrs@FreeBSD.org
 
   The texmf.cnf file for pTeX is now installed in texmf/web2c-ptex.
 
 20040618:
   AFFECTS: users of japanese/ptex-pkfonts*
   AUTHOR: hrs@FreeBSD.org
 
   The japanese/ptex-pkfonts* has been removed because pkfonts are
   already included in the teTeX distribution.
 
 20040618:
   AFFECTS: users of japanese/xdvik-vflib*
   AUTHOR: hrs@FreeBSD.org
 
   The japanese/xdvik-vflib no longer supports VFlib2, and now depends on
   print/freetype2.  For the configuration details, see vfontmap file which
   installed as texmf/xdvi/vfontmap.  japanese/kochi-ttfonts is used for
   min and goth by default.
 
   xdvik-vflib-pk* variants has been removed because pkfonts are already included
   in the teTeX distribution.
 
 20040618:
   AFFECTS: users of print/teTeX
   AUTHOR: hrs@FreeBSD.org
 
   The print/teTeX has been split into print/teTeX-base and print/teTeX-texmf,
   and print/teTeX is now a meta-port for the two and print/dvipsk-tetex and
   print/xdvik.  print/teTeX installs dvips and xdvi by default again (via
   print/dvipsk-tetex and print/xdvik).   For people who want to use teTeX,
   simply install print/teTeX with options set by default.
 
   print/teTeX-base has additional options for adding xdvi and dvips included
   in the teTeX distribution itself, but use of them are not recommended if
   you do not understand what you are trying to do.  Especially, when the
   options are set by yourself, do not install ports that match *xdvi* and
   *dvips* because they break the installed print/teTeX-base's dviware
   and such conflicts will not be detected.  In most cases, a combination
   of print/teTeX-base + print/dvipsk-tetex + print/xdvik (which are
   installed by print/teTeX by default) will be sufficient.
 
 20040615:
   AFFECTS: users of www/firefox
   AUTHOR: gnome@FreeBSD.org
 
   The firefox-0.9 update has a special requirement before you can run it.
   You must first run firefox as root before running it as another user.
   The best way to do this is to su - to root or log
   in as root (i.e. do not su -m to root).  After becoming root, simply run
   ``firefox''.  You can then quit the browser, then run it as any other
   user.  If you do not run firefox as root first, the browser window will
   not appear.
 
 20040608:
   AFFECTS: users of net/haproxy
   AUTHOR: clement@FreeBSD.org
 
   The haproxy port must now be enabled / disabled and configured in
   rc.conf.  See the pkg-message or script for details.
 
 20040605:
   AFFECTS: users of www/apache2
   AUTHOR: clement@FreeBSD.org
 
   The apache2 port must now be enabled / disabled and configured in
   rc.conf.  See the pkg-message or script for details.
 
 20040602:
   AFFECTS: users of sysutils/mkisofs and sysutils/mkisofs-devel
   AUTHOR: netchild@FreeBSD.org, marius@FreeBSD.org
 
   sysutils/mkisofs and sysutils/mkisofs-devel were merged into
   sysutils/cdrtools and sysutils/cdrtools-devel respectively.
 
   To update them generate ("make index") or fetch ("make fetchindex") a
   new INDEX/INDEX-5. Run "pkgdb -F" and unregister the mkisofs/-devel
   port. Then forcefully update the cdrtools port and all of its
   dependencies (e.g. "portupgrade -rf cdrtools"). After the update
   it may be necessary to rerun "pkgdb -F" and resolve a stale
   dependency to cdrtools.
 
 20040531:
   AFFECTS: users of lang/perl5.8
   AUTHOR: mat@FreeBSD.org, marcus@FreeBSD.org
 
   lang/perl5.8 has been updated to 5.8.4. you should update everything
   depending on perl, that is :
     * first, upgrade your perl5.8 installation.
     * run "use.perl port", so that the system knows you have 5.8.4.
     * now, run some magic incantations to upgrade all ports depending on perl,
       that is run something like :
       portupgrade -f `(pkg_info -R perl-5.8.4 |tail +4; \
         find /usr/local/lib/perl5/site_perl/5.8.2 -type f -print0 \
         | xargs -0 pkg_which -fv | sed -e '/: ?/d' -e 's/.*: //')|sort -u`
       This is likely to fail for a few ports, you'll have to upgrade them
       afterward.
 
 20040529:
   AFFECTS: users of mail/mailman and japanese/mailman
   AUTHOR: nork@FreeBSD.org
 
   In Mailman 2.1.5, some significant changes have been made to the
   file formats for qfiles and the pendings database.  See
   $PREFIX/share/doc/mailman/UPGRADING for details (if you define
   NOPORTDOCS, refer relevant file in an archive).
 
 20040527:
   AFFECTS: users of net/openldap22-client
   AUTHOR: eik@FreeBSD.org
 
   The OpenLDAP library soname has changed, requiring a recompilation
   of all dependent ports:
 
   portupgrade -rf net/openldap22-client
 
 20040525:
   AFFECTS: users of databases/postgresql-client
   AUTHOR: mat@FreeBSD.org
 
   This port was removed because of dependencies problem. If you still want to
   have it, install databases/postgresql7 with -DWITHOUT_SERVER
 
 20040521:
   AFFECTS: users of irc/ircd-hybrid-ru
   AUTHOR: krion@FreeBSD.org
 
   UID/GID were changed from 6667 to 555, please manually delete
   old entries from /etc/passwd /etc/master.passwd and /etc/group
 
 20040514:
   AFFECTS: users of audio/faad
   AUTHOR: pav@FreeBSD.org
 
   If the compilation of faad fails, please manually delete older
   installed version of faad and reinstall from port.
 
 20040512:
   AFFECTS: users of print/teTeX
   AUTHOR: hrs@FreeBSD.org
 
   The print/teTeX no longer installs dvipsk by default.  To build and
   install dvipsk, you have to specify WITH_DVIPSK, or the dvipsk utility
   in the print/teTeX is also available print/dvipsk-tetex separately.
   This change is to resolve conflicts between various versions of dvips.
 
 20040504:
   AFFECTS: users of mail/drac
   AUTHOR: nork@FreeBSD.org
 
   The "drac_flags" rc.conf(5) variable has been renamed to "dracd_flags".
   See the pkg-message or script for details.
 
 20040501:
   AFFECTS: users of www/apache13
   AUTHOR: nork@FreeBSD.org
 
   The apache13 port must now be enabled / disabled and configured in
   rc.conf.  See the pkg-message or script for details.
 
 20040429:
   AFFECTS: users of sysutils/smartmontools
   AUTHOR: nork@FreeBSD.org
 
   The smartmontools port must now be enabled / disabled and configured in
   rc.conf.  See the pkg-message or script for details.
 
 20040420:
   AFFECTS: users of sysutils/cdrtools
   AUTHOR: netchild@FreeBSD.org
 
   The cdrecord program now uses ${PREFIX}/etc (e.g. /usr/local/etc) instead
   of /etc/default as the location of the global configuration file. If you
   created such a configuration file you need to copy it over to the new
   location.
 
 20040420:
   AFFECTS: users of x11/kdebase3
   AUTHOR: kde@FreeBSD.org
 
   If you update KDE from version 3.2.1 or earlier to version 3.2.2 while
   running a KDE session, newly opened instances of Konqueror might hang
   or crash, depending on how far the update has progressed.
 
   If this happens, it is necessary to restart your KDE session in order to
   restore proper operations.
 
 20040404:
   AFFECTS: GNOME desktop users
   AUTHOR: gnome@FreeBSD.org
 
   GNOME has been updated to 2.6.  Simply portupgrading will cause serious
   problems if you are using the desktop itself.  If you are a GNOME desktop
   user, you should carefully read the instructions at:
 
   http://www.freebsd.org/gnome/docs/faq26.html
 
   And use the gnome_upgrade.sh script to properly upgrade to GNOME 2.6.  If
   you are just a casual user of some of the GNOME libraries, portupgrade
   should be sufficient to update your ports.
 
 20040316:
   AFFECTS: users of net/isc-dhcp3-*
   AUTHOR: des@FreeBSD.org
 
   The isc-dhcp3-* ports must now be enabled / disabled and configured in
   rc.conf.  See the pkg-message for details.
 
 20040313:
   AFFECTS: users of textproc/expat2
   AUTHOR: marcus@FreeBSD.org
 
   Users of expat2 (and its many dependencies) should do the following to
   properly update expat2 and all of its dependencies:
 
   portupgrade -rf textproc/expat2
 
 20040311:
   AFFECTS: users of databases/postgresql7
   AUTHOR: osa@FreeBSD.org
 
   PostgreSQL 7.4.2 Released and release notes available at
   http://www.postgresql.org/news/173.html
 
   NOTICE: unlike most minor versions, this version does require some
   updates to the pg_* system tables. Full instructions for how to do
   this are included in the full HISTORY file.
 
   DO NOT UPGRADE WITHOUT READING THESE INSTRUCTIONS.
 
 20040309:
   AFFECTS: users of x11/kdelibs3 and x11/kdebase3
   AUTHOR: kde@FreeBSD.org
 
   If you update kdelibs from version 3.2.0 to version 3.2.1 while running
   a KDE 3.2.0 session, newly opened instances of Konqueror will silently
   crash as soon as the new version of kdelibs has been installed, due to
   mismatching linker symbols.
 
   It is recommended you quit your KDE session at that point and update
   kdebase to version 3.2.1, then restart KDE.
 
 20040309:
   AFFECTS: users of audio/arts and x11/kdebase3
   AUTHOR: kde@FreeBSD.org
 
   The arts port, PORTVERSION 1.2.1 does not include artswrapper anymore.
   Instead, artswrapper is now installed by a new port audio/artswrapper.
 
   Installation of artswrapper is optional, however:
 
   If you presently run KDE and you have "Run with the highest possible
   priority (realtime priority)" checked in Control Center/Sound & Multimedia/
   Sound System and you choose to NOT install audio/artswrapper, you need to
 
   - Uncheck "Run with the highest possible priority (realtime priority)"
     in Control Center/Sound & Multimedia/Sound System BEFORE updating arts
 
   OR
 
   - AFTER updating arts and kdebase, go to Control Center/Sound & Multimedia/
     Sound System, click on the unchecked "Run with the highest possible priority
     (realtime priority)", dismiss the message telling you that realtime is un-
     available or artswrapper is missing and then click Apply.
 
 20040305:
   AFFECTS: users of security/antivir-milter
   AUTHOR: netchild@FreeBSD.org
 
   When updating from a previous version of security/antivir-milter you
   have to do the following after deinstalling the old port:
       rm <PREFIX>/AntiVir/antivir
       rm <PREFIX>/AntiVir/antivir.vdf
       chown root:wheel <PREFIX>/AntiVir
       chown root:smmsp <PREFIX>/AntiVir/hbedv.key
     In your SENDMAIL_MC change
       `S=unix:<PREFIX>/AntiVir/avmilter.sock, F=T, T=S:10m;R:10m;E:5m'
     to:
       `S=unix:/var/spool/avmilter/avmilter.sock, F=T, T=S:10m;R:10m;E:10m'
     and rebuild sendmail.cf.
     If /var/spool/avmilter exist you have to:
       chown -R smmsp:smmsp /var/spool/avmilter
     If you are using a customized <PREFIX>/etc/avmilter.conf the port
     won't remove it on deinstall and you have to manually change User
     and Group to smmsp there.
     Afterwards you can install the new version of this port. You then
     should run antivirupdater to get a current VDF.
 
 20040226:
   AFFECTS: i386 users of lang/ruby* and sysutils/portupgrade
   AUTHOR: knu@FreeBSD.org
 
   Change the default version of ruby to 1.8 for i386.
 
   If you are a ruby developer and want to keep ruby 1.6 as default,
   please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.
 
   Otherwise, please run the following series of commands to migrate to
   ruby 1.8:
 
   1) Reinstall portupgrade manually (and as a result ruby 1.8 will be
      installed):
 	pkg_delete portupgrade-\*
 	(cd /usr/ports/sysutils/portupgrade; make install clean)
 
   2) Reinstall everything that depends on ruby 1.6 to use ruby 1.8
      instead:
 	portupgrade -fr lang/ruby16
 
   3) Reinstall ruby 1.8 (because the previous step kills symlinks):
 	portupgrade -f lang/ruby18
 
   4) Deinstall ruby 1.6 stuff (if you are paranoia):
 	pkg_deinstall -ri lang/ruby16
 
   5) If the above commands do now work somehow and portupgrade starts
      causing LoadError, please reinstall portupgrade manually again.
      Whenever you get confused, you can always deinstall portupgrade
      and all the ruby stuff (run "pkg_delete -r ruby-\*") and
      reinstall portupgrade as a last resort.
 
 20040204:
   AFFECTS: 5.2-CURRENT users who started with a 5.2-RELEASE or older.
   AUTHOR: obrien@FreeBSD.org
 
   Change the default version of perl to 5.8.
 
   1) Force perl-5.6.1 to be upgraded with perl-5.8.
         portupgrade -o lang/perl5.8 -f perl-5.6.1_15
 
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
 $FreeBSD$

Property changes on: head/UPDATING
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.249
\ No newline at end of property
+1.250
\ No newline at end of property
Index: head/databases/gnatsweb4/Makefile
===================================================================
--- head/databases/gnatsweb4/Makefile	(revision 150327)
+++ head/databases/gnatsweb4/Makefile	(revision 150328)
@@ -1,63 +1,63 @@
 # New ports collection makefile for:	gnatsweb4
 # Date created:				20 Sep 2003
 # Whom:					Oliver Eikemeier <eikemeier@fillmore-labs.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		gnatsweb
 PORTVERSION=		4.00
 CATEGORIES=		databases devel www
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnatsweb
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Gnatsweb, a GNATS web interface
 
 RUN_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
 .ifdef WITH_APACHE2
-RUN_DEPENDS+=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
+RUN_DEPENDS+=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
 .endif
 
 USE_PERL5_RUN=		yes
 NO_BUILD=		yes
 
 CGI_DIR?=		${PREFIX}/www/cgi-bin
 
 PLIST_SUB=		CGI_DIR="${CGI_DIR:S,^${PREFIX}/,,}"
 
 DOCFILES=		CUSTOMIZE CUSTOMIZE.cb CUSTOMIZE.vars \
 			ChangeLog INSTALL NEWS README TROUBLESHOOTING
 
 EXAMPLEFILES=		gnatsweb-site-example.pl
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/gnatsweb
 	@${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
 		${PREFIX}/etc/gnatsweb/gnatsweb-site.pl.default
 	@[ -f ${PREFIX}/etc/gnatsweb/gnatsweb-site.pl ] || \
 		${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
 		${PREFIX}/etc/gnatsweb
 	@${MKDIR} ${CGI_DIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${CGI_DIR}
 	@${LN} -s ${PREFIX}/etc/gnatsweb/gnatsweb-site.pl ${CGI_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${CGI_DIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@for doc in ${DOCFILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
 	done
 	@${MKDIR} ${EXAMPLESDIR}
 	@for example in ${EXAMPLEFILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${example} ${EXAMPLESDIR}; \
 	done
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 RUN_DEPENDS+=		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/gnatsweb4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/devel/subversion/Makefile
===================================================================
--- head/devel/subversion/Makefile	(revision 150327)
+++ head/devel/subversion/Makefile	(revision 150328)
@@ -1,445 +1,445 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 DISTVERSION=	1.3.0-rc2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://lolut.utbm.info/pub/subversion-1.3.0/rc2/:main \
 		http://svnbook.red-bean.com/en/1.1/:book
 #MASTER_SITES=	http://subversion.tigris.org/tarballs/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 INSTALLS_SHLIB=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
 MANCOMPRESSED=	no
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${TXT_DOCS}
 .endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		WITHOUT_NEON="@comment "
 .endif
 
 .if defined(WITHOUT_BDB)
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		WITHOUT_BDB="@comment "
 .else
 PLIST_SUB+=		WITHOUT_BDB=""
 .endif
 
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
 .endif
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
 MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
 			SVN::Delta.3 \
 			SVN::Fs.3 \
 			SVN::Ra.3 \
 			SVN::Repos.3 \
 			SVN::Wc.3
 .else
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_PYTHON=""
 .else
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_RUBY=""
 .else
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
 PLIST_SUB+=		WITH_JAVA=""
 .else
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif
 
 .if defined(WITH_JAVA) && ${OSVERSION} < 503000 
 BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
 .if !defined(SWIG_BINDINGS)
 CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
 PLIST_SUB+=	APACHEDIR="apache21"
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 PLIST_SUB+=	APACHEDIR="apache2"
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE2_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 .else
 PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 PORTDOCS+=	book
 DISTFILES+=	svn-book.html:book svn-book.pdf:book
 .endif
 
 SCRIPTS=
 
 SCRIPTS_DATA=
 
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_NEON)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_BDB)
 	@${ECHO_MSG} "db4 repository backend disabled."
 .else
 	@${ECHO_MSG} "db4 repository backend enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
 	@${ECHO_MSG} "Build debug version."
 .else
 	@${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PERL)
 	@${ECHO_MSG} "Build with perl bindings."
 	@${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time."
 .else
 	@${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PYTHON)
 	@${ECHO_MSG} "Build with Python bindings."
 .else
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_RUBY)
 	@${ECHO_MSG} "Build with Ruby bindings."
 .else
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_JAVA)
 	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 .else
 	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
 	@${ECHO_MSG} "You should have apr built with threads for Java support!"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
 	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
 	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN.  This option implies"
 	@${ECHO_MSG} "the WITH_APACHE2_APR option."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${ECHO_MSG} "svnserve wrapper enabled."
 .else
 	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
 	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 	@${ECHO_MSG} ""
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 	@${ECHO_MSG} "Subversion Book will be installed."
 .else
 	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
 
 post-extract:
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \
 		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 
 post-build:
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
 .if defined(WITH_JAVA)
 	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 	cd ${WRKSRC} ; \
 	  ${MAKE} javahl
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
 	${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 .endif
 
 post-install:	${MKREPOS_TARGET}
 	@${MKDIR} ${PREFIX}/share/subversion
 	cd ${WRKSRC}/tools ; \
 	  tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
 	${MKDIR} ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.html ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
 	  ${MAKE} install-swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
 .if defined(WITH_JAVA)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-javahl
 .endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
 
 repository:	_mkrepos
 
 _SVNGRPFILES=	dav db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 post-deinstall:
 .if defined(WITH_MOD_DAV_SVN)
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/subversion/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/devel/subversion-devel/Makefile
===================================================================
--- head/devel/subversion-devel/Makefile	(revision 150327)
+++ head/devel/subversion-devel/Makefile	(revision 150328)
@@ -1,445 +1,445 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 DISTVERSION=	1.3.0-rc2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://lolut.utbm.info/pub/subversion-1.3.0/rc2/:main \
 		http://svnbook.red-bean.com/en/1.1/:book
 #MASTER_SITES=	http://subversion.tigris.org/tarballs/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 INSTALLS_SHLIB=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
 MANCOMPRESSED=	no
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${TXT_DOCS}
 .endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		WITHOUT_NEON="@comment "
 .endif
 
 .if defined(WITHOUT_BDB)
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		WITHOUT_BDB="@comment "
 .else
 PLIST_SUB+=		WITHOUT_BDB=""
 .endif
 
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
 .endif
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
 MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
 			SVN::Delta.3 \
 			SVN::Fs.3 \
 			SVN::Ra.3 \
 			SVN::Repos.3 \
 			SVN::Wc.3
 .else
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_PYTHON=""
 .else
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_RUBY=""
 .else
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
 PLIST_SUB+=		WITH_JAVA=""
 .else
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif
 
 .if defined(WITH_JAVA) && ${OSVERSION} < 503000 
 BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
 .if !defined(SWIG_BINDINGS)
 CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
 PLIST_SUB+=	APACHEDIR="apache21"
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 PLIST_SUB+=	APACHEDIR="apache2"
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE2_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 .else
 PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 PORTDOCS+=	book
 DISTFILES+=	svn-book.html:book svn-book.pdf:book
 .endif
 
 SCRIPTS=
 
 SCRIPTS_DATA=
 
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_NEON)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_BDB)
 	@${ECHO_MSG} "db4 repository backend disabled."
 .else
 	@${ECHO_MSG} "db4 repository backend enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
 	@${ECHO_MSG} "Build debug version."
 .else
 	@${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PERL)
 	@${ECHO_MSG} "Build with perl bindings."
 	@${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time."
 .else
 	@${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PYTHON)
 	@${ECHO_MSG} "Build with Python bindings."
 .else
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_RUBY)
 	@${ECHO_MSG} "Build with Ruby bindings."
 .else
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_JAVA)
 	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 .else
 	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
 	@${ECHO_MSG} "You should have apr built with threads for Java support!"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
 	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
 	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN.  This option implies"
 	@${ECHO_MSG} "the WITH_APACHE2_APR option."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${ECHO_MSG} "svnserve wrapper enabled."
 .else
 	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
 	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 	@${ECHO_MSG} ""
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 	@${ECHO_MSG} "Subversion Book will be installed."
 .else
 	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
 
 post-extract:
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \
 		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 
 post-build:
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
 .if defined(WITH_JAVA)
 	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 	cd ${WRKSRC} ; \
 	  ${MAKE} javahl
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
 	${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 .endif
 
 post-install:	${MKREPOS_TARGET}
 	@${MKDIR} ${PREFIX}/share/subversion
 	cd ${WRKSRC}/tools ; \
 	  tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
 	${MKDIR} ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.html ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
 	  ${MAKE} install-swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
 .if defined(WITH_JAVA)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-javahl
 .endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
 
 repository:	_mkrepos
 
 _SVNGRPFILES=	dav db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 post-deinstall:
 .if defined(WITH_MOD_DAV_SVN)
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/subversion-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/devel/subversion-freebsd/Makefile
===================================================================
--- head/devel/subversion-freebsd/Makefile	(revision 150327)
+++ head/devel/subversion-freebsd/Makefile	(revision 150328)
@@ -1,445 +1,445 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 DISTVERSION=	1.3.0-rc2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://lolut.utbm.info/pub/subversion-1.3.0/rc2/:main \
 		http://svnbook.red-bean.com/en/1.1/:book
 #MASTER_SITES=	http://subversion.tigris.org/tarballs/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 INSTALLS_SHLIB=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
 MANCOMPRESSED=	no
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${TXT_DOCS}
 .endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		WITHOUT_NEON="@comment "
 .endif
 
 .if defined(WITHOUT_BDB)
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		WITHOUT_BDB="@comment "
 .else
 PLIST_SUB+=		WITHOUT_BDB=""
 .endif
 
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
 .endif
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
 MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
 			SVN::Delta.3 \
 			SVN::Fs.3 \
 			SVN::Ra.3 \
 			SVN::Repos.3 \
 			SVN::Wc.3
 .else
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_PYTHON=""
 .else
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_RUBY=""
 .else
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
 PLIST_SUB+=		WITH_JAVA=""
 .else
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif
 
 .if defined(WITH_JAVA) && ${OSVERSION} < 503000 
 BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
 .if !defined(SWIG_BINDINGS)
 CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
 PLIST_SUB+=	APACHEDIR="apache21"
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 PLIST_SUB+=	APACHEDIR="apache2"
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE2_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 .else
 PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 PORTDOCS+=	book
 DISTFILES+=	svn-book.html:book svn-book.pdf:book
 .endif
 
 SCRIPTS=
 
 SCRIPTS_DATA=
 
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_NEON)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_BDB)
 	@${ECHO_MSG} "db4 repository backend disabled."
 .else
 	@${ECHO_MSG} "db4 repository backend enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
 	@${ECHO_MSG} "Build debug version."
 .else
 	@${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PERL)
 	@${ECHO_MSG} "Build with perl bindings."
 	@${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time."
 .else
 	@${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PYTHON)
 	@${ECHO_MSG} "Build with Python bindings."
 .else
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_RUBY)
 	@${ECHO_MSG} "Build with Ruby bindings."
 .else
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_JAVA)
 	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 .else
 	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
 	@${ECHO_MSG} "You should have apr built with threads for Java support!"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
 	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
 	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN.  This option implies"
 	@${ECHO_MSG} "the WITH_APACHE2_APR option."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${ECHO_MSG} "svnserve wrapper enabled."
 .else
 	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
 	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 	@${ECHO_MSG} ""
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 	@${ECHO_MSG} "Subversion Book will be installed."
 .else
 	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
 
 post-extract:
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \
 		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 
 post-build:
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
 .if defined(WITH_JAVA)
 	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 	cd ${WRKSRC} ; \
 	  ${MAKE} javahl
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
 	${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 .endif
 
 post-install:	${MKREPOS_TARGET}
 	@${MKDIR} ${PREFIX}/share/subversion
 	cd ${WRKSRC}/tools ; \
 	  tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
 	${MKDIR} ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.html ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
 	  ${MAKE} install-swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
 .if defined(WITH_JAVA)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-javahl
 .endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
 
 repository:	_mkrepos
 
 _SVNGRPFILES=	dav db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 post-deinstall:
 .if defined(WITH_MOD_DAV_SVN)
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/subversion-freebsd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/devel/subversion16/Makefile
===================================================================
--- head/devel/subversion16/Makefile	(revision 150327)
+++ head/devel/subversion16/Makefile	(revision 150328)
@@ -1,445 +1,445 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 DISTVERSION=	1.3.0-rc2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://lolut.utbm.info/pub/subversion-1.3.0/rc2/:main \
 		http://svnbook.red-bean.com/en/1.1/:book
 #MASTER_SITES=	http://subversion.tigris.org/tarballs/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 INSTALLS_SHLIB=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
 MANCOMPRESSED=	no
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${TXT_DOCS}
 .endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		WITHOUT_NEON="@comment "
 .endif
 
 .if defined(WITHOUT_BDB)
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		WITHOUT_BDB="@comment "
 .else
 PLIST_SUB+=		WITHOUT_BDB=""
 .endif
 
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
 .endif
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
 MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
 			SVN::Delta.3 \
 			SVN::Fs.3 \
 			SVN::Ra.3 \
 			SVN::Repos.3 \
 			SVN::Wc.3
 .else
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_PYTHON=""
 .else
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 SWIG_BINDINGS+=		yes
 PLIST_SUB+=		WITH_RUBY=""
 .else
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
 PLIST_SUB+=		WITH_JAVA=""
 .else
 PLIST_SUB+=		WITH_JAVA="@comment "
 .endif
 
 .if defined(WITH_JAVA) && ${OSVERSION} < 503000 
 BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
 .if !defined(SWIG_BINDINGS)
 CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
 PLIST_SUB+=	APACHEDIR="apache21"
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 PLIST_SUB+=	APACHEDIR="apache2"
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE2_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.2:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SVNSERVE_WRAPPER)
 PLIST_SUB+=	SVNSERVE_WRAPPER=""
 EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 .else
 PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 PORTDOCS+=	book
 DISTFILES+=	svn-book.html:book svn-book.pdf:book
 .endif
 
 SCRIPTS=
 
 SCRIPTS_DATA=
 
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_NEON)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITHOUT_BDB)
 	@${ECHO_MSG} "db4 repository backend disabled."
 .else
 	@${ECHO_MSG} "db4 repository backend enabled."
 	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
 	@${ECHO_MSG} "Build debug version."
 .else
 	@${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PERL)
 	@${ECHO_MSG} "Build with perl bindings."
 	@${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time."
 .else
 	@${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_PYTHON)
 	@${ECHO_MSG} "Build with Python bindings."
 .else
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_RUBY)
 	@${ECHO_MSG} "Build with Ruby bindings."
 .else
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_JAVA)
 	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 .else
 	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
 	@${ECHO_MSG} "You should have apr built with threads for Java support!"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
 	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
 	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN.  This option implies"
 	@${ECHO_MSG} "the WITH_APACHE2_APR option."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${ECHO_MSG} "svnserve wrapper enabled."
 .else
 	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
 	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 	@${ECHO_MSG} ""
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 	@${ECHO_MSG} "Subversion Book will be installed."
 .else
 	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
 
 post-extract:
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \
 		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 
 post-build:
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
 .if defined(WITH_JAVA)
 	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 	cd ${WRKSRC} ; \
 	  ${MAKE} javahl
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
 	${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 .endif
 
 post-install:	${MKREPOS_TARGET}
 	@${MKDIR} ${PREFIX}/share/subversion
 	cd ${WRKSRC}/tools ; \
 	  tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
 	${MKDIR} ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.html ${DOCSDIR}/book
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
 	  ${MAKE} install-swig-pl
 .endif
 .if defined(WITH_PYTHON)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
 .if defined(WITH_JAVA)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-javahl
 .endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
 
 repository:	_mkrepos
 
 _SVNGRPFILES=	dav db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 post-deinstall:
 .if defined(WITH_MOD_DAV_SVN)
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/subversion16/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/lang/php4/Makefile
===================================================================
--- head/lang/php4/Makefile	(revision 150327)
+++ head/lang/php4/Makefile	(revision 150328)
@@ -1,224 +1,224 @@
 # New ports collection makefile for:	php4
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	php4
 PORTVERSION=	4.4.1
 PORTREVISION?=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
 		http://downloads.php.net/jani/:rc
 MASTER_SITE_SUBDIR=	distributions/:release
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT?=	PHP Scripting Language (Apache Module and CLI)
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} == "-cgi" || ${PKGNAMESUFFIX} == "-cli"
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .else
 .if ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .else
 .if ${WITH_REGEX_TYPE} == "apache"
 CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 .endif
 
 .if !defined(PKGNAMEPREFIX) && !defined(PKGNAMESUFFIX)
 PHP_SAPI=	full
 WITH_APACHE=	yes
 .else
 .if !defined(PKGNAMEPREFIX)
 PHP_SAPI=	${PKGNAMESUFFIX:S/-//}
 .else
 PHP_SAPI=	${PKGNAMEPREFIX:S/_//}
 WITH_APACHE=	yes
 .endif
 .endif
 
 .if defined(WITH_APACHE)
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 APACHE_COMPAT=	yes
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 OPTIONS=	REDIRECT "Enable force-cgi-redirect support" off \
 		DISCARD "Enable discard-path support" off \
 		FASTCGI "Enable fastcgi support" off \
 		PATHINFO "Enable path-info-check support" on
 .endif
 .if defined(WITH_APACHE)
 .if defined(WITH_APACHE2)
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" on
 .else
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" off
 .endif
 .endif
 OPTIONS+=	DEBUG "Enable debug" off \
 		MULTIBYTE "Enable zend multibyte support" off \
 		IPV6 "Enable ipv6 support" on \
 		OPENSSL "Build static OpenSSL extension" off
 
 EXT_DIR=	20020429
 
 CONFLICTS?=	php4-cli-4* mod_php4-4* php4-cgi-4*
 CONFLICTS+=	php5-5* php5-cli-5* mod_php5-5* php5-cgi-5*
 
 .if ${PHP_SAPI} == "cgi" || ${PHP_SAPI} == "mod"
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 MAN1=		php-config.1 phpize.1
 .if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli"
 PLIST_SUB+=	CLI=""
 MAN1+=		php.1
 .else
 PLIST_SUB+=	CLI="@comment "
 .endif
 
 .if defined(WITH_APACHE)
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
 .endif
 
 .if ${PHP_SAPI} == "cli"
 CONFIGURE_ARGS+=--disable-cgi
 SAPI_FILE=	"@comment "
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 SAPI_FILE=	bin/php
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV=	ac_cv_pthreads_lib=${PTHREAD_LIBS} \
 		ac_cv_pthreads_cflags=${PTHREAD_CFLAGS}
 
 .if defined(WITH_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
 		--with-openssl-dir=${OPENSSLBASE}
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 .endif
 
 .if defined(WITH_APACHE)
 .if exists(${LOCALBASE}/include/apache2/httpd.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp4.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp4.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 .if defined(WITH_MULTIBYTE)
 CONFIGURE_ARGS+=--enable-zend-multibyte
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 .if defined(WITH_REDIRECT)
 CONFIGURE_ARGS+=--enable-force-cgi-redirect
 .endif
 .if defined(WITH_DISCARD)
 CONFIGURE_ARGS+=--enable-discard-path
 .endif
 .if defined(WITH_FASTCGI)
 CONFIGURE_ARGS+=--enable-fastcgi
 .endif
 .if defined(WITHOUT_PATHINFO)
 CONFIGURE_ARGS+=--disable-path-info-check
 .endif
 .endif
 
 _PORTSDIR!=	${REALPATH} ${PORTSDIR}
 PHP_PORT=	${.CURDIR:S|^${_PORTSDIR}||:S|^/||}
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 
 .if ${PHP_SAPI} == "full"
 pre-configure:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Use port:"
 	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
 	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
 	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=4" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=\$${PORTSDIR}/${PHP_PORT}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 .if defined(WITH_OPENSSL)
 	@${ECHO_CMD} "PHP_EXT_INC=openssl" >> ${WRKDIR}/php.conf
 .endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
 .if ${PKGNAMESUFFIX} == "-pear"
 .include "${MASTERDIR}/Makefile.pear"
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/lang/php4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.94
\ No newline at end of property
+1.95
\ No newline at end of property
Index: head/lang/php5/Makefile
===================================================================
--- head/lang/php5/Makefile	(revision 150327)
+++ head/lang/php5/Makefile	(revision 150328)
@@ -1,218 +1,218 @@
 # New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	php5
 PORTVERSION=	5.0.5
 PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
 		http://downloads.php.net/jani/:rc
 MASTER_SITE_SUBDIR=	distributions/:release
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT?=	PHP Scripting Language (Apache Module and CLI)
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} == "-cgi" || ${PKGNAMESUFFIX} == "-cli"
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
 		--enable-spl
 
 USE_GNOME=	libxml2
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .else
 .if ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .else
 .if ${WITH_REGEX_TYPE} == "apache"
 CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 .endif
 
 .if !defined(PKGNAMEPREFIX) && !defined(PKGNAMESUFFIX)
 PHP_SAPI=	full
 WITH_APACHE=	yes
 .else
 .if !defined(PKGNAMEPREFIX)
 PHP_SAPI=	${PKGNAMESUFFIX:S/-//}
 .else
 PHP_SAPI=	${PKGNAMEPREFIX:S/_//}
 WITH_APACHE=	yes
 .endif
 .endif
 
 .if defined(WITH_APACHE)
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 APACHE_COMPAT=	yes
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 OPTIONS=	REDIRECT "Enable force-cgi-redirect support" off \
 		DISCARD "Enable discard-path support" off \
 		FASTCGI "Enable fastcgi support" off \
 		PATHINFO "Enable path-info-check support" on
 .endif
 .if defined(WITH_APACHE)
 .if defined(WITH_APACHE2)
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" on
 .else
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" off
 .endif
 .endif
 OPTIONS+=	DEBUG "Enable debug" off \
 		MULTIBYTE "Enable zend multibyte support" off \
 		IPV6 "Enable ipv6 support" on
 
 EXT_DIR=	20041030
 
 CONFLICTS?=	php5-cli-5* mod_php5-5* php5-cgi-5*
 CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if ${PHP_SAPI} == "cgi" || ${PHP_SAPI} == "mod"
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 MAN1=		php-config.1 phpize.1
 .if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli"
 PLIST_SUB+=	CLI=""
 MAN1+=		php.1
 .else
 PLIST_SUB+=	CLI="@comment "
 .endif
 
 .if defined(WITH_APACHE)
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
 .endif
 
 .if ${PHP_SAPI} == "cli"
 CONFIGURE_ARGS+=--disable-cgi
 SAPI_FILE=	"@comment "
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 SAPI_FILE=	bin/php
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV=	ac_cv_pthreads_lib=${PTHREAD_LIBS} \
 		ac_cv_pthreads_cflags=${PTHREAD_CFLAGS}
 
 .if defined(WITH_APACHE)
 .if exists(${LOCALBASE}/include/apache2/httpd.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 .if defined(WITH_MULTIBYTE)
 CONFIGURE_ARGS+=--enable-zend-multibyte
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 .if defined(WITH_REDIRECT)
 CONFIGURE_ARGS+=--enable-force-cgi-redirect
 .endif
 .if defined(WITH_DISCARD)
 CONFIGURE_ARGS+=--enable-discard-path
 .endif
 .if defined(WITH_FASTCGI)
 CONFIGURE_ARGS+=--enable-fastcgi
 .endif
 .if defined(WITHOUT_PATHINFO)
 CONFIGURE_ARGS+=--disable-path-info-check
 .endif
 .endif
 
 _PORTSDIR!=	${REALPATH} ${PORTSDIR}
 PHP_PORT=	${.CURDIR:S|^${_PORTSDIR}||:S|^/||}
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 
 .if ${PHP_SAPI} == "full"
 pre-configure:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Use port:"
 	@${ECHO_CMD} "	lang/php5-cli		for Command Line Interpreter only"
 	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
 	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=\$${PORTSDIR}/${PHP_PORT}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
 .if ${PKGNAMESUFFIX} == "-pear"
 .include "${MASTERDIR}/Makefile.pear"
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/lang/php5/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/lang/php53/Makefile
===================================================================
--- head/lang/php53/Makefile	(revision 150327)
+++ head/lang/php53/Makefile	(revision 150328)
@@ -1,218 +1,218 @@
 # New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	php5
 PORTVERSION=	5.0.5
 PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
 		http://downloads.php.net/jani/:rc
 MASTER_SITE_SUBDIR=	distributions/:release
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT?=	PHP Scripting Language (Apache Module and CLI)
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} == "-cgi" || ${PKGNAMESUFFIX} == "-cli"
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
 		--enable-spl
 
 USE_GNOME=	libxml2
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .else
 .if ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .else
 .if ${WITH_REGEX_TYPE} == "apache"
 CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 .endif
 
 .if !defined(PKGNAMEPREFIX) && !defined(PKGNAMESUFFIX)
 PHP_SAPI=	full
 WITH_APACHE=	yes
 .else
 .if !defined(PKGNAMEPREFIX)
 PHP_SAPI=	${PKGNAMESUFFIX:S/-//}
 .else
 PHP_SAPI=	${PKGNAMEPREFIX:S/_//}
 WITH_APACHE=	yes
 .endif
 .endif
 
 .if defined(WITH_APACHE)
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 APACHE_COMPAT=	yes
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 OPTIONS=	REDIRECT "Enable force-cgi-redirect support" off \
 		DISCARD "Enable discard-path support" off \
 		FASTCGI "Enable fastcgi support" off \
 		PATHINFO "Enable path-info-check support" on
 .endif
 .if defined(WITH_APACHE)
 .if defined(WITH_APACHE2)
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" on
 .else
 OPTIONS=	APACHE2 "Use apache 2.x instead of apache 1.3.x" off
 .endif
 .endif
 OPTIONS+=	DEBUG "Enable debug" off \
 		MULTIBYTE "Enable zend multibyte support" off \
 		IPV6 "Enable ipv6 support" on
 
 EXT_DIR=	20041030
 
 CONFLICTS?=	php5-cli-5* mod_php5-5* php5-cgi-5*
 CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if ${PHP_SAPI} == "cgi" || ${PHP_SAPI} == "mod"
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 MAN1=		php-config.1 phpize.1
 .if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli"
 PLIST_SUB+=	CLI=""
 MAN1+=		php.1
 .else
 PLIST_SUB+=	CLI="@comment "
 .endif
 
 .if defined(WITH_APACHE)
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
 .endif
 
 .if ${PHP_SAPI} == "cli"
 CONFIGURE_ARGS+=--disable-cgi
 SAPI_FILE=	"@comment "
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 SAPI_FILE=	bin/php
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV=	ac_cv_pthreads_lib=${PTHREAD_LIBS} \
 		ac_cv_pthreads_cflags=${PTHREAD_CFLAGS}
 
 .if defined(WITH_APACHE)
 .if exists(${LOCALBASE}/include/apache2/httpd.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 .if defined(WITH_MULTIBYTE)
 CONFIGURE_ARGS+=--enable-zend-multibyte
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 .if ${PHP_SAPI} == "cgi"
 .if defined(WITH_REDIRECT)
 CONFIGURE_ARGS+=--enable-force-cgi-redirect
 .endif
 .if defined(WITH_DISCARD)
 CONFIGURE_ARGS+=--enable-discard-path
 .endif
 .if defined(WITH_FASTCGI)
 CONFIGURE_ARGS+=--enable-fastcgi
 .endif
 .if defined(WITHOUT_PATHINFO)
 CONFIGURE_ARGS+=--disable-path-info-check
 .endif
 .endif
 
 _PORTSDIR!=	${REALPATH} ${PORTSDIR}
 PHP_PORT=	${.CURDIR:S|^${_PORTSDIR}||:S|^/||}
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 
 .if ${PHP_SAPI} == "full"
 pre-configure:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Use port:"
 	@${ECHO_CMD} "	lang/php5-cli		for Command Line Interpreter only"
 	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
 	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=\$${PORTSDIR}/${PHP_PORT}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
 .if ${PKGNAMESUFFIX} == "-pear"
 .include "${MASTERDIR}/Makefile.pear"
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/lang/php53/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.89
\ No newline at end of property
+1.90
\ No newline at end of property
Index: head/misc/linux-opengroupware/Makefile
===================================================================
--- head/misc/linux-opengroupware/Makefile	(revision 150327)
+++ head/misc/linux-opengroupware/Makefile	(revision 150328)
@@ -1,227 +1,227 @@
 # New ports collection makefile for:	linux-opengroupware.org
 # Date created:				2003-07-20
 # Whom:					Frank Reppin
 #
 # $FreeBSD$
 
 PORTNAME=	opengroupware
 PORTVERSION=	1.0
 PORTREVISION=	4
 CATEGORIES=	misc www linux
 MASTER_SITES=	http://download.opengroupware.org/nightly/packages/freebsd/linux-opengroupware/RPMS/:ogo \
 		http://download.opengroupware.org/nightly/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \
 		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	updates/8.0/en/os/${MACHINE_ARCH}
 PKGNAMEPREFIX=	linux-
 DISTFILES=	${SET1} \
 		${SET2} \
 		${SET3}
 EXTRACT_ONLY=	${NGOBJWEB_ADAPTOR}
 
 MAINTAINER=	frank@opengroupware.org
 COMMENT=	Groupware package including mail, calendar, palm sync and much more
 
 EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20 \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake
 
 USE_PGSQL=	yes
 
 #BEGINSET1
 
 SET1=		opengroupware-core-4.2-ogo107.i386.rpm:ogo \
 		opengroupware-core-tools-4.2-ogo107.i386.rpm:ogo \
 		opengroupware-database-1.0-ogo022.i386.rpm:ogo \
 		opengroupware-docapi-1.0-ogo101.i386.rpm:ogo \
 		opengroupware-env-1.0-ogo016.i386.rpm:ogo \
 		opengroupware-epoz-0.6.1-ogo003.i386.rpm:ogo \
 		opengroupware-gstep-db-4.2-ogo042.i386.rpm:ogo \
 		opengroupware-gstep-db-postgresql72-4.2-ogo042.i386.rpm:ogo \
 		opengroupware-gstep-make-4.2-ogo009.i386.rpm:ogo \
 		opengroupware-gstep-objc-2.95.3-ogo011.i386.rpm:ogo \
 		opengroupware-js-1.5-ogo013.i386.rpm:ogo \
 		opengroupware-libfoundation-1.0.25-ogo049.i386.rpm:ogo \
 		opengroupware-libical-0.23.0-ogo010.i386.rpm:ogo \
 		opengroupware-libxml2-2.6.11-ogo002.i386.rpm:ogo \
 		opengroupware-libxslt-1.1.8-ogo002.i386.rpm:ogo \
 		opengroupware-logic-1.0-ogo112.i386.rpm:ogo \
 		opengroupware-nhsc-1.0-ogo001.i386.rpm:ogo \
 		opengroupware-pda-1.0-ogo033.i386.rpm:ogo \
 		opengroupware-pilot-link-0.10.99-ogo008.i386.rpm:ogo \
 		opengroupware-plr-1.0-ogo008.i386.rpm:ogo \
 		opengroupware-publisher-1.0-ogo020.i386.rpm:ogo \
 		opengroupware-sope-4.2-ogo163.i386.rpm:ogo \
 		opengroupware-theme-blue-de-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-blue-en-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-default-de-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-default-dk-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-default-en-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-default-es-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-default-it-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-kde-en-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-ooo-de-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-ooo-en-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-orange-de-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-theme-orange-en-1.0-ogo039.i386.rpm:ogo \
 		opengroupware-tools-account-1.0-ogo031.i386.rpm:ogo \
 		opengroupware-tools-aptnotify-1.0-ogo031.i386.rpm:ogo \
 		opengroupware-tools-bulkmessages-1.0-ogo031.i386.rpm:ogo \
 		opengroupware-tools-installsieve-1.0-ogo031.i386.rpm:ogo \
 		opengroupware-webui-admin-1.0-ogo032.i386.rpm:ogo \
 		opengroupware-webui-app-1.0-ogo054.i386.rpm:ogo \
 		opengroupware-webui-common-1.0-ogo087.i386.rpm:ogo \
 		opengroupware-webui-contact-1.0-ogo072.i386.rpm:ogo \
 		opengroupware-webui-forms-1.0-ogo016.i386.rpm:ogo \
 		opengroupware-webui-job-1.0-ogo037.i386.rpm:ogo \
 		opengroupware-webui-libs-1.0-ogo059.i386.rpm:ogo \
 		opengroupware-webui-mailer-1.0-ogo077.i386.rpm:ogo \
 		opengroupware-webui-news-1.0-ogo018.i386.rpm:ogo \
 		opengroupware-webui-prefs-1.0-ogo038.i386.rpm:ogo \
 		opengroupware-webui-project-1.0-ogo077.i386.rpm:ogo \
 		opengroupware-webui-resource-de-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-dk-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-en-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-es-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-fr-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-it-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-nl-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-resource-pt_BR-1.0-ogo132.i386.rpm:ogo \
 		opengroupware-webui-scheduler-1.0-ogo080.i386.rpm:ogo \
 		opengroupware-xml-4.2-ogo066.i386.rpm:ogo \
 		opengroupware-xml-STXSaxDriver-4.2-ogo066.i386.rpm:ogo \
 		opengroupware-xml-icalsaxdriver-4.2-ogo066.i386.rpm:ogo \
 		opengroupware-xml-libxmlsaxdriver-4.2-ogo066.i386.rpm:ogo \
 		opengroupware-xmlrpcd-1.0-ogo049.i386.rpm:ogo \
 		opengroupware-zidestore-1.2-ogo082.i386.rpm:ogo
 #ENDSET1
 
 SET2=		${NGOBJWEB_ADAPTOR}:ngo
 SET3=		postgresql-libs-7.2.4-5.80.i386.rpm \
 		openssl-0.9.6b-35.8.i386.rpm \
 		cyrus-sasl-2.1.10-1.i386.rpm \
 		openldap-2.0.27-2.8.0.i386.rpm \
 		pam-0.75-46.8.0.i386.rpm \
 		krb5-libs-1.2.5-15.i386.rpm
 
 NGOBJWEB_ADAPTOR=	opengroupware.org-mod_ngobjweb-200407092000.tar.gz
 PATCHDIR?=	${MASTERDIR}/files
 USE_LINUX=	yes
 USE_GMAKE=	yes
 MAKEFILE=	${WRKSRC}/opengroupware.org-mod_ngobjweb/GNUmakefile
 BUILD_WRKSRC?=	${WRKSRC}/opengroupware.org-mod_ngobjweb
 NGWEB_ADAP_DIR=	opengroupware.org-mod_ngobjweb
 PKGNAME_PREFIX=	linux-
 
 ONLY_FOR_ARCHS=	i386
 NO_PACKAGE=	We dont really build anything ...
 DIST_SUBDIR=	ogo
 PLIST=		${WRKDIR}/pkg-plist
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 PREFIX=		${LINUXBASE}
 
 .include <bsd.port.pre.mk>
 
 RPM2CPIO?=	${LOCALBASE}/bin/rpm2cpio
 CPIOFLAGS=	--extract --make-directories --no-absolute-filenames \
 		--preserve-modification-time --quiet
 RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
 
 REMOVEFILES=	.md5sum .md5sum.changes \
 		${NGOBJWEB_ADAPTOR} \
 		etc/rc.d/init.d/saslauthd \
 		usr/sbin/dbconverter-2 \
 		usr/sbin/saslauthd \
 		usr/sbin/sasldblistusers \
 		usr/sbin/sasldblistusers2 \
 		usr/sbin/saslpasswd \
 		usr/sbin/saslpasswd2 \
 		sbin/pam_console_apply \
 		sbin/pam_tally \
 		sbin/pam_timestamp_check \
 		sbin/pwdb_chkpwd \
 		sbin/unix_chkpwd \
 		etc/krb5.conf \
 		etc/rc.d/init.d/kdcrotate \
 		usr/bin/openssl
 
 REMOVEDIRS=	${NGWEB_ADAP_DIR} \
 		etc/openldap \
 		usr/share/openldap \
 		usr/kerberos/share
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${EXTRACT_ONLY} ${WRKSRC}
 	@(cd ${WRKSRC} && ${TAR} xfz ${EXTRACT_ONLY})
 
 	@for myfile in ${SET1} ${SET3}; do \
 		ourfile=`${ECHO} $$myfile |${SED} -e 's/:ogo//'`; \
 		${ECHO} "Extracting for: $$ourfile"; \
 		(cd ${WRKSRC} && ${RPM2CPIO} ${RPMDIR}/$$ourfile | ${CPIO} ${CPIOFLAGS}); \
 	done
 
 post-build:
 	${INSTALL} ${COPY} -m 644 ${WRKSRC}/${NGWEB_ADAP_DIR}/ngobjweb*.so ${WRKSRC}/opt/opengroupware.org
 
 	@for delfile in ${REMOVEFILES}; do \
 		${ECHO} "Removing unecessary file in ${WRKSRC}: $$delfile"; \
 		${RM} -f ${WRKSRC}/$$delfile; \
 	done
 
 	@for deldir in ${REMOVEDIRS}; do \
 		${ECHO} "Removing unecessary dir in ${WRKSRC}: $$deldir"; \
 		${RM} -rf ${WRKSRC}/$$deldir; \
 	done
 
 .if !defined(EXTRACT_PRESERVE_OWNERSHIP)
 	@if [ `id -u` = 0 ]; then \
 		${CHMOD} -R ug-s ${WRKDIR}; \
 		${CHOWN} -R 0:0 ${WRKDIR}; \
 	fi
 .endif
 
 pre-install:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC} && ${FIND} -s . -type f -o -type l | \
 		${CUT} -c3-999 >> ${PLIST} \
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
 	cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX}
 	${FIND} ${PREFIX} -type d \! -ipath '${LINUXBASE}/proc*' -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${MKDIR} ${LINUXBASE}/opt/opengroupware.org/documents
 	@${CHMOD} 750 ${LINUXBASE}/opt/opengroupware.org/documents
 	@${MKDIR} ${LINUXBASE}/opt/opengroupware.org/news
 	@${CHMOD} 750 ${LINUXBASE}/opt/opengroupware.org/news
 	@${ECHO} '/opt/skyrix/system/Libraries/ix86/linux-gnu/gnu-fd-nil' >>${LINUXBASE}/etc/ld.so.conf
 	@${ECHO} '/opt/opengroupware.org/Libraries/ix86/linux-gnu/gnu-fd-nil' >>${LINUXBASE}/etc/ld.so.conf
 	@${ECHO} '/usr/kerberos/lib' >>${LINUXBASE}/etc/ld.so.conf
 	@${LN} -sf ${LINUXBASE}/usr/lib/libpq.so.2 ${LINUXBASE}/usr/lib/libpq.so.3
 	@${LN} -sf ${LINUXBASE}/lib/libssl.so.0.9.6b ${LINUXBASE}/lib/libssl.so.9.6
 	@${LN} -sf ${LINUXBASE}/lib/ibcrypto.so.0.9.6b ${LINUXBASE}/lib/libcrypto.so.2
 	@${PREFIX}/sbin/ldconfig
 	@${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 	@${CHOWN} -Rh ogo:skyrix ${LINUXBASE}/opt/skyrix
 	@${CHOWN} -Rh ogo:skyrix ${LINUXBASE}/opt/opengroupware.org
 	@${INSTALL} -d -m 770 -o ogo -g skyrix /var/log/opengroupware
 	@${CHOWN} -Rh ogo:skyrix /var/log/opengroupware
 	@${INSTALL} -m 640 -o ogo -g skyrix ${FILESDIR}/OpenGroupware.org.sh.tmpl ${LINUXBASE}/opt/opengroupware.org/OpenGroupware.org.sh
 	@${SH} ${PKGDIR}/pkg-install ${PKGNAME} WRITE-DEFAULTS-FIRSTTIME
 	@${SH} ${PKGDIR}/pkg-install ${PKGNAME} COPY-TEMPLATES
 	@${CHOWN} -Rh ogo:skyrix ${LINUXBASE}/opt/opengroupware.org/.libFoundation
 	@${INSTALL} -m 500 -o root -g wheel ${FILESDIR}/ogo.sh.sample ${LOCALBASE}/etc/rc.d/ogo.sh.sample
 	@${INSTALL} -m 500 -o root -g wheel ${FILESDIR}/zidestore.sh.sample ${LOCALBASE}/etc/rc.d/zidestore.sh.sample
 	@${INSTALL} -m 500 -o root -g wheel ${FILESDIR}/xmlrpcd.sh.sample ${LOCALBASE}/etc/rc.d/xmlrpcd.sh.sample
 	@${INSTALL} -m 500 -o root -g wheel ${FILESDIR}/nhsd.sh.sample ${LOCALBASE}/etc/rc.d/nhsd.sh.sample
 	@${PERL} ${SCRIPTDIR}/patch_apache_version.pl
 	@${CHOWN} -Rh ogo:skyrix ${LINUXBASE}/opt/opengroupware.org/OpenGroupware.org.apacheinclude
 	@${INSTALL} -m 444 -o ogo -g skyrix ${FILESDIR}/INSTALL.fbsd ${LINUXBASE}/opt/opengroupware.org/INSTALL.fbsd
 	@${ECHO} ''
 	@fmt ${PKGMESSAGE}
 	@${ECHO} ''
 
 .include <bsd.port.post.mk>

Property changes on: head/misc/linux-opengroupware/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/net/xbone-gui/Makefile
===================================================================
--- head/net/xbone-gui/Makefile	(revision 150327)
+++ head/net/xbone-gui/Makefile	(revision 150328)
@@ -1,56 +1,56 @@
 # New ports collection makefile for:	xbone
 # Date created:         		June 8 2000
 # Whom:                 		X-Bone Project <xbone@isi.edu>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	XBone-GUI
 PORTVERSION=	3.2
 PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 DISTNAME=	XBone-${PORTVERSION}
 
 MAINTAINER=	xbone@isi.edu
 COMMENT=	The GUI for XBone, a tool to deploy and manage IP-based VPNs
 
 BUILD_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
 		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
 		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
 		${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
 		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
 		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail\
 		${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6\
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
 		${SITE_PERL}/${PERL_ARCH}/APR.pm:${PORTSDIR}/www/mod_perl2 \
 		${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
 		${SITE_PERL}/Tk/Getopt.pm:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \
 		${SITE_PERL}/${PERL_ARCH}/Tk/TableMatrix.pm:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix
 
 USE_GMAKE=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/XBone-${PORTVERSION}
 INSTALL_TARGET=	gui
 
 MAN5=		xbone-gui.conf.5
 MAN8=		xb-gui-control.8 xb-apache-config.8
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 470000
 FORBIDDEN=	"X-Bone ${PORTVERSION} does not support FreeBSD prior to 4.7"
 .endif
 
 .if ${PERL_LEVEL} < 500601
 IGNORE=		X-Bone requires Perl version 5.6.1 or higher. Install lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net/xbone-gui/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/Makefile
===================================================================
--- head/www/Makefile	(revision 150327)
+++ head/www/Makefile	(revision 150328)
@@ -1,951 +1,951 @@
 # $FreeBSD$
 #
 
     COMMENT = Ports related to the World Wide Web
 
     SUBDIR += MT
     SUBDIR += MT-PM
     SUBDIR += WebMagick
     SUBDIR += abcache
     SUBDIR += adblock
     SUBDIR += adblock-firefox
     SUBDIR += admuser
     SUBDIR += adzap
     SUBDIR += adzap2squirm
     SUBDIR += amaya
     SUBDIR += amphetadesk
     SUBDIR += amyc
     SUBDIR += analog
     SUBDIR += aolserver
     SUBDIR += aolserver-openacs-pg
     SUBDIR += apache-contrib
     SUBDIR += apache-forrest
     SUBDIR += apache-jserv
     SUBDIR += apache13
     SUBDIR += apache13+ipv6
     SUBDIR += apache13-modperl
     SUBDIR += apache13-modssl
     SUBDIR += apache13-modssl+ipv6
     SUBDIR += apache13-ssl
-    SUBDIR += apache2
+    SUBDIR += apache20
     SUBDIR += apache21
     SUBDIR += apache22
     SUBDIR += arena
     SUBDIR += aria
     SUBDIR += ashe           # requires Motif
     SUBDIR += asp2php
     SUBDIR += aswedit
     SUBDIR += aswiki
     SUBDIR += august
     SUBDIR += auth_ldap
     SUBDIR += autoindex
     SUBDIR += autoindex2
     SUBDIR += awstats
     SUBDIR += axis
     SUBDIR += b2evo
     SUBDIR += bannerfilter
     SUBDIR += bblog
     SUBDIR += bins
     SUBDIR += bk2site
     SUBDIR += bk_edit
     SUBDIR += bkmrkconv
     SUBDIR += bluefish
     SUBDIR += boa
     SUBDIR += bookmarkbridge
     SUBDIR += bozohttpd
     SUBDIR += bricolage
     SUBDIR += bugmenot
     SUBDIR += bugmenot-firefox
     SUBDIR += cadaver
     SUBDIR += calamaris
     SUBDIR += campsite
     SUBDIR += caudium10
     SUBDIR += caudium12
     SUBDIR += cgi-lib
     SUBDIR += cgi-lib.pl
     SUBDIR += cgic
     SUBDIR += cgicc
     SUBDIR += cgichk
     SUBDIR += cgihtml
     SUBDIR += cgiparse
     SUBDIR += cgiwrap
     SUBDIR += checkbot
     SUBDIR += cheetah
     SUBDIR += cherokee
     SUBDIR += chimera
     SUBDIR += chpasswd
     SUBDIR += chtml
     SUBDIR += cl-lml
     SUBDIR += cl-lml-clisp
     SUBDIR += cl-lml-cmucl
     SUBDIR += cl-lml-sbcl
     SUBDIR += clearsilver
     SUBDIR += clearsilver-python
     SUBDIR += cocoon
     SUBDIR += comclear
     SUBDIR += coppermine
     SUBDIR += crawl
     SUBDIR += crp
     SUBDIR += css-mode.el
     SUBDIR += cssed
     SUBDIR += cybercalendar
     SUBDIR += dalbum
     SUBDIR += dansguardian
     SUBDIR += dansguardian-devel
     SUBDIR += decss
     SUBDIR += demoroniser
     SUBDIR += dfileserver
     SUBDIR += dhttpd
     SUBDIR += dillo
     SUBDIR += dokuwiki
     SUBDIR += dotproject
     SUBDIR += dpsearch
     SUBDIR += drupal
     SUBDIR += dtse
     SUBDIR += dummyflash
     SUBDIR += eaccelerator
     SUBDIR += eldav.el
     SUBDIR += elinks
     SUBDIR += emacs-w3m
     SUBDIR += emacs-w3m-emacs20
     SUBDIR += emacs-w3m-xemacs21-mule
     SUBDIR += emp
     SUBDIR += epiphany
     SUBDIR += epiphany-extensions
     SUBDIR += erwn
     SUBDIR += eventum
     SUBDIR += evg
     SUBDIR += evolution-caldav
     SUBDIR += evolution-webcal
     SUBDIR += fcgi
     SUBDIR += feedonfeeds
     SUBDIR += ffproxy
     SUBDIR += fhttpd
     SUBDIR += firefox
     SUBDIR += firefox-remote
     SUBDIR += flashplugin
     SUBDIR += flashplugin-mozilla
     SUBDIR += flashpluginwrapper
     SUBDIR += flood
     SUBDIR += fnord
     SUBDIR += formication
     SUBDIR += frontpage
     SUBDIR += frontpage-ar
     SUBDIR += frontpage-de
     SUBDIR += frontpage-es
     SUBDIR += frontpage-fr
     SUBDIR += frontpage-he
     SUBDIR += frontpage-it
     SUBDIR += frontpage-ja
     SUBDIR += frontpage-ko
     SUBDIR += frontpage-nl
     SUBDIR += frontpage-sv
     SUBDIR += frontpage-th
     SUBDIR += frontpage-zh
     SUBDIR += fswiki
     SUBDIR += fxhtml
     SUBDIR += g-gcl
     SUBDIR += galeon
     SUBDIR += gallery
     SUBDIR += gallery2
     SUBDIR += gatling
     SUBDIR += gecko-sharp10
     SUBDIR += gecko-sharp20
     SUBDIR += geeklog
     SUBDIR += gekko
     SUBDIR += geneweb
     SUBDIR += geolizer
     SUBDIR += gforge
     SUBDIR += glibwww
     SUBDIR += gnome-user-share
     SUBDIR += gnuinfo
     SUBDIR += google-sitemapgen
     SUBDIR += goose
     SUBDIR += gtkhtml
     SUBDIR += gtkhtml3
     SUBDIR += guile-www
     SUBDIR += gurlchecker
     SUBDIR += harvest
     SUBDIR += horde
     SUBDIR += horde-passwd
     SUBDIR += horde-php5
     SUBDIR += hotjava
     SUBDIR += htdump
     SUBDIR += html2hdml
     SUBDIR += html2wml
     SUBDIR += htmlobject
     SUBDIR += htmlpp
     SUBDIR += http-analyze
     SUBDIR += http_get
     SUBDIR += http_load
     SUBDIR += httpgrabber
     SUBDIR += httptunnel
     SUBDIR += httrack
     SUBDIR += hydra
     SUBDIR += hypermail
     SUBDIR += igal
     SUBDIR += imgsizer
     SUBDIR += indexme
     SUBDIR += instiki
     SUBDIR += interchange
     SUBDIR += ismail
     SUBDIR += jakarta-jmeter
     SUBDIR += jakarta-tomcat3
     SUBDIR += jakarta-tomcat4
     SUBDIR += jakarta-tomcat41
     SUBDIR += jakarta-tomcat5
     SUBDIR += jakarta-tomcat55
     SUBDIR += jdresolve
     SUBDIR += jesred
     SUBDIR += jetspeed
     SUBDIR += jetty
     SUBDIR += joomla
     SUBDIR += kannel
     SUBDIR += kazehakase
     SUBDIR += kdewebdev
     SUBDIR += knowledgekit
     SUBDIR += larbin
     SUBDIR += libghttp
     SUBDIR += libgtkhtml
     SUBDIR += libhttpd-persistent
     SUBDIR += libwww
     SUBDIR += lighttpd
     SUBDIR += linkcheck
     SUBDIR += linkchecker
     SUBDIR += linklint
     SUBDIR += links
     SUBDIR += links1
     SUBDIR += linux-beonex
     SUBDIR += linux-firefox
     SUBDIR += linux-flashplugin
     SUBDIR += linux-flashplugin6
     SUBDIR += linux-flashplugin7
     SUBDIR += linux-mozilla
     SUBDIR += linux-mozilla-devel
     SUBDIR += linux-nvu
     SUBDIR += linux-opera
     SUBDIR += linux-sunbird
     SUBDIR += linuxpluginwrapper
     SUBDIR += ljdeps
     SUBDIR += ljpms
     SUBDIR += ljsm
     SUBDIR += logtools
     SUBDIR += lws
     SUBDIR += lynx
     SUBDIR += lynx-current
     SUBDIR += lynx-ssl
     SUBDIR += mambo
     SUBDIR += man2web
     SUBDIR += mapedit
     SUBDIR += mathopd
     SUBDIR += mdw
     SUBDIR += mediawiki
     SUBDIR += mediawiki13
     SUBDIR += mediawiki14
     SUBDIR += mergelog
     SUBDIR += mgstat
     SUBDIR += mhonarc
     SUBDIR += micro_httpd
     SUBDIR += middleman
     SUBDIR += mini_httpd
     SUBDIR += mkapachepw
     SUBDIR += mknmz-wwwoffle
     SUBDIR += mmosaic
     SUBDIR += mnogosearch
     SUBDIR += mnogosearch31
     SUBDIR += mod_access_identd
     SUBDIR += mod_access_referer
     SUBDIR += mod_accesscookie
     SUBDIR += mod_accounting
     SUBDIR += mod_auth_any
     SUBDIR += mod_auth_cookie_mysql
     SUBDIR += mod_auth_cookie_mysql2
     SUBDIR += mod_auth_external
     SUBDIR += mod_auth_external2
     SUBDIR += mod_auth_imap
     SUBDIR += mod_auth_imap2
     SUBDIR += mod_auth_kerb
     SUBDIR += mod_auth_mysql
     SUBDIR += mod_auth_mysql2
     SUBDIR += mod_auth_mysql41_ap2
     SUBDIR += mod_auth_mysql_another
     SUBDIR += mod_auth_pam
     SUBDIR += mod_auth_pam2
     SUBDIR += mod_auth_pgsql
     SUBDIR += mod_auth_pgsql2
     SUBDIR += mod_auth_pwcheck
     SUBDIR += mod_auth_remote
     SUBDIR += mod_auth_useragent
     SUBDIR += mod_authenticache
     SUBDIR += mod_backhand
     SUBDIR += mod_bandwidth
     SUBDIR += mod_bf
     SUBDIR += mod_blosxom
     SUBDIR += mod_blowchunks
     SUBDIR += mod_bunzip2
     SUBDIR += mod_bw
     SUBDIR += mod_cband
     SUBDIR += mod_curb
     SUBDIR += mod_cfg_ldap
     SUBDIR += mod_cgi_debug
     SUBDIR += mod_chroot
     SUBDIR += mod_clamav
     SUBDIR += mod_color
     SUBDIR += mod_cvs
     SUBDIR += mod_cvs2
     SUBDIR += mod_dav
     SUBDIR += mod_dosevasive20
     SUBDIR += mod_dtcl
     SUBDIR += mod_encoding
     SUBDIR += mod_extract_forwarded
     SUBDIR += mod_extract_forwarded2
     SUBDIR += mod_fastcgi
     SUBDIR += mod_fcgid
     SUBDIR += mod_filter
     SUBDIR += mod_frontpage
     SUBDIR += mod_frontpage2-rtr
     SUBDIR += mod_frontpage-rtr
     SUBDIR += mod_geoip
     SUBDIR += mod_geoip2
     SUBDIR += mod_gzip
     SUBDIR += mod_hosts_access
     SUBDIR += mod_index_rss
     SUBDIR += mod_injection
     SUBDIR += mod_jk
     SUBDIR += mod_jk-apache2
     SUBDIR += mod_jk2
     SUBDIR += mod_jk2-apache2
     SUBDIR += mod_layout
     SUBDIR += mod_layout2
     SUBDIR += mod_limitipconn
     SUBDIR += mod_limitipconn2
     SUBDIR += mod_log_config-st
     SUBDIR += mod_log_data
     SUBDIR += mod_log_mysql
     SUBDIR += mod_log_spread
     SUBDIR += mod_log_sql
     SUBDIR += mod_log_sql2
     SUBDIR += mod_macro
     SUBDIR += mod_macro2
     SUBDIR += mod_mp3
     SUBDIR += mod_musicindex
     SUBDIR += mod_mya
     SUBDIR += mod_mylo
     SUBDIR += mod_mysqluserdir
     SUBDIR += mod_ntlm
     SUBDIR += mod_perl
     SUBDIR += mod_perl2
     SUBDIR += mod_php4
     SUBDIR += mod_php5
     SUBDIR += mod_proxy_add_forward
     SUBDIR += mod_proxy_html
     SUBDIR += mod_put
     SUBDIR += mod_python
     SUBDIR += mod_python3
     SUBDIR += mod_realip
     SUBDIR += mod_roaming
     SUBDIR += mod_roaming2
     SUBDIR += mod_rpaf
     SUBDIR += mod_rpaf2
     SUBDIR += mod_ruby
     SUBDIR += mod_scgi
     SUBDIR += mod_security
     SUBDIR += mod_sed
     SUBDIR += mod_sequester
     SUBDIR += mod_shapvh
     SUBDIR += mod_snake
     SUBDIR += mod_sqlinclude
     SUBDIR += mod_ticket
     SUBDIR += mod_tidy
     SUBDIR += mod_traf_thief
     SUBDIR += mod_transform
     SUBDIR += mod_trigger
     SUBDIR += mod_tsunami
     SUBDIR += mod_uid
     SUBDIR += mod_v2h
     SUBDIR += mod_vdbh
     SUBDIR += mod_vhost_ldap
     SUBDIR += mod_vhs
     SUBDIR += mod_webapp
     SUBDIR += mod_zap
     SUBDIR += moinmoin
     SUBDIR += momspider
     SUBDIR += monkey
     SUBDIR += moodle
     SUBDIR += mozex
     SUBDIR += mozex-firefox
     SUBDIR += mozilla
     SUBDIR += mozilla-bonobo
     SUBDIR += mozilla-devel
     SUBDIR += mozplugger
     SUBDIR += mplayer-plugin
     SUBDIR += myfaces
     SUBDIR += myghty
     SUBDIR += nanoblogger
     SUBDIR += nd
     SUBDIR += neon
     SUBDIR += neowebscript
     SUBDIR += netrik
     SUBDIR += nginx
     SUBDIR += notftp
     SUBDIR += npc
     SUBDIR += nscache
     SUBDIR += nspostgres
     SUBDIR += nvu
     SUBDIR += ocaml-net
     SUBDIR += ocaml-wdialog
     SUBDIR += oops
     SUBDIR += openacs
     SUBDIR += openacs-dotlrn
     SUBDIR += openvrml
     SUBDIR += opera
     SUBDIR += osb-browser
     SUBDIR += osb-nrcit
     SUBDIR += osb-nrcore
     SUBDIR += oscommerce
     SUBDIR += p5-AMF-Perl
     SUBDIR += p5-Acme-Monta
     SUBDIR += p5-Apache-ASP
     SUBDIR += p5-Apache-AddHostPath
     SUBDIR += p5-Apache-Admin-Config
     SUBDIR += p5-Apache-AntiSpam
     SUBDIR += p5-Apache-Archive
     SUBDIR += p5-Apache-AuthCookie
     SUBDIR += p5-Apache-AuthTicket
     SUBDIR += p5-Apache-AuthenCache
     SUBDIR += p5-Apache-AuthenURL
     SUBDIR += p5-Apache-AutoIndex
     SUBDIR += p5-Apache-AxKit-Plugin-AddXSLParams-Request
     SUBDIR += p5-Apache-Clean
     SUBDIR += p5-Apache-Compress
     SUBDIR += p5-Apache-CompressClientFixup
     SUBDIR += p5-Apache-ConfigFile
     SUBDIR += p5-Apache-DB
     SUBDIR += p5-Apache-DBI
     SUBDIR += p5-Apache-DebugInfo
     SUBDIR += p5-Apache-DumpHeaders
     SUBDIR += p5-Apache-Filter
     SUBDIR += p5-Apache-Gallery
     SUBDIR += p5-Apache-GopherHandler
     SUBDIR += p5-Apache-Icon
     SUBDIR += p5-Apache-Language
     SUBDIR += p5-Apache-MP3
     SUBDIR += p5-Apache-NNTPGateway
     SUBDIR += p5-Apache-PageKit
     SUBDIR += p5-Apache-ParseFormData
     SUBDIR += p5-Apache-Peek
     SUBDIR += p5-Apache-Profiler
     SUBDIR += p5-Apache-Radius
     SUBDIR += p5-Apache-Reload
     SUBDIR += p5-Apache-SSI
     SUBDIR += p5-Apache-Scoreboard
     SUBDIR += p5-Apache-Session
     SUBDIR += p5-Apache-Session-PHP
     SUBDIR += p5-Apache-Session-SQLite3
     SUBDIR += p5-Apache-Session-SharedMem
     SUBDIR += p5-Apache-Session-Wrapper
     SUBDIR += p5-Apache-Singleton
     SUBDIR += p5-Apache-SubProcess
     SUBDIR += p5-Apache-Test
     SUBDIR += p5-Apache2-Scoreboard
     SUBDIR += p5-ApacheBench
     SUBDIR += p5-AxKit
     SUBDIR += p5-AxKit-XSP-Cookie
     SUBDIR += p5-AxKit-XSP-ESQL
     SUBDIR += p5-AxKit-XSP-Exception
     SUBDIR += p5-AxKit-XSP-IfParam
     SUBDIR += p5-AxKit-XSP-Param
     SUBDIR += p5-AxKit-XSP-PerForm
     SUBDIR += p5-AxKit-XSP-Sendmail
     SUBDIR += p5-AxKit-XSP-Util
     SUBDIR += p5-AxKit-XSP-WebUtils
     SUBDIR += p5-B-LexInfo
     SUBDIR += p5-Bundle-Catalyst
     SUBDIR += p5-Bundle-Slash
     SUBDIR += p5-Bundle-Sledge
     SUBDIR += p5-CGI-Ajax
     SUBDIR += p5-CGI-Application
     SUBDIR += p5-CGI-Application-Plugin-ValidateRM
     SUBDIR += p5-CGI-Application-ValidateRM
     SUBDIR += p5-CGI-ArgChecker
     SUBDIR += p5-CGI-Builder
     SUBDIR += p5-CGI-Builder-TT2
     SUBDIR += p5-CGI-Cache
     SUBDIR += p5-CGI-FastTemplate
     SUBDIR += p5-CGI-Framework
     SUBDIR += p5-CGI-Kwiki
     SUBDIR += p5-CGI-Minimal
     SUBDIR += p5-CGI-Response
     SUBDIR += p5-CGI-SSI
     SUBDIR += p5-CGI-Session
     SUBDIR += p5-CGI-Simple
     SUBDIR += p5-CGI-SpeedyCGI
     SUBDIR += p5-CGI-Untaint
     SUBDIR += p5-CGI-Untaint-email
     SUBDIR += p5-CGI-Upload
     SUBDIR += p5-CGI-XMLApplication
     SUBDIR += p5-CGI-modules
     SUBDIR += p5-CGI.pm
     SUBDIR += p5-CGI_Lite
     SUBDIR += p5-Catalyst
     SUBDIR += p5-Catalyst-Engine-Apache
     SUBDIR += p5-Catalyst-Helper-Controller-Scaffold
     SUBDIR += p5-Catalyst-Model-CDBI
     SUBDIR += p5-Catalyst-Model-CDBI-Sweet
     SUBDIR += p5-Catalyst-Model-DBIC
     SUBDIR += p5-Catalyst-Model-DBIC-Plain
     SUBDIR += p5-Catalyst-Plugin-Authentication-CDBI
     SUBDIR += p5-Catalyst-Plugin-DefaultEnd
     SUBDIR += p5-Catalyst-Plugin-FillInForm
     SUBDIR += p5-Catalyst-Plugin-FormValidator
     SUBDIR += p5-Catalyst-Plugin-FormValidator-Simple
     SUBDIR += p5-Catalyst-Plugin-I18N
     SUBDIR += p5-Catalyst-Plugin-Pluggable
     SUBDIR += p5-Catalyst-Plugin-Prototype
     SUBDIR += p5-Catalyst-Plugin-Session
     SUBDIR += p5-Catalyst-Plugin-Session-FastMmap
     SUBDIR += p5-Catalyst-Plugin-Session-State-Cookie
     SUBDIR += p5-Catalyst-Plugin-Session-State-URI
     SUBDIR += p5-Catalyst-Plugin-Session-Store-File
     SUBDIR += p5-Catalyst-Plugin-Singleton
     SUBDIR += p5-Catalyst-Plugin-Static
     SUBDIR += p5-Catalyst-Plugin-SubRequest
     SUBDIR += p5-Catalyst-Plugin-Textile
     SUBDIR += p5-Catalyst-Plugin-XMLRPC
     SUBDIR += p5-Catalyst-View-HTML-Template
     SUBDIR += p5-Catalyst-View-TT
     SUBDIR += p5-Class-DBI-FromForm
     SUBDIR += p5-Compress-LeadingBlankSpaces
     SUBDIR += p5-FAQ-OMatic
     SUBDIR += p5-FastCGI
     SUBDIR += p5-FastCGI-ProcManager
     SUBDIR += p5-Feed-Find
     SUBDIR += p5-Flickr-API
     SUBDIR += p5-Flickr-Upload
     SUBDIR += p5-HTML
     SUBDIR += p5-HTML-Breadcrumbs
     SUBDIR += p5-HTML-CalendarMonthSimple
     SUBDIR += p5-HTML-Chunks
     SUBDIR += p5-HTML-Clean
     SUBDIR += p5-HTML-Diff
     SUBDIR += p5-HTML-Element-Extended
     SUBDIR += p5-HTML-Embperl
     SUBDIR += p5-HTML-FillInForm
     SUBDIR += p5-HTML-FromText
     SUBDIR += p5-HTML-LinkExtractor
     SUBDIR += p5-HTML-Mason
     SUBDIR += p5-HTML-Pager
     SUBDIR += p5-HTML-Parser
     SUBDIR += p5-HTML-Prototype
     SUBDIR += p5-HTML-QuickCheck
     SUBDIR += p5-HTML-Scrubber
     SUBDIR += p5-HTML-SimpleLinkExtor
     SUBDIR += p5-HTML-SimpleParse
     SUBDIR += p5-HTML-StickyQuery
     SUBDIR += p5-HTML-Stream
     SUBDIR += p5-HTML-Strip
     SUBDIR += p5-HTML-Summary
     SUBDIR += p5-HTML-Table
     SUBDIR += p5-HTML-TableExtract
     SUBDIR += p5-HTML-TableLayout
     SUBDIR += p5-HTML-TableTiler
     SUBDIR += p5-HTML-TagCloud
     SUBDIR += p5-HTML-TagCloud-Extended
     SUBDIR += p5-HTML-Tagset
     SUBDIR += p5-HTML-Template
     SUBDIR += p5-HTML-Template-Associate
     SUBDIR += p5-HTML-Template-Compiled
     SUBDIR += p5-HTML-Template-Expr
     SUBDIR += p5-HTML-Template-HashWrapper
     SUBDIR += p5-HTML-Template-JIT
     SUBDIR += p5-HTML-TokeParser-Simple
     SUBDIR += p5-HTML-Tree
     SUBDIR += p5-HTML-Webmake
     SUBDIR += p5-HTML-Widgets-SelectLayers
     SUBDIR += p5-HTTP-Body
     SUBDIR += p5-HTTP-BrowserDetect
     SUBDIR += p5-HTTP-Cache-Transparent
     SUBDIR += p5-HTTP-DAV
     SUBDIR += p5-HTTP-GHTTP
     SUBDIR += p5-HTTP-Lite
     SUBDIR += p5-HTTP-MHTTP
     SUBDIR += p5-HTTP-MobileAgent
     SUBDIR += p5-HTTP-Proxy
     SUBDIR += p5-HTTP-Recorder
     SUBDIR += p5-HTTP-Request-AsCGI
     SUBDIR += p5-HTTP-Request-Params
     SUBDIR += p5-HTTP-Server-Simple
     SUBDIR += p5-HTTP-Server-Simple-Mason
     SUBDIR += p5-HTTP-Server-Simple-Static
     SUBDIR += p5-HTTP-WebTest
     SUBDIR += p5-HTTPD-Log-Filter
     SUBDIR += p5-HTTPD-User-Manage
     SUBDIR += p5-IMDB-Movie
     SUBDIR += p5-Kwiki
     SUBDIR += p5-Kwiki-Archive-Rcs
     SUBDIR += p5-Kwiki-Archive-SVK
     SUBDIR += p5-Kwiki-Atom
     SUBDIR += p5-Kwiki-Diff
     SUBDIR += p5-Kwiki-Edit-RequireUserName
     SUBDIR += p5-Kwiki-GDGraphGenerator
     SUBDIR += p5-Kwiki-Icons-Gnome
     SUBDIR += p5-Kwiki-Infobox
     SUBDIR += p5-Kwiki-ModPerl
     SUBDIR += p5-Kwiki-NavigationToolbar
     SUBDIR += p5-Kwiki-NewPage
     SUBDIR += p5-Kwiki-Notify-Mail
     SUBDIR += p5-Kwiki-PagePrivacy
     SUBDIR += p5-Kwiki-RecentChanges
     SUBDIR += p5-Kwiki-RecentChangesRSS
     SUBDIR += p5-Kwiki-Revisions
     SUBDIR += p5-Kwiki-Search
     SUBDIR += p5-Kwiki-Theme-ColumnLayout
     SUBDIR += p5-Kwiki-UserName
     SUBDIR += p5-Kwiki-UserPreferences
     SUBDIR += p5-Kwiki-VimMode
     SUBDIR += p5-Kwiki-plugins
     SUBDIR += p5-LWP-Authen-Wsse
     SUBDIR += p5-MasonX-Interp-WithCallbacks
     SUBDIR += p5-MasonX-Profiler
     SUBDIR += p5-MasonX-Request-WithApacheSession
     SUBDIR += p5-MasonX-WebApp
     SUBDIR += p5-Maypole
     SUBDIR += p5-Maypole-Authentication-UserSessionCookie
     SUBDIR += p5-Maypole-Component
     SUBDIR += p5-PHP-Session
     SUBDIR += p5-PLP
     SUBDIR += p5-POE-Component-Client-HTTP
     SUBDIR += p5-POE-Component-Client-UserAgent
     SUBDIR += p5-POE-Component-Server-HTTP
     SUBDIR += p5-POE-Component-Server-HTTPServer
     SUBDIR += p5-POE-Component-Server-SOAP
     SUBDIR += p5-POE-Component-Server-SimpleHTTP
     SUBDIR += p5-ParallelUA
     SUBDIR += p5-PodToHTML
     SUBDIR += p5-Sledge
     SUBDIR += p5-Sledge-Plugin-CacheContent
     SUBDIR += p5-Sledge-Plugin-Download
     SUBDIR += p5-Sledge-Plugin-Dumper
     SUBDIR += p5-Sledge-Plugin-HTML2HDML
     SUBDIR += p5-Sledge-Plugin-Log
     SUBDIR += p5-Sledge-Plugin-NoCache
     SUBDIR += p5-Sledge-Plugin-SaveUpload
     SUBDIR += p5-Sledge-Plugin-ScratchPad
     SUBDIR += p5-Sledge-Plugin-SessionAutoCleanup
     SUBDIR += p5-Sledge-Plugin-XSLT
     SUBDIR += p5-Sledge-SessionManager-CookieStore
     SUBDIR += p5-Sledge-Template-Expr
     SUBDIR += p5-Syntax-Highlight-HTML
     SUBDIR += p5-Syntax-Highlight-Shell
     SUBDIR += p5-Task-Catalyst
     SUBDIR += p5-Template-Multilingual
     SUBDIR += p5-Template-Plugin-Class
     SUBDIR += p5-Template-Plugin-Comma
     SUBDIR += p5-Template-Plugin-MP3
     SUBDIR += p5-Template-Plugin-Monta
     SUBDIR += p5-Template-Timer
     SUBDIR += p5-Template-Toolkit
     SUBDIR += p5-URI-Fetch
     SUBDIR += p5-URI-Sequin
     SUBDIR += p5-W3C-LinkChecker
     SUBDIR += p5-W3C-LogValidator
     SUBDIR += p5-WWW-Automate
     SUBDIR += p5-WWW-Babelfish
     SUBDIR += p5-WWW-Curl
     SUBDIR += p5-WWW-Dilbert
     SUBDIR += p5-WWW-IMDb
     SUBDIR += p5-WWW-Link
     SUBDIR += p5-WWW-Mechanize
     SUBDIR += p5-WWW-Mechanize-FormFiller
     SUBDIR += p5-WWW-Mechanize-Shell
     SUBDIR += p5-WWW-Mixi
     SUBDIR += p5-WWW-Robot
     SUBDIR += p5-WWW-Scraper-ISBN
     SUBDIR += p5-WWW-Scraper-ISBN-Amazon_Driver
     SUBDIR += p5-WWW-Scraper-ISBN-Driver
     SUBDIR += p5-WWW-Scraper-ISBN-ORA_Driver
     SUBDIR += p5-WWW-Scraper-ISBN-Record
     SUBDIR += p5-WWW-Search
     SUBDIR += p5-WWW-Search-AltaVista
     SUBDIR += p5-WWW-Search-Google
     SUBDIR += p5-WWW-Shorten
     SUBDIR += p5-WWW-SourceForge
     SUBDIR += p5-WWW-Wikipedia
     SUBDIR += p5-WebService-Bloglines
     SUBDIR += p5-WebService-Technorati
     SUBDIR += p5-ldap-abook
     SUBDIR += p5-libapreq
     SUBDIR += p5-libapreq-static
     SUBDIR += p5-libapreq2
     SUBDIR += p5-libservlet
     SUBDIR += p5-libwww
     SUBDIR += p5-webservice-validator-css-w3c
     SUBDIR += p5-webservice-validator-html-w3c
     SUBDIR += peacock
     SUBDIR += pear-HTTP
     SUBDIR += pear-HTTP_Client
     SUBDIR += pear-HTTP_Download
     SUBDIR += pear-HTTP_Header
     SUBDIR += pear-HTTP_Request
     SUBDIR += pear-HTTP_Server
     SUBDIR += pear-HTTP_Session
     SUBDIR += pear-HTTP_Upload
     SUBDIR += pear-Text_Wiki
     SUBDIR += pecl-APC
     SUBDIR += perlbal
     SUBDIR += pglogd
     SUBDIR += photo_gallery
     SUBDIR += php-dyn
     SUBDIR += php-screw
     SUBDIR += php-templates
     SUBDIR += php4-cgi
     SUBDIR += php4-mnogosearch
     SUBDIR += php4-session
     SUBDIR += php5-cgi
     SUBDIR += php5-mnogosearch
     SUBDIR += php5-session
     SUBDIR += php5-tidy
     SUBDIR += phpSysInfo
     SUBDIR += phpadsnew
     SUBDIR += phpbb
     SUBDIR += phpgedview
     SUBDIR += phpmyfaq
     SUBDIR += phpsurveyor
     SUBDIR += phpwebapp
     SUBDIR += phpwiki
     SUBDIR += phpwiki13
     SUBDIR += planet
     SUBDIR += plog
     SUBDIR += plone
     SUBDIR += plugger
     SUBDIR += plugger-plugins-hubbe
     SUBDIR += pmwiki
     SUBDIR += pnews
     SUBDIR += podcastamatic
     SUBDIR += polipo
     SUBDIR += postnuke
     SUBDIR += pound
     SUBDIR += preferential
     SUBDIR += preferential-firefox
     SUBDIR += privoxy
     SUBDIR += privoxy+ipv6
     SUBDIR += pserv
     SUBDIR += publicfile
     SUBDIR += pwebstats
     SUBDIR += py-HTMLgen
     SUBDIR += py-albatross
     SUBDIR += py-beautifulsoup
     SUBDIR += py-clientform
     SUBDIR += py-cssutils
     SUBDIR += py-django
     SUBDIR += py-fcgi
     SUBDIR += py-forgethtml
     SUBDIR += py-formencode
     SUBDIR += py-htmltestcase
     SUBDIR += py-imdbpy
     SUBDIR += py-jonpy
     SUBDIR += py-mechanize
     SUBDIR += py-mt
     SUBDIR += py-nevow
     SUBDIR += py-pullparser
     SUBDIR += py-scgi
     SUBDIR += py-twistedWeb
     SUBDIR += py-twistedWeb2
     SUBDIR += py-webware
     SUBDIR += py-webware-component
     SUBDIR += pyblosxom
     SUBDIR += pyweblib
     SUBDIR += qdecoder
     SUBDIR += quixote
     SUBDIR += raqdevil
     SUBDIR += rejik
     SUBDIR += reportmagic
     SUBDIR += resin2
     SUBDIR += resin3
     SUBDIR += retawq
     SUBDIR += rnews
     SUBDIR += roundup
     SUBDIR += roxen
     SUBDIR += rt2
     SUBDIR += rt3
     SUBDIR += rt3-elixus
     SUBDIR += rt32
     SUBDIR += rt34
     SUBDIR += ruboard
     SUBDIR += ruby-amazon
     SUBDIR += ruby-asp
     SUBDIR += ruby-borges
     SUBDIR += ruby-div
     SUBDIR += ruby-fcgi
     SUBDIR += ruby-google
     SUBDIR += ruby-gtkhtml2
     SUBDIR += ruby-gtkmozembed
     SUBDIR += ruby-http-access
     SUBDIR += ruby-mnogosearch
     SUBDIR += ruby-nora
     SUBDIR += ruby-tmpl
     SUBDIR += ruby-webunit
     SUBDIR += rubygem-actionpack
     SUBDIR += rubygem-actionwebservice
     SUBDIR += rubygem-rails
     SUBDIR += rubygem-redcloth
     SUBDIR += sarg
     SUBDIR += sbox-dtc
     SUBDIR += scout
     SUBDIR += screem
     SUBDIR += script4rss
     SUBDIR += seamonkey
     SUBDIR += selenium
     SUBDIR += servlet-api
     SUBDIR += session2
     SUBDIR += shttpd
     SUBDIR += sidplug
     SUBDIR += simplog
     SUBDIR += sitebar
     SUBDIR += sitecopy
     SUBDIR += sitemapgen
     SUBDIR += skytemplate
     SUBDIR += slash
     SUBDIR += smarty
     SUBDIR += smb2www
     SUBDIR += smb_auth
     SUBDIR += snarf
     SUBDIR += snownews
     SUBDIR += spreadlogd
     SUBDIR += squid
     SUBDIR += squid_radius_auth
     SUBDIR += squidclients
     SUBDIR += squidguard
     SUBDIR += squidpurge
     SUBDIR += squidtimes
     SUBDIR += squirm
     SUBDIR += squishdot
     SUBDIR += srg
     SUBDIR += ssserver
     SUBDIR += suphp
     SUBDIR += surfraw
     SUBDIR += swfdec-plugin
     SUBDIR += swiggle
     SUBDIR += swish++
     SUBDIR += swish-e
     SUBDIR += syndigator
     SUBDIR += tclhttpd
     SUBDIR += tclwebtest
     SUBDIR += tdiary
     SUBDIR += tdiary-devel
     SUBDIR += tdom
     SUBDIR += thttpd
     SUBDIR += thttpd-st
     SUBDIR += thumbnail_index
     SUBDIR += tidy
     SUBDIR += tidy-devel
     SUBDIR += tidy-lib
     SUBDIR += tinyproxy
     SUBDIR += trac
     SUBDIR += transproxy
     SUBDIR += twhttpd
     SUBDIR += twig
     SUBDIR += twiki
     SUBDIR += typo
     SUBDIR += typo3
     SUBDIR += udmsearch
     SUBDIR += ump
     SUBDIR += urchin5
     SUBDIR += usermanager
     SUBDIR += validator
     SUBDIR += visitors
     SUBDIR += vtiger
     SUBDIR += w3
     SUBDIR += w3-4
     SUBDIR += w3c-httpd
     SUBDIR += w3m
     SUBDIR += w3m-img
     SUBDIR += w3m-m17n
     SUBDIR += w3m-m17n-img
     SUBDIR += w3mir
     SUBDIR += waccess
     SUBDIR += wacko
     SUBDIR += wb0
     SUBDIR += wcol
     SUBDIR += web-traceroute
     SUBDIR += web2ldap
     SUBDIR += webalizer
     SUBDIR += webcalendar
     SUBDIR += webcheck
     SUBDIR += webcopy
     SUBDIR += webcrawl
     SUBDIR += webfs
     SUBDIR += webglimpse
     SUBDIR += weblint
     SUBDIR += webredirect
     SUBDIR += webreport
     SUBDIR += webresolve
     SUBDIR += webstats
     SUBDIR += webstone
     SUBDIR += webstone-ssl
     SUBDIR += wget4web
     SUBDIR += wiliki
     SUBDIR += winhelpcgi
     SUBDIR += wml
     SUBDIR += wnews
     SUBDIR += wordpress
     SUBDIR += wordpress-mu
     SUBDIR += wsdlpull
     SUBDIR += wsmake
     SUBDIR += www6to4
     SUBDIR += wwwcount
     SUBDIR += wwwoffle
     SUBDIR += wwwstat
     SUBDIR += wyvern
     SUBDIR += xaraya
     SUBDIR += xist
     SUBDIR += xitami
     SUBDIR += xpath2rss
     SUBDIR += xshttpd
     SUBDIR += yabb
     SUBDIR += yaws
     SUBDIR += zerowait-httpd
     SUBDIR += znavigator
     SUBDIR += zope
     SUBDIR += zope28
     SUBDIR += zope-FileSystemSite
     SUBDIR += zope-annotations
     SUBDIR += zope-archetypes
     SUBDIR += zope-btreefolder2
     SUBDIR += zope-cmf
     SUBDIR += zope-cmfactionicons
     SUBDIR += zope-cmfformcontroller
     SUBDIR += zope-cmfforum
     SUBDIR += zope-cmfphoto
     SUBDIR += zope-cmfphotoalbum
     SUBDIR += zope-cmfquickinstaller
     SUBDIR += zope-coreblog
     SUBDIR += zope-epoz
     SUBDIR += zope-exuserfolder
     SUBDIR += zope-formulator
     SUBDIR += zope-generator
     SUBDIR += zope-groupuserfolder
     SUBDIR += zope-guf
     SUBDIR += zope-i18nlayer
     SUBDIR += zope-kupu
     SUBDIR += zope-mimetypesregistry
     SUBDIR += zope-mindmapbbs
     SUBDIR += zope-mysqluserfolder
     SUBDIR += zope-parsedxml
     SUBDIR += zope-placelesstranslationservice
     SUBDIR += zope-plonelanguagetool
     SUBDIR += zope-portaltransforms
     SUBDIR += zope-proxyindex
     SUBDIR += zope-silva
     SUBDIR += zope-silvaviews
     SUBDIR += zope-simpleblog
     SUBDIR += zope-ttwtype
     SUBDIR += zope-validation
     SUBDIR += zope-xmlmethods
     SUBDIR += zope-xmlwidgets
     SUBDIR += zope-zmysqlda
     SUBDIR += zope-zsyncer
     SUBDIR += zope-zwiki
     SUBDIR += zope31
 
 .include <bsd.port.subdir.mk>

Property changes on: head/www/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1254
\ No newline at end of property
+1.1255
\ No newline at end of property
Index: head/www/apache21/Makefile
===================================================================
--- head/www/apache21/Makefile	(revision 150327)
+++ head/www/apache21/Makefile	(revision 150328)
@@ -1,235 +1,235 @@
 # New ports collection makefile for:	apache21
 # Date created:				Dec 11 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 # For more information, please read Makefile.doc
 #
 
 PORTNAME=	apache
 PORTVERSION=	2.1.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
 DISTNAME=	httpd-${PORTVERSION}-beta
 DISTFILES=	${DISTNAME}.tar.bz2 \
 		powerlogo.gif:powerlogo
 DIST_SUBDIR=	apache21
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2.1 of Apache web server with ${WITH_MPM:L} MPM.
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 
 LATEST_LINK=	apache21
 
 CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* \
 		apache-2.0.* apache-*-2.0.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_BZIP2=		yes
 USE_ICONV=		yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes
 USE_REINPLACE=		yes
 LIBTOOLFILES=		configure
 .if !defined(WITH_APR_FROM_PORTS)
 INSTALLS_SHLIB=		yes
 .endif
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--with-iconv=${LOCALBASE} \
 		--enable-http
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 
 WITH_MPM?=	prefork # or worker, perchild, threadpool, event
 
 WITH_HTTP_PORT?=	80
 
 .if defined (WITH_WINDOWSUPDATEFIX)
 EXTRA_PATCHES+=		${FILESDIR}/exp-windowsupdate.patch
 .endif
 
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .else
 CATEGORIES+=		ipv6
 .   if defined(WITH_IPV6_V6ONLY) && defined(WITHOUT_V4MAPPED)
 CONFIGURE_ARGS+=	--disable-v4-mapped
 .   else
 CONFIGURE_ARGS+=	--enable-v4-mapped
 .   endif
 .endif
 
 #backward compatibility
 .if defined(WITHOUT_SSL)
 WITHOUT_SSL_MODULES=	YES
 .endif
 
 .if !defined(WITHOUT_SSL_MODULES)
 USE_OPENSSL=	yes
 .endif
 
 .if defined(WITH_STATIC_SUPPORT)
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
 
 # debug overrides CFLAGS
 .if defined(WITH_DEBUG)
 DEBUG_FLAGS?=	-O0 -g -ggdb3
 CFLAGS=		${DEBUG_FLAGS}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 WITH_EXCEPTION_HOOK=	YES
 .endif
 
 .if defined(WITH_EXCEPTION_HOOK)
 CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}
 .else
 APACHEDIR=	${MASTERDIR}
 .endif
 
 .if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
 USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap \
 			--with-ldap-lib="${LOCALBASE}/lib" \
 			--with-ldap-include="${LOCALBASE}/include"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APR_FROM_PORTS)
 PLIST_SUB+=	APR_PORTS="@comment "
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config
 CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
 .else
 PLIST_SUB+=	APR_PORTS=""
 CONFLICTS+=	apr-1.*
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 WANT_APACHE=	common21
-.include "${APACHEDIR}/../apache2/Makefile.modules.3rd"
+.include "${APACHEDIR}/../apache20/Makefile.modules.3rd"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
 show-categories:
 .for category in ${ALL_MODULES_CATEGORIES}
 	@${ECHO_MSG} "${category} contains these modules:"
 	@${ECHO_MSG} "  ${${category}_MODULES}"
 .endfor
 
 show-modules:
 	@for module in ${AVAILABLE_MODULES} ; do \
 	${ECHO_MSG} -n "$${module}: ";\
 	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 			${ECHO_CMD} -n "enabled "; \
 				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 					${ECHO_CMD} "(static)" ; \
 				else \
 					${ECHO_CMD} "(shared)" ;\
 				fi;\
 			else\
 			${ECHO_CMD} disabled ;\
 		fi;\
 	done
 
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"
 	@${ECHO_MSG}	" To disable a module category: WITHOUT_<CATEGORY>_MODULES"
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	" Per default categories are:"
 	@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES}"
 	@${ECHO_MSG}	" Categories available:"
 	@${ECHO_MSG}	"  ${ALL_MODULES_CATEGORIES}"
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
 	@${ECHO_MSG}	"  To see all modules in different categories, type make show-categories"
 	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
 	@${ECHO_MSG}	""
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' \
 		${WRKSRC}/docs/docroot/index.html
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
 	@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
 	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-configure:
 	@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
 
 post-configure:
 	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
 	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \
 			${WRKSRC}/docs/conf/extra/httpd-userdir.conf
 	${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}, ; \
 			s,%%WWWGRP%%,${WWWGRP}, " \
 			${WRKSRC}/docs/conf/httpd.conf
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 install-startup-script:
 .if !exists(${WRKDIR}/apache21.sh)
 	@${MKDIR} ${WRKDIR}
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
 .endif
 	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
 	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
 
 post-install: install-startup-script
 	@${MKDIR} ${PREFIX}/etc/apache21/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache21/Includes
 	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/apache21/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.176
\ No newline at end of property
+1.177
\ No newline at end of property
Index: head/www/dpsearch/Makefile
===================================================================
--- head/www/dpsearch/Makefile	(revision 150327)
+++ head/www/dpsearch/Makefile	(revision 150328)
@@ -1,146 +1,146 @@
 # New ports collection makefile for:    dpsearch
 # Date created:         14.06.2004
 # Whom:                 Maxim Zakharov <maxime@sochi.net.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dpsearch
 PORTVERSION=	4.35
 CATEGORIES=	www
 MASTER_SITES=	http://dataparksearch.newsa.ru/ \
 		http://www.dataparksearch.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source search engine for Internet and Intranet sites
 
 #RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 DOCSDIR=	${PREFIX}/share/doc/dataparksearch
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \
 		--localstatedir=/var/dpsearch \
 		--enable-mp3 \
 		--with-zlib
 
 SUB_FILES=	pkg-message
 
 OPTIONS=	DPSEARCH_THREADS  "Enable pthreads"                       on  \
 		DPSEARCH_SSL      "Enable SSL"                            on  \
 		DPSEARCH_GUESSER  "Enable charset and language guesser"   on  \
 		DPSEARCH_CHINESE  "Enable chinese charsets"               off \
 		DPSEARCH_JAPANESE "Enable japanese charsets"              off \
 		DPSEARCH_MECAB    "Enable MeCab japanese analyzer"        off \
 		DPSEARCH_CHASEN   "Enable ChaSen japanese analyzer"       off \
 		DPSEARCH_APACHE   "Enable mod_dpsearch for Apache"        off \
 		DPSEARCH_IDN      "Enable Internationalized Domain Names" off \
 		DPSEARCH_ASPELL   "Enable aspell support"                 off \
 		DPSEARCH_PGSQL    "Use PostgreSQL  (mutually exclusive)"  off \
 		DPSEARCH_MYSQL    "Use MySQL       (mutually exclusive)"  on \
 		DPSEARCH_SQLITE   "Use SQLite      (mutually exclusive)"  off
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV+=	PORTNAME="${PORTNAME}"
 
 .if !defined(WITHOUT_DPSEARCH_THREADS)
 CONFIGURE_ARGS+=--enable-pthreads
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 .else
 CONFIGURE_ARGS+=--disable-pthreads
 .endif
 
 .if !defined(WITHOUT_DPSEARCH_ASPELL)
 LIB_DEPEND+=	aspell.16:${PORTSDIR}/textproc/aspell
 .else
 CONFIGURE_ARGS+=--without-aspell
 .endif
 
 .if !defined(NO_OPENSSL) && !defined(WITHOUT_DPSEARCH_SSL)
 WITH_OPENSSL=	yes
 .endif
 
 .ifdef WITH_OPENSSL
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 .if defined(WITH_DPSEARCH_GUESSER)
 CONFIGURE_ARGS+=--enable-charset-guesser
 .endif
 
 .if defined(WITH_DPSEARCH_CHASRETS)
 CONFIGURE_ARGS+=--with-extra-charsets=all
 .endif
 
 .if defined(WITH_DPSEARCH_CHINESE)
 CONFIGURE_ARGS+=--with-extra-charsets=chinese
 .endif
 
 .if defined(WITH_DPSEARCH_JAPANESE)
 CONFIGURE_ARGS+=--with-extra-charsets=japanese
 .endif
 
 .if defined(WITH_DPSEARCH_MECAB)
 LIB_DEPEND+=	mecab.0:${PORTSDIR}/japanese/mecab
 CONFIGURE_ARGS+=--enable-mecab
 .endif
 
 .if defined(WITH_DPSEARCH_CHASEN)
 LIB_DEPEND+=	chasen.0:${PORTSDIR}/japanese/chasen
 CONFIGURE_ARGS+=--enable-chasen
 .endif
 
 .if defined(WITH_DPSEARCH_IDN)
 LIB_DEPEND+=	idn.16:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=--enable-idn
 .endif
 
 .if defined(WITH_DPSEARCH_APACHE)
 .if defined (WITH_APACHE2)
-BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
+BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
 .else
 BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 .endif
 CONFIGURE_ARGS+=--enable-apache-module
 .endif
 
 .if !defined(WITH_DPSEARCH_PGSQL) && !defined(WITH_DPSEARCH_MYSQL) && !defined(WITH_DPSEARCH_SQLITE)
 WITH_DPSEARCH_MYSQL=yes
 pre-fetch:
 	@${ECHO}
 	@${ECHO} "Choose MySQL by default."
 	@${ECHO}
 .endif
 
 .if defined(WITH_DPSEARCH_PGSQL)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 
 .elif defined(WITH_DPSEARCH_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 
 .elif defined(WITH_DPSEARCH_SQLITE)
 LIB_DEPEND+=		sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 
 pre-install:
 	@${MKDIR} ${DATADIR}
 
 post-install:
 	${CHMOD} 700 /var/dpsearch/cache
 	${CHOWN} -R www:www /var/dpsearch/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/dpsearch/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/www/gnome-user-share/Makefile
===================================================================
--- head/www/gnome-user-share/Makefile	(revision 150327)
+++ head/www/gnome-user-share/Makefile	(revision 150328)
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	gnome-user-share
 # Date created:				26 November 2004
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnome-user-share
 PORTVERSION=	0.9
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Personal file-sharing service for the GNOME Desktop
 
 LIB_DEPENDS=	howl:${PORTSDIR}/net/howl
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_APACHE=	yes
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 gconf2
 USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	desktop_gnome_file_sharing.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/httpd/modules|${LOCALBASE}/libexec/apache2|g' \
 		${WRKSRC}/dav_user.conf
 
 .include <bsd.port.mk>

Property changes on: head/www/gnome-user-share/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/mod_access_identd/Makefile
===================================================================
--- head/www/mod_access_identd/Makefile	(revision 150327)
+++ head/www/mod_access_identd/Makefile	(revision 150328)
@@ -1,23 +1,23 @@
 # New ports collection makefile for:	mod_access_identd
 # Date created:				10 April 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_access_identd
 PORTVERSION=	1.2.0
 CATEGORIES=	www
 MASTER_SITES=	http://MeepZor.Com/packages/mod_access_identd/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module to supply access control based on ident reply
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 WANT_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_access_identd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/mod_access_referer/Makefile
===================================================================
--- head/www/mod_access_referer/Makefile	(revision 150327)
+++ head/www/mod_access_referer/Makefile	(revision 150328)
@@ -1,41 +1,41 @@
 # New ports collection makefile for:	mod_access_referer
 # Date created:			18 Oct 2000
 # Whom:				Alex Kapranoff <kapr@crosswinds.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_access_referer
 PORTVERSION=	1.0.2
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	accessreferer
 DIST_SUBDIR=	apache
 
 PATCH_SITES=    ${MASTER_SITE_SOURCEFORGE}
 PATCH_SITE_SUBDIR=	accessreferer
 PATCHFILES=	mod_access_referer_1.0.2_third_part_patch.txt
 PATCH_DIST_STRIP=	-l
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Provides access control based on Referer HTTP header for Apache
 
 WANT_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=		HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_access_referer/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/www/mod_accesscookie/Makefile
===================================================================
--- head/www/mod_accesscookie/Makefile	(revision 150327)
+++ head/www/mod_accesscookie/Makefile	(revision 150328)
@@ -1,35 +1,35 @@
 # New ports collection makefile for:	mod_accessCookie
 # Date created:			Apr 16 2004
 # Whom:				Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_accessCookie
 PORTVERSION=	0.4
 CATEGORIES=	www
 MASTER_SITES=	http://etweb.wkv.at/himself/Programming/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Supply access control based cookies stored in a MySQL database
 
 USE_MYSQL=	YES
 WANT_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_accesscookie/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/mod_auth_any/Makefile
===================================================================
--- head/www/mod_auth_any/Makefile	(revision 150327)
+++ head/www/mod_auth_any/Makefile	(revision 150328)
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	mod_auth_any
 # Date created:				10 April 2001
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_auth_any
 PORTVERSION=	1.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.itlab.musc.edu/webNIS/dist/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module to use any command line program to authenticate a user
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 .include <bsd.port.pre.mk>
 .if exists(${LOCALBASE}/include/apache2/http_core.h) || defined(WITH_APACHE2)
 WANT_APACHE=	2
 # Dirty hack
 AP_INC+=	. -DWITH_APACHE2=1
 .else
 WANT_APACHE=	13
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_any/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/www/mod_auth_cookie_mysql/Makefile
===================================================================
--- head/www/mod_auth_cookie_mysql/Makefile	(revision 150327)
+++ head/www/mod_auth_cookie_mysql/Makefile	(revision 150328)
@@ -1,40 +1,40 @@
 # New ports collection makefile for:	mod_auth_cookie_mysql
 # Date created:				Tue Oct  7
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_cookie_mysql
 PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
 		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
 # Original Location: http://www.qwk.net/opensource/mod_auth_cookie_mysql/mod_auth_cookie_mysql.tar.gz
 DIST_SUBDIR=	apache
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against a MySQL database via a secure cookie
 
 USE_MYSQL=	YES
 # If someone can test it with MySQL 4.1 ;-)
 BROKEN_WITH_MYSQL=	41
 
 WANT_APACHE=	13
 
 AP_FAST_BUILD=	YES
 AP_INC?=	${LOCALBASE}/include/mysql
 AP_LIB?=	${LOCALBASE}/lib/mysql -lmysqlclient -lz
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/authform.tmpl ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/putcookie.cgi ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_cookie_mysql/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_auth_cookie_mysql2/Makefile
===================================================================
--- head/www/mod_auth_cookie_mysql2/Makefile	(revision 150327)
+++ head/www/mod_auth_cookie_mysql2/Makefile	(revision 150328)
@@ -1,36 +1,36 @@
 # New ports collection makefile for:	mod_auth_cookie_mysql2
 # Date created:				Sun Aug 8 2004
 # Whom:					clement
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_cookie_mysql2
 PORTVERSION=	0.5
 CATEGORIES=	www
 MASTER_SITES=	http://home.digithi.de/digithi/dev/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against a MySQL database via a secure cookie
 
 USE_MYSQL=	YES
 # If someone can test it with MySQL 5.0 ;-)
 BROKEN_WITH_MYSQL=	50
 
 WANT_APACHE=	2
 
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC?=	${LOCALBASE}/include/mysql
 AP_LIB?=	${LOCALBASE}/lib/mysql -lmysqlclient -lz
 PORTDOCS=	mod_auth_cookie_mysql.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_cookie_mysql2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_auth_external2/Makefile
===================================================================
--- head/www/mod_auth_external2/Makefile	(revision 150327)
+++ head/www/mod_auth_external2/Makefile	(revision 150328)
@@ -1,34 +1,34 @@
 # New ports collection makefile for:	mod_auth_external2
 # Date created:				Fri Oct  10
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_external
 PORTVERSION=	2.2.10
 CATEGORIES=	www
 MASTER_SITES=	http://www.unixpapa.com/software/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users authentication based on external mechanisms
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 LATEST_LINK=	mod_auth_external2
 SHORTMODNAME=	external_auth
 
 PORTDOCS=	AUTHENTICATORS INSTALL README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_external2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/mod_auth_imap/Makefile
===================================================================
--- head/www/mod_auth_imap/Makefile	(revision 150327)
+++ head/www/mod_auth_imap/Makefile	(revision 150328)
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	mod_auth_imap
 # Date created:				Jun 5 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_auth_imap
 PORTVERSION=	1.1
 CATEGORIES=	www
 MASTER_SITES=	http://ben.brillat.net/files/projects/mod_auth_imap/
 DIST_SUBDIR=	apache
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache module to provide authentication via an IMAP mail server
 
 WANT_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 PORTDOCS=	htaccess-example httpd.conf-append-example
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_imap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/mod_auth_mysql2/Makefile
===================================================================
--- head/www/mod_auth_mysql2/Makefile	(revision 150327)
+++ head/www/mod_auth_mysql2/Makefile	(revision 150328)
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	mod_auth_mysql2
 # Date created:				Sep 10 2005
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	1.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.heuer.org/mod_auth_mysql/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	MySQL-based authentication module with VirtualHost support
 
 LATEST_LINK=	mod_auth_mysql2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	YES
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	INSTALL example_data.html htpasswd.sql
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_mysql2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/mod_auth_mysql_another/Makefile
===================================================================
--- head/www/mod_auth_mysql_another/Makefile	(revision 150327)
+++ head/www/mod_auth_mysql_another/Makefile	(revision 150328)
@@ -1,41 +1,41 @@
 # New ports collection makefile for:    apache mod_auth_mysql_another
 # Date created:		2002/04/20
 # Whom:			mbr@freebsd.org
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	3.0.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_//g}
 PKGNAMESUFFIX=	_another
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 
 USE_MYSQL=	YES
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC=		${LOCALBASE}/include/mysql
 AP_LIB=		${LOCALBASE}/lib/mysql
 AP_EXTRAS=	-DAPACHE${AP_VER} -lmysqlclient -lz -lm
 
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 post-build:
 	@${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CONFIGURE" >> ${PLIST}
 	@${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CHANGES" >> ${PLIST}
 	@${ECHO} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/CONFIGURE ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_mysql_another/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/mod_auth_pam2/Makefile
===================================================================
--- head/www/mod_auth_pam2/Makefile	(revision 150327)
+++ head/www/mod_auth_pam2/Makefile	(revision 150328)
@@ -1,36 +1,36 @@
 # New ports collection makefile for:	mod_auth_pam2
 # Date created:				Sun Oct  5
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_auth_pam
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	mod_auth_pam2
 
 USE_GMAKE=	YES
 MAKE_ENV+=	APXS=${APXS}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 APXS?=		${LOCALBASE}/sbin/apxs
 
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${EXAMPLESDIR}/pam-httpd.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/www/mod_auth_pam2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_auth_pgsql2/Makefile
===================================================================
--- head/www/mod_auth_pgsql2/Makefile	(revision 150327)
+++ head/www/mod_auth_pgsql2/Makefile	(revision 150328)
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	mod_auth_pgsql2
 # Date created:				Mon Oct  6
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	2.0.2b1
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PGSQL=	yes
 
 LATEST_LINK=	mod_auth_pgsql2
 
 APXS?=		${LOCALBASE}/sbin/apxs
 PG_INC?=	${LOCALBASE}/include
 PG_LIBS?=	${LOCALBASE}/lib -lpq
 
 do-build:
 	@(cd ${WRKSRC} && ${APXS} -I ${PG_INC} -L ${PG_LIBS} -c ${PORTNAME}.c)
 
 do-install:
 	@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.la)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/www/mod_auth_pgsql2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/www/mod_auth_useragent/Makefile
===================================================================
--- head/www/mod_auth_useragent/Makefile	(revision 150327)
+++ head/www/mod_auth_useragent/Makefile	(revision 150328)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	mod_auth_useragent
 # Date created:				Apr 16 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_auth_useragent
 PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	http://download.tangent.org/ \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to forbid clients based on their User-Agent
 
 WANT_APACHE=	13
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	README faq.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_auth_useragent/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mod_bw/Makefile
===================================================================
--- head/www/mod_bw/Makefile	(revision 150327)
+++ head/www/mod_bw/Makefile	(revision 150328)
@@ -1,33 +1,33 @@
 # New ports collection makefile for:	mod_bw
 # Date created:				Sep 11 2005
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_bw
 PORTVERSION=	0.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.ivn.cl/apache/
 DISTNAME=	bw_mod-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Bandwidth and Connection control per Virtual Host or Directory
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 SRC_FILE=	bw_mod-0.6.c
 PORTDOCS=	APACHE2-LICENSE LICENSE bw_mod-0.6.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_bw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/mod_cband/Makefile
===================================================================
--- head/www/mod_cband/Makefile	(revision 150327)
+++ head/www/mod_cband/Makefile	(revision 150328)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	mod_cband
 # Date created:				Sep 7 2005
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_cband
 PORTVERSION=	0.9.5.2
 CATEGORIES=	www
 MASTER_SITES=	http://cband.linux.pl/download/
 DISTNAME=	${PORTNAME:C/_/-/}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A per-virtualhost bandwidth limiter module for Apache 2
 
 WANT_APACHE=	2
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-apxs=${APXS}
 ALL_TARGET=	#
 PORTDOCS=	libpatricia.copyright
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/libpatricia.copyright ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_cband/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_cfg_ldap/Makefile
===================================================================
--- head/www/mod_cfg_ldap/Makefile	(revision 150327)
+++ head/www/mod_cfg_ldap/Makefile	(revision 150328)
@@ -1,42 +1,42 @@
 # New ports collection makefile for:	mod_cfg_ldap
 # Date created:				Sun Oct 19
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_cfg_ldap
 PORTVERSION=	1.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_//g}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to keep your virtual host configuration in a LDAP directory
 
 WANT_APACHE=	2
 USE_OPENLDAP=	YES
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 LDAP_INC?=	${LOCALBASE}/include
 LDAP_LIB?=	${LOCALBASE}/lib -lldap
 AP_INC+=	${LDAP_INC}
 AP_LIB+=	${LDAP_LIB}
 
 PORTDOCS=	AUTHORS cfg_ldap.conf ChangeLog COPYING INSTALL \
 		mod_cfg_ldap.schema README TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_cfg_ldap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mod_chroot/Makefile
===================================================================
--- head/www/mod_chroot/Makefile	(revision 150327)
+++ head/www/mod_chroot/Makefile	(revision 150328)
@@ -1,27 +1,27 @@
 # Ports collection makefile for:	mod_chroot
 # Date created:				May 18, 2004
 # Whom:					Alexey A.Ukhov <auk@startext.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_chroot
 PORTVERSION=	0.5
 CATEGORIES=	www
 MASTER_SITES=	http://core.segfault.pl/~hobbit/mod_chroot/dist/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	The mod_chroot makes running Apache in a chroot easy
 
 PORTDOCS=	INSTALL CAVEATS README.Apache20 README
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_chroot/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/www/mod_curb/Makefile
===================================================================
--- head/www/mod_curb/Makefile	(revision 150327)
+++ head/www/mod_curb/Makefile	(revision 150328)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	mod_curb
 # Date created:				Sep 7 2005
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_curb
 PORTVERSION=	1.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.steve.org.uk/Software/mod_curb/
 DISTNAME=	${PORTNAME:C/_/-/}-${PORTVERSION}
 DIST_SUBDIR=	apache
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A per-server bandwidth limiter module for Apache 1.3
 
 WANT_APACHE=	13
 
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_curb/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/mod_dosevasive20/Makefile
===================================================================
--- head/www/mod_dosevasive20/Makefile	(revision 150327)
+++ head/www/mod_dosevasive20/Makefile	(revision 150328)
@@ -1,46 +1,46 @@
 # New ports collection makefile for:	mod_dosevasive20
 # Date created:				26 Jul 2004
 # Whom:					Xavier Beaudouin <kiwi@oav.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_dosevasive20
 PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dosevasive/ \
 		ftp://ftp.oav.net/pkg_freebsd/distfiles/
 DISTNAME=	mod_dosevasive_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	An Apache 2 module to try to protect HTTP DoS or DDoS attacks
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 WRKSRC=		${WRKDIR}/mod_dosevasive
 
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
 		${WRKSRC}/mod_dosevasive.c ${WRKSRC}/mod_dosevasive20.c \
 		${WRKSRC}/mod_dosevasiveNSAPI.c
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_dosevasive20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_evasive/Makefile
===================================================================
--- head/www/mod_evasive/Makefile	(revision 150327)
+++ head/www/mod_evasive/Makefile	(revision 150328)
@@ -1,46 +1,46 @@
 # New ports collection makefile for:	mod_dosevasive20
 # Date created:				26 Jul 2004
 # Whom:					Xavier Beaudouin <kiwi@oav.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_dosevasive20
 PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dosevasive/ \
 		ftp://ftp.oav.net/pkg_freebsd/distfiles/
 DISTNAME=	mod_dosevasive_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	An Apache 2 module to try to protect HTTP DoS or DDoS attacks
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 WRKSRC=		${WRKDIR}/mod_dosevasive
 
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
 		${WRKSRC}/mod_dosevasive.c ${WRKSRC}/mod_dosevasive20.c \
 		${WRKSRC}/mod_dosevasiveNSAPI.c
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_evasive/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_evasive20/Makefile
===================================================================
--- head/www/mod_evasive20/Makefile	(revision 150327)
+++ head/www/mod_evasive20/Makefile	(revision 150328)
@@ -1,46 +1,46 @@
 # New ports collection makefile for:	mod_dosevasive20
 # Date created:				26 Jul 2004
 # Whom:					Xavier Beaudouin <kiwi@oav.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_dosevasive20
 PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dosevasive/ \
 		ftp://ftp.oav.net/pkg_freebsd/distfiles/
 DISTNAME=	mod_dosevasive_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	An Apache 2 module to try to protect HTTP DoS or DDoS attacks
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 WRKSRC=		${WRKDIR}/mod_dosevasive
 
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
 		${WRKSRC}/mod_dosevasive.c ${WRKSRC}/mod_dosevasive20.c \
 		${WRKSRC}/mod_dosevasiveNSAPI.c
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_evasive20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_injection/Makefile
===================================================================
--- head/www/mod_injection/Makefile	(revision 150327)
+++ head/www/mod_injection/Makefile	(revision 150328)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	mod_injection
 # Date created:				Sun Oct  5
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_injection
 PORTVERSION=	0.3.1
 CATEGORIES=	www
 MASTER_SITES=	http://pmade.org/distfiles/oss-releases/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Injects text in the HTTP response after a HTML tag
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 APXS?=		${LOCALBASE}/sbin/apxs
 
 do-build:
 	@(cd ${WRKSRC}/src && ${APXS} -c ${PORTNAME}.c)
 
 do-install:
 	@(cd ${WRKSRC}/src && ${APXS} -A -i ${PORTNAME}.la)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -Rf ${WRKSRC}/docs/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/www/mod_injection/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_log_config-st/Makefile
===================================================================
--- head/www/mod_log_config-st/Makefile	(revision 150327)
+++ head/www/mod_log_config-st/Makefile	(revision 150328)
@@ -1,29 +1,29 @@
 # New ports collection makefile for:	mod_log_config-st
 # Date created:				Sun May 2 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_log_config-st
 PORTVERSION=	1.0
 CATEGORIES=	www
 # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_config.c
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A modified version of mod_log_config for apache2
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 SRC_FILE=	mod_log_config.c
 SHORTMODNAME=	log_config
 MODULENAME=	mod_log_config-st
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${CAT} ${PKGMESSAGE}
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_log_config-st/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/mod_log_mysql/Makefile
===================================================================
--- head/www/mod_log_mysql/Makefile	(revision 150327)
+++ head/www/mod_log_mysql/Makefile	(revision 150328)
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	mod_mod_mysql
 # Date created:				Sun May 2 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_log_mysql
 PORTVERSION=	1.0
 CATEGORIES=	www
 # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_mysql.c
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache 2 to log to a MySQL database
 
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 USE_MYSQL=	YES
 
 AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_log_mysql/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/mod_log_sql2/Makefile
===================================================================
--- head/www/mod_log_sql2/Makefile	(revision 150327)
+++ head/www/mod_log_sql2/Makefile	(revision 150328)
@@ -1,45 +1,45 @@
 # New ports collection makefile for:	mod_log_sql2
 # Date created:				2001/11/22
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.100
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
 LATEST_LINK=	mod_log_sql2
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 SSL_PLIST=	""
 PLIST_SUB+=	SSL=${SSL_PLIST}
 
 USE_MYSQL=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h)
 CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
 LIB_DEPENDS+=		dbi.0:${PORTSDIR}/databases/libdbi
 .endif
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .   if ${AP_VER} == 13
 WITHOUT_SSL=	YES
 .   endif
 .if defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--disable-ssl
 SSL_PLIST=	"@comment "
 .else
 .if !exists(${LOCALBASE}/include/apache2/mod_ssl.h)
 BROKEN=		"Please recompile apache2 with SSL support"
 .endif
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_log_sql2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/mod_macro/Makefile
===================================================================
--- head/www/mod_macro/Makefile	(revision 150327)
+++ head/www/mod_macro/Makefile	(revision 150328)
@@ -1,31 +1,31 @@
 # ex:ts=8
 # Ports collection makefile for:	mod_macro
 # Date created:			Nov 20, 2003
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_macro
 PORTVERSION=	1.1.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.cri.ensmp.fr/~coelho/mod_macro/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for use macros in config files
 
 WANT_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=	${PORTNAME}.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_macro/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mod_macro2/Makefile
===================================================================
--- head/www/mod_macro2/Makefile	(revision 150327)
+++ head/www/mod_macro2/Makefile	(revision 150328)
@@ -1,30 +1,30 @@
 # Ports collection makefile for:	mod_macro2
 # Date created:				Sun Aug 8 2004
 # Whom:					clement
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_macro
 PORTVERSION=	1.1.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.cri.ensmp.fr/~coelho/mod_macro/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache2 module for use macros in config files
 
 WANT_APACHE=	2
 LATEST_LINK=	mod_macro2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=	${PORTNAME}.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_macro2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_musicindex/Makefile
===================================================================
--- head/www/mod_musicindex/Makefile	(revision 150327)
+++ head/www/mod_musicindex/Makefile	(revision 150328)
@@ -1,51 +1,51 @@
 # New ports collection makefile for:	mod_musicindex
 # Date created:				Nov 1 2003
 # Whom:					clsung
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	0.99.7
 PORTREVISION=	3
 CATEGORIES=	www audio
 # Master site doesn't have a current version'd tarball...
 #MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/
 MASTER_SITES=	http://depot.fsck.ch/mirror/distfiles/
 DISTNAME=	libapache-mod-musicindex_${PORTVERSION}
 
 MAINTAINER=	ports@fsck.ch
 COMMENT=	Apache module in C that implements the perl module Apache::MP3
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad \
 		FLAC.7:${PORTSDIR}/audio/flac
 
 CPPFLAGS=	-DHAS_MP3 -DHAS_OGG -DHAS_FLAC
 CFLAGS+=	-I${LOCALBASE}/include
 
 #WANT_APACHE=	YES
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 MAKE_ENV+=	APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 
 .if "${AP_VER}"=="2"
 MAKE_ENV+=	APACHE_VERSION=2 APRCONFIG=${LOCALBASE}/lib/apache2/apr-config
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	@${ECHO_MSG} ""
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_musicindex/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/www/mod_rpaf/Makefile
===================================================================
--- head/www/mod_rpaf/Makefile	(revision 150327)
+++ head/www/mod_rpaf/Makefile	(revision 150328)
@@ -1,24 +1,24 @@
 # New ports collection makefile for:	mod_rpaf
 # Date created:				Mar 17, 2003
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_rpaf
 PORTVERSION=	0.5
 CATEGORIES=	www
 MASTER_SITES=	http://stderr.net/apache/rpaf/download/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Make proxied requests appear with client IP
 
 AP_FAST_BUILD=	YES
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP2_SRC_FILE=	mod_rpaf-2.0.c
 AP2_PKGNAMESUFFIX=	-ap2
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_rpaf/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_tidy/Makefile
===================================================================
--- head/www/mod_tidy/Makefile	(revision 150327)
+++ head/www/mod_tidy/Makefile	(revision 150328)
@@ -1,35 +1,35 @@
 # New ports collection makefile for:	mod_tidy
 # Date created:				Sun Oct  5
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_tidy
 PORTVERSION=	0.5
 CATEGORIES=	www
 MASTER_SITES=	http://mod-tidy.sourceforge.net/src/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Validates the HTML output of your apache2 webserver
 
 LIB_DEPENDS=	tidy:${PORTSDIR}/www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/tidy
 AP_LIB+=	${LOCALBASE}/lib -ltidy
 PLIST_FILES=	${DOCSDIR:S/${PREFIX}\///}/LICENSE
 PLIST_DIRS=	${DOCSDIR:S/${PREFIX}\///}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/../LICENSE ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_tidy/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/www/mod_traf_thief/Makefile
===================================================================
--- head/www/mod_traf_thief/Makefile	(revision 150327)
+++ head/www/mod_traf_thief/Makefile	(revision 150328)
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	mod_traf_thief
 # Date created:				Sun Oct  5
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_traf_thief
 PORTVERSION=	0.01
 CATEGORIES=	www
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
 EXTRACT_SUFX=	.c
 # Original location: http://web.god.net.ru/projects/mod_traf_thief/dist/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to redirect part of the traffic to your url
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 RESTRICTED=	No licence
 
 NO_WRKSUBDIR=	YES
 APXS?=		${LOCALBASE}/sbin/apxs
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}.c
 
 do-build:
 	@(cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c)
 
 do-install:
 	@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.la)
 
 .include <bsd.port.mk>

Property changes on: head/www/mod_traf_thief/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/www/mod_transform/Makefile
===================================================================
--- head/www/mod_transform/Makefile	(revision 150327)
+++ head/www/mod_transform/Makefile	(revision 150328)
@@ -1,25 +1,25 @@
 # New ports collection makefile for:	mod_transform
 # Date created:				5 December 2004
 # Whom:					laruiss
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_transform
 PORTVERSION=	0.6.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_transform/
 
 MAINTAINER=	stan@stormier.net
 COMMENT=	An XSLT and XIncludes Filter module for Apache 2.0
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
 
 HAS_CONFIGURE=	yes
 USE_GNOME=	libxslt
 
 post-install:
 	@${CAT}	${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/www/mod_transform/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/mod_v2h/Makefile
===================================================================
--- head/www/mod_v2h/Makefile	(revision 150327)
+++ head/www/mod_v2h/Makefile	(revision 150328)
@@ -1,51 +1,51 @@
 # ports collection makefile for:	mod_v2h
 # Date created:				6th May 2002
 # Whom:					hikari-chan
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_v2h
 PORTVERSION=	2.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.fractal.net/files/
 DISTNAME=	mod_v2h
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A mass virtual hosting module for Apache with support
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+BUILD_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-2
 USE_REINPLACE=	yes
 USE_PERL5_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS=		-fPIC
 .endif
 
 post-patch:
 	${CP} ${FILESDIR}/add-module ${WRKSRC}
 	${CP} ${FILESDIR}/files-Makefile ${WRKSRC}/Makefile
 	${REINPLACE_CMD} \
 		-e 's,@@PERL@@,${PERL},g' \
 		-e 's,@@LOCAL@@,${LOCALBASE},g' \
 		${WRKSRC}/Makefile ${WRKSRC}/add-module
 
 post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===> Stripping ${LOCALBASE}/libexec/apache2/mod_v2h.so"
 	@${STRIP_CMD} ${LOCALBASE}/libexec/apache2/mod_v2h.so
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "---------------------------------------"
 	@${ECHO_MSG} "Remember to check the documentation on:"
 	@${ECHO_MSG} "http://www.fractal.net/mod_v2h.tm"
 	@${ECHO_MSG} "---------------------------------------"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_v2h/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/www/mod_vdbh/Makefile
===================================================================
--- head/www/mod_vdbh/Makefile	(revision 150327)
+++ head/www/mod_vdbh/Makefile	(revision 150328)
@@ -1,39 +1,39 @@
 # New ports collection makefile for:	mod_vdbh
 # Date created:				Sun Oct 19
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_vdbh
 PORTVERSION=	1.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.synthemesc.com/downloads/mod_vdbh/
 DIST_SUBDIR=	apache
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows mass virtual hosting using a MySQL backend with Apache 2.0.x
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 USE_MYSQL=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	AUTHORS README TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_vdbh/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mod_vhost_ldap/Makefile
===================================================================
--- head/www/mod_vhost_ldap/Makefile	(revision 150327)
+++ head/www/mod_vhost_ldap/Makefile	(revision 150328)
@@ -1,39 +1,39 @@
 # New ports collection makefile for:	mod_vhost_ldap
 # Date created:				Sep 10 2005
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_vhost_ldap
 PORTVERSION=	0.2.6
 CATEGORIES=	www
 MASTER_SITES=	http://alioth.debian.org/download.php/1137/
 DISTNAME=	${PORTNAME:S/_/-/g}-${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Virtual Hosting from ldap built on top of mod_ldap
 
 USE_BZIP2=	YES
 USE_OPENLDAP=	YES
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_LIB+=	${LOCALBASE}/lib -lldap
 AP_EXTRAS+=	-DMOD_VHOST_LDAP_VERSION=\\\"mod_vhost_ldap/${PORTVERSION}\\\"
 
 PORTDOCS=	mod_vhost_ldap.schema vhost_ldap.conf COPYING
 
 .if defined(PACKAGE_BUILDING)
 IGNORE=		Requires support of LDAP in apache 2.0.x port
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_vhost_ldap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mod_vhs/Makefile
===================================================================
--- head/www/mod_vhs/Makefile	(revision 150327)
+++ head/www/mod_vhs/Makefile	(revision 150328)
@@ -1,51 +1,51 @@
 # New ports collection makefile for:	mod_vhs
 # Date created:				Sun Jul 25 2004
 # Whom:					Xavier Beaudouin <kiwi@oav.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_vhs
 PORTVERSION=	1.0.26
 CATEGORIES=	www
 MASTER_SITES=	http://www.oav.net/projects/mod_vhs/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Allows mass virtual hosting using libhome system with Apache 2.0.x
 
 LIB_DEPENDS+=	home:${PORTSDIR}/misc/libhome
 
 WITH_APACHE2=	yes
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
 WANT_PHP_MOD=	yes
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 .if defined(PACKAGE_BUILDING)
 IGNORE=		This port cannot be build as package because lang/php4 requires apache2
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 AP_INC+=	${LOCALBASE}/include/home
 AP_LIB+=	${LOCALBASE}/lib -lhome
 AP_EXTRAS+=	-I ${LOCALBASE}/include/php -I ${LOCALBASE}/include/php/Zend -I ${LOCALBASE}/include/php/TSRM -DHAVE_MOD_PHP_SUPPORT
 
 PORTDOCS=	ChangeLog AUTHORS README.logs README.wildcards WARNING \
 		WARNING.THREADS README.phpopt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .   for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mod_vhs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/www/resin2/Makefile
===================================================================
--- head/www/resin2/Makefile	(revision 150327)
+++ head/www/resin2/Makefile	(revision 150328)
@@ -1,137 +1,137 @@
 # New ports collection makefile for:   resin2
 # Whom:                                Jean-Baptiste Quenot <jb.quenot@caraldi.com>
 # Date Created:                        2002-07-15 15:00:43
 #
 # $FreeBSD$
 #
 
 PORTNAME=		resin
 PORTVERSION=		2.1.16
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
 MAINTAINER=		jb.quenot@caraldi.com
 COMMENT=		Resin, a Java-based Application Server, 2.x branch
 
 USE_JAVA=		yes
 JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 USE_REINPLACE=		yes
 
 # Customizable settings
 RUNASUSER?=		www
 RUNASUID?=		80
 GROUP?=			${RUNASUSER}
 GID?=			${RUNASUID}
 PORT?=			8080
 # Do not use PKGNAMESUFFIX here because version info is already in PORTVERSION
 # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11
 APP_NAME_SUFFIX=	${PORTVERSION:C/\..*$//}
 APP_NAME?=		${PORTNAME}${APP_NAME_SUFFIX}
 LATEST_LINK=		${APP_NAME}
 APP_HOME?=		${PREFIX}/${APP_NAME}
 WITH_APACHE?=		NO
 WITH_APACHE2?=		NO
 PID_FILE?=		${APP_HOME}/${APP_NAME}.pid
 LOG_FILE?=		${APP_HOME}/${APP_NAME}.log
 
 # Other settings
 APXS?=			${LOCALBASE}/sbin/apxs
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
 REINPLACE_FILES=	${WRKSRC}/src/c/plugin/apache/Makefile.in \
 			${WRKSRC}/src/c/plugin/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
 			${FILESDIR}/pkg-deinstall \
 			${FILESDIR}/install.sh \
 			${FILESDIR}/pkg-message.in \
 			${WRKSRC}/conf/resin.conf \
 			${FILESDIR}/resinctl \
 			${FILESDIR}/resin.sh.in
 COPYDIRS=		doc lib libexec xsl
 
 .include <bsd.port.pre.mk>
 
 # Pass JAVA_HOME as determined by bsd.java.mk
 CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
 #
 # Apache 1.3
 #
 BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache13
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache
 # Allow apxs invocations
 PLIST_SUB+=		APACHE=""
 .elif defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)
 #
 # Apache 2
 #
-BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache20
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache2
 # Allow apxs invocations
 PLIST_SUB+=		APACHE=""
 .else
 PLIST_SUB+=		MOD_DIR="@comment "
 # Prevent apxs invocations
 PLIST_SUB+=		APACHE="@comment "
 .endif
 
 PLIST_SUB+=		APP_NAME=${APP_NAME}
 PLIST_SUB+=		APXS=${APXS}
 
 SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
 			-e "s|%%APP_NAME%%|${APP_NAME}|g" \
 			-e "s|%%APXS%%|${APXS}|g" \
 			-e "s|%%COPYDIRS%%|${COPYDIRS}|g" \
 			-e "s|%%FILESDIR%%|${FILESDIR}|g" \
 			-e "s|%%GROUP%%|${GROUP}|g" \
 			-e "s|%%GID%%|${GID}|g" \
 			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
 			-e "s|%%JAVA%%|${JAVA}|g" \
 			-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
 			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
 			-e "s|%%PID_FILE%%|${PID_FILE}|g" \
 			-e "s|%%PORT%%|${PORT}|g" \
 			-e "s|%%PORTNAME%%|${PORTNAME}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%RUNASUID%%|${RUNASUID}|g" \
 			-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
 			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
 			-e "s|%%WRKSRC%%|${WRKSRC}|g"
 
 post-patch:
 	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}
 	@for FILE in ${REPLACE_FILES} ; do \
 	    ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
 	    done
 	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
 .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
 defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${ECHO_CMD} The Resin Apache module mod_caucho has been activated \
 	    in the Apache configuration file, where you should also \
 	    add a line to specify the location of the Resin configuration \
 	    file, for example: | fmt -w 80 >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
 	@${ECHO_CMD} "    CauchoConfigFile ${PREFIX}/etc/${APP_NAME}.xml" >> ${PKGMESSAGE}
 	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
 
 # Resin does not handle installation, so proceed now
 post-install:
 	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
 	@${ECHO_MSG} "********************************************************************************"
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} "********************************************************************************"
 	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/resin2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/resin3/Makefile
===================================================================
--- head/www/resin3/Makefile	(revision 150327)
+++ head/www/resin3/Makefile	(revision 150328)
@@ -1,148 +1,148 @@
 # New ports collection makefile for:   resin3
 # Whom:                                Jean-Baptiste Quenot <jb.quenot@caraldi.com>
 # Date Created:                        2003-09-29 14:17:14
 #
 # $FreeBSD$
 #
 
 PORTNAME=		resin
 PORTVERSION=		3.0.14
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
 MAINTAINER=		jb.quenot@caraldi.com
 COMMENT=		Resin, a Java-based Application Server, 3.x branch
 
 USE_JAVA=		yes
 JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 USE_REINPLACE=		yes
 USE_OPENSSL=		yes
 
 # Customizable settings
 RUNASUSER?=		www
 RUNASUID?=		80
 GROUP?=			${RUNASUSER}
 GID?=			${RUNASUID}
 PORT?=			8080
 # Do not use PKGNAMESUFFIX here because version info is already in PORTVERSION
 # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11
 APP_NAME_SUFFIX=	${PORTVERSION:C/\..*$//}
 APP_NAME?=		${PORTNAME}${APP_NAME_SUFFIX}
 LATEST_LINK=		${APP_NAME}
 APP_HOME?=		${PREFIX}/${APP_NAME}
 WITH_APACHE?=		NO
 WITH_APACHE2?=		NO
 PID_FILE?=		${APP_HOME}/${APP_NAME}.pid
 LOG_FILE?=		${APP_HOME}/${APP_NAME}.log
 
 # Other settings
 APXS?=			${LOCALBASE}/sbin/apxs
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
 REINPLACE_FILES=	${WRKSRC}/modules/c/src/apache1/Makefile.in \
 			${WRKSRC}/modules/c/src/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
 			${FILESDIR}/pkg-deinstall \
 			${FILESDIR}/install.sh \
 			${FILESDIR}/pkg-message.in \
 			${WRKSRC}/conf/resin.conf \
 			${FILESDIR}/resinctl \
 			${FILESDIR}/resin.sh.in
 COPYDIRS=		lib libexec webapps
 
 .include <bsd.port.pre.mk>
 
 # Pass JAVA_HOME as determined by bsd.java.mk
 CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 			--with-openssl-lib=${OPENSSLLIB} \
 			--with-openssl-include=${OPENSSLINC}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
 #
 # Apache 1.3
 #
 BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache13
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache
 # Allow apxs invocations
 PLIST_SUB+=		APACHE=""
 .elif defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)
 #
 # Apache 2
 #
-BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache20
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache2
 # Allow apxs invocations
 PLIST_SUB+=		APACHE=""
 .else
 PLIST_SUB+=		MOD_DIR="@comment "
 # Prevent apxs invocations
 PLIST_SUB+=		APACHE="@comment "
 .endif
 
 PLIST_SUB+=		APP_NAME=${APP_NAME}
 PLIST_SUB+=		APXS=${APXS}
 
 SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
 			-e "s|%%APP_NAME%%|${APP_NAME}|g" \
 			-e "s|%%APXS%%|${APXS}|g" \
 			-e "s|%%COPYDIRS%%|${COPYDIRS}|g" \
 			-e "s|%%FILESDIR%%|${FILESDIR}|g" \
 			-e "s|%%GROUP%%|${GROUP}|g" \
 			-e "s|%%GID%%|${GID}|g" \
 			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
 			-e "s|%%JAVA%%|${JAVA}|g" \
 			-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
 			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
 			-e "s|%%PID_FILE%%|${PID_FILE}|g" \
 			-e "s|%%PORT%%|${PORT}|g" \
 			-e "s|%%PORTNAME%%|${PORTNAME}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%RUNASUID%%|${RUNASUID}|g" \
 			-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
 			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
 			-e "s|%%WRKSRC%%|${WRKSRC}|g"
 
 post-patch:
 	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}
 	@for FILE in ${REPLACE_FILES} ; do \
 	    ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
 	    done
 	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
 .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
 defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${ECHO_CMD} The Resin Apache module mod_caucho has been activated \
 	    in the Apache configuration file, where you should also \
 	    add a line to specify the location of the Resin configuration \
 	    server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
 	@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
 	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
 
 post-build:
 	cd ${WRKSRC}/modules/c/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
 
 do-install:
 	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
 .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
 	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so
 .endif
 .if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache1/.libs/mod_caucho.so
 .endif
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
 	@${ECHO_MSG} "********************************************************************************"
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} "********************************************************************************"
 	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/resin3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/www/suphp/Makefile
===================================================================
--- head/www/suphp/Makefile	(revision 150327)
+++ head/www/suphp/Makefile	(revision 150328)
@@ -1,81 +1,81 @@
 # New ports collection makefile for:	suphp
 # Date created:		15 September 2002
 # Whom:			Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	suphp
 PORTVERSION=	0.5.2
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/
 
 MAINTAINER=	freebsd@jdc.parodius.com
 COMMENT=	Securely execute ~user PHP scripts
 
 GNU_CONFIGURE=	yes
 USE_PHP=	yes
 USE_APACHE=	yes
 WANT_PHP_CGI=	yes
 CONFLICTS=	mod_php4-4* php-4.* mod_php5-5* php-5.*
 
 WITH_LOGFILE?=	/var/log/suphp.log
 PHP_PATH?=	${LOCALBASE}/bin/php
 MIN_UID?=	80
 MIN_GID?=	80
 WITH_SETID_MODE?=	owner
 MYPORTDOCS=	apache/CONFIG apache/INSTALL apache/README apache/LICENSE LICENSE INSTALL README
 LANG=		en de
 
 CONFIGURE_ARGS+=	--with-php=${PHP_PATH} \
 			--with-logfile=${WITH_LOGFILE} \
 			--with-apache-user=${WWWOWN} \
 			--with-min-gid=${MIN_UID} \
 			--with-min-uid=${MIN_GID} \
 			--with-apxs=${APXS}
 
 ## Available knobs:
 ##   WITHOUT_CHECKPATH:    disable check if script resides in DOCUMENT_ROOT
 .if defined(WITHOUT_CHECKPATH)
 CONFIGURE_ARGS+=	--disable-checkpath
 .endif
 ##   WITHOUT_CHECKUID:     accept UIDs that are not listed in /etc/passwd
 .if defined(WITHOUT_CHECKUID)
 CONFIGURE_ARGS+=	--disable-checkuid
 .endif
 ##   WITHOUT_CHECKGID:     accept GIDs that are not listed in /etc/group
 .if defined(WITHOUT_CHECKGID)
 CONFIGURE_ARGS+=	--disable-checkgid
 .endif
 ##   WITH_SETID_MODE:      mode to use for setting UID/GID.
 CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2)
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 PLIST_SUB+=	MODULEDIR="libexec/apache2/"
 .else
 PLIST_SUB+=	MODULEDIR="libexec/apache/"
 .endif
 
 show-options:
 	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
 
 pre-everything::
 	@${MAKE} show-options
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for l in ${LANG}
 	@${MKDIR} ${DOCSDIR}/${l}/apache
 .       for f in ${MYPORTDOCS}
 	@${CP} -Rfp ${WRKSRC}/doc/${l}/${f} ${DOCSDIR}/${l}/${f}
 .       endfor
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/suphp/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property